Changeset 7944 in orxonox.OLD for branches/cr/src/world_entities

Timestamp:

May 29, 2006, 12:02:04 AM (18 years ago)

Author:

patrick

Message:

cr: collision registration work

Location:

branches/cr/src/world_entities

Files:

• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (2 diffs)

branches/cr/src/world_entities/world_entity.cc

@@ -254 +254 @@
 
 /**
+ * registers a new collision to this world entity
+ *  @param collisionEvent the event
+ */
+void WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BouningVolume* bvA, BoundingVolume* bvB)
+{
+  // create a collision event
+  Collision* c = CREngine::getInstance()->popCollisionObject();
+  c->collide(entityA, entityB, bvA, bvB);
+
+  for(int i = 0; i < CREngine::CR_NUMBER; ++i)
+    if( this->collisionHandles[i] != NULL)
+      this->collisionHandles[i]->registerCollision(c);
+}
+
+
+/**
  * @brief moves this entity to the List OM_List
  * @param list the list to set this Entity to.

branches/cr/src/world_entities/world_entity.h

@@ -24 +24 @@
 
 class BVTree;
+class BoundingVolume;
 class Model;
 class CollisionHandle;
+class Collision;
 
 
@@ -69 +71 @@
   /* --- Collision Reaction Block --- */
   void subscribeReaction(CREngine::CRType type, int nrOfTargets, long target, ...);
+  void registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);