Changeset 4521 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 6, 2005, 11:27:10 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some corrections and additions

Location:

orxonox/trunk/src/util/collision_detection

Files:

• bounding_volume.h (modified) (1 diff)
• obb.h (modified) (1 diff)

orxonox/trunk/src/util/collision_detection/bounding_volume.h

@@ -24 +24 @@
   inline const sVect3D* getHalfLength() const { return this->halfLength; } 
 
-  sVect3D* getVertices() const;
-  void mergeWith(const BoundingVolume& bv);
+  virtual sVect3D* getVertices() const = NULL;
+  virtual void mergeWith(const BoundingVolume& bv) = NULL;
+
+  virtual void drawBV(int currentDepth, int depth) = NULL;
+  virtual void drawBVPolygon(int currentDepth, int depth) const = NULL;
+  virtual void drawBVBlended(int currentDepth, int depth) const = NULL;
 
  private:
-  Vector*    center;                     //!< Center point of box
-  Vector*    axis;                       //!< Axes of oriented box [x,y,z]
-  sVect3D*   halfLength;                 //!< Half lengths of the box
+  Vector*             center;                     //!< Center point of box
+  Vector*             axis;                       //!< Axes of oriented box [x,y,z]
+  sVect3D*            halfLength;                 //!< Half lengths of the box
 
-
+  unsigned int        treeIndex;                  //!< Index number of the BV in the tree
 };
 

orxonox/trunk/src/util/collision_detection/obb.h

@@ -20 +20 @@
 
 
+
  private:
-
+  OBB*     leftNode;                   //!< left node of the tree
+  OBB*     rightNode;                  //!< right node of the tree
 };