Changeset 5924 in orxonox.OLD for branches/avi_play/src/lib/collision_detection/cd_engine.cc

Timestamp:

Dec 4, 2005, 11:37:49 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the Trunk back into the branche avi_play again

merged with command svn merge ../trunk/ avi_play/ -r5845:HEAD
no conflicts

File:

• branches/avi_play/src/lib/collision_detection/cd_engine.cc (modified) (2 diffs)

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

@@ -24 +24 @@
 #include "world_entity.h"
 #include "terrain.h"
-#include "player.h"
+// #include "player.h"
 
 #include "spatial_separation.h"
@@ -119 +119 @@
     Quadtree* q = this->terrain->ssp->getQuadtree();
 
-    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
+//    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
   }
   //sTriangleExt* tri = q->getTriangleFromPosition(this->player->getAbsCoor());