Changeset 5870 in orxonox.OLD

Timestamp:

Dec 2, 2005, 12:30:55 PM (18 years ago)

Author:

patrick

Message:

collision_detection: getting rid of the old vertices based structure

Location:

branches/collision_detection/src/lib/collision_detection

Files:

• bounding_volume.h (modified) (2 diffs)
• obb_tree_node.cc (modified) (2 diffs)

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

@@ -23 +23 @@
 
     inline const Vector& getCenter() const { return this->center; }
+    inline const modelInfo* getModelInfo() const { return this->modelInf; }
 
-    const sVec3D* getVertices() const { return this->vertices; }
     virtual void mergeWith(const BoundingVolume &bv) = 0;
 
@@ -34 +34 @@
     Vector              center;                     //!< Center point of box
 
-    const sVec3D*       vertices;                   //!< if CD_STORE_VERTICES enabled, this is the place, where the vert. will be sotred
-    int                 numOfVertices;              //!< number of vertices in the vertices buffer
     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
+    int                 triangleIndexesLength;      //!< length of the indexes array
 };
 

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

@@ -127 +127 @@
   this->bvElement->modelInf = &modelInf;
   this->bvElement->triangleIndexes = triangleIndexes;
-  this->bvElement->numTriangles = length;
+  this->bvElement->triangleIndexesLength = length;
 
   /* create the boxes in three steps */
@@ -605 +605 @@
 
 
-  //for (element = nameList.begin(); element != nameList.end(); element++)
-//   iterator = partition2.getIterator();
-//   element = iterator->firstElement();
 
   for(element = partition2.begin(), index = 0; element != partition2.end(); element++, index++)