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

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/lib

Files:

• collision_reaction/collision_event.h (modified) (1 diff)
• graphics/importer/bsp_manager.cc (modified) (2 diffs)
• graphics/importer/bsp_manager.h (modified) (2 diffs)

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

@@ -25 +25 @@
   { 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(WorldEntity* entity, Vector normal, Vector position)
-  { this->entityA = entity; this->groundNormal = normal; this->position = position; }
+  inline void collide(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position)
+  { this->entityA = entity; this->entityB = groundEntity, this->groundNormal = normal; this->position = position; }
 
 

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

@@ -48 +48 @@
 //CREATE_FACTORY( BspManager, CL_BSP_MODEL);
 
-BspManager::BspManager()
-{
+BspManager::BspManager(WorldEntity* parent)
+{
+  this->parent = parent;
   /*// open a BSP file
   this->bspFile = new BspFile();
@@ -917 +918 @@
     // Return the normal here: Normal's stored in this->collPlane;
    if(collision)
-     worldEntity->registerCollision(worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
+     worldEntity->registerCollision(worldEntity, this->parent, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
 }
 

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

@@ -51 +51 @@
 public:
   // Constructors
-  BspManager();
+  BspManager(WorldEntity* parent);
 
   BspManager(const char* fileName, float scale = 0.4f);
@@ -99 +99 @@
                             For example, if traceMins was (-100,-3,-15) and traceMaxs was (55,22,7), traceExtents */
 
+  WorldEntity* parent;          //!< the parent entity of the bspManager: interface to this
 
   bool * alreadyVisible;