Changeset 5705 in orxonox.OLD

Timestamp:

Nov 22, 2005, 2:22:40 PM (18 years ago)

Author:

patrick

Message:

collision_detection: slowly removing old functions and exchanging them with the new interface

Location:

branches/collision_detection/src/lib/collision_detection

Files:

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

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

@@ -94 +94 @@
   /* triangles indexes created */
   int* triangleIndexes = new int[modelInf.numTriangles];
+  for(int i = 0; i < modelInf.numTriangles; ++i)
+    triangleIndexes[i] = i;
   
   this->rootNode->spawnBVTree(--depth, modelInf, triangleIndexes, modelInf.numTriangles);

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

@@ -124 +124 @@
   this->bvElement->numTriangles = length;
   
+  /* create the boxes in three steps */
   this->calculateBoxCovariance(this->bvElement, modelInf, triangleIndexes, length);
   this->calculateBoxEigenvectors(this->bvElement, modelInf, triangleIndexes, length);
   this->calculateBoxAxis(this->bvElement, modelInf, triangleIndexes, length);
 
-  /* if this is the first node, the vertices data are the original ones of the model itself, 
-     so dont delete them in cleanup */
+  /* do we need to descent further in the obb tree?*/
   if( likely( this->depth > 0))
   {
@@ -218 +218 @@
 
 
-void OBBTreeNode::calculateBoxCovariance(OBB* box, const modelInfo& modInfo, const int* triangleIndexes, unsigned int length)
-{}
-
-
-void OBBTreeNode::calculateBoxCovariance(OBB* box, const sVec3D* verticesList, unsigned int length)
-{
+void OBBTreeNode::calculateBoxCovariance(OBB* box, const modelInfo& modInfo, 
+                                         const int* triangleIndexes, unsigned int length)
+{
+  const sVec3D* verticesList;
+  
   PRINTF(3)("Created OBBox\n");
   

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

@@ -32 +32 @@
     virtual inline const BoundingVolume* getBV() const { return (BoundingVolume*)this->bvElement; }
     
+    
     virtual void spawnBVTree(const int depth, const sVec3D *verticesList, unsigned int length);
     virtual void spawnBVTree(const int depth, const modelInfo& modelInf, 
@@ -37 +38 @@
 
     virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB);
-
     virtual void drawBV(int depth, int drawMode, const Vector& color = Vector(1,0,0), bool top = true) const;
-
     void debug() const;
 
+    
   private:
-    void calculateBoxCovariance(OBB* box, const sVec3D* verticesList, unsigned int length);
     void calculateBoxEigenvectors(OBB* box, const sVec3D* verticesList, unsigned int length);
     void calculateBoxAxis(OBB* box, const sVec3D* verticesList, unsigned int length);
@@ -51 +50 @@
     void calculateBoxAxis(OBB* box, const modelInfo& modelInf, const int* triangleIndexes, unsigned int length);
 
-
     void forkBox(OBB* box);
 
     bool overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB);
 
+    
   protected:
     OBB*                bvElement;                  //!< the obb element
@@ -61 +60 @@
     OBBTreeNode*        nodeRight;                  //!< ref to the right tree node
 
+
   private:
     unsigned int        treeIndex;                  //!< Index number of the BV in the tree
+    int                 depth;                      //!< the depth of the node in the tree
+    const OBBTree*      obbTree;                    //!< reference to the obb tree
+    
     const sVec3D*       vertices;                   //!< pointer to the vertices data
     int                 numOfVertices;              //!< number of vertices in vertices data
-    int                 depth;                      //!< the depth of the node in the tree
-    const OBBTree*      obbTree;                    //!< reference to the obb tree
     Plane               separationPlane;            //!< the separation plane of the obb
     const sVec3D*       sepPlaneCenter;             //!< only needed to draw plane
@@ -81 +82 @@
     static float*       eigvlMat;
     static int*         rotCount;
+    
 };