Changeset 8329 in orxonox.OLD

Timestamp:

Jun 12, 2006, 7:54:50 PM (18 years ago)

Author:

bottac

Message:

colision detection again.

File:

• branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc (modified) (4 diffs)

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

@@ -873 +873 @@
 void BspManager::checkCollision(WorldEntity* worldEntity)
 {
-  Vector position = worldEntity->getAbsCoor();
+  Vector position = worldEntity->getLastAbsCoor();
 
 
@@ -881 +881 @@
   Vector upDir = worldEntity->getAbsDirY();
   Vector dest = position;
-
+  /*
   dest.x  += forwardDir.x;
   dest.y  += forwardDir.y;
   dest.z  += forwardDir.z;
+  */
+  
+  dest = worldEntity->getAbsCoor();
   Vector out = dest;
 
@@ -913 +916 @@
     this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
     if(this->outputFraction == 1.0f)  out1 = dest;
-    else {
+    else {(
       collision = true;
       out1.x = position1.x + (dest1.x -position1.x) * this->outputFraction;
@@ -934 +937 @@
 
     float height = 40;
-
+    this->outputAllSolid = false;
 
     this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );