Changeset 4919 in orxonox.OLD

Timestamp:

Jul 21, 2005, 12:49:18 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: CDEngine knows player and gets the array offsets

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• lib/collision_detection/cd_engine.h (modified) (3 diffs)
• lib/graphics/spatial_separation/spatial_separation.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• world_entities/terrain.h (modified) (1 diff)

orxonox/trunk/src/lib/collision_detection/cd_engine.cc

@@ -20 +20 @@
 #include "debug.h"
 #include "abstract_model.h"
+#include "list.h"
+
 #include "world_entity.h"
-#include "list.h"
+#include "terrain.h"
+#include "player.h"
+
+#include "spatial_separation.h"
+#include "quadtree.h"
+#include "quadtree_node.h"
+
 
 using namespace std;
@@ -93 +101 @@
 void CDEngine::checkCollisionGround()
 {
-
+  Quadtree* q = this->terrain->ssp->getQuadtree();
+  q->getQuadtreeFromPosition(this->player->getAbsCoor());
 
 }

orxonox/trunk/src/lib/collision_detection/cd_engine.h

@@ -16 +16 @@
 class OBBTree;
 class Terrain;
+class Player;
 
 
@@ -47 +48 @@
   inline void setEntityList(tList<WorldEntity>* entityList) { this->entityList = entityList; }
   inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
+  inline void setPlayer(Player* player) { this->player = player; } /* only for debug purposes \todo: delete*/
 
   void drawBV(int depth, int drawMode) const;
@@ -72 +74 @@
 
   Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
+  Player*                 player;
 };
 

orxonox/trunk/src/lib/graphics/spatial_separation/spatial_separation.h

@@ -33 +33 @@
     Quadtree* createQuadtree(AbstractModel* model);
 
+    inline Quadtree* getQuadtree() { return this->quadtree; }
 
     void drawQuadtree();

orxonox/trunk/src/story_entities/world.cc

@@ -377 +377 @@
           // if we load a 'Player' we use it as localPlayer
           //todo do this more elegant
-          if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
+          if( element->Value() != NULL && !strcmp( element->Value(), "Player"))
+          {
+            localPlayer = (Player*) created;
+            CDEngine::getInstance()->setPlayer(localPlayer);
+          }
           if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
           if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))

orxonox/trunk/src/world_entities/terrain.h

@@ -37 +37 @@
   virtual void draw();
 
+  public:
+    SpatialSeparation* ssp;
+
  private:
   int objectList;
-  SpatialSeparation* ssp;
+
 };