Changeset 9099 in orxonox.OLD for branches

Timestamp:

Jul 4, 2006, 3:51:10 AM (18 years ago)

Author:

patrick

Message:

cr better and better

File:

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

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

@@ -70 +70 @@
 
 
-  float CR_MAX_WALK_HEIGHT = 10.0f;
+  float CR_MAX_WALK_HEIGHT = 15.0f;
   float CR_THRESHOLD = 0.2f;
 
-  float height = 0;
-  float front = 0;
-  float side = 0;
+  float height = 0.0f;
+  float front = 0.0f;
+  float back = 0.0f;
+  float right = 0.0f;
+  float left = 0.0f;
 
 
@@ -92 +94 @@
     switch( ce->getType())
     {
-        // collision in the x-axis
+      /* collision in the X-AXIS */
       case COLLISION_TYPE_AXIS_X:
-        front = collPos.len() - box->halfLength[0]; // should be [0]
+        front = collPos.len() - box->halfLength[0];
 
         // object is beneath the plane (ground)
@@ -113 +115 @@
 
       case COLLISION_TYPE_AXIS_X_NEG:
-        front = collPos.len() - box->halfLength[0]; // should be [0]
-
-        // object is beneath the plane (ground)
-        if( front <= 0.0f)
+        back = collPos.len() - box->halfLength[0];
+
+        PRINTF(0)("back: %f\n", back);
+        // object is beneath the plane (ground)
+        if( back <= 0.0f)
         {
           Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
@@ -132 +135 @@
 
 
-        // collision in the y-axis
+        /* collision in the Y-AXIS */
       case COLLISION_TYPE_AXIS_Y_NEG:
         // calulate the height above ground
@@ -140 +143 @@
         // object is beneath the plane (ground)
 //         if(height >= 0.0f && height <= 0.0001f) break ;// Do nothing
-        if( height < 0.0f /*&& height < -CR_MAX_WALK_HEIGHT*/)
+        if( height < 0.0f && -height < CR_MAX_WALK_HEIGHT)
         {
           entity->shiftCoor(Vector(0.0f, -height + 0.00001, 0.0f));
@@ -162 +165 @@
       case COLLISION_TYPE_AXIS_Z:
 
-        side = collPos.len()  - box->halfLength[2]; // should be [2]
-
-        // object is beneath the plane (ground)
-        if( side <= 0.0f )
+        right = collPos.len()  - box->halfLength[2];
+
+        // object is beneath the plane (ground)
+        if( right <= 0.0f )
         {
           entity->setAbsCoor(entity->getAbsCoor());
           Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize();
-          Vector backoff = dirZ * side;
+          Vector backoff = dirZ * right;
           entity->shiftCoor(backoff);
         }
@@ -183 +186 @@
       case COLLISION_TYPE_AXIS_Z_NEG:
 
-        side = collPos.len()  - box->halfLength[2]; // should be [2]
-
-        // object is beneath the plane (ground)
-        if( side <= 0.0f )
-        {
-
+        left = collPos.len()  - box->halfLength[2];
+
+        // object is beneath the plane (ground)
+        if( left <= 0.0f )
+        {
           Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize();
-          Vector backoff = dirZ * side*-1.0f;
+          Vector backoff = dirZ * left*-1.0f;
           entity->shiftCoor(backoff);
         }