Changeset 5717 in orxonox.OLD for branches/collision_detection/src/lib

Timestamp:

Nov 23, 2005, 12:31:47 AM (19 years ago)

Author:

patrick

Message:

collision_detection: work flush

Location:

branches/collision_detection/src/lib/collision_detection

Files:

• bv_tree_node.h (modified) (1 diff)
• cd_engine.cc (modified) (3 diffs)
• obb_tree.cc (modified) (2 diffs)
• obb_tree.h (modified) (1 diff)
• obb_tree_node.cc (modified) (2 diffs)
• obb_tree_node.h (modified) (2 diffs)

branches/collision_detection/src/lib/collision_detection/bv_tree_node.h

@@ -26 +26 @@
   virtual ~BVTreeNode();
 
+  virtual const BoundingVolume* getBV() const = 0;
+  inline const int getIndex() const { return this->treeIndex; }
+
   virtual void spawnBVTree(const sVec3D *verticesList, unsigned int length ) = 0;
   virtual void spawnBVTree(const modelInfo& modInfo, const int* triangleIndexes, unsigned int length) = 0;
 
-  virtual const BoundingVolume* getBV() const = 0;
-  inline const int getIndex() { return this->treeIndex; }
-
-  virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB) = 0;
+  virtual void collideWith(const BVTreeNode& treeNode, const WorldEntity& nodeA, const WorldEntity& nodeB) const = 0;
 
   virtual void drawBV(int depth, int drawMode, const Vector& color = Vector(1,0,0), bool top = true) const = 0;

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

@@ -14 +14 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION_DETECTION
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION
 
 #include "cd_engine.h"
@@ -78 +78 @@
 void CDEngine::checkCollisionObjects()
 {
-  BVTree* tree;
+  const BVTree* tree;
   tIterator<WorldEntity>* iterator1 = entityList->getIterator();
   tIterator<WorldEntity>* iterator2 = entityList->getIterator();
@@ -94 +94 @@
         if( likely(entity2 != this->terrain))
         {
-          PRINTF(4)("checking object %s against %s\n", entity1->getName(), entity2->getName());
+          printf("checking object %s against %s\n", entity1->getName(), entity2->getName());
           tree = entity1->getOBBTree();
-          if( likely(tree != NULL) && entity2->getOBBTree() != NULL) tree->collideWith(entity1, entity2);
+
+          if( likely(tree != NULL) && entity2->getOBBTree() != NULL)
+            //tree->collideWith(entity1, entity2);
+            PRINTF(5)("Collision check\n");
         }
         entity2 = iterator2->nextElement();

branches/collision_detection/src/lib/collision_detection/obb_tree.cc

@@ -87 +87 @@
     this->flushTree();
   }
-  OBBTreeNode* node = new OBBTreeNode(*this, depth);
-  this->rootNode = node;
+  this->rootNode = new OBBTreeNode(*this, depth-1);
 
   /* triangles indexes created */
@@ -97 +96 @@
   this->rootNode->spawnBVTree(modelInf, triangleIndexes, modelInf.numTriangles);
 }
+
+
 
 

branches/collision_detection/src/lib/collision_detection/obb_tree.h

@@ -34 +34 @@
     virtual void drawBV(int depth, int drawMode) const;
 
-    int getID() { return ++this->id;}
-    inline OBBTreeNode* getRootNode() { return this->rootNode; }
+    const int getID() { return ++this->id;}
+    inline const OBBTreeNode* getRootNode() const { return this->rootNode; }
 
     void debug();

branches/collision_detection/src/lib/collision_detection/obb_tree_node.cc

@@ -600 +600 @@
 
 
-void OBBTreeNode::collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB)
+void OBBTreeNode::collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB) const
 {
   PRINTF(3)("collideWith\n");
@@ -645 +645 @@
 
 
-bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB)
+bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB) const
 {
   if( boxB == NULL || boxA == NULL)

branches/collision_detection/src/lib/collision_detection/obb_tree_node.h

@@ -34 +34 @@
     virtual void spawnBVTree(const modelInfo& modelInf, const int* triangleIndexes, unsigned int length);
 
-    virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB);
+    virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB) const;
     virtual void drawBV(int depth, int drawMode, const Vector& color = Vector(1,0,0), bool top = true) const;
     void debug() const;
@@ -48 +48 @@
     void forkBox(OBB& box);
 
-    bool overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB);
+    bool overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB) const;