Changeset 8910 in orxonox.OLD for branches/single_player_map/src/lib/graphics/importer

Timestamp:

Jun 29, 2006, 4:03:42 PM (18 years ago)

Author:

bottac

Message:

Still not working.

Location:

branches/single_player_map/src/lib/graphics/importer

Files:

• bsp_manager.cc (modified) (8 diffs)
• bsp_manager.h (modified) (1 diff)

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

@@ -82 +82 @@
     delete this->bspFile;
 }
- 
+
 int BspManager::load(const char* fileName, float scale)
 {
   // open a BSP file
-  
-  
+
+
   this->bspFile = new BspFile();
   this->bspFile->scale =  scale;
   if(this->bspFile->read(ResourceManager::getFullName(fileName).c_str()) == -1)
-  return -1;
-  
+    return -1;
+
   this->bspFile->build_tree();
   this->root  = this->bspFile->get_root();
@@ -98 +98 @@
 
   this->outputFraction = 1.0f;
-  
+
   return 0;
 }
@@ -998 +998 @@
   } else {
     // Init positions and destinations to anything useful!
-
+   
   }
 
@@ -1045 +1045 @@
   }
 
-  plane* testPlane = this->collPlane;
+  plane* testPlane = new plane;
+  testPlane->x =  this->collPlane->x;
+  testPlane->y = this->collPlane->y;
+  testPlane->z = this->collPlane->z;
 
 
   bool xCollision = false;
   bool zCollision = false;
-  if(!SolidFlag) {
+  
 
     // 2nd Collision Detection
@@ -1060 +1063 @@
     this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
 
-    if(!this->outputAllSolid != 1.0f) {
+    if(this->outputFraction < 1.0f) {
       out.x = dest1.x + (dest1.x -position1.x) * this->outputFraction;
       xCollision = true;
       testPlane = this->collPlane;
     }
-    if(this->outputAllSolid) {
+    if(this->outputAllSolid || !this->outputStartsOut) {
       SolidFlag = true;
-      xCollision = true;  
+      xCollision = true;
     }
     //out.z = this->outputFraction;
 
-    if(!SolidFlag) {
+   
 
       // 3rd Collision Detection
@@ -1082 +1085 @@
       //out.x = this->outputFraction;
 
-      if(this->outputFraction != 1.0f ) {
+      if(this->outputFraction < 1.0f ) {
         out.z = out.z = dest2.z + (dest2.z -position2.z) * this->outputFraction;
         zCollision = true;
@@ -1088 +1091 @@
 
       }
-      if(this->outputAllSolid) {
-          SolidFlag = true;
-          zCollision = true;   
+      if(this->outputAllSolid || !this->outputStartsOut) {
+        SolidFlag = true;
+        zCollision = true;
       }
-    }
-  }//end if
+    
+  //end if
   /*
   This is how you would calculate the Coordinates where worldEntity Collided with the BSP world.
@@ -1104 +1107 @@
   if( collision) {
     PRINTF(5)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
-    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y || (xCollision ? COLLISION_TYPE_AXIS_X :0) | (zCollision ? COLLISION_TYPE_AXIS_Z :0), this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);
-  } else {
-    if(xCollision || zCollision) {
-
-      worldEntity->registerCollision((xCollision ? COLLISION_TYPE_AXIS_X :0) | (zCollision ? COLLISION_TYPE_AXIS_Z :0) , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);
-    }
-
-  }
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);
+  }
+  if(xCollision) {
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);
+  }
+  if(zCollision) {
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);
+  }
+
+
   //else  worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y, this->parent, worldEntity, Vector(0.0, 2.0, 0.0), dest, false);
 

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

@@ -119 +119 @@
   ::std::deque<int> opal; //!< the others here.
 
-  Vector out;  //!< For debugging only
+  Vector out;  //!< Stores collision coordinates
   Vector out1; //!< For debugging only
   Vector out2; //!< For debugging only