Changeset 9893 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/collision_handle.cc

Timestamp:

Oct 19, 2006, 3:37:40 PM (18 years ago)

Author:

patrick

Message:

collision reactions now only registered with collision tube. no compile

File:

• branches/coll_rect/src/lib/collision_reaction/collision_handle.cc (modified) (1 diff)

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

@@ -108 +108 @@
     this->targetList.push_back(target);
     PRINTF(5)("addTarget: %i \n", target.id());
-  }
-
-
-  /**
-   * 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
-   */
-  Collision* CollisionHandle::registerCollision(WorldEntity* entityA, WorldEntity* entityB)
-  {
-    //first get the collision object, multiple sources
-    Collision* c;
-    if( this->collisionList.empty() ||
-        ((this->collisionList.back())->getEntityA() != entityA && (this->collisionList.back())->getEntityB() != entityB ))
-    {
-      c = CREngine::getInstance()->popCollisionObject();
-      c->collide(entityA, entityB);
-      this->collisionList.push_back(c);
-
-      // now register it as a shared collision with the other collision entity
-      CollisionHandle* ch = entityB->getCollisionHandle(this->type);
-      if( ch != NULL)
-        ch->registerSharedCollision(c);
-    }
-    else
-      c = this->collisionList.back();
-
-    return c;
-  }
-
-
-  /**
-   * register a Collision to the Collision handle.
-   *  @param collision the collision object to register
-   *
-   * This is used for internal collision registration: sharing the collision objects between Collision Reactions
-   * Therefore dispatching it only once
-   */
-  void CollisionHandle::registerSharedCollision(Collision* collision)
-  {
-    // fist check if we are listening for this Collision
-    if( !this->filterCollision(collision))
-      return;
-
-    // set the state to not dispatched
-    this->bDispatched = false;
-    this->bCollided = true;
-    collision->setEntityBCollide(true);
-
-    this->collisionList.push_back(collision);
-  }
-
-
-  /**
-   * this is the function to be called on a collision event for this handle
-   *  @param collision the collision objects containing all collision informations
-   */
-  void CollisionHandle::registerCollisionEvent(CollisionEvent* collisionEvent)
-  {
-    if( !this->filterCollisionEvent(collisionEvent))
-      return;
-
-    // set the state to not dispatched
-    this->bDispatched = false;
-    this->bCollided = true;
-
-    // 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);
-
-    c->registerCollisionEvent(collisionEvent);
-    PRINTF(5)("Registering Collision Event: %s, %s\n", collisionEvent->getEntityA()->getClassCName(), collisionEvent->getEntityB()->getClassCName());
-  }
-
-
-  /**
-   * flushes the collision list
-   */
-  void CollisionHandle::flushCollisions()
-  {
-    this->collisionList.clear();
   }