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

Timestamp:

Jun 12, 2006, 5:17:14 PM (18 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.

File:

• branches/terrain/src/lib/collision_detection/cd_engine.cc (modified) (2 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());
   }