Changeset 9892 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/collision_event.h

Timestamp:

Oct 14, 2006, 1:25:47 AM (18 years ago)

Author:

patrick

Message:

new interface to collision registers, more transparent. some more functionality

File:

• branches/coll_rect/src/lib/collision_reaction/collision_event.h (modified) (2 diffs)

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

@@ -14 +14 @@
 
 #include "vector.h"
+#include "cr_engine.h"
 
 #include "cr_defs.h"
@@ -33 +34 @@
 
     /** collides two WorldEntities @param entityA world entity A, @param entityB world entity B, @param bvA volume A @param bvB volumeB */
-    inline void collide(int type, WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
+    inline void collide(CREngine::CollisionType type, WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
     { this->collisionType = type; this->entityA = entityA; this->entityB = entityB; this->bvA = bvA; this->bvB = bvB; }
     /** collides two WorldEntities @param entity world entity , @param ground ground plane, @param position position on the ground */
-    inline void collide(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall)
+    inline void collide(CREngine::CollisionType type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall)
     {
       this->collisionType = type;