Changeset 8468 in orxonox.OLD

Timestamp:

Jun 15, 2006, 2:57:44 PM (18 years ago)

Author:

bottac

Message:

Ground Collision fixed.

Location:

branches/bsp_model/src/lib/graphics

Files:

• graphics_engine.cc (modified) (1 diff)
• importer/bsp_manager.cc (modified) (6 diffs)
• importer/bsp_manager.h (modified) (2 diffs)

branches/bsp_model/src/lib/graphics/graphics_engine.cc

@@ -66 +66 @@
 
   this->bDisplayFPS = false;
-  this->bAntialiasing = true;
+  this->bAntialiasing = false;
   this->minFPS = 9999;
   this->maxFPS = 0;

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

@@ -50 +50 @@
 BspManager::BspManager(WorldEntity* parent)
 {
-  this->outputStartsOut = true;
-  this->outputAllSolid = false;
-  this->outputFraction = 1.0f;
+ 
   this->parent = parent;
   /*// open a BSP file
@@ -595 +593 @@
   float startFraction = -1.0f;
   float endFraction = 1.0f;
-  bool startsOut = false;
-  bool endsOut = false;
-
-  Vector inputStart = State::getCameraTargetNode()->getLastAbsCoor();
-  Vector inputEnd   = State::getCameraTargetNode()->getAbsCoor();
+  bool  startsOut = false;
+  bool  endsOut = false;
+
+ // Vector inputStart = State::getCameraTargetNode()->getLastAbsCoor();
+ // Vector inputEnd   = State::getCameraTargetNode()->getAbsCoor();
+
+  for (int i = 0; i < curBrush->n_brushsides; i++) {
+    brushside& curBrushSide =   this->bspFile->brushSides[curBrush->brushside + i]   ;
+    plane& curPlane  =   this->bspFile->planes[curBrushSide.plane] ;
+
+    startDistance = inputStart.x * curPlane.x + inputStart.y * curPlane.y+ inputStart.z * curPlane.z - curPlane.d;
+    endDistance = inputEnd.x * curPlane.x +inputEnd.y * curPlane.y +inputEnd.z * curPlane.z -curPlane.d;
+
+    if (startDistance > 0)
+      startsOut = true;
+    if (endDistance > 0)
+      endsOut = true;
+
+    // make sure the trace isn't completely on one side of the brush
+    if (startDistance > 0 && endDistance > 0) {   // both are in front of the plane, its outside of this brush
+      return;
+    }
+    if (startDistance <= 0 && endDistance <= 0) {   // both are behind this plane, it will get clipped by another one
+      continue;
+    }
+
+    // MMM... BEEFY
+    if (startDistance > endDistance) {   // line is entering into the brush
+      float fraction = (startDistance - EPSILON) / (startDistance - endDistance);  // *
+      if (fraction > startFraction)
+        startFraction = fraction;
+      // store plane
+      this->collPlane = &curPlane;
+
+    } else {   // line is leaving the brush
+      float fraction = (startDistance + EPSILON) / (startDistance - endDistance);  // *
+      if (fraction < endFraction)
+        endFraction = fraction;
+      // store plane
+      this->collPlane = & curPlane;
+
+    }
+
+  }
+  if (startsOut == false) {
+    this->outputStartsOut = false;
+    if (endsOut == false)
+      this->outputAllSolid = true;
+    return;
+  }
+
+  if (startFraction < endFraction) {
+    if (startFraction > -1.0f && startFraction < outputFraction) {
+      if (startFraction < 0)
+        startFraction = 0;
+      this->outputFraction = startFraction;
+    }
+  }
+
+}
+
+void BspManager::checkBrushRayN(brush* curBrush, Vector& inputStart, Vector& inputEnd)
+{
+  float EPSILON = 0.000001;
+  float startDistance;
+  float endDistance;
+
+  float startFraction = -1.0f;
+  float endFraction = 1.0f;
+  bool  startsOut = false;
+  bool  endsOut = false;
+
+  //Vector inputStart = State::getCameraTargetNode()->getLastAbsCoor();
+  //Vector inputEnd   = State::getCameraTargetNode()->getAbsCoor();
 
   for (int i = 0; i < curBrush->n_brushsides; i++) {
@@ -870 +937 @@
 void BspManager::checkCollision(WorldEntity* worldEntity)
 {
-  Vector position = worldEntity->getLastAbsCoor();
+  
+  this->outputStartsOut = true;
+  this->outputAllSolid = false;
+  this->outputFraction = 1.0f;
+  
+  Vector position = worldEntity->getAbsCoor();
 
 
@@ -877 +949 @@
 
   Vector upDir = worldEntity->getAbsDirY();
-  Vector dest = position;
+  upDir.x = 0.0;
+  upDir.y = 1.0;
+  upDir.z = 0.0;
+  Vector dest;
   /*
   dest.x  += forwardDir.x;
@@ -884 +959 @@
   */
 
-  dest = worldEntity->getAbsCoor();
+  dest = worldEntity->getAbsCoor() - upDir*40.0;
   Vector out = dest;
 
@@ -901 +976 @@
 
   float height = 40;
-  this->outputAllSolid = false;
-
+  
+  this->inputStart =  position;
+  this->inputEnd =   dest;
   this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
 
   PRINTF(0)(" checking collision: %s, solid = %i, fraction = %f\n", worldEntity->getClassName(), this->outputAllSolid, this->outputFraction);
+  PRINTF(0)("checking collision!! Pos.Coords: %f , %f , %f\n", position.x , position.y, position.z);
+  PRINTF(0)("checking collision!! Dest.Coords: %f , %f , %f\n", dest.x , dest.y, dest.z);  
 //   position1.debug();
 

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

@@ -77 +77 @@
   void  checkBrushRay(brush* curBrush);
   void  checkBrushRayN(brush* curBrush);
+  void   checkBrushRayN(brush* curBrush, Vector& inputStart, Vector& inputEnd);
+
   void drawDebugCube(Vector* cam);
   bool isAlreadyVisible(int Face);
@@ -94 +96 @@
   bool  outputAllSolid;
   float outputFraction;
+  Vector inputStart;
+  Vector inputEnd;
+  
   Vector traceMins; //!< Mins of current bbox
   Vector traceMaxs; //!< Maxs of current bbox