Changeset 8334 in orxonox.OLD for branches/bsp_model/src/lib/collision_reaction

Timestamp:

Jun 12, 2006, 11:56:02 PM (18 years ago)

Author:

patrick

Message:

bsp: just a very little cleanup to make it more readable. no change in content

File:

• branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) (1 diff)

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

@@ -53 +53 @@
 void CRPhysicsGroundWalk::reactToCollision(Collision* collision)
 {
-//   CollisionEvent* ce = collision->getCollisionEvents().front();
-//   Vector normal = ce->getGroundNormal();
-//   normal.normalize();
-//
-//   Vector position = ce->getCollisionPosition();
+  CollisionEvent* ce = collision->getCollisionEvents().front();
+  Vector normal = ce->getGroundNormal();
+  normal.normalize();
 
+  // put it back
+  PRINTF(0)("putting it back to lastPos: \n");
+  this->lastPosition.debug();
+  PRINTF(0)("current pos:\n");
+  collision->getEntityB()->getAbsCoor().debug();
 
-  if( this->lastPosition != collision->getEntityB()->getAbsCoor())
-  {
-  // put it back
-    PRINTF(0)("putting it back to: \n");
-    this->lastPosition.debug();
-    this->afterLastPosition.debug();
-
-    collision->getEntityB()->setVelocity(Vector());
-    collision->getEntityB()->setAbsCoor(this->afterLastPosition);
-  }
+  collision->getEntityB()->setVelocity(Vector());
+  collision->getEntityB()->setAbsCoor(this->lastPosition);
 }