Changeset 7116 in orxonox.OLD for trunk

Timestamp:

Feb 8, 2006, 9:39:53 AM (19 years ago)

Author:

rennerc

Message:

terrain collision hack

Location:

trunk/src

Files:

• util/multiplayer_team_deathmatch.cc (modified) (3 diffs)
• world_entities/space_ships/space_ship.h (modified) (3 diffs)

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -28 +28 @@
 #include "space_ships/space_ship.h"
 
+
 #include "shared_network_data.h"
-
-#include <list>
+#include "terrain.h"
+#include "class_list.h"
+#include "space_ships/space_ship.h"
+
 
 using namespace std;
@@ -181 +184 @@
   }
 
-
-
-
+  
+  if ( SharedNetworkData::getInstance()->isGameServer() )
+  {
+    float offsetx = 500.0f;
+    float offsety = 323.0f;
+    float offsetz = 200.0f;
+    
+    offsetz += 10;
+    
+    Terrain * terrain = dynamic_cast<Terrain*>(*(ClassList::getList( CL_TERRAIN )->begin()));
+    const std::list<BaseObject*> * list = ClassList::getList( CL_SPACE_SHIP );
+    for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++)
+    {
+      SpaceShip * ss = dynamic_cast<SpaceShip*>(*it);
+      float terrx = ss->getAbsCoor().x + offsetx;
+      float terry = ss->getAbsCoor().z + offsetz;
+      float terrz = ss->getAbsCoor().y + offsety;
+      if ( terrz < terrain->getHeight( terrx, terry ) && ss->getAbsCoor().x > -1000 )
+      {
+        //PRINTF(0)("COLLLLLLIIIIIDDDDEEEE\n");
+        ss->networkCollisionList.push_back( 1234567890 );
+        ss->doCollideNetwork( 1234567890 );
+      }
+      //PRINTF(0)("x = %f, y = %f, z = %f, height = %f\n", terrx, terry, terrz, terrain->getHeight( terrx, terry ));
+      //ss->setRelCoorSoft( ss->getAbsCoor().x, terrain->getHeight( terrx, terry )-offsety, ss->getAbsCoor().z );
+      
+      float dist = (dynamic_cast<Playable*>(*it)->getAbsCoor() - big_left).len();
+      if( (dynamic_cast<Playable*>(*it)->getAbsCoor() - big_left).len() > rBig &&
+           (dynamic_cast<Playable*>(*it)->getAbsCoor() - big_right).len() > rBig &&
+           (dynamic_cast<Playable*>(*it)->getAbsCoor() - small_left).len() > rSmall &&
+           (dynamic_cast<Playable*>(*it)->getAbsCoor() - small_middle).len() > rSmall &&
+           (dynamic_cast<Playable*>(*it)->getAbsCoor() - small_right).len() > rSmall)
+      {
+        PRINTF(0)("KILLLLLLLL\n");
+
+        if((*it)->isA(CL_SPACE_SHIP))
+        {
+          dynamic_cast<SpaceShip*>(*it)->networkCollisionList.push_back(116369220.33434f);
+          dynamic_cast<SpaceShip*>(*it)->doCollideNetwork(116369220.33434f);
+        }
+      }
+    }
+  }
+
+
+#if 0
   std::list<BaseObject*>::const_iterator it;
   const std::list<BaseObject*>* list = ClassList::getList(CL_PLAYABLE);
@@ -205 +251 @@
     }
   }
-
-
-}
-
-
-
-
-
-
+#endif
+
+}
+
+
+
+
+
+

trunk/src/world_entities/space_ships/space_ship.h

@@ -46 +46 @@
     virtual int       readBytes(byte* data, int maxLength, int * reciever);
 
-
-    //HACK HACK HACK make this private or remove it
+    //HACK HACK HACK HACK make this private or remove it
     void doCollideNetwork( float energy );
+    std::list<float>        networkCollisionList;
 
   private:
@@ -54 +54 @@
 
     void calculateVelocity(float time);
-
-
 
     bool                  bUp;                //!< up button pressed.
@@ -91 +89 @@
     ParticleEmitter*      burstEmitter;
     ParticleSystem*       burstSystem;
-
-    std::list<float>        networkCollisionList;
 };