Changeset 7946 in orxonox.OLD for branches/cr/src/lib

Timestamp:

May 29, 2006, 1:04:39 AM (19 years ago)

Author:

patrick

Message:

cr: more cr cleanup

Location:

branches/cr/src/lib/collision_reaction

Files:

• collision_handle.cc (modified) (1 diff)
• collision_handle.h (modified) (1 diff)
• cr_engine.cc (modified) (4 diffs)
• cr_engine.h (modified) (1 diff)

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

@@ -43 +43 @@
 {
   // delete what has to be deleted here
+}
+
+/**
+ * restores the CollisionHandle to its initial state
+ */
+void CollisionHandle::reset()
+{
+  this->flushCollisions();
 }
 

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

@@ -27 +27 @@
     virtual ~CollisionHandle();
 
+    void reset();
 
     void addTarget(long classID);
-
     void registerCollision(Collision* collision);
 

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

@@ -64 +64 @@
 
 
+/**
+ * flushes the CollisionHandles and restores the CREngine to the initial state
+ */
 void CREngine::reset()
 {
@@ -69 +72 @@
   std::vector<CollisionHandle*>::iterator it;
   for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
+  {
+    (*it)->reset();
     delete *it;
+  }
   this->collisionHandles.clear();
 }
@@ -78 +84 @@
  *  @param owner: the WE to subscribe
  *  @param type: the type of collision reaction to perform
+ *  @return the newly created CollisionHandle
  */
 CollisionHandle* CREngine::subscribeReaction(WorldEntity* owner, CRType type)
@@ -86 +93 @@
 
 
-bool CREngine::unsubscribeReaction(WorldEntity* worldEntity)
-{}
-
-
+/**
+ * unsubscribe reaction from the reaction list
+ *  @param collisionHandle the CollisionHandle to remove
+ *  @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;
+}
 
 

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

@@ -46 +46 @@
   CollisionHandle* subscribeReaction(WorldEntity* worldEntity, CRType type);
 
-  bool unsubscribeReaction(WorldEntity* worldEntity);
   bool unsubscribeReaction(CollisionHandle* collisionHandle);