Changeset 5028 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Aug 15, 2005, 8:59:02 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: changed the collision detection interface again slightly to make it more useable

Location:

orxonox/trunk/src/lib/collision_detection

Files:

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

orxonox/trunk/src/lib/collision_detection/bv_tree.h

@@ -42 +42 @@
   virtual void flushTree() = NULL;
 
-  virtual void collideWith(BVTree* tree, PNode* nodeA, PNode* nodeB) = NULL;
+  virtual void collideWith(BVTree* tree, WorldEntity* nodeA, WorldEntity* nodeB) = NULL;
   virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2) = NULL;
 

orxonox/trunk/src/lib/collision_detection/bv_tree_node.h

@@ -15 +15 @@
 class BVTree;
 class PNode;
+class WorldEntity;
 template<class T> class tList;
 
@@ -29 +30 @@
   inline const int getIndex() { return this->treeIndex; }
 
-  virtual void collideWith(BVTreeNode* treeNode, PNode* nodeA, PNode* nodeB) = NULL;
+  virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB) = NULL;
 
   virtual void drawBV(int depth, int drawMode) = NULL;

orxonox/trunk/src/lib/collision_detection/obb_tree.cc

@@ -113 +113 @@
 {
   if( likely(entity2->getOBBTree() != NULL) )
-    this->rootNode->collideWith(((OBBTree*)entity2->getOBBTree())->getRootNode(), (PNode*)entity1, (PNode*)entity2);
+    this->rootNode->collideWith(((OBBTree*)entity2->getOBBTree())->getRootNode(), entity1, entity2);
 }
 
@@ -123 +123 @@
  * @param nodeB: Pnode of object B
  */
-void OBBTree::collideWith(BVTree* tree, PNode* nodeA, PNode* nodeB)
+void OBBTree::collideWith(BVTree* tree, WorldEntity* nodeA, WorldEntity* nodeB)
 {
   this->rootNode->collideWith(((OBBTree*)tree)->getRootNode(), nodeA, nodeB);

orxonox/trunk/src/lib/collision_detection/obb_tree.h

@@ -28 +28 @@
     virtual void flushTree();
 
-    virtual void collideWith(BVTree* tree, PNode* nodeA, PNode* nodeB);
+    virtual void collideWith(BVTree* tree, WorldEntity* nodeA, WorldEntity* nodeB);
     virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2);
 

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -22 +22 @@
 #include "vector.h"
 #include "abstract_model.h"
-#include "p_node.h"
+#include "world_entity.h"
 
 #include <math.h>
@@ -620 +620 @@
 
 
-void OBBTreeNode::collideWith(BVTreeNode* treeNode, PNode* nodeA, PNode* nodeB)
+void OBBTreeNode::collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB)
 {
   PRINTF(3)("collideWith\n");
@@ -647 +647 @@
        this->nodeRight->collideWith(((OBBTreeNode*)treeNode)->nodeRight, nodeA, nodeB);
       }
-    }
-  }
-}
-
-
-
-bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB, PNode* nodeA, PNode* nodeB)
+
+      /* so there is a collision and this is the last box in the tree (i.e. leaf) */
+      if( unlikely(this->nodeRight == NULL && this->nodeLeft == NULL))
+      {
+        //nodeA->collidesWith()
+      }
+    }
+  }
+}
+
+
+
+bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB)
 {
   /* first check all axis */

orxonox/trunk/src/lib/collision_detection/obb_tree_node.h

@@ -34 +34 @@
     inline void setTreeRef(OBBTree* tree) { this->obbTree = tree;}
 
-    virtual void collideWith(BVTreeNode* treeNode, PNode* nodeA, PNode* nodeB);
+    virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB);
 
     virtual void drawBV(int depth, int drawMode);
@@ -46 +46 @@
     void forkBox(OBB* box);
 
-    bool overlapTest(OBB* boxA, OBB* boxB, PNode* nodeA, PNode* nodeB);
+    bool overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB);
 
   protected: