Changeset 7967 in orxonox.OLD for branches/cr/src

Timestamp:

May 30, 2006, 1:22:05 AM (18 years ago)

Author:

patrick

Message:

cr: more memory handling now

Location:

branches/cr/src/lib/collision_reaction

Files:

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

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

@@ -74 +74 @@
 /**
  * registers a new Collision Object
+ * 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)
 {
-  // get the new collision object
-  Collision* c = CREngine::getInstance()->popCollisionObject();
+  //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();
+  else
+    c = this->collisionList.back();
 
-  c->collide(collisionEvent->getEntityA(), collisionEvent->getEntityB());
+  c->collide(entityA, entityB);
   this->collisionList.push_back(c);
+
+  return c;
 }
 
@@ -92 +101 @@
 {
   // first element only
-  if( this->collisionList.empty())
-  {
-    return;
-  }
-
-  if( ((this->collisionList.back())->getEntityA() == collisionEvent->getEntityA()) &&
-        ((this->collisionList.back())->getEntityB() == collisionEvent->getEntityB()))
-  {
-    (this->collisionList.back())->registerCollisionEvent(collisionEvent);
-  }
+ Collision* c = this->registerCollision(collisionEvent->getEntityA(), collisionEvent->getEntityB());
+ c->registerCollisionEvent(collisionEvent);
 }
 

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

@@ -29 +29 @@
 
     void addTarget(long classID);
-    Collision registerCollision(WorldEntity* entityA, WorldEntity* entityB);
+    Collision* registerCollision(WorldEntity* entityA, WorldEntity* entityB);
     void registerCollisionEvent(CollisionEvent* collisionEvent);
     /** @returns true if regiestered some new collision events in this tick frame */

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

@@ -149 +149 @@
 }
 
+
 /**
  * flushes all the collision lists and puts them to their initial state
  */
-void CREngeine::flushCollisions()
+void CREngine::flushCollisions()
 {
+  vector<Collision*>::iterator it = this->collisionsUsed.begin();
+  for(; it < this->collisionsUsed.end(); it++)
+    this->collisionsUnused.push_back(*it);
 
+  this->collisionsUsed.clear();
 }