Changeset 8216 in orxonox.OLD for branches/bsp_model/src/world_entities

Timestamp:

Jun 7, 2006, 9:33:10 PM (19 years ago)

Author:

patrick

Message:

bsp: collision registering should now work

Location:

branches/bsp_model/src/world_entities

Files:

• world_entity.cc (modified) (4 diffs)
• world_entity.h (modified) (2 diffs)

branches/bsp_model/src/world_entities/world_entity.cc

@@ -410 +410 @@
  *  @param position it collides on the plane
  */
-bool WorldEntity::registerCollision(WorldEntity* entity, Plane* plane, Vector position)
+bool WorldEntity::registerCollision(WorldEntity* entity, Vector normal, Vector position)
 {
   // is there any handler listening?
@@ -419 +419 @@
   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, plane, position);
+  c->collide(entity, normal, position);
 
   for( int i = 0; i < CREngine::CR_NUMBER; ++i)
@@ -504 +504 @@
   Vector u = Vector(0.0,-20.0,0.0);
 
-         
+
   if(!(this->getAbsCoor().x == ray_2.x && this->getAbsCoor().y == ray_2.y && this->getAbsCoor().z == ray_2.z) )
   {
@@ -521 +521 @@
 
   }
-   
-    
+
+
 }
 

branches/bsp_model/src/world_entities/world_entity.h

@@ -29 +29 @@
 class CollisionHandle;
 class Collision;
-class Plane;
 
 
@@ -86 +85 @@
 
   bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
-  bool registerCollision(WorldEntity* entity, Plane* plane, Vector position);
+  bool registerCollision(WorldEntity* entity, Vector normal, Vector position);
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }