Changeset 6447 in orxonox.OLD

Timestamp:

Jan 9, 2006, 12:39:15 AM (18 years ago)

Author:

patrick

Message:

collision: some more debug work on the collision detection framework

Location:

branches/collision_detection/src/lib/collision_detection

Files:

• bv_tree_node.h (modified) (1 diff)
• obb_tree.cc (modified) (1 diff)
• obb_tree.h (modified) (2 diffs)
• obb_tree_node.cc (modified) (11 diffs)
• obb_tree_node.h (modified) (5 diffs)

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

@@ -34 +34 @@
   inline const int getIndex() const { return this->treeIndex; }
 
-  virtual void spawnBVTree(const modelInfo& modInfo, const int* triangleIndexes, unsigned int length) = 0;
+  virtual void spawnBVTree(const modelInfo& modInfo, const int* triangleIndexes, int length) = 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/obb_tree.cc

@@ -66 +66 @@
     this->flushTree();
   }
-  this->rootNode = new OBBTreeNode(*this, depth-1);
+  this->rootNode = new OBBTreeNode(*this, NULL, depth-1);
 
   /* triangles indexes created */

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

@@ -32 +32 @@
 
     /** returns the next if for the obb tree node @return integer id number of the next node */
-    const int getID() { return ++this->id;}
+    inline const int getID() { return ++this->id;}
     /** returns the root node of the bounding volume tree @return reference to the root node */
     inline const OBBTreeNode* getRootNode() const { return this->rootNode; }
@@ -40 +40 @@
   private:
     OBBTreeNode*         rootNode;                        //!< reference to the root node of the tree
-    int                  id;
+    int                  id;                              //!< the next id of a obb tree node
     int                  depth;                           //!< the depth of the tree to generate
 };

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

@@ -11 +11 @@
 ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: ...
 */
 
@@ -44 +43 @@
  * @param depth: the depth of the obb tree to generate
  */
-OBBTreeNode::OBBTreeNode (const OBBTree& tree, unsigned int depth)
+OBBTreeNode::OBBTreeNode (const OBBTree& tree, OBBTreeNode* prev, int depth)
     : BVTreeNode()
 {
@@ -50 +49 @@
 
   this->obbTree = &tree;
+  this->nodePrev = prev;
   this->depth = depth;
+  this->nextID = 0;
 
   this->nodeLeft = NULL;
@@ -64 +65 @@
   if( OBBTreeNode_sphereObj == NULL)
     OBBTreeNode_sphereObj = gluNewQuadric();
+
+  /* debug ids */
+  if( this->nodePrev)
+    this->treeIndex = 100 * this->depth + this->nodePrev->getID();
+  else
+    this->treeIndex = 0;
 }
 
@@ -95 +102 @@
  * on the triangle informations (triangle soup not polygon soup)
  */
-void OBBTreeNode::spawnBVTree(const modelInfo& modelInf, const int* triangleIndexes, unsigned int length)
+void OBBTreeNode::spawnBVTree(const modelInfo& modelInf, const int* triangleIndexes, int length)
 {
   PRINTF(3)("\n==============================Creating OBB Tree Node==================\n");
   PRINT(3)(" OBB Tree Infos: \n");
-  PRINT(3)("\tDepth: %i \n\tTree Index: %i \n\tNumber of Triangles: %i\n", depth, treeIndex, length);
+  PRINT(3)("\tDepth: %i \n\tTree Index: %i \n\tNumber of Triangles: %i\n", depth, this->treeIndex, length);
   this->depth = depth;
 
@@ -107 +114 @@
   this->bvElement->triangleIndexesLength = length;
 
-  /* create the boxes in three steps */
+  /* create the bounding boxes in three steps */
   this->calculateBoxCovariance(*this->bvElement, modelInf, triangleIndexes, length);
   this->calculateBoxEigenvectors(*this->bvElement, modelInf, triangleIndexes, length);
@@ -119 +126 @@
     if( this->triangleIndexLength1 >= 3)
     {
-      this->nodeLeft = new OBBTreeNode(*this->obbTree, depth - 1);
+      this->nodeLeft = new OBBTreeNode(*this->obbTree, this, depth - 1);
       this->nodeLeft->spawnBVTree(modelInf, this->triangleIndexList1, this->triangleIndexLength1);
     }
     if( this->triangleIndexLength2 >= 3)
     {
-      this->nodeRight = new OBBTreeNode(*this->obbTree, depth - 1);
+      this->nodeRight = new OBBTreeNode(*this->obbTree, this, depth - 1);
       this->nodeRight->spawnBVTree(modelInf, this->triangleIndexList2, this->triangleIndexLength2);
     }
@@ -139 +146 @@
  * @param length: the length of the indexes array
  */
-void OBBTreeNode::calculateBoxCovariance(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, unsigned int length)
+void OBBTreeNode::calculateBoxCovariance(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, int length)
 {
   float     facelet[length];                         //!< surface area of the i'th triangle of the convex hull
@@ -269 +276 @@
  */
 void OBBTreeNode::calculateBoxEigenvectors(OBB& box, const modelInfo& modelInf,
-    const int* triangleIndexes, unsigned int length)
+    const int* triangleIndexes, int length)
 {
 
@@ -305 +312 @@
  * @param length: the length of the indexes array
  */
-void OBBTreeNode::calculateBoxAxis(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, unsigned int length)
+void OBBTreeNode::calculateBoxAxis(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, int length)
 {
 
@@ -448 +455 @@
 
   /* find the center of the box */
-
   this->separationPlane = Plane(box.axis[longestAxisIndex], box.center);
   this->sepPlaneCenter[0] = box.center.x;

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

@@ -25 +25 @@
 
   public:
-    OBBTreeNode(const OBBTree& tree, unsigned int depth);
+    OBBTreeNode(const OBBTree& tree, OBBTreeNode* prev, int depth);
     virtual ~OBBTreeNode();
 
@@ -31 +31 @@
     virtual inline const BoundingVolume* getBV() const { return (BoundingVolume*)this->bvElement; }
 
-    virtual void spawnBVTree(const modelInfo& modelInf, const int* triangleIndexes, unsigned int length);
+    virtual void spawnBVTree(const modelInfo& modelInf, const int* triangleIndexes, int length);
 
     virtual void collideWith(const BVTreeNode& treeNode, const WorldEntity& nodeA, const WorldEntity& nodeB) const;
@@ -37 +37 @@
     void debug() const;
 
+    /**  gets the id of the current child @return id of the child */
+    inline const int getID() { return this->nextID++; }
 
   private:
     void calculateBoxAxis(OBB& box, const sVec3D* verticesList, unsigned int length);
 
-    void calculateBoxCovariance(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, unsigned int length);
-    void calculateBoxEigenvectors(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, unsigned int length);
-    void calculateBoxAxis(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, unsigned int length);
+    void calculateBoxCovariance(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, int length);
+    void calculateBoxEigenvectors(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, int length);
+    void calculateBoxAxis(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, int length);
     void forkBox(OBB& box);
 
@@ -51 +53 @@
   protected:
     OBB*                bvElement;                  //!< the obb element
+    OBBTreeNode*        nodePrev;                   //!< ref to the previous (parent) tree node = NULL if first
     OBBTreeNode*        nodeLeft;                   //!< ref to the left tree node
     OBBTreeNode*        nodeRight;                  //!< ref to the right tree node
@@ -56 +59 @@
 
   private:
-    unsigned int        treeIndex;                  //!< Index number of the BV in the tree
+    int                 treeIndex;                  //!< Index number of the BV in the tree
+    int                 nextID;                     //!< the id of the next child
     int                 depth;                      //!< the depth of the node in the tree
     const OBBTree*      obbTree;                    //!< reference to the obb tree