Changeset 8892 in orxonox.OLD

Timestamp:

Jun 29, 2006, 12:04:17 AM (18 years ago)

Author:

bottac

Message:

Just a small cleanup.

File:

• branches/single_player_map/src/lib/graphics/importer/bsp_manager.cc (modified) (6 diffs)

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

@@ -918 +918 @@
 void BspManager::checkCollisionBox(void)
 {}
-;
+
 
 void BspManager::TraceBox( Vector& inputStart, Vector& inputEnd,
@@ -952 +952 @@
 
 
-  Vector forwardDir = worldEntity->getAbsDirX();
-
-
-  Vector upDir = worldEntity->getAbsDirY();
-  upDir.x = 0.0;
-  upDir.y = 1.0;
-  upDir.z = 0.0;
-  Vector dest;
-
-
-  Vector position = worldEntity->getAbsCoor();       //+ upDir*10.0f ;
-  dest = worldEntity->getAbsCoor() - upDir*40.0f; //
-  Vector out = dest;
-
+  Vector forwardDir = Vector(0.0,0.0,1.0);
+  Vector upDir = Vector(0.0,1.0,0.0);
+  Vector position = worldEntity->getAbsCoor();
 
   bool SolidFlag = false;
@@ -971 +960 @@
   Vector position1 = position;
   Vector position2 = position + Vector(0.0,1.0,0.0);
+  Vector dest = worldEntity->getAbsCoor() - upDir*40.0f; //
   Vector dest1 = position + forwardDir*4.0f;
   Vector dest2 = position2 + forwardDir;
   dest = position - Vector(0.0, 40.0,0.0);
+  Vector out = dest;
   Vector out1;
   Vector out2;
@@ -1000 +991 @@
 
 
-  //
+  // 1st Ray
   this->inputStart =  position;
   this->inputEnd =   dest;
@@ -1060 +1051 @@
       out.x = dest1.x + (dest1.x -position1.x) * this->outputFraction;
       xCollision = true;
+      testPlane = this->collPlane;
     }
     if(this->outputAllSolid) {
       SolidFlag = true;
-      xCollision = true;   
+      xCollision = true;  
     }
     //out.z = this->outputFraction;
@@ -1081 +1073 @@
         out.z = out.z = dest2.z + (dest2.z -position2.z) * this->outputFraction;
         zCollision = true;
+        testPlane = this->collPlane;
+
       }
       if(this->outputAllSolid) {