Changeset 8325 in orxonox.OLD

Timestamp:

Jun 12, 2006, 12:49:46 AM (18 years ago)

Author:

patrick

Message:

bspmodel: finished work for tonight. switching to sleep state

Location:

branches/bsp_model/src/lib/collision_reaction

Files:

• cr_physics_ground_walk.cc (modified) (2 diffs)
• cr_physics_ground_walk.h (modified) (1 diff)

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

@@ -65 +65 @@
     PRINTF(0)("putting it back to: \n");
     this->lastPosition.debug();
+    this->afterLastPosition.debug();
 
     collision->getEntityB()->setVelocity(Vector());
-//  collision->getEntityB()->setAbsCoorSoft(this->lastPosition, 0.1);
-    collision->getEntityB()->setAbsCoor(this->lastPosition);
+    collision->getEntityB()->setAbsCoor(this->afterLastPosition);
   }
 }
@@ -79 +79 @@
 void CRPhysicsGroundWalk::update(WorldEntity* owner)
 {
+  this->afterLastPosition = this->lastPosition;
   this->lastPosition = owner->getAbsCoor();
+
   this->lastDirection = owner->getAbsDir();
   PRINTF(0)("no collision: saving location: \n");

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

@@ -25 +25 @@
   private:
     Vector       lastPosition;                //!< vector with the last valid position
+    Vector       afterLastPosition;           //!< vector for the after last
     Quaternion   lastDirection;               //!< quat with the last valid direction
 };