Changeset 9896 in orxonox.OLD for branches

Timestamp:

Oct 20, 2006, 1:09:03 AM (18 years ago)

Author:

patrick

Message:

more design, thinner interface

Location:

branches/coll_rect/src

Files:

• lib/collision_detection/aabb_tree_node.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• lib/collision_reaction/collision_filter.cc (modified) (3 diffs)
• lib/collision_reaction/collision_filter.h (modified) (2 diffs)
• lib/collision_reaction/collision_tube.cc (modified) (1 diff)
• lib/collision_reaction/collision_tube.h (modified) (3 diffs)
• lib/graphics/importer/bsp_manager.cc (modified) (7 diffs)
• world_entities/world_entity.cc (modified) (10 diffs)
• world_entities/world_entity.h (modified) (6 diffs)

branches/coll_rect/src/lib/collision_detection/aabb_tree_node.cc

@@ -17 +17 @@
 #include "aabb_tree_node.h"
 #include "aabb.h"
-
 #include "bv_tree.h"
+
+#include "collision_tube.h"
 
 #include "matrix.h"
@@ -532 +533 @@
         (treeNode->nodeRight == NULL && treeNode->nodeLeft == NULL)) )
     {
-      nodeA->registerCollision(nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
+      CoRe::CollisionTube::getInstance()->registerCollisionEvent( nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
     }
 

branches/coll_rect/src/lib/collision_detection/obb_tree_node.cc

@@ -18 +18 @@
 #include "obb_tree.h"
 #include "obb.h"
+
+#include "collision_tube.h"
 
 #include "matrix.h"
@@ -567 +569 @@
     {
 //       PRINTF(0)("----------------------------------------------\n\n\n\n\n\n--------------------------------\n\n\n");
-      nodeA->registerCollision(nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
+      CoRe::CollisionTube::getInstance()->registerCollisionEvent( nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
     }
 

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

@@ -29 +29 @@
 #include "debug.h"
 
+#include <vector>
+
+
 namespace CoRe
 {
@@ -38 +41 @@
    * @todo this constructor is not jet implemented - do it
   */
-  CollisionFilter::CollisionFilter (WorldEntity* owner, CREngine::ReactionType type)
+  CollisionFilter::CollisionFilter (WorldEntity* owner)
   {
     this->registerObject(this, CollisionFilter::_objectList);
 
-    this->owner = owner;
-    this->type = type;
+    this->_owner = owner;
 
-    this->bCollided = false;
-    this->bDispatched = true;
-
-    this->collisionReaction = NULL;
-    this->bContinuousPoll = false;
-    this->bStopOnFirstCollision = false;
-
-
-    switch( type)
-    {
-        case CREngine::CR_PHYSICS_FULL_WALK:
-        this->collisionReaction = new CRPhysicsFullWalk();
-        this->bContinuousPoll = true;
-        break;
-        case CREngine::CR_PHYSICS_GROUND_WALK:
-        this->collisionReaction = new CRPhysicsGroundWalk();
-        this->bContinuousPoll = true;
-        break;
-        case CREngine::CR_OBJECT_DAMAGE:
-        this->collisionReaction = new CRObjectDamage();
-        this->bStopOnFirstCollision = true;
-        break;
-        default:
-        break;
-    };
+    this->_bContinuousPoll = false;
+    this->_bStopOnFirstCollision = false;
+    this->_bReactive = false;
   }
 
@@ -78 +58 @@
   CollisionFilter::~CollisionFilter ()
   {
-    // delete what has to be deleted here
-    if( this->collisionReaction != NULL)
-      delete this->collisionReaction;
-  }
-
-  /**
-   * restores the CollisionFilter to its initial state
-   */
-  void CollisionFilter::reset()
-  {
-    this->flushCollisions();
+    this->unsubscribeReactions();
   }
 
 
   /**
-   * add more filter targets to this collision handle
-   *  @param classID the classid to look for
+   * subscribe reaction
    */
-  void CollisionFilter::addTarget(const ClassID& target)
+  void CollisionFilter::subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1)
   {
-    // make sure there is no dublicate
-    std::vector<ClassID>::iterator it = this->targetList.begin();
-    for( ; it < this->targetList.end(); it++)
-      if( (*it) == target)
-        return;
+    // check if its a valid type
+    if( likely(this->validCRType( type)))
+    {
+      //check if this or any parent class isn't already registered
+      std::vector<ClassID>::iterator it = this->_filters[type].begin();
+      for(; it != this->_filters[type].end(); it++)
+      {
+        if( unlikely(*it == target1))
+          return;
+      }
 
-
-    // add element
-    this->targetList.push_back(target);
-    PRINTF(5)("addTarget: %i \n", target.id());
+      // so subscribe the reaction finaly
+      this->_filters[type].push_back(target1);
+      this->_bReactive = true;
+    }
   }
 
 
   /**
-   * handles the collisions and react according to algorithm
+   * subscribe for a reaction
    */
-  void CollisionFilter::handleCollisions()
+  void CollisionFilter::subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2)
   {
-    // if continuous poll the reaction
-    if( this->bContinuousPoll && !this->bCollided)
-    {
-      this->collisionReaction->update(this->owner);
-      return;
-    }
-
-    // collision reaction calculations (for every collision there will be a reaction)
-    std::vector<Collision*>::iterator it = this->collisionList.begin();
-    for(; it < this->collisionList.end(); it++)
-    {
-      if( !(*it)->isDispatched())
-      {
-        this->collisionReaction->reactToCollision(*it);
-        (*it)->flushCollisionEvents();
-      }
-    }
-
-    // now set state to dispatched
-    this->bDispatched = true;
-    this->bCollided = false;
-
-    this->flushCollisions();
+    this->subscribeReaction(type, target1);
+    this->subscribeReaction(type, target2);
   }
 
 
   /**
-   * filter out the CollisionEvents that are not wanted
-   *  @param collisionEvent the collision event to filter
+   * subscribe for a reaction
    */
-  bool CollisionFilter::filterCollisionEvent(CollisionEvent* collisionEvent)
+  void CollisionFilter::subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2, const ClassID& target3)
   {
-    std::vector<ClassID>::iterator it = this->targetList.begin();
-    for(; it < this->targetList.end(); it++)
-    {
-      //     if(collisionEvent->getEntityB()->isA(CL_AIMING_SYSTEM) || collisionEvent->getEntityA()->isA(CL_AIMING_SYSTEM))
-      //     {
-      //        PRINTF(0)("I am: %s colliding with: %s\n", owner->getClassCName(), collisionEvent->getEntityB()->getClassCName(), *it);
-      //        if( collisionEvent->getEntityA() == this->owner) {
-      //          PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassCName(),
-      //          collisionEvent->getEntityB()->getClassCName(), *it);
-      //          if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
-      //            PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
-      //            collisionEvent->getEntityB()->getClassCName(), *it);
-      //             }
-      //        }
-      //        else {
-      //          PRINTF(0)("I am not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassCName(),
-      //          collisionEvent->getEntityB()->getClassCName(), *it);
-      //          if( collisionEvent->getEntityA()->isA((ClassID)(*it))) {
-      //            PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
-      //            collisionEvent->getEntityA()->getClassCName(), *it);
-      //             }
-      //        }
-      //
-      //     }
+    this->subscribeReaction(type, target1);
+    this->subscribeReaction(type, target2);
+    this->subscribeReaction(type, target3);
+  }
 
-      if( collisionEvent->getEntityA() == this->owner)
-      {
-        if( collisionEvent->getEntityB()->isA((*it)))
-        {
-          PRINTF(5)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
-                    collisionEvent->getEntityB()->getClassCName(), (*it).id());
-          return true;
-        }
-      }
-      else
-      {
-        if( collisionEvent->getEntityA()->isA((*it)))
-        {
-          PRINTF(5)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
-                    collisionEvent->getEntityA()->getClassCName(), (*it).id());
-          return true;
-        }
-      }
-    }
+  /**
+   * unsubscribe from a specific collision reaction
+   */
+  void CollisionFilter::unsubscribeReaction(CoRe::CREngine::ReactionType type)
+  {
+    if( likely(this->validCRType( type)))
+      this->_filters[type].clear();
+  }
 
