Changeset 8182 in orxonox.OLD for branches/cr/src/lib

Timestamp:

Jun 7, 2006, 11:41:16 AM (19 years ago)

Author:

patrick

Message:

cr: extended the collisionevent and added the interface to the WE

File:

• branches/cr/src/lib/collision_reaction/collision_event.h (modified) (4 diffs)

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

@@ -11 +11 @@
 class WorldEntity;
 class BoundingVolume;
+class Plane;
 
 
@@ -23 +24 @@
   inline void collide(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
   { this->entityA = entityA; this->entityB = entityB; this->bvA = bvA; this->bvB = bvB; }
+  /** collides two WorldEntities @param entity world entity , @param ground ground plane, @param position position on the ground */
+  inline void collide(WorldEntity* entity, Plane* ground, Vector position)
+  { this->entityA = entity; this->ground = ground; this->position = position; }
 
 
@@ -35 +39 @@
 
 
+  inline void operator()(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB) { this->collide(entityA, entityB, bvA, bvB); }
+  inline void operator()(WorldEntity* entity, Plane* ground, Vector position) { this->collide(entity, ground, position); }
+
+
  private:
   WorldEntity*      entityA;                       //!< the collision body A
@@ -41 +49 @@
   BoundingVolume*   bvA;                           //!< reference to the bounding volume A
   BoundingVolume*   bvB;                           //!< reference to the bounding volume B
+
+  Plane*            ground;                        //!< the ground plane with which it collides (only for bsp-model collisions
+  Vector            position;                      //!< position of the collision on the ground plane
 };