Changeset 8336 in orxonox.OLD

Timestamp:

Jun 13, 2006, 12:34:33 AM (18 years ago)

Author:

patrick

Message:

bsp: better collision ground reaction: now it jumps back. but there are still bugs and freezes

Location:

branches/bsp_model/src/lib

Files:

• collision_reaction/collision_handle.cc (modified) (1 diff)
• collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• collision_reaction/cr_physics_ground_walk.h (modified) (1 diff)
• graphics/importer/bsp_manager.cc (modified) (1 diff)

branches/bsp_model/src/lib/collision_reaction/collision_handle.cc

@@ -196 +196 @@
   {
     this->collisionReaction->update(this->owner);
+    if( this->collisionList.size() > 0) PRINTF(0)("collision list: %i\n", this->collisionList.size());
     return;
   }

branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -58 +58 @@
 
   // put it back
-  PRINTF(0)("putting it back to lastPos: \n");
-  this->lastPosition.debug();
-  PRINTF(0)("current pos:\n");
-  collision->getEntityB()->getAbsCoor().debug();
+//   PRINTF(0)("putting it back to lastPos: \n");
+//   this->lastPositions[0].debug();
+//   PRINTF(0)("current pos:\n");
+//   collision->getEntityB()->getAbsCoor().debug();
 
   collision->getEntityB()->setVelocity(Vector());
-  collision->getEntityB()->setAbsCoor(this->lastPosition);
+  collision->getEntityB()->setAbsCoor(this->lastPositions[9]);
 }
 
@@ -74 +74 @@
 void CRPhysicsGroundWalk::update(WorldEntity* owner)
 {
-  this->afterLastPosition = this->lastPosition;
-  this->lastPosition = owner->getAbsCoor();
+//   this->afterLastPosition = this->lastPosition;
+//   this->lastPosition = owner->getAbsCoor();
+
+  for( int i = 9; i > 0; i--)
+    this->lastPositions[i] = this->lastPositions[i-1];
+  this->lastPositions[0] = owner->getAbsCoor();
+
 
   this->lastDirection = owner->getAbsDir();
-  PRINTF(0)("no collision: saving location: \n");
-  this->lastPosition.debug();
+//   this->lastPosition.debug();
 }
 

branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.h

@@ -27 +27 @@
     Vector       afterLastPosition;           //!< vector for the after last
     Quaternion   lastDirection;               //!< quat with the last valid direction
+
+    Vector       lastPositions[10];           //!< last 10 positions
 };
 

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

@@ -911 +911 @@
       if(this->outputAllSolid)
       {
-        PRINTF(0)("this output all solid\n");
         this->collPlane = new plane;
         this->collPlane->x = 1.0f;