Changeset 7960 in orxonox.OLD

Timestamp:

May 29, 2006, 5:57:39 PM (18 years ago)

Author:

patrick

Message:

cr: list handling fuck up. better stuff to come… but after a big chinese meal being coocked by the most wicked simon:D

File:

• branches/cr/src/lib/collision_reaction/cr_engine.h (modified) (2 diffs)

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()) { return this->cachedCollisions.back(); this->cachedCollisions.pop_back();} else return NULL; }
+  inline Collision* popCollisionObject() { if(!this->collisionsUnused.empty()) { return this->collisionsUnused.back(); this->collisionsUnused.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); }
+  inline void pushCollisionObject(Collision* collision) { this->collisionsUsed.push_back(collision); }
 
 
@@ -66 +66 @@
 private:
   std::vector<CollisionHandle*>       collisionHandles;         //!< list with the collision handles
-  std::vector<Collision*>             cachedCollisions;         //!< a list of unused, cached collision events
+
+  std::vector<Collision*>             collisionsUsed;           //!< a list of used, cached collisions
+  std::vector<Collision*>             collisionsUnused;         //!< a list of unused, cached collisions
+
+  std::vector<Collision*>             collisionEventsUsed;      //!< a list of used, cached collision events
+  std::vector<Collision*>             collisionEventsUnused;    //!< a list of unused, cached collision events
 
   static CREngine*                    singletonRef;             //!< the reference to the CREngine object (singleton)