Changeset 7711 in orxonox.OLD for trunk/src/lib/collision_detection/bounding_volume.h

Timestamp:

May 18, 2006, 11:44:21 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the cd branche back to trunk

File:

• trunk/src/lib/collision_detection/bounding_volume.h (modified) (3 diffs)

trunk/src/lib/collision_detection/bounding_volume.h

@@ -11 +11 @@
 #include "model.h"
 
-class Vector;
+
 template<class T> class tList;
 
@@ -22 +22 @@
     virtual ~BoundingVolume();
 
-    inline const Vector* getCenter() const { return this->center; }
+    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;
 
@@ -32 +32 @@
 
   public:
-    Vector*             center;                     //!< Center point of box
+    Vector              center;                     //!< Weighter average center point of box
+    Vector              arithCenter;                //!< Arithmetical center of the 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
-    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
+    int                 triangleIndexesLength;      //!< length of the indexes array
 };