Changeset 8337 in orxonox.OLD

Timestamp:

Jun 13, 2006, 2:21:04 AM (18 years ago)

Author:

patrick

Message:

bsp: collision detection still not working perfectly

Location:

branches/bsp_model/src

Files:

• lib/collision_reaction/collision_handle.cc (modified) (1 diff)
• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• story_entities/game_world.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

@@ -64 +64 @@
 
   collision->getEntityB()->setVelocity(Vector());
-  collision->getEntityB()->setAbsCoor(this->lastPositions[9]);
+  collision->getEntityB()->setAbsCoor(this->lastPositions[6]);
 }
 
@@ -74 +74 @@
 void CRPhysicsGroundWalk::update(WorldEntity* owner)
 {
-//   this->afterLastPosition = this->lastPosition;
-//   this->lastPosition = owner->getAbsCoor();
-
-  for( int i = 9; i > 0; i--)
+  for( int i = 9; i > 0; i--) {
     this->lastPositions[i] = this->lastPositions[i-1];
+//     PRINTF(0)("lastPosition[%i]: %f, %f, %f\n", i, lastPositions[i].x, lastPositions[i].y, lastPositions[i].z);
+  }
   this->lastPositions[0] = owner->getAbsCoor();
-
-
-  this->lastDirection = owner->getAbsDir();
-//   this->lastPosition.debug();
 }
 

branches/bsp_model/src/story_entities/game_world.cc

@@ -279 +279 @@
     /* process time */
     this->tick ();
+
     /* collision detection */
     this->collisionDetection ();
     /* collision reaction */
     this->collisionReaction ();
+
     /* update the state */
     this->update ();
+
     /* check the game rules */
     this->checkGameRules();