Changeset 8218 in orxonox.OLD for branches/bsp_model/src/lib

Timestamp:

Jun 7, 2006, 10:07:54 PM (19 years ago)

Author:

patrick

Message:

bsp: changed the BSPEntity name to BspEntity for more consistency, using new interface

Location:

branches/bsp_model/src/lib

Files:

• collision_detection/cd_engine.cc (modified) (1 diff)
• graphics/importer/bsp_manager.cc (modified) (1 diff)
• graphics/importer/bsp_manager.h (modified) (1 diff)

branches/bsp_model/src/lib/collision_detection/cd_engine.cc

@@ -109 +109 @@
   for( bspIterator = bspList->begin(); bspIterator != bspList->end(); bspIterator++) {
       for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
-        (static_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
+        (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
   }
 }

branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

@@ -918 +918 @@
    if(collision)
      worldEntity->registerCollision(worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
-
-}
+}
+
 
 void  BspManager::checkCollision(BspTreeNode* node, Vector* cam)

branches/bsp_model/src/lib/graphics/importer/bsp_manager.h

@@ -64 +64 @@
 
 
-  void checkCollision(WorldEntity* worldEntity); /*!< WorldEntities use this function to check wheter they collided with the BSPEntity.
+  void checkCollision(WorldEntity* worldEntity); /*!< WorldEntities use this function to check wheter they collided with the BspEntity.
                                                       If a collision has been detected, the collides-function of worldEntity will be called.*/