Changeset 9086 in orxonox.OLD

Timestamp:

Jul 4, 2006, 1:52:10 AM (18 years ago)

Author:

patrick

Message:

more comments and less variables

File:

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

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

@@ -1146 +1146 @@
 
 
-  Vector forwardDir = Vector(0.0,0.0,1.0);
-  Vector upDir = Vector(0.0,1.0,0.0);
+/*  Vector forwardDir = Vector(0.0,0.0,1.0);
+  Vector upDir = Vector(0.0,1.0,0.0);*/
   Vector position = entity->getAbsCoor();
 
@@ -1154 +1154 @@
   plane* testPlane = NULL;
 
-  bool xCollision = false;
+  bool xCollisionRight = false;
+  bool xCollisionLeft = false;
 
 
@@ -1166 +1167 @@
   Vector dirX =  entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
 
+  // calculate the rays
   if( box != NULL)
   {
@@ -1173 +1175 @@
   else
   {
-    Vector position2 = position + Vector(0.0, 1.0,0.0);
-    Vector position3 = position;
-    Vector position4 = position + Vector(0.0, 1.0, 0.0);
-
-    left  = position + forwardDir * 4.0f;
-    right = position2 + forwardDir * 4.0;
-  }
-
-//     dest1
-//     dest2
+    left  = position + dirX * 4.0f;
+    right = position + Vector(0.0, 1.0, 0.0) + dirX * 4.0;
+  }
 
 
@@ -1198 +1193 @@
   {
     collPos = position + (right - position) * this->outputFraction;
-    xCollision = true;
+    xCollisionRight = true;
     testPlane = this->collPlane;
   }
@@ -1209 +1204 @@
     testPlane = this->collPlane;
     SolidFlag = true;
-    xCollision = true;
+    xCollisionRight = true;
   }
 
   // collision registration
-  if( xCollision) {
+  if( xCollisionRight) {
     entity->registerCollision(COLLISION_TYPE_AXIS_X ,
                               this->parent, entity,