Changeset 7958 in orxonox.OLD for branches/cr/src/lib/collision_reaction

Timestamp:

May 29, 2006, 5:32:42 PM (18 years ago)

Author:

patrick

Message:

cr: collision reactance introduced

Location:

branches/cr/src/lib/collision_reaction

Files:

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

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

@@ -52 +52 @@
 
   if( this->cachedCollisions.size() != CR_MAX_COLLISIONS)
-    PRINTF(0)("CollisionReaction Error: cache size missmatch: %i of %i\n", this->cachedCollisions.size(), CR_NUMBER);
+    PRINTF(0)("CollisionReaction Error: cache size missmatch: %i of %i\n", this->cachedCollisions.size(), CR_MAX_COLLISIONS);
 
   this->reset();
@@ -59 +59 @@
   for(; it < this->cachedCollisions.end(); it++)
     delete *it;
-
-//    while( !this->cachedCollisions.empty())
-//      delete this->cachedCollisions.back();
 
   this->cachedCollisions.clear();

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

@@ -51 +51 @@
 
   /** @returns an instance to a collision object. instead of creating new object this ones can be resycled */
-  inline Collision* popCollisionObject() { if(!this->cachedCollisions.empty()) { this->cachedCollisions.back(); this->cachedCollisions.pop_back();} else return NULL; }
+  inline Collision* popCollisionObject() { if(!this->cachedCollisions.empty()) { return this->cachedCollisions.back(); this->cachedCollisions.pop_back();} else return NULL; }
   /** @param collision: returns the Collision object back to the cache list */
   inline void pushCollisionObject(Collision* collision) { this->cachedCollisions.push_back(collision); }