Changeset 7934 in orxonox.OLD

Timestamp:

May 28, 2006, 9:55:20 PM (18 years ago)

Author:

patrick

Message:

collision event

Location:

branches/cr/src/lib

Files:

• collision_detection/collision.cc (modified) (2 diffs)
• collision_detection/collision.h (modified) (2 diffs)
• collision_reaction/collision_handle.h (modified) (1 diff)

branches/cr/src/lib/collision_detection/collision.cc

@@ -26 +26 @@
 Collision::Collision ()
 {
-   this->setClassID(CL_COLLISION, "Collision");
-
 }
 
@@ -37 +35 @@
 Collision::~Collision ()
 {
-  // delete what has to be deleted here
 }

branches/cr/src/lib/collision_detection/collision.h

@@ -1 @@
-/*! 
+/*!
  * @file collision.h
-  *  Definition of a collision event
-
-*/
+ *  Definition of a collision event
+ */
 
 #ifndef _COLLISION_H
 #define _COLLISION_H
 
-#include "base_object.h"
 #include "vector.h"
-
 
 class WorldEntity;
 class BoundingVolume;
 
+
 //! A class representing a simple collision
-class Collision : public BaseObject {
+class Collision {
 
  public:
@@ -22 +20 @@
   virtual ~Collision();
 
- 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
+
+
+ private:
+  WorldEntity*      entityA;                       //!< the collision body A
+  WorldEntity*      entityB;                       //!< the collision body B
+
+  BoundingVolume*   bvA;                          //!< reference to the bounding volume A
+  BoundingVolume*   bvB;                          //!< reference to the bounding volume B
 };
 

branches/cr/src/lib/collision_reaction/collision_handle.h

@@ -32 +32 @@
 
   void handleCollisions();
+  void flushCollsions();