Changeset 6657 in orxonox.OLD for branches/cd_merge/src/lib/collision_detection/obb.h

Timestamp:

Jan 23, 2006, 2:25:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/cd_merge: merged the old collision-detection here.

File:

• branches/cd_merge/src/lib/collision_detection/obb.h (modified) (2 diffs)

branches/cd_merge/src/lib/collision_detection/obb.h

@@ -21 +21 @@
 
 
-  inline Vector* getAxis () const { return this->axis; }
+  inline Vector getAxisX () const { return this->axis[0]; }
+  inline Vector getAxisY () const { return this->axis[1]; }
+  inline Vector getAxisZ () const { return this->axis[2]; }
+
   inline const float* getHalfLength() const { return this->halfLength; }
 
@@ -31 +34 @@
 
  public:
-  Vector*          axis;                       //!< Axes of oriented box [x,y,z]
-  float*           halfLength;                 //!< Half lengths of the box along the axis
+  Vector           axis[3];                    //!< Axes of oriented box [x,y,z]
+  float            halfLength[3];              //!< Half lengths of the box along the axis
   float            covarianceMatrix[3][3];     //!< the covariance matrix