-    return false;
+  /**
+   * unsubscribe from all collision reactions
+   */
+  void CollisionFilter::unsubscribeReactions()
+  {
+    for(int i = 0; i < CREngine::CR_NUMBER; i++)
+      this->_filters[i].clear();
   }
 
 
+
   /**
-   * filter Collisions that are not wanted to be reacted to
-   *  @param collision the collision object to filter
+   * tests if the owner WorldEntity is listening to collisions from another specif WorldEntity entity
+   *  @param entity WorldEntity to test against
+   *
+   * This is the most important interface function of this class: it performs a check and returns true
+   * if the WorldEntity entity is actualy responsive for a certain other WorldEntity
    */
-  bool CollisionFilter::filterCollision(Collision* collision)
+  bool CollisionFilter::operator()(const WorldEntity* entity) const
   {
-    std::vector<ClassID>::iterator it = this->targetList.begin();
-    for(; it < this->targetList.end(); it++)
+    // if there are no installed criterions just ommit and
+    if( this->bReactive())
+      return false;
+
+    // goes through all registered filter criterions and looks for matches
+    for( int i = 0; i < CREngine::CR_NUMBER; i++ )
     {
-
-      //     if(collision->getEntityB()->isA(CL_AIMING_SYSTEM) || collision->getEntityA()->isA(CL_AIMING_SYSTEM))
-      //     {
-      //       PRINTF(0)("Shared!!! I am: %s colliding with: %s\n", owner->getClassCName(), collision->getEntityB()->getClassCName(), *it);
-      //       if( collision->getEntityA() == this->owner) {
-      //         PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassCName(),
-      //         collision->getEntityB()->getClassCName(), *it);
-      //         if( collision->getEntityB()->isA((ClassID)(*it))) {
-      //           PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
-      //           collision->getEntityB()->getClassCName(), *it);
-      //         }
-      //       }
-      //       else {
-      //         PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassCName(),
-      //         collision->getEntityB()->getClassCName(), *it);
-      //         if( collision->getEntityA()->isA((ClassID)(*it))) {
-      //           PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
-      //           collision->getEntityA()->getClassCName(), *it);
-      //         }
-      //       }
-      //     }
-
-      if( collision->getEntityA() == this->owner)
-      {
-        if( collision->getEntityA()->isA(*it))
+      std::vector<ClassID>::const_iterator it = this->_filters[i].begin();
+      for(; it != this->_filters[i].end(); i++ )
+        if( unlikely(entity->isA(*it)))
           return true;
-      }
-      else
-      {
-        if( collision->getEntityB()->isA(*it))
-          return true;
-      }
     }
 

branches/coll_rect/src/lib/collision_reaction/collision_filter.h

@@ -1 +1 @@
 /*!
- * @file collision_handle.h
- * @brief Definition of a collision handle: used for accessing per world entity collision events and reactions
+ * @file collision_filter.h
+ * @brief Definition of a collision filter: checks if a certain WorldEntity is responsive for another WorldEntity
+ *
 */
 
@@ -24 +25 @@
 
 
-  //! A class for defining collision reactions and storing events
+  /**
+   * A class for defining collision reactions and storing events (functional object)
+   *
+   * This class basically checks if the owner of this filter (a WorldEntity) is responsive for a certain other WorldEntity.
+   * The check is performed via the operator() (therefore it's a functional objects). For each CollisionReaction there is a list
+   * of WorldEntities (their ClassIDs) to which it listens to.
+   */
   class CollisionFilter : public BaseObject
   {
     ObjectListDeclaration(CollisionFilter);
 
+
+    /* Constructor/Deconstructors */
   public:
-    CollisionFilter(WorldEntity* owner, CREngine::ReactionType type);
+    CollisionFilter(WorldEntity* owner);
     virtual ~CollisionFilter();
 
-    void reset();
-
-    void addTarget(const ClassID& target);
-
-    /** @returns true if regiestered some new collision events in this tick frame */
-    inline bool isCollided() const { return this->bCollided; }
-    /** @returns true if this collision handle has already been dispatched */
-    inline bool isDispatched() const { return this->bDispatched; }
-    /** @returns true if this handle should be pulled also if there are no collisions */
-    inline bool isContinuousPoll() const { return this->bContinuousPoll; }
-    /** @returns the type */
-    inline CREngine::ReactionType getType() const { return this->type; }
-
-    void handleCollisions();
+  private:
+    CollisionFilter(const CollisionFilter& collisionFilter) {}
+    WorldEntity*                  _owner;                   //!< the worldenity this reaction will be applied on
 
 
-  private:
-    void flushCollisions();
-    bool filterCollisionEvent(CollisionEvent* collisionEvent);
-    bool filterCollision(Collision* collision);
+    /* Defines Operators */
+    bool operator()(const WorldEntity* entity) const;
 
 
+    /* Collision Reaction subscription unsubscription Block */
+  public:
+    void subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1);
+    void subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2);
+    void subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2, const ClassID& target3);
+
+    void unsubscribeReaction(CoRe::CREngine::ReactionType type);
+    void unsubscribeReactions();
 
   private:
