Changeset 7968 in orxonox.OLD

Timestamp:

May 30, 2006, 1:28:36 AM (18 years ago)

Author:

patrick

Message:

cr: process call line almost clear now

Location:

branches/cr/src/lib/collision_reaction

Files:

• collision.cc (modified) (1 diff)
• collision.h (modified) (1 diff)

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

@@ -40 +40 @@
 
 
+/**
+ * handles the collision events
+ */
+void Collision::handleCollisionEvents()
+{
 
+
+  this->flushCollisionEvents();
+}
+
+
+/**
+ * flushes the CollisionEvent list
+ */
+void Collision::flushCollisionEvents()
+{
+  this->collisionEvents.clear();
+}
+

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

@@ -15 +15 @@
 
 //! A class representing a simple collision
-class Collision {
+class Collision
+{
 
- public:
-   Collision();
-  virtual ~Collision();
+  public:
+    Collision();
+    virtual ~Collision();
 
-  /** 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; }
+    /** 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; }
 
 
-  /** @return Collision WorldEntity A */
-  inline WorldEntity* getEntityA() const { return this->entityA; }
-  /** @return Collision WorldEntity B */
-  inline WorldEntity* getEntityB() const { return this->entityB; }
+    /** @return Collision WorldEntity A */
+    inline WorldEntity* getEntityA() const { return this->entityA; }
+    /** @return Collision WorldEntity B */
+    inline WorldEntity* getEntityB() const { return this->entityB; }
 
-  /** registers a @param event CollisionEvent to take place */
-  inline void registerCollisionEvent(CollisionEvent* event) { this->collisionList.push_back(event); }
+    /** registers a @param event CollisionEvent to take place */
+    inline void registerCollisionEvent(CollisionEvent* event) { this->collisionEvents.push_back(event); }
+
+    void handleCollisionEvents();
 
 
- private:
-  WorldEntity*                 entityA;                       //!< the collision body A
-  WorldEntity*                 entityB;                       //!< the collision body B
+  private:
+    void flushCollisionEvents();
 
-  std::vector<CollisionEvent*> collisionList;                 //!< the collision event list
+
+  private:
+    WorldEntity*                 entityA;                       //!< the collision body A
+    WorldEntity*                 entityB;                       //!< the collision body B
+
+    std::vector<CollisionEvent*> collisionEvents;               //!< the collision event list
 };