Changeset 8124 in orxonox.OLD for branches/cr

Timestamp:

Jun 3, 2006, 2:36:03 PM (18 years ago)

Author:

patrick

Message:

cr: some bugs found and solved, minor cleanup

Location:

branches/cr/src

Files:

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

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

@@ -66 +66 @@
   this->entityBCollide = false;
 
+  this->bDispatched = false;
+
   this->collisionEvents.clear();
 }

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

@@ -2 +2 @@
  * @file collision.h
  *  Definition of a collision as a two WE hit each other
+ *
+ *  A is shared between two WorldEntity's CollisionHandles if both are subscribed to this event. In this case only one
+ *  of the two CollisionHandles will calculate the CollisionReaction and the bDispatched flag will be set afterwards
+ *  to signal that it's already cared about and should be ignored.
  */
 

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

@@ -80 +80 @@
 /**
  * registers a new Collision Object
+ *  @param entityA WorldEntity A of the collision
+ *  @param entityB WorldEntity B of the collision
  * if a there is already a collision object with the same stats
  * registration will be skipped and the last collision object is returned
@@ -97 +99 @@
   // now register it as a shared collision with the other collision entity
   CollisionHandle* ch = entityB->getCollisionHandle(this->type);
-  if( ch != NULL) {
+  if( ch != NULL)
     ch->registerSharedCollision(c);
-    c->setEntityBCollide(true);
-  }
 
   return c;
@@ -134 +134 @@
   this->bDispatched = false;
 
-  // first element only
+  // checks if these WorldEntities have already collided or if its a new collision -> create a new Collision object
  Collision* c = this->registerCollision(collisionEvent->getEntityA(), collisionEvent->getEntityB());
  c->setEntityACollide(true);
@@ -178 +178 @@
   vector<long>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
-  {
-    if( !collisionEvent->getEntityA()->isA((ClassID)(*it)))
-      return false;
-  }
+    if( collisionEvent->getEntityA()->isA((ClassID)(*it)))
+      return true;
 
-  return true;
+  return false;
 }
 

branches/cr/src/world_entities/world_entity.cc

@@ -323 +323 @@
   this->collisionHandles[type] = CREngine::getInstance()->subscribeReaction(this, type);
 
-  // now there is at least one collision reaction subsribed
+  // now there is at least one collision reaction subscribed
   this->bReactive = true;
 }
@@ -379 +379 @@
   // create a collision event
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
-  assert(c != NULL);
+  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)
+  for( int i = 0; i < CREngine::CR_NUMBER; ++i)
     if( this->collisionHandles[i] != NULL)
       this->collisionHandles[i]->registerCollisionEvent(c);