Changeset 8220 in orxonox.OLD

Timestamp:

Jun 7, 2006, 11:44:50 PM (18 years ago)

Author:

patrick

Message:

bsp: collision detection doesn't work at all

Location:

branches/bsp_model/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/collision_reaction/collision_handle.cc (modified) (1 diff)
• lib/event/event_handler.cc (modified) (1 diff)
• lib/graphics/importer/bsp_manager.cc (modified) (3 diffs)
• story_entities/game_world.cc (modified) (1 diff)
• world_entities/bsp_entity.cc (modified) (5 diffs)

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++)
+      {
+//         PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassName());
         (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
+      }
   }
 }

branches/bsp_model/src/lib/collision_reaction/collision_handle.cc

@@ -173 +173 @@
 
  c->registerCollisionEvent(collisionEvent);
+ PRINTF(0)("Registering Collision Event: %s, %s\n", collisionEvent->getEntityA()->getClassName(), collisionEvent->getEntityB()->getClassName());
 }
 

branches/bsp_model/src/lib/event/event_handler.cc

@@ -353 +353 @@
   else
   {
-//    SDL_WM_GrabInput(SDL_GRAB_ON);
+    SDL_WM_GrabInput(SDL_GRAB_ON);
     SDL_ShowCursor(SDL_DISABLE);
   }

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

@@ -83 +83 @@
   this->root  = this->bspFile->get_root();
   this->alreadyVisible = new bool [this->bspFile->numFaces];
+
+  this->outputFraction = 1.0f;
 }
 /*
@@ -853 +855 @@
 
   Vector position = worldEntity->getAbsCoor();
-
-
-  Vector forwardDir = worldEntity->getAbsDirX();
-  forwardDir.x =8.0*forwardDir.x;
-  forwardDir.y =8.0*forwardDir.y;
-  forwardDir.z =8.0*forwardDir.z;
-
-  Vector upDir = worldEntity->getAbsDirY();
-  Vector dest = position;
-  dest.x  += forwardDir.x;
-  dest.y  += forwardDir.y;
-  dest.z  += forwardDir.z;
-  Vector out = dest;
+  Vector downDir = worldEntity->getAbsDirY();
+  Vector dest = position + downDir * -80.0f;
+
+//   Vector forwardDir = worldEntity->getAbsDirX();
+//   forwardDir.x =8.0*forwardDir.x;
+//   forwardDir.y =8.0*forwardDir.y;
+//   forwardDir.z =8.0*forwardDir.z;
+//
+//   Vector upDir = worldEntity->getAbsDirY();
+//   Vector dest = position;
+//   dest.x  += forwardDir.x;
+//   dest.y  += forwardDir.y;
+//   dest.z  += forwardDir.z;
+//   Vector out = dest;
 
    bool collision = false;
 
-   Vector position1 = position + Vector(0.0,0.1,0.0);
-   Vector position2 = position + Vector(0.0,0.2,0.0);
-   Vector dest1 = position1 + forwardDir;
-   Vector dest2 = position2 + forwardDir;
-   dest = position - Vector(0.0, 20.0,0.0);
-   Vector out1;
-   Vector out2;
-
-   this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
-   if(this->outputFraction == 1.0f)  out1 = dest;
+
+//    Vector position1 = position + Vector(0.0,0.1,0.0);
+//    Vector position2 = position + Vector(0.0,0.2,0.0);
+//    Vector dest1 = position1 + forwardDir;
+//    Vector dest2 = position2 + forwardDir;
+//    dest = position - Vector(0.0, 20.0,0.0);
+//    Vector out1;
+//    Vector out2;
+
+//    this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
+//    if(this->outputFraction == 1.0f)  out1 = dest;
+//    else {
+//      collision = true;
+//      out1.x = position1.x + (dest1.x -position1.x) * this->outputFraction;
+//      out1.y = position1.y + (dest1.y -position1.y) * this->outputFraction;
+//      out1.z = position1.z + (dest1.z - position1.z) * this->outputFraction;
+//
+//    }
+//    this->checkCollisionRayN(this->root,0.0f,1.0f, &position2, &dest2 );
+//    if(this->outputFraction == 1.0f) out2= dest;
+//    else {
+//      collision = true;
+//      out2.x = position2.x + (dest2.x -position2.x) * this->outputFraction;
+//      out2.y = position2.y + (dest2.y -position2.y) * this->outputFraction;
+//      out2.z = position2.z + (dest2.z - position2.z) * this->outputFraction;
+//
+//    }
+
+   this->checkCollisionRayN(this->root,0.0f, 1.0f, &position, &dest );
+
+   if( this->outputFraction == 1.0f)
+     out = dest;
    else {
+     PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
      collision = true;
-     out1.x = position1.x + (dest1.x -position1.x) * this->outputFraction;
-     out1.y = position1.y + (dest1.y -position1.y) * this->outputFraction;
-     out1.z = position1.z + (dest1.z - position1.z) * this->outputFraction;
-
-   }
-
-   this->checkCollisionRayN(this->root,0.0f,1.0f, &position2, &dest2 );
-   if(this->outputFraction == 1.0f) out2= dest;
-   else {
-     collision = true;
-     out2.x = position2.x + (dest2.x -position2.x) * this->outputFraction;
-     out2.y = position2.y + (dest2.y -position2.y) * this->outputFraction;
-     out2.z = position2.z + (dest2.z - position2.z) * this->outputFraction;
-
-   }
-
-   this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
-   if(this->outputFraction == 1.0f) out = dest;
-   else {
-     collision = true;
-     out.x = position.x + (dest.x -position.x) * this->outputFraction;
-     out.y = position.y + (dest.y -position.y) * this->outputFraction;
-     out.z = position.z + (dest.z -position.z) * this->outputFraction;
+//      out.x = position.x + (dest.x -position.x) * this->outputFraction;
+//      out.y = position.y + (dest.y -position.y) * this->outputFraction;
+//      out.z = position.z + (dest.z -position.z) * this->outputFraction;
+
+     out = position + (dest - position) * this->outputFraction;
 
      Vector out3 = out + Vector(3*this->collPlane->x,3*this->collPlane->y,3*this->collPlane->z);
-     this->out = out;
-     this->out1 = out1;
-     this->out2 = out2;
+
+
       //this->drawDebugCube(&out1);
       //this->drawDebugCube(&out2);
@@ -917 +924 @@
 
     // Return the normal here: Normal's stored in this->collPlane;
-   if(collision)
+   if( collision) {
      worldEntity->registerCollision(worldEntity, this->parent, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
+   }
 }
 

branches/bsp_model/src/story_entities/game_world.cc

@@ -428 +428 @@
   // ground collision detection: BSP Model
   CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_01));
 }
 

branches/bsp_model/src/world_entities/bsp_entity.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Claudio Botta
    co-programmer: ...
 */
@@ -27 +27 @@
 {
   this->init();
+
   if (root != NULL)
     this->loadParams(root);
@@ -37 +38 @@
 BspEntity::~BspEntity ()
 {
-
+  if( this->bspManager)
+    delete this->bspManager;
 }
-
-void BspEntity::setName(const std::string& name)
-{
-  PRINTF(0)("+++++++++++ LOADING NAME %s\n", name.c_str());
-
-  this->bspManager->load(name.c_str(), 0.1f);
-}
-
 
 
@@ -55 +49 @@
 void BspEntity::init()
 {
-  this->bspManager = new BspManager(this);
   this->setClassID(CL_BSP_ENTITY, "BspEntity");
 
+  this->bspManager = new BspManager(this);
   this->toList(OM_ENVIRON);
 
@@ -63 +57 @@
    * @todo: Write CL_BSP_ENTITY INTO THE src/defs/class_id.h (your own definition)
    */
+}
 
+
+void BspEntity::setName(const std::string& name)
+{
+  PRINTF(0)("+++++++++++ LOADING NAME %s\n", name.c_str());
+
+  this->bspManager->load(name.c_str(), 0.1f);
 }