Changeset 8099 in orxonox.OLD

Timestamp:

Jun 1, 2006, 6:47:16 PM (18 years ago)

Author:

patrick

Message:

cr: more bnla

Location:

branches/cr/src

Files:

• lib/collision_reaction/collision_handle.cc (modified) (2 diffs)
• lib/collision_reaction/collision_handle.h (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -100 +100 @@
 
 /**
+ * register a Collision to the Collision handle.
+ *  @param collision
+ * This is used for internal collision registration: sharing the collision objects between Collision Reactions
+ * Therefore dispatching it only once
+ */
+void CollisionHandle::registerCollision(Collision* collision)
+{
+
+}
+
+
+/**
  * this is the function to be called on a collision event for this handle
  *  @param collision the collision objects containing all collision informations
@@ -111 +123 @@
  Collision* c = this->registerCollision(collisionEvent->getEntityA(), collisionEvent->getEntityB());
  c->registerCollisionEvent(collisionEvent);
+
 }
 

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

@@ -31 +31 @@
     void addTarget(long target);
     Collision* registerCollision(WorldEntity* entityA, WorldEntity* entityB);
+    void registerCollision(Collision* collision);
     void registerCollisionEvent(CollisionEvent* collisionEvent);
 

branches/cr/src/world_entities/world_entity.h

@@ -84 +84 @@
   inline bool isReactive() const { return this->bReactive; }
 
+  const CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }
+
 
   /* @returns the Count of Faces on this WorldEntity */