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

Timestamp:

Nov 20, 2006, 12:53:27 AM (17 years ago)

Author:

patrick

Message:

removed some comilation problems.

File:

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

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

@@ -32 +32 @@
   {
   public:
+
     Collision();
     virtual ~Collision();
@@ -39 +40 @@
 
 
+    /* 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  const_iterator;   //!< constant iterator definition
+
+    /** registers a @param event CollisionEvent to take place */
+    inline void registerCollisionEvent(CollisionEvent* event) { this->_collisionEvents.push_back(event); this->bDispatched = false;}
+    /** @returns a vector of collision events */
+    inline const std::vector<CollisionEvent*>& getCollisionEvents() const { return this->_collisionEvents; }
+
+    void flushCollisionEvents();
+
+
+    /** @returns iterator pointing to the beginning of the collision event vector */
+    inline iterator       begin()        { return this->_collisionEvents.begin(); }
+    /** @returns const iterator pointing to the beginning of the collision event vector */
+    inline const_iterator begin() const  { return this->_collisionEvents.begin(); }
+    /** @returns iterator pointing to the end of the collision event vector */
+    inline iterator       end()          { return this->_collisionEvents.end(); }
+    /** @returns const iterator pointing to the end of the collision event vector */
+    inline const_iterator end() const    { return this->_collisionEvents.end(); }
+
+
+  private:
+    collisionVector  _collisionEvents;               //!< the collision event list
+
+
+
+    /* misc interface functions */
+  public:
     /** @return Collision WorldEntity A */
     inline WorldEntity* getEntityA() const { return this->entityA; }
     /** @return Collision WorldEntity B */
     inline WorldEntity* getEntityB() const { return this->entityB; }
+    inline bool match(const WorldEntity& entityA, WorldEntity& entityB) const {
+      return ((this->entityA == &entityA && this->entityB == &entityB) || (this->entityA == &entityB && this->entityB == &entityA)); }
+
     /** @return true if Entity A collides */
     inline bool isEntityACollide() const { return this->entityACollide; }
@@ -53 +88 @@
 
 
-    inline bool match(const WorldEntity& entityA, WorldEntity& entityB) const {
-      return ((this->entityA == &entityA && this->entityB == &entityB) || (this->entityA == &entityB && this->entityB == &entityA)); }
+
     /** @returns true if this Collision has already been dispatched */
     inline bool isDispatched() { return this->bDispatched; }
     /** sets the dispatched flag to true */
     inline void dispatched() { this->bDispatched = true; }
-
-    /** registers a @param event CollisionEvent to take place */
-    inline void registerCollisionEvent(CollisionEvent* event) { this->collisionEvents.push_back(event); this->bDispatched = false;}
-    /** @returns a vector of collision events */
-    inline const std::vector<CollisionEvent*>& getCollisionEvents() const { return this->collisionEvents; }
-
-
-    void flushCollisionEvents();
-
 
   private:
@@ -77 +102 @@
     bool                         bDispatched;                   //!< true if this collision has already been dispatched
 
-    std::vector<CollisionEvent*> collisionEvents;               //!< the collision event list
   };
 }