Changeset 8343 in orxonox.OLD for branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

Timestamp:

Jun 13, 2006, 4:04:33 PM (18 years ago)

Author:

patrick

Message:

bsp: md3 model adding skelettons

File:

• branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc (modified) (1 diff)

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

@@ -885 +885 @@
 
 
-  if(/*!worldEntity->isA(CL_PLAYABLE)*/ false) {
-
-
-
+
+
+  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, 40.0,0.0);
+  Vector out1;
+  Vector out2;
+
+
+  float height = 40;
+  this->outputAllSolid = false;
+
+  this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
+
+  PRINTF(0)(" checking collision: %s, solid = %i, fraction = %f\n", worldEntity->getClassName(), this->outputAllSolid, this->outputFraction);
+//   position1.debug();
+
+  if( this->outputFraction == 1.0f)
+  {
+    if(this->outputAllSolid)
+    {
+      this->collPlane = new plane;
+      this->collPlane->x = 1.0f;
+      this->collPlane->y = 0.0f;
+      this->collPlane->z = 0.0f;
+      collision = true;
+    }
+    else
+      collision = false;
+
+
+    out = dest;
   }
   else {
 
-    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, 40.0,0.0);
-    Vector out1;
-    Vector out2;
-
-
-    float height = 40;
-    this->outputAllSolid = false;
-
-    this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
-
-    if( this->outputFraction == 1.0f)
-    {
-      if(this->outputAllSolid)
-      {
-        this->collPlane = new plane;
-        this->collPlane->x = 1.0f;
-        this->collPlane->y = 0.0f;
-        this->collPlane->z = 0.0f;
-        collision = true;
-      }
-      else
-        collision = false;
-
-
-      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;
-
-      Vector out3 = out + Vector(height*this->collPlane->x,height*this->collPlane->y,height*this->collPlane->z);
-      this->out = out;
-      //this->out1 = out1;
-      //this->out2 = out2;
-      //this->drawDebugCube(&out1);
-      //this->drawDebugCube(&out2);
-      //this->drawDebugCube(&out3);
-    }
-    // Return the normal here: Normal's stored in this->collPlane;
-    if(collision ) {
-//       PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
-      worldEntity->registerCollision(this->parent, worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
-    }
+    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;
+
+    Vector out3 = out + Vector(height*this->collPlane->x,height*this->collPlane->y,height*this->collPlane->z);
+    this->out = out;
+  }
+
+  // Return the normal here: Normal's stored in this->collPlane;
+  if( collision) {
+    PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
+    worldEntity->registerCollision(this->parent, worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
   }