Changeset 10618 in orxonox.OLD for trunk/src/lib/graphics/importer/bsp

Timestamp:

Apr 4, 2007, 12:13:53 PM (18 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/lib/graphics/importer/bsp/bsp_manager.cc (modified) (10 diffs)
• src/lib/graphics/importer/bsp/bsp_manager.h (modified) (1 diff)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/src/lib/graphics/importer/bsp/bsp_manager.cc

@@ -30 +30 @@
 #include "debug.h"
 #include "material.h"
-#include "camera.h"
+#include "tools/camera.h"
 #include "vertex_array_model.h"
 #include "world_entities/player.h"
@@ -982 +982 @@
   float endDistance = end->dot(node->plane) - node->d;
   float startDistance = start->dot(node->plane) - node->d;
-
-
+  
   if( node->isLeaf) {
     leaf& curLeaf = this->bspFile->leaves[node->leafIndex];
@@ -999 +998 @@
   }
 
-
+  //TODO valgrind complains about uninitialised value here
   if (startDistance >= 0 && endDistance >= 0)     // A
   {   // both points are in front of the plane
@@ -1102 +1101 @@
   this->outputFraction = 1.0f;
 
-
   this->checkCollisionX(worldEntity);
-  this->checkCollisionY(worldEntity);
   this->checkCollisionZ(worldEntity);
+
+  if(!(this->checkCollisionY(worldEntity)))
+  this->checkCollisionWay(worldEntity);
 
 
@@ -1288 +1288 @@
  * check the collision in the x direction (forward, backward)
  */
-void BspManager::checkCollisionX(WorldEntity* entity)
+bool BspManager::checkCollisionX(WorldEntity* entity)
 {
   // Retrieve Bounding box
@@ -1398 +1398 @@
                               SolidFlag);
   }
+
+ return (xCollisionBackward || xCollisionForward);
 }
 
@@ -1404 +1406 @@
  * check the collision in the z direction (up, down)
  */
-void BspManager::checkCollisionY(WorldEntity* entity)
+bool BspManager::checkCollisionY(WorldEntity* entity)
 {
 
@@ -1546 +1548 @@
                               collPos, SolidFlag);
   }
+
+ return (yCollisionUp || yCollisionDown);
 }
 
@@ -1554 +1558 @@
  * check the collision in the z direction (left, right)
  */
-void BspManager::checkCollisionZ(WorldEntity* entity)
+bool BspManager::checkCollisionZ(WorldEntity* entity)
 {
   // Retrieve Bounding box
@@ -1664 +1668 @@
                                collPos , SolidFlag);
   }
+
+ return (zCollisionLeft || zCollisionRight);
+
+}
+
+
+
+
+/**
+ * check wether a collision occured on the way from the last position to the current position
+ */
+bool BspManager::checkCollisionWay(WorldEntity* entity)
+{
+
+
+  
+  plane*            testPlane          = NULL;  //!< the collision test plane
+  Vector            to;
+  Vector            collPos;                    //!< the collision position
+
+  bool              yCollisionUp       = false; //!< flag true if right collision
+  bool              SolidFlag          = false; //!< flag set true if solid
+
+  Vector            from;                   //!< current position of the entity
+  Vector            dirY;                       //!< direction x
+
+  from = entity->getLastAbsCoor();
+  to    = entity->getAbsCoor();
+  collPos = from;
+  dirY =  Vector(0.0, 1.0, 0.0);
+
+
+
+
+  /*   Y Ray up */
+  // init some member variables before collision check
+  this->inputStart = from;
+  this->inputEnd   = to;
+  this->checkCollisionRayN(this->root,0.0f,1.0f, &from, &to );
+
+  if( !this->outputStartsOut )
+  {
+    this->collPlane = new plane;
+    this->collPlane->x = 0.0f;
+    this->collPlane->y = 0.0f;
+    this->collPlane->z = 0.0f;
+    yCollisionUp = true;
+  }
+  else
+  {
+    if( this->outputFraction == 1.0f)
+    {
+      if( this->outputAllSolid )
+      {
+        this->collPlane = new plane;
+        this->collPlane->x = 0.0f;
+        this->collPlane->y = 0.0f;
+        this->collPlane->z = 0.0f;
+        yCollisionUp = true;
+        SolidFlag = true;
+      }
+      else
+      {
+        yCollisionUp = false;
+        collPos = to;
+      }
+    }
+    else
+    {
+      yCollisionUp = true;
+      collPos = from + (to - from) * this->outputFraction;
+      this->out = collPos;        // why this????
+    }
+  }
+  testPlane = this->collPlane;
+
+  // collision registration
+  if( yCollisionUp)
+  {
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_WAY,
+                              entity, this->parent,
+                              Vector(testPlane->x, testPlane->y, testPlane->z),
+                              collPos, SolidFlag);
+  }
+
+ return yCollisionUp;
 
 }

trunk/src/lib/graphics/importer/bsp/bsp_manager.h

@@ -88 +88 @@
   void  checkCollisionRayN(BspTreeNode * node,float startFraction, float endFraction, Vector* start, Vector* end);
 
-  void checkCollisionX(WorldEntity* entity);
-  void checkCollisionY(WorldEntity* entity);
-  void checkCollisionZ(WorldEntity* entity);
+  bool checkCollisionX(WorldEntity* entity);
+  bool checkCollisionY(WorldEntity* entity);
+  bool checkCollisionZ(WorldEntity* entity);
+  bool checkCollisionWay(WorldEntity* entity);
 
   void  checkCollisionBox(void);

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs