Changeset 8219 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

bsp: new ground collision attribute tripple

Location:

branches/bsp_model/src

Files:

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

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;

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; }