Changeset 4700 in orxonox.OLD

Timestamp:

Jun 26, 2005, 12:37:38 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: 3 axis get checked:) 12 to go…

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/bv_tree.h (modified) (2 diffs)
• lib/collision_detection/bv_tree_node.h (modified) (2 diffs)
• lib/collision_detection/obb_tree.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree.h (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.h (modified) (3 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

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

@@ -15 +15 @@
 class BoundingVolume;
 class BVTreeNode;
+class PNode;
 
 typedef enum DrawMode
@@ -39 +40 @@
   virtual void flushTree() = NULL;
 
-  virtual void collideWith(BVTree* tree) = NULL;
+  virtual void collideWith(BVTree* tree, PNode* nodeA, PNode* nodeB) = NULL;
 
   virtual void drawBV(int depth, int drawMode) const = NULL;

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

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

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

@@ -22 +22 @@
 #include "compiler.h"
 #include "material.h"
+#include "p_node.h"
 
 using namespace std;
@@ -103 +104 @@
 
 
-void OBBTree::collideWith(BVTree* tree)
+void OBBTree::collideWith(BVTree* tree, PNode* nodeA, PNode* nodeB)
 {
-  this->rootNode->collideWith(((OBBTree*)tree)->getRootNode());
+  this->rootNode->collideWith(((OBBTree*)tree)->getRootNode(), nodeA, nodeB);
 }
 

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

@@ -14 +14 @@
 class Material;
 class OBBTreeNode;
+class PNode;
 
 //! A class for representing an obb tree
@@ -27 +28 @@
     virtual void flushTree();
 
-    virtual void collideWith(BVTree* tree);
+    virtual void collideWith(BVTree* tree, PNode* nodeA, PNode* nodeB);
 
     virtual void drawBV(int depth, int drawMode) const;

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

@@ -22 +22 @@
 #include "vector.h"
 #include "abstract_model.h"
+#include "p_node.h"
 
 #include <math.h>
@@ -604 +605 @@
 
 
-void OBBTreeNode::collideWith(BVTreeNode* treeNode)
-{
-  PRINTF(0)("collideWith");
+void OBBTreeNode::collideWith(BVTreeNode* treeNode, PNode* nodeA, PNode* nodeB)
+{
+  PRINTF(0)("collideWith\n");
   /* if the obb overlap, make subtests: check which node is realy overlaping  */
-  if( this->overlapTest(this->bvElement, ((OBBTreeNode*)treeNode)->bvElement))
+  if( this->overlapTest(this->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
   {
     /* check if left node overlaps */
     if( unlikely( this->nodeLeft != NULL))
-      if( this->overlapTest(this->nodeLeft->bvElement, ((OBBTreeNode*)treeNode)->bvElement))
-        this->nodeLeft->collideWith(((OBBTreeNode*)treeNode)->nodeLeft);
+      if( this->overlapTest(this->nodeLeft->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
+        this->nodeLeft->collideWith(((OBBTreeNode*)treeNode)->nodeLeft, nodeA, nodeB);
     /* check if right node overlaps */
     if( unlikely( this->nodeRight != NULL))
-      if(this->overlapTest(this->nodeRight->bvElement, ((OBBTreeNode*)treeNode)->bvElement))
-        this->nodeLeft->collideWith(((OBBTreeNode*)treeNode)->nodeRight);
-  }
-}
-
-
-
-bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB)
-{
+      if(this->overlapTest(this->nodeRight->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
+        this->nodeLeft->collideWith(((OBBTreeNode*)treeNode)->nodeRight, nodeA, nodeB);
+  }
+}
+
+
+
+bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB, PNode* nodeA, PNode* nodeB)
+{
+  
+  
   /* first check all axis */
-  float r = 0.0f;
-  Vector l = boxA->axis[0];
-  for(int i = 0; i < 3; ++i)
-  {
-    r += boxA->halfLength[i] * boxA->axis[i].dot(l);
-  }
-
-  printf("r = %f\n", r);
-  /* now check all orthogonals from the axis */
+  Vector t = nodeA->getAbsCoor() + *boxA->center - ( nodeB->getAbsCoor() + *boxB->center);
+  float rA = 0.0f;
+  float rB = 0.0f;
+  Vector l;
+
+  for(int j = 0; j < 3; ++j)
+    {
+      rA = 0.0f;
+      rB = 0.0f;
+      l = boxA->axis[j];
+
+      for(int i = 0; i < 3; ++i)
+        {
+          rA += fabs(boxA->halfLength[i] * boxA->axis[i].dot(l));
+        }
+  
+      for(int i = 0; i < 3; ++i)
+        {
+          rB += fabs(boxB->halfLength[i] * boxB->axis[i].dot(l));
+        }
+  
+      PRINTF(0)("s = %f, rA+rB = %f\n", fabs(t.dot(l)), rA+rB);
+
+      if( (rA + rB) < fabs(t.dot(l)))
+        PRINTF(0)(" - The Boxes are disjoint!\n");
+      else
+        PRINTF(0)(" - The Boxes are not disjoint\n");
+  
+      PRINTF(0)("rA = %f, rB = %f\n", rA, rB);
+
+
+      /* now check all orthogonals from the axis */
+
+    }
+  return false;
 }
 

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

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

orxonox/trunk/src/world_entities/world_entity.cc

@@ -130 +130 @@
 void WorldEntity::collideWith(WorldEntity* entity)
 {
-  this->obbTree->collideWith(entity->obbTree);
+  this->obbTree->collideWith(entity->obbTree, (PNode*)this, (PNode*)entity);
 }