Changeset 8328 in orxonox.OLD for branches/terrain/src/lib/collision_detection

Timestamp:

Jun 12, 2006, 5:17:14 PM (19 years ago)

Author:

ponder

Message:

• Renamed Terrain into TerrainEntity in order to avoid conflicts between the importer/terrain class and the world_entities/terrain.
• Changed TerrainEntity to support the new terrain class.

Location:

branches/terrain/src/lib/collision_detection

Files:

• cd_engine.cc (modified) (2 diffs)
• cd_engine.h (modified) (3 diffs)

branches/terrain/src/lib/collision_detection/cd_engine.cc

@@ -22 +22 @@
 #include "model.h"
 #include "world_entity.h"
-#include "terrain.h"
+#include "terrain_entity.h"
+
 // #include "player.h"
 
@@ -99 +100 @@
   if( likely( this->terrain != NULL))
   {
-    Quadtree* q = dynamic_cast<Terrain*>(this->terrain)->ssp->getQuadtree();
-//    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
+        //kraus: TODO put collision detection for terrain class here...
+    //Quadtree* q = dynamic_cast<TerrainEntity*>(this->terrain)->ssp->getQuadtree();
+        //QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
   }
   

branches/terrain/src/lib/collision_detection/cd_engine.h

@@ -16 +16 @@
 class WorldEntity;
 class OBBTree;
-class Terrain;
+class TerrainEntity;
 class BspManager;
 //class Player;
@@ -50 +50 @@
   inline void disable(const int options) { int temp = this->state & options; this->state ^= temp; }
 
-  inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
+  inline void setTerrain( TerrainEntity* terrain) { this->terrain = terrain; }
   inline void setBSPModel(BspManager* bspManager) { this->bspManager = bspManager; }
 
@@ -83 +83 @@
   OBBTree*                rootTree;                         //!< for testing purposes a root tree
 
-  Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
+  TerrainEntity*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
   BspManager*             bspManager;
 };