Changeset 7959 in orxonox.OLD

Timestamp:

May 29, 2006, 5:43:10 PM (18 years ago)

Author:

patrick

Message:

cr: introducing CollisionEvent and some cleanup

Location:

branches/cr/src/lib/collision_reaction

Files:

• Makefile.am (modified) (2 diffs)
• collision.cc (modified) (1 diff)
• collision.h (modified) (4 diffs)
• collision_event.cc (added)
• collision_event.h (added)
• collision_handle.h (modified) (1 diff)

branches/cr/src/lib/collision_reaction/Makefile.am

@@ -6 +6 @@
 libORXcr_a_SOURCES = cr_engine.cc \
                      collision.cc \
+                     collision_event.cc \
                      collision_handle.cc
 
@@ -12 +13 @@
 noinst_HEADERS =     cr_engine.h \
                      collision.h \
+                     collision_event.h \
                      collision_handle.h \
                      cr_defs.h

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

@@ -29 +29 @@
   this->entityA = NULL;
   this->entityB = NULL;
-  this->bvA = NULL;
-  this->bvB = NULL;
 }
 

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

@@ -1 +1 @@
 /*!
  * @file collision.h
- *  Definition of a collision event
+ *  Definition of a collision as a two WE hit each other
  */
 
@@ -11 +11 @@
 class WorldEntity;
 class BoundingVolume;
-
+class CollisionEvent;
 
 //! A class representing a simple collision
@@ -21 +21 @@
 
   /** 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, BoundingVolume* bvA, BoundingVolume* bvB)
-  { this->entityA = entityA; this->entityB = entityB; this->bvA = bvA; this->bvB = bvB; }
+  inline void collide(WorldEntity* entityA, WorldEntity* entityB) { this->entityA = entityA; this->entityB = entityB; }
 
 
@@ -29 +28 @@
   /** @return Collision WorldEntity B */
   inline const WorldEntity* getEntityB() const { return this->entityB; }
-  /** @return Bounding Volume from EntityA */
-  inline const BoundingVolume* getBVA() const { return this->bvA; }
-  /** @return Bounding Volume from EntityB */
-  inline const BoundingVolume* getBVB() const { return this->bvB; }
+
+  /** registers a @param event CollisionEvent to take place */
+  inline void registerCollisionEvent(CollisionEvent* event) { this->collisionList.push_back(event); }
 
 
  private:
-  WorldEntity*      entityA;                       //!< the collision body A
-  WorldEntity*      entityB;                       //!< the collision body B
+  WorldEntity*                 entityA;                       //!< the collision body A
+  WorldEntity*                 entityB;                       //!< the collision body B
 
-  BoundingVolume*   bvA;                          //!< reference to the bounding volume A
-  BoundingVolume*   bvB;                          //!< reference to the bounding volume B
+  std::vector<CollisionEvent*> collisionList;                 //!< the collision event list
 };
 

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

@@ -16 +16 @@
 class WorldEntity;
 
-// struct CRType;