Changeset 8182 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

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

Location:

branches/cr/src

Files:

• lib/collision_reaction/collision_event.h (modified) (4 diffs)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (2 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
 };
 

branches/cr/src/world_entities/world_entity.cc

@@ -368 +368 @@
 
 /**
- * registers a new collision to this world entity
+ * registers a new collision event to this world entity
  *  @param collisionEvent the event
  */
@@ -381 +381 @@
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
   c->collide(entityA, entityB, bvA, bvB);
+
+  for( int i = 0; i < CREngine::CR_NUMBER; ++i)
+    if( this->collisionHandles[i] != NULL)
+      this->collisionHandles[i]->registerCollisionEvent(c);
+}
+
+
+/**
+ * registers a new collision event to this woeld entity
+ *  @param entity the entity that collides
+ *  @param plane it stands on
+ *  @param position it collides on the plane
+ */
+bool WorldEntity::registerCollision(WorldEntity* entity, Plane* plane, Vector position)
+{
+  // is there any handler listening?
+  if( !this->bReactive)
+    return false;
+
+  // create a collision event
+  CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
+  assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
+  c->collide(entity, plane, position);
 
   for( int i = 0; i < CREngine::CR_NUMBER; ++i)

branches/cr/src/world_entities/world_entity.h

@@ -29 +29 @@
 class CollisionHandle;
 class Collision;
+class Plane;
 
 
@@ -81 +82 @@
 
   bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
+  bool registerCollision(WorldEntity* entity, Plane* plane, Vector position);
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }