Changeset 8887 in orxonox.OLD for branches

Timestamp:

Jun 28, 2006, 9:11:54 PM (18 years ago)

Author:

bottac

Message:

Started to move collision detection / reaction to the new interface.

Location:

branches/single_player_map/src/lib

Files:

• graphics/importer/bsp_manager.cc (modified) (7 diffs)
• shell/shell_command.cc (modified) (1 diff)

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

@@ -968 +968 @@
   Vector out = dest;
 
-
+  
+  bool SolidFlag = false;
   bool collision = false;
   Vector position1 = position;
@@ -998 +999 @@
   else
   {
+    // Init positions and destinations to anything useful!
 
   }
@@ -1025 +1027 @@
         this->collPlane->z = 0.0f;
         collision = true;
+        SolidFlag = true;
       } else
         collision = false;
@@ -1046 +1049 @@
   plane* testPlane = this->collPlane;
 
+  
+  bool xCollision = false;
+  bool zCollision = false;
+  if(!SolidFlag)
+  {
 
   // 2nd Collision Detection
@@ -1055 +1063 @@
   this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
   out.x = this->outputFraction;
+  xCollision = true;
   //out.z = this->outputFraction;
 
+  if(!SolidFlag)
+  {
 
     // 3rd Collision Detection
@@ -1067 +1078 @@
   //out.x = this->outputFraction;
   out.z = this->outputFraction;
-
-
+  if(this->outputFraction != 1.0 )
+    zCollision = true;
+  }
+  }
   /*
   This is how you would calculate the Coordinates where worldEntity Collided with the BSP world.
@@ -1082 +1095 @@
     worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y, this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, false);
   }
-  else  worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y, this->parent, worldEntity, Vector(0.0, 2.0, 0.0), dest, false);
+  else 
+  {
+    if(xCollision || yCollision)
+    {
+      
+      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, false);
+    }
+    
+  }
+  //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/shell/shell_command.cc

@@ -373 +373 @@
     else
     {
-      delete this->completors[parameter];
+      if(this->completors[parameter] == NULL)
+      //delete this->completors[parameter];
       this->completors[parameter] = completorPlugin.clone();
     }