-    WorldEntity*                  owner;                   //!< the worldenity this reaction will be applied on
-    CREngine::ReactionType              type;                    //!< the reaction type
+    std::vector<ClassID>          _filters[CREngine::CR_NUMBER];  //!< an array of filter targets: for each collision type a list of filter objects
 
-    bool                          bContinuousPoll;         //!< if this is true
-    bool                          bDispatched;             //!< true if this handle has already been dispatched
-    bool                          bStopOnFirstCollision;   //!< true if the cd of this object should be terminated after one match
-    bool                          bCollided;               //!< true if the CollsionHandle has registered some new collisions
 
-    std::vector<Collision*>       collisionList;           //!< a list full of collisions
-    std::vector<ClassID>          targetList;              //!< a list of target classes for filtering @TODO TAKE SET INSTEAD OF VECTOR HERE
+    /* Misc State Informations */
+  public:
+    /** @returns true if this handle should be pulled also if there are no collisions, can also be set with this function (reference)*/
+    inline bool& bContinousPoll() { return this->_bContinuousPoll; }
+    /** @returns true if this filter should be pulled always */
+    inline bool bContinousPoll() const { return this->_bContinuousPoll; }
+    /** @returns true if this @param type Collision Reaction type is a valid number */
+    inline bool validCRType(const CREngine::ReactionType& type) const {return (type >= 0 && type < CREngine::CR_NUMBER); }
+    /** @returns true if this filter is reactive i.e. at least one filter criterion installed */
+    inline bool bReactive() const { return this->_bReactive; }
 
-    CollisionReaction*            collisionReaction;       //!< reference to the collision reaction object
+  private:
+    bool                          _bContinuousPoll;         //!< if this is true
+    bool                          _bStopOnFirstCollision;   //!< true if the cd of this object should be terminated after one match
+    bool                          _bReactive;               //!< true if this class has at least one filter criterion == one target
 
   };

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

@@ -33 +33 @@
 
   ObjectListDefinition(CollisionTube);
+
+  CollisionTube* CollisionTube::instance = NULL;
+
 
   /**

branches/coll_rect/src/lib/collision_reaction/collision_tube.h

@@ -48 +48 @@
     ObjectListDeclaration(CollisionTube);
 
+  public:
+    virtual ~CollisionTube();
 
-  public:
-    CollisionTube();
-    virtual ~CollisionTube();
+    inline static CollisionTube* getInstance() { if( CollisionTube::instance != NULL) CollisionTube::instance = new CollisionTube(); return CollisionTube::instance; }
 
     /** @returns true if at least one of both WorldEntities are subscribed for a collision check */
@@ -66 +66 @@
 
   private:
+    /* private std constructor since this is a singleton class */
+    CollisionTube();
     /* private copy constructor so this object can't be passed as a */
     CollisionTube(const CollisionTube& tube) {}
@@ -73 +75 @@
     std::vector<Collision*>        _collisionList;      //!< the list of collisions since the last processing
 
+    static CollisionTube*          instance;            //!< the singleton instance
   };
 

branches/coll_rect/src/lib/graphics/importer/bsp_manager.cc

@@ -46 +46 @@
 
 #include "aabb.h"
