Changeset 9988 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/collision.h

Timestamp:

Dec 3, 2006, 4:55:19 PM (17 years ago)

Author:

patrick

Message:

removed most of the compiler bugs. more to come

File:

• branches/coll_rect/src/lib/collision_reaction/collision.h (modified) (3 diffs)

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

@@ -31 +31 @@
   class Collision
   {
+
+    typedef std::vector<CollisionEvent*>                  CollisionVector;  //!< the vector containing all collision events
+    typedef std::vector<CollisionEvent*>::iterator        Iterator;         //!< iterator definition
+    typedef std::vector<CollisionEvent*>::const_iterator  ConstIterator;   //!< constant iterator definition
+
+
   public:
 
@@ -37 +43 @@
 
     /** collides two WorldEntities @param entityA world entity A, @param entityB world entity B, @param bvA volume A @param bvB volumeB */
-    inline void collide(WorldEntity* entityA, WorldEntity* entityB) { this->entityA = entityA; this->entityB = entityB; this->bDispatched = false; }
+    inline void collide(WorldEntity* entityA, WorldEntity* entityB) { this->_entityA = entityA; this->_entityB = entityB; }
 
 
     /* list stuff */
   public:
-    typedef std::vector<CollisionEvent*>                  CollisionVector;  //!< the vector containing all collision events
-    typedef std::vector<CollisionEvent*>::iterator        Iterator;         //!< iterator definition
-    typedef std::vector<CollisionEvent*>::const_iterator  ConstIterator;   //!< constant iterator definition
 
     /** registers a @param event CollisionEvent to take place */
-    inline void registerCollisionEvent(CollisionEvent* event) { this->_collisionEvents.push_back(event); this->bDispatched = false;}
+    inline void registerCollisionEvent(CollisionEvent* event) { this->_collisionEvents.push_back(event); }
 
     void reset();
@@ -87 +90 @@
     bool                         _entityBCollide;                //!< true if entity B is subscribed for collision reaction
 
-    collisionVector              _collisionEvents;               //!< the collision event list
+    CollisionVector              _collisionEvents;               //!< the collision event list
 
   };