Changeset 5702 in orxonox.OLD

Timestamp:

Nov 22, 2005, 1:11:06 PM (18 years ago)

Author:

patrick

Message:

collision_detection: interface change, const war continued

Location:

branches/collision_detection/src/lib/collision_detection

Files:

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

branches/collision_detection/src/lib/collision_detection/bounding_volume.cc

@@ -45 +45 @@
   if( this->vertices && !this->bOrigVertices)
     delete[] this->vertices;
+  
+  if( this->triangleIndexes)
+    delete[] this->triangleIndexes;
 }

branches/collision_detection/src/lib/collision_detection/bounding_volume.h

@@ -37 +37 @@
     int                 numOfVertices;              //!< number of vertices in the vertices buffer
     bool                bOrigVertices;              //!< is true if the vertices pointer points to the original model data - only important for deleting
+    const modelInfo*    modelInf;                   //!< Reference to the model's ModelInfo
+    const int*          triangleIndexes;            //!< Array with the triangle indexes in modelInfo
+    unsigned int        numTriangles;               //!< Number of triangles in this BV
 };
 

branches/collision_detection/src/lib/collision_detection/bv_tree.h

@@ -40 +40 @@
 
   virtual void spawnBVTree(int depth, sVec3D *verticesList, const int length) = 0;
-  virtual void spawnBVTree(int depth, const modelInfo& modInfo) = 0;
+  virtual void spawnBVTree(int depth, const modelInfo& modelInf) = 0;
   virtual void flushTree() = 0;
 

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

@@ -27 +27 @@
 
   virtual void spawnBVTree(const int depth, const sVec3D *verticesList, unsigned int length ) = 0;
-  virtual void spawnBVTree(const int depth, const modelInfo& modInfo) = 0;
+  virtual void spawnBVTree(const int depth, const modelInfo& modInfo, const int* triangleIndexes, unsigned int length) = 0;
 
   virtual BoundingVolume* getBV(int index) const = 0;

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

@@ -83 +83 @@
 
 
-void OBBTree::spawnBVTree(int depth, const modelInfo& modInfo)
+void OBBTree::spawnBVTree(int depth, const modelInfo& modelInf)
 {
   if( unlikely(this->rootNode != NULL))
@@ -93 +93 @@
   this->rootNode = node;
   this->rootNode->setTreeRef(this);
-  this->rootNode->spawnBVTree(--depth, modInfo);
+  
+  /* triangles indexes created */
+  int* triangleIndexes = new int[modelInf.numTriangles];
+  
+  this->rootNode->spawnBVTree(--depth, modelInf, triangleIndexes, modelInf.numTriangles);
 }
 

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

@@ -27 +27 @@
 
     virtual void spawnBVTree(int depth, sVec3D *verticesList, const int length);
-    virtual void spawnBVTree(int depth, const modelInfo& modInfo);
+    virtual void spawnBVTree(int depth, const modelInfo& modelInf);
     virtual void flushTree();
 

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

@@ -111 +111 @@
  * on the triangle informations (triangle soup not polygon soup)
  */
-void OBBTreeNode::spawnBVTree(const int depth, const modelInfo& modInfo)
-{
-  int length = 0;
+void OBBTreeNode::spawnBVTree(const int depth, const modelInfo& modelInf, 
+                              const int* triangleIndexes, unsigned int length)
+{
   sVec3D* verticesList;
 
@@ -123 +123 @@
 
   this->bvElement = new OBB();
-  this->bvElement->vertices = verticesList;
-  this->bvElement->numOfVertices = length;
+  
+  this->bvElement->modelInf = &modelInf;
+  this->bvElement->triangleIndexes = triangleIndexes;
+  this->bvElement->numTriangles = length;
+  
   PRINTF(3)("Created OBBox\n");
-  this->calculateBoxCovariance(this->bvElement, modInfo);
+  this->calculateBoxCovariance(this->bvElement, modelInf, triangleIndexes, length);
   PRINTF(3)("Calculated attributes1\n");
-  this->calculateBoxEigenvectors(this->bvElement, modInfo);
+  this->calculateBoxEigenvectors(this->bvElement, modelInf, triangleIndexes, length);
   PRINTF(3)("Calculated attributes2\n");
-  this->calculateBoxAxis(this->bvElement,modInfo);
+  this->calculateBoxAxis(this->bvElement, modelInf, triangleIndexes, length);
   PRINTF(3)("Calculated attributes3\n");
 
@@ -228 +231 @@
 
 
-void OBBTreeNode::calculateBoxCovariance(OBB* box, const modelInfo& modInfo)
+void OBBTreeNode::calculateBoxCovariance(OBB* box, const modelInfo& modInfo, const int* triangleIndexes, unsigned int length)
 {}
 
@@ -421 +424 @@
 
 
-void OBBTreeNode::calculateBoxEigenvectors(OBB* box, const modelInfo& modInfo)
+void OBBTreeNode::calculateBoxEigenvectors(OBB* box, const modelInfo& modInfo, 
+                                           const int* triangleIndexes, unsigned int length)
 {}
 
@@ -473 +477 @@
 
 
-void OBBTreeNode::calculateBoxAxis(OBB* box, const modelInfo& modInfo)
+void OBBTreeNode::calculateBoxAxis(OBB* box, const modelInfo& modInfo, const int* triangleIndexes, unsigned int length)
 {
   this->calculateBoxAxis(box, (const sVec3D*)modInfo.pVertices, modInfo.numVertices);

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

@@ -29 +29 @@
 
     virtual void spawnBVTree(const int depth, const sVec3D *verticesList, unsigned int length);
-    virtual void spawnBVTree(const int depth, const modelInfo& modInfo);
+    virtual void spawnBVTree(const int depth, const modelInfo& modelInf, 
+                             const int* triangleIndexes, unsigned int length);
 
     BoundingVolume* getBV(int index) const { return (BoundingVolume*)this->bvElement; }
@@ -46 +47 @@
     void calculateBoxAxis(OBB* box, const sVec3D* verticesList, unsigned int length);
 
-    void calculateBoxCovariance(OBB* box, const modelInfo& modInfo);
-    void calculateBoxEigenvectors(OBB* box, const modelInfo& modInfo);
-    void calculateBoxAxis(OBB* box, const modelInfo& modInfo);
+    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);