Changeset 9065 in orxonox.OLD for branches/presentation/src/lib/collision_reaction/cr_physics_ground_walk.cc

Timestamp:

Jul 3, 2006, 7:22:44 PM (18 years ago)

Author:

patrick

Message:

ground collision works again

File:

• branches/presentation/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) (6 diffs)

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

@@ -102 +102 @@
           Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
           Vector backoff = dirX * front;
-          
+
           entity->setAbsCoor(entity->getLastAbsCoor());
          // entity->shiftCoor(backoff);
@@ -112 +112 @@
         }
         break;
-        
+
       case COLLISION_TYPE_AXIS_X_NEG:
         front = collPos.len() - box->halfLength[0]; // should be [0]
@@ -121 +121 @@
           Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
           Vector backoff = dirX * front * -1.0f;
-          
+
           entity->setAbsCoor(entity->getLastAbsCoor());
          // entity->shiftCoor(backoff);
@@ -134 +134 @@
 
         // collision in the y-axis
-      case COLLISION_TYPE_AXIS_Y_NEG:
+      case COLLISION_TYPE_AXIS_Y:
         // calulate the height above ground
         height = collPos.y - box->halfLength[1];
@@ -179 +179 @@
         }
         break;
-        
-        
+
+
          // collision in the z-axis
       case COLLISION_TYPE_AXIS_Z_NEG:
@@ -189 +189 @@
         if( side <= 0.0f )
         {
-         
+
           Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize();
           Vector backoff = dirZ * side*-1.0f;