Changeset 9895 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/cr_engine.cc

Timestamp:

Oct 19, 2006, 3:54:49 PM (18 years ago)

Author:

patrick

Message:

interface adjustements

File:

• branches/coll_rect/src/lib/collision_reaction/cr_engine.cc (modified) (5 diffs)

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

@@ -20 +20 @@
 #include "collision.h"
 #include "collision_event.h"
-#include "collision_handle.h"
+#include "collision_filter.h"
 #include "cr_defs.h"
 
@@ -122 +122 @@
   void CREngine::reset()
   {
-    // first clear all CollisionHandles
-    std::vector<CollisionHandle*>::iterator it = this->collisionHandles.begin();
-    for(; it < this->collisionHandles.end(); it++)
-    {
-      (*it)->reset();
-      delete *it;
-    }
-
-    this->collisionHandles.clear();
+//     // first clear all CollisionHandles
+//     std::vector<CollisionHandle*>::iterator it = this->collisionHandles.begin();
+//     for(; it < this->collisionHandles.end(); it++)
+//     {
+//       (*it)->reset();
+//       delete *it;
+//     }
+//
+//     this->collisionHandles.clear();
   }
 
@@ -140 +140 @@
    *  @return the newly created CollisionHandle
    */
-  CollisionHandle* CREngine::subscribeReaction(WorldEntity* owner, ReactionType type)
-  {
-    CollisionHandle* ch = new CollisionHandle(owner, type);
-    this->collisionHandles.push_back(ch);
-
-    return ch;
-  }
+//   CollisionHandle* CREngine::subscribeReaction(WorldEntity* owner, ReactionType type)
+//   {
+//     CollisionHandle* ch = new CollisionHandle(owner, type);
+//     this->collisionHandles.push_back(ch);
+//
+//     return ch;
+//   }
 
 
@@ -154 +154 @@
    *  @param returns true if worked collrectly
    */
-  bool CREngine::unsubscribeReaction(CollisionHandle* collisionHandle)
-  {
-    std::vector<CollisionHandle*>::iterator it;
-    for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
-    {
-      if( *it == collisionHandle)
-      {
-        this->collisionHandles.erase(it);
-        delete collisionHandle;
-        return true;
-      }
-    }
-    return false;
-  }
+//   bool CREngine::unsubscribeReaction(CollisionHandle* collisionHandle)
+//   {
+//     std::vector<CollisionHandle*>::iterator it;
+//     for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
+//     {
+//       if( *it == collisionHandle)
+//       {
+//         this->collisionHandles.erase(it);
+//         delete collisionHandle;
+//         return true;
+//       }
+//     }
+//     return false;
+//   }
 
 
@@ -175 +175 @@
   void CREngine::handleCollisions()
   {
-    std::vector<CollisionHandle*>::iterator it;
-    for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
-    {
-      if( !(*it)->isDispatched() || (*it)->isContinuousPoll())  //does it have any collisions to report at all
-      {
-        (*it)->handleCollisions();
-      }
-    }
-    this->flushCollisions();
+//     std::vector<CollisionHandle*>::iterator it;
+//     for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
+//     {
+//       if( !(*it)->isDispatched() || (*it)->isContinuousPoll())  //does it have any collisions to report at all
+//       {
+//         (*it)->handleCollisions();
+//       }
+//     }
+//     this->flushCollisions();
   }