-#include "cr_defs.h"
+#include "cr_engine.h"
+#include "collision_tube.h"
 
 
@@ -1215 +1216 @@
   if( xCollisionForward)
   {
-    entity->registerCollision(COLLISION_TYPE_AXIS_X ,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_X ,
                               this->parent, entity,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
@@ -1254 +1255 @@
   if( xCollisionBackward)
   {
-    entity->registerCollision(COLLISION_TYPE_AXIS_X_NEG ,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_X_NEG,
                               this->parent, entity,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
@@ -1350 +1351 @@
   if( yCollisionUp)
   {
-    entity->registerCollision(COLLISION_TYPE_AXIS_Y , this->parent,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Y, this->parent,
                               entity,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
@@ -1403 +1404 @@
   if( yCollisionDown)
   {
-    entity->registerCollision(COLLISION_TYPE_AXIS_Y_NEG , this->parent,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Y_NEG , this->parent,
                               entity,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
                               collPos, SolidFlag);
   }
-
-
 }
 
@@ -1484 +1483 @@
 
   if( zCollisionRight) {
-    entity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Z , this->parent,
                               entity,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
@@ -1523 +1522 @@
 
   if( zCollisionLeft) {
-    entity->registerCollision(COLLISION_TYPE_AXIS_Z_NEG , this->parent,
-                              entity,
-                              Vector(testPlane->x, testPlane->y, testPlane->z),
-                              collPos , SolidFlag);
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Z_NEG , this->parent,
+                               entity,
+                               Vector(testPlane->x, testPlane->y, testPlane->z),
+                               collPos , SolidFlag);
   }
 

branches/coll_rect/src/world_entities/world_entity.cc

@@ -35 +35 @@
 #include "camera.h"
 
-#include "collision_handle.h"
+#include "collision_filter.h"
 #include "collision_event.h"
 #include "game_rules.h"
@@ -58 +58 @@
  */
 WorldEntity::WorldEntity()
-    : Synchronizeable()
+  : Synchronizeable(), collisionFilter(this)
 {
   this->registerObject(this, WorldEntity::_objectList);
@@ -78 +78 @@
 
   // reset all collision handles to NULL == unsubscribed state
-  for(int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)
-    this->collisionHandles[i] = NULL;
   this->bReactive = false;
   this->bOnGround = false;
@@ -88 +86 @@
   this->toList(OM_NULL);
 
-  registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName", PERMISSION_MASTER_SERVER ) );
-  modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName", PERMISSION_MASTER_SERVER ) );
-  scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling", PERMISSION_MASTER_SERVER ) );
-  list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list", PERMISSION_MASTER_SERVER ) );
-
-  health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health", PERMISSION_MASTER_SERVER ) );
-  healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth", PERMISSION_MASTER_SERVER ) );
+  this->registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName", PERMISSION_MASTER_SERVER ) );
+  this->modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName", PERMISSION_MASTER_SERVER ) );
+  this->scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling", PERMISSION_MASTER_SERVER ) );
+  this->list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list", PERMISSION_MASTER_SERVER ) );
+
+  this->health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health", PERMISSION_MASTER_SERVER ) );
+  this->healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth", PERMISSION_MASTER_SERVER ) );
 }
 
@@ -115 +113 @@
     delete this->healthWidget;
 
-  this->unsubscribeReaction();
+  this->unsubscribeReactions();
 }
 
@@ -304 +302 @@
 void WorldEntity::subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1)
 {
-  this->subscribeReaction(type);
-
-  // add the target filter
-  this->collisionHandles[type]->addTarget(target1);
+  this->collisionFilter.subscribeReaction(type, target1);
 }
 
@@ -318 +313 @@
 void WorldEntity::subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2)
 {
-  this->subscribeReaction(type);
-
-  // add the target filter
-  this->collisionHandles[type]->addTarget(target1);
-  this->collisionHandles[type]->addTarget(target2);
+  this->collisionFilter.subscribeReaction(type, target1, target2);
 }
 
@@ -333 +324 @@
 void WorldEntity::subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2, const ClassID& target3)
 {
-  this->subscribeReaction(type);
-
-  // add the target filter
-  this->collisionHandles[type]->addTarget(target1);
-  this->collisionHandles[type]->addTarget(target2);
-  this->collisionHandles[type]->addTarget(target3);
-}
-
-
-
-/**
- * subscribes this world entity to a collision reaction
- *  @param type the type of reaction to subscribe to
- *  @param nrOfTargets number of target filters
- *  @param ... the targets as classIDs
- */
-void WorldEntity::subscribeReaction(CoRe::CREngine::ReactionType type)
-{
-  if( this->collisionHandles[type] != NULL)
-  {
-    PRINTF(2)("Registering for a CollisionReaction already subscribed to! Skipping\n");
-    return;
-  }
-
-  this->collisionHandles[type] = CoRe::CREngine::getInstance()->subscribeReaction(this, type);
-
-  // now there is at least one collision reaction subscribed
-  this->bReactive = true;
+  this->collisionFilter.subscribeReaction(type, target1, target2, target3);
 }
 
@@ -370 +334 @@
 void WorldEntity::unsubscribeReaction(CoRe::CREngine::ReactionType type)
 {
-  if( this->collisionHandles[type] == NULL)
-    return;
-
-  CoRe::CREngine::getInstance()->unsubscribeReaction(this->collisionHandles[type]);
-  this->collisionHandles[type] = NULL;
-
-  // check if there is still any handler registered
-  for(int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)
-  {
-    if( this->collisionHandles[i] != NULL)
-    {
-      this->bReactive = true;
-      return;
-    }
-  }
-  this->bReactive = false;
+  this->collisionFilter.unsubscribeReaction(type);
 }
 
@@ -392 +341 @@
  * unsubscribes all collision reactions
  */
-void WorldEntity::unsubscribeReaction()
-{
-  for( int i = 0; i < CoRe::CREngine::CR_NUMBER; i++)
-    this->unsubscribeReaction((CoRe::CREngine::ReactionType)i);
-
-  // there are no reactions subscribed from now on
-  this->bReactive = false;
-}
-
-
-/**
- * registers a new collision event to this world entity
- *  @param entityA entity of the collision
- *  @param entityB entity of the collision
- *  @param bvA colliding bounding volume of entityA
- *  @param bvB colliding bounding volume of entityA
- */
-bool WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
-{
-  PRINTF(5)("registering collision of type: %s vs %s\n", entityA->getClassCName(), entityB->getClassCName());
-  // is there any handler listening?
-  if( !this->bReactive)
-    return false;
-
-  // get a collision event
-  CoRe::CollisionEvent* c = CoRe::CREngine::getInstance()->popCollisionEventObject();
-  assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-//  c->collide(COLLISION_TYPE_OBB, entityA, entityB, bvA, bvB);
-
-  for( int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)
-    if( this->collisionHandles[i] != NULL)
-      this->collisionHandles[i]->registerCollisionEvent(c);
-  return true;
-}
-
-
-/**
- * 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(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall)
-{
-  // is there any handler listening?
-  if( !this->bReactive)
-    return false;
-
-  // get a collision event
-  CoRe::CollisionEvent* c = CoRe::CREngine::getInstance()->popCollisionEventObject();
-  assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-//  c->collide(type, entity, groundEntity, normal, position, bInWall);
-
-  for( int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)
-    if( this->collisionHandles[i] != NULL)
-      this->collisionHandles[i]->registerCollisionEvent(c);
-  return true;
+void WorldEntity::unsubscribeReactions()
+{
+  this->collisionFilter.unsubscribeReactions();
 }
 

branches/coll_rect/src/world_entities/world_entity.h

@@ -12 +12 @@
 
 #include "cr_engine.h"
+#include "collision_filter.h"
 #include "object_manager.h"
 #include "glincl.h"
@@ -25 +26 @@
 namespace OrxSound { class SoundBuffer; class SoundSource; }
 namespace OrxGui { class GLGuiWidget; class GLGuiBar; class GLGuiEnergyWidget; };
-namespace CoRe { class CollisionHandle; class Collision; }
+namespace CoRe { class Collision; }
 
 class BVTree;
@@ -76 +77 @@
   inline AABB* getModelAABB() const { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
 
+  virtual void hit(float damage, WorldEntity* killer);
+
 
   /* --- Collision Reaction Block --- */
-  void subscribeReaction(CoRe::CREngine::ReactionType type);
   void subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1);
   void subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2);
@@ -84 +86 @@
 
   void unsubscribeReaction(CoRe::CREngine::ReactionType type);
-  void unsubscribeReaction();
-
-  bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
-  bool registerCollision(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall = false);
+  void unsubscribeReactions();
+
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }
 
-  CoRe::CollisionHandle* getCollisionHandle(CoRe::CREngine::ReactionType type) const { return this->collisionHandles[type]; }
+  const CoRe::CollisionFilter& getCollisionFilter(CoRe::CREngine::ReactionType type) const { return this->collisionFilter; }
 
   /** @returns true if this entity is standing on ground (BSP model) */
@@ -97 +97 @@
   /** @param flag: marks if this entity is standing on ground */
   void setOnGround(bool flag) { this->bOnGround = flag; }
-
-  virtual void hit(float damage, WorldEntity* killer);
 
   virtual void destroy( WorldEntity* killer );
@@ -193 +191 @@
 
   /* collision reaction stuff */
-  CoRe::CollisionHandle*  collisionHandles[CoRe::CREngine::CR_NUMBER];  //!< the list of the collision reactions
-  bool                    bReactive;                              //!< true if there is at least one collision reaction subscibed
+  CoRe::CollisionFilter   collisionFilter;                 //!< filter for collision event filtering (not every entity listens to all collisions)
+  bool                    bReactive;                       //!< true if there is at least one collision reaction subscibed