Changeset 9084 in orxonox.OLD for branches

Timestamp:

Jul 4, 2006, 1:49:43 AM (18 years ago)

Author:

patrick

Message:

one half x made

File:

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

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

@@ -1151 +1151 @@
 
   bool SolidFlag = false;
-  bool collision = false;
-  Vector position1 = position;
-  Vector position2 = position + Vector(0.0,1.0,0.0);
-  Vector position3 = position;
-  Vector position4 = position + Vector(0.0,1.0,0.0);
-  Vector dest = entity->getAbsCoor() - upDir*40.0f; //
-
-  Vector dest3 = position + forwardDir * 4.0f;
-  Vector dest4 = position2 + forwardDir * 4.0;
-  dest = position - Vector(0.0, 40.0,0.0);
-  Vector out = dest;
-  Vector out1;
-  Vector out2;
-
-
-  plane* testPlane;
+
+  plane* testPlane = NULL;
 
   bool xCollision = false;
-  bool zCollision = false;
+
 
   Vector            left;                       //!< left collision ray
   Vector            right;                      //!< right collision ray
-
-  Vector dest1;
-
-  float height = 40;
+  Vector            collPos;                    //!< the collision position
+
+
+
 
   Vector dirX =  entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
@@ -1187 +1173 @@
   else
   {
-    left  = position + forwardDir*4.0f;
-    right = position2 + forwardDir*4.0;
-  }
-
-    //
+    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
 
 
-    // 2nd Collision Detection X-RAY
+  /*   X Ray Left  */
+  // init some member variables before collision check
   this->outputStartsOut = true;
   this->outputAllSolid = false;
   this->outputFraction = 1.0f;
-  this->inputStart =  position1;
-//   this->inputEnd =   dest1;                                                 <===============
-//  this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
-
-  if(this->outputFraction < 1.0f) {
-    out.x = dest1.x + (dest1.x -position1.x) * this->outputFraction;
-    dest1 = position1 + (dest1 -position1) * this->outputFraction;
+  this->inputStart =  position;
+  this->inputEnd =   right;
+  this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &right );
+
+  // collision occured
+  if( this->outputFraction < 1.0f)
+  {
+    collPos = position + (right - position) * this->outputFraction;
     xCollision = true;
     testPlane = this->collPlane;
   }
-  if(this->outputAllSolid ) {
-
+  if(this->outputAllSolid )
+  {
     this->collPlane = new plane;
     this->collPlane->x = 0.0f;
@@ -1220 +1211 @@
     xCollision = true;
   }
-    //out.z = this->outputFraction;
-
-
-
+
+  // collision registration
   if( xCollision) {
-    entity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, entity,
-                                   Vector(testPlane->x, testPlane->y, testPlane->z),dest1 ,
-                                   SolidFlag);
+    entity->registerCollision(COLLISION_TYPE_AXIS_X ,
+                              this->parent, entity,
+                              Vector(testPlane->x, testPlane->y, testPlane->z),
+                              collPos,
+                              SolidFlag);
   }