Changeset 4520 in orxonox.OLD

Timestamp:

Jun 6, 2005, 11:06:16 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented bv, collision, and added a global cd defs file

Location:

orxonox/trunk/src/util/collision_detection

Files:

• bounding_volume.h (modified) (2 diffs)
• collision.h (modified) (2 diffs)
• collision_defs.h (added)

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

@@ -10 +10 @@
 #include "base_object.h"
 
+class sVect3D;
+class Vector;
 
 //! An abstract class representing a bounding volume
@@ -18 +20 @@
   virtual ~BoundingVolume();
 
+  inline const Vector* getCenter() const { return this->center; }
+  inline const Vector* getAxis () const { return this->axis; }
+  inline const sVect3D* getHalfLength() const { return this->halfLength; } 
+
+  sVect3D* getVertices() const;
+  void mergeWith(const BoundingVolume& bv);
 
  private:
+  Vector*    center;                     //!< Center point of box
+  Vector*    axis;                       //!< Axes of oriented box [x,y,z]
+  sVect3D*   halfLength;                 //!< Half lengths of the box
+
 
 };

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

@@ -9 +9 @@
 
 #include "base_object.h"
+#include "vector.h"
 
 // FORWARD DEFINITION
-
-
+class WorldEntity;
+class sVec3D;
+class BoundingVolume;
 
 //! A class representing a simple collision
@@ -21 +23 @@
   virtual ~Collision();
 
-
- private:
-
+ public:
+  Vector            pointOfImpact;              //!< point of impact, approximated via bounding volumes
+  WorldEntity*      body;                       //!< the collision body
+  BoundingVolume*   boundingVolume;             //!< reference to the bounding volume that fired the collision
 };