Changeset 9050 in orxonox.OLD for branches/single_player_map/src/lib/collision_reaction

Timestamp:

Jul 3, 2006, 5:08:54 PM (19 years ago)

Author:

bottac

Message:

cr_ground_walk fixed

File:

• branches/single_player_map/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) (4 diffs)

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

@@ -95 +95 @@
         // collision in the x-axis
       case COLLISION_TYPE_AXIS_X:
-        front = collPos.x - box->halfLength[0]; // should be [0]
+        front = collPos.len() - box->halfLength[0]; // should be [0]
 
         // object is beneath the plane (ground)
         if( front <= 0.0f )
         {
-          Vector backoff = entity->getAbsDirX() * front;
-//           entity->shiftCoor(backoff);
+          Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
+          Vector backoff = dirX * front;
+          entity->shiftCoor(backoff);
         }
         // object is already in the wall
@@ -118 +119 @@
 
         // object is beneath the plane (ground)
-        if( height <= 0.0f )
-        {
-          entity->shiftCoor(Vector(0.0f, -height, 0.0f));
+        if(height >= 0.0f && height <= 0.0001f) break ;// Do nothing
+        else if( height < 0.0f )
+        {
+          entity->shiftCoor(Vector(0.0f, -height + 0.00001, 0.0f));
           entity->setOnGround(true);
         }
@@ -139 +141 @@
       case COLLISION_TYPE_AXIS_Z:
 
-        side = collPos.z - box->halfLength[2]; // should be [2]
+        side = collPos.len()  - box->halfLength[2]; // should be [2]
 
         // object is beneath the plane (ground)
         if( side <= 0.0f )
         {
-          Vector backoff = entity->getAbsDirX() * side;
-//           entity->shiftCoor(backoff);
+        
+          Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize();
+          Vector backoff = dirZ * side;
+//          entity->shiftCoor(backoff);
         }
         // object is already in the wall
@@ -155 +159 @@
     }
   }
-  //PRINTF(0)("collision distances: x: %f, y: %f, z: %f\n", front, height, side);
+  PRINTF(0)("collision distances: x: %f, y: %f, z: %f\n", front, height, side);