Changeset 8087 in orxonox.OLD for branches/bsp_model/src/lib/collision_detection

Timestamp:

Jun 1, 2006, 5:10:54 PM (18 years ago)

Author:

bensch

Message:

merges some merges

Location:

branches/bsp_model/src/lib/collision_detection

Files:

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

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

@@ -29 +29 @@
 #include "quadtree_node.h"
 
-
+#include "bsp_manager.h"
 
 using namespace std;
@@ -95 +95 @@
  *  this checks the collisions with the ground
  */
-void CDEngine::checkCollisionGround()
+void CDEngine::checkCollisionGround(std::list<WorldEntity*>& list1)
 {
   if( likely( this->terrain != NULL))
   {
     Quadtree* q = dynamic_cast<Terrain*>(this->terrain)->ssp->getQuadtree();
-
 //    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
   }
-  //sTriangleExt* tri = q->getTriangleFromPosition(this->player->getAbsCoor());
+  
+  if( likely( this->bspManager != NULL))
+  {
+    std::list<WorldEntity*>::iterator iterator;
+    PRINTF(3)("checking for collisions\n");
+
+    iterator = list1.begin();
+    while (iterator != list1.end())
+    {
+      bspManager->checkCollision(*iterator);
+      iterator++;
+    }
+  }
 }
 

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

@@ -17 +17 @@
 class OBBTree;
 class Terrain;
+class BspManager;
 //class Player;
 
@@ -50 +51 @@
 
   inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
+  inline void setBSPModel(BspManager* bspManager) { this->bspManager = bspManager; }
 
   void checkCollisions(std::list<WorldEntity*>& list1, std::list<WorldEntity*>& list2);
+  void checkCollisionGround(std::list<WorldEntity*>& list1);
 
   void drawBV(const std::list<WorldEntity*>& drawList, int level) const;
@@ -69 +72 @@
 
   void checkCollisionObjects();
-  void checkCollisionGround();
+
 
   void debugSpawnTree(int depth, sVec3D* vertices, int numVertices);
@@ -81 +84 @@
 
   Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
+  BspManager*             bspManager;
 };