Changeset 9985 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/cr_engine.h

Timestamp:

Dec 2, 2006, 4:28:11 PM (19 years ago)

Author:

patrick

Message:

giving the crengine the ability to check for collisions itself, collision tube only used as container

File:

• branches/coll_rect/src/lib/collision_reaction/cr_engine.h (modified) (4 diffs)

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

@@ -29 +29 @@
     ObjectListDeclaration(CREngine);
 
+    typedef std::vector<Collision*>::iterator        CollisionIterator;
+    typedef std::vector<CollisionEvent*>::iterator   CollisionEventIterator;
 
 
@@ -70 +72 @@
     Collision* popCollisionObject();
     CollisionEvent* popCollisionEventObject();
-    void reset();
 
     void handleCollisions();
@@ -85 +86 @@
 
   private:
-    //std::vector<CollisionHandle*>       collisionHandles;         //!< list with the collision handles
+    static CREngine*                    singletonRef;             //!< the reference to the CREngine object (singleton)
 
     std::vector<Collision*>             collisionsUsed;           //!< a list of used, cached collisions
@@ -93 +94 @@
     std::vector<CollisionEvent*>        collisionEventsUnused;    //!< a list of unused, cached collision events
 
-    static CREngine*                    singletonRef;             //!< the reference to the CREngine object (singleton)
+    CollisionReaction*                  _reactionList[CREngine::CR_NUMBER];  //!< the collision reaction list containing all reactions types
+
+
   };