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

Timestamp:

Jun 7, 2006, 10:15:00 PM (19 years ago)

Author:

patrick

Message:

bsp: new ground collision attribute tripple

Location:

branches/bsp_model/src/world_entities

Files:

• bsp_entity.cc (modified) (2 diffs)
• world_entity.cc (modified) (2 diffs)
• world_entity.h (modified) (1 diff)

branches/bsp_model/src/world_entities/bsp_entity.cc

@@ -42 +42 @@
 void BspEntity::setName(const std::string& name)
 {
-  printf("+++++++++++ LOADING NAME %s\n", name.c_str());
+  PRINTF(0)("+++++++++++ LOADING NAME %s\n", name.c_str());
 
   this->bspManager->load(name.c_str(), 0.1f);
@@ -55 +55 @@
 void BspEntity::init()
 {
-  this->bspManager = new BspManager();
+  this->bspManager = new BspManager(this);
   this->setClassID(CL_BSP_ENTITY, "BspEntity");
 

branches/bsp_model/src/world_entities/world_entity.cc

@@ -410 +410 @@
  *  @param position it collides on the plane
  */
-bool WorldEntity::registerCollision(WorldEntity* entity, Vector normal, Vector position)
+bool WorldEntity::registerCollision(WorldEntity* entity, WorldEntity* groundEntity, 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, normal, position);
+  c->collide(entity, groundEntity, normal, position);
 
   for( int i = 0; i < CREngine::CR_NUMBER; ++i)

branches/bsp_model/src/world_entities/world_entity.h

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