Changeset 4525 in orxonox.OLD

Timestamp:

Jun 7, 2005, 12:37:43 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented some more bv, obb and bs functions now reached the point to start implementing it

Location:

orxonox/trunk/src/util/collision_detection

Files:

• bounding_sphere.h (modified) (1 diff)
• bounding_volume.h (modified) (2 diffs)
• obb.h (modified) (1 diff)

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

@@ -19 +19 @@
   virtual ~BoundingSphere();
 
+  inline const float getRadius () const { return this->radius; }
 
  private:
-
+  float radius;
 };
 

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

@@ -21 +21 @@
 
   inline const Vector* getCenter() const { return this->center; }
-  inline const Vector* getAxis () const { return this->axis; }
-  inline const sVect3D* getHalfLength() const { return this->halfLength; } 
+  inline const int getIndex() { return this->treeIndex; }
 
   virtual sVect3D* getVertices() const = NULL;
@@ -31 +30 @@
   virtual void drawBVBlended(int currentDepth, const 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
 
   unsigned int        treeIndex;                  //!< Index number of the BV in the tree

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

@@ -19 +19 @@
   virtual ~OBB();
 
-
+  inline const Vector* getAxis () const { return this->axis; }
+  inline const sVect3D* getHalfLength() const { return this->halfLength; } 
 
  private:
-  OBB*     leftNode;                   //!< left node of the tree
-  OBB*     rightNode;                  //!< right node of the tree
+  Vector*          axis;                       //!< Axes of oriented box [x,y,z]
+  sVect3D*         halfLength;                 //!< Half lengths of the box
+
+  OBB*             leftNode;                   //!< left node of the tree
+  OBB*             rightNode;                  //!< right node of the tree
 };