Changeset 7959 in orxonox.OLD for branches/cr/src
- Timestamp:
- May 29, 2006, 5:43:10 PM (18 years ago)
- Location:
- branches/cr/src/lib/collision_reaction
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/cr/src/lib/collision_reaction/Makefile.am
r7940 r7959 6 6 libORXcr_a_SOURCES = cr_engine.cc \ 7 7 collision.cc \ 8 collision_event.cc \ 8 9 collision_handle.cc 9 10 … … 12 13 noinst_HEADERS = cr_engine.h \ 13 14 collision.h \ 15 collision_event.h \ 14 16 collision_handle.h \ 15 17 cr_defs.h -
branches/cr/src/lib/collision_reaction/collision.cc
r7955 r7959 29 29 this->entityA = NULL; 30 30 this->entityB = NULL; 31 this->bvA = NULL;32 this->bvB = NULL;33 31 } 34 32 -
branches/cr/src/lib/collision_reaction/collision.h
r7940 r7959 1 1 /*! 2 2 * @file collision.h 3 * Definition of a collision event3 * Definition of a collision as a two WE hit each other 4 4 */ 5 5 … … 11 11 class WorldEntity; 12 12 class BoundingVolume; 13 13 class CollisionEvent; 14 14 15 15 //! A class representing a simple collision … … 21 21 22 22 /** collides two WorldEntities @param entityA world entity A, @param entityB world entity B, @param bvA volume A @param bvB volumeB */ 23 inline void collide(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB) 24 { this->entityA = entityA; this->entityB = entityB; this->bvA = bvA; this->bvB = bvB; } 23 inline void collide(WorldEntity* entityA, WorldEntity* entityB) { this->entityA = entityA; this->entityB = entityB; } 25 24 26 25 … … 29 28 /** @return Collision WorldEntity B */ 30 29 inline const WorldEntity* getEntityB() const { return this->entityB; } 31 /** @return Bounding Volume from EntityA */ 32 inline const BoundingVolume* getBVA() const { return this->bvA; } 33 /** @return Bounding Volume from EntityB */ 34 inline const BoundingVolume* getBVB() const { return this->bvB; } 30 31 /** registers a @param event CollisionEvent to take place */ 32 inline void registerCollisionEvent(CollisionEvent* event) { this->collisionList.push_back(event); } 35 33 36 34 37 35 private: 38 WorldEntity* entityA; //!< the collision body A39 WorldEntity* entityB; //!< the collision body B36 WorldEntity* entityA; //!< the collision body A 37 WorldEntity* entityB; //!< the collision body B 40 38 41 BoundingVolume* bvA; //!< reference to the bounding volume A 42 BoundingVolume* bvB; //!< reference to the bounding volume B 39 std::vector<CollisionEvent*> collisionList; //!< the collision event list 43 40 }; 44 41 -
branches/cr/src/lib/collision_reaction/collision_handle.h
r7947 r7959 16 16 class WorldEntity; 17 17 18 // struct CRType;19 18 20 19
Note: See TracChangeset
for help on using the changeset viewer.