Changeset 8864 in orxonox.OLD for branches/single_player_map/src/world_entities

Timestamp:

Jun 28, 2006, 3:51:36 PM (19 years ago)

Author:

patrick

Message:

new collision registration functions

Location:

branches/single_player_map/src/world_entities

Files:

• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (1 diff)

branches/single_player_map/src/world_entities/world_entity.cc

@@ -418 +418 @@
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-  c->collide(entityA, entityB, bvA, bvB);
+  c->collide(COLLISION_TYPE_OBB, entityA, entityB, bvA, bvB);
 
   for( int i = 0; i < CREngine::CR_NUMBER; ++i)
@@ -433 +433 @@
  *  @param position it collides on the plane
  */
-bool WorldEntity::registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall)
+bool WorldEntity::registerCollision(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall)
 {
   // is there any handler listening?
@@ -442 +442 @@
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-  c->collide(entity, groundEntity, normal, position, bInWall);
+  c->collide(type, entity, groundEntity, normal, position, bInWall);
 
   for( int i = 0; i < CREngine::CR_NUMBER; ++i)

branches/single_player_map/src/world_entities/world_entity.h

@@ -88 +88 @@
 
   bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
-  bool registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall = false);
+  bool registerCollision(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall = false);
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }