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

Timestamp:

Jul 3, 2006, 6:05:34 PM (19 years ago)

Author:

bottac

Message:

 

Location:

branches/single_player_map/src/lib/collision_reaction

Files:

• cr_defs.h (modified) (1 diff)
• cr_physics_ground_walk.cc (modified) (2 diffs)

branches/single_player_map/src/lib/collision_reaction/cr_defs.h

@@ -29 +29 @@
 
 //!< the collision axis x collision event
-#define COLLISION_TYPE_AXIS_X   1
+#define COLLISION_TYPE_AXIS_X      1
+#define COLLISION_TZPE_AXIS_X_NEG  2
 //!< the collision axis y collision event
-#define COLLISION_TYPE_AXIS_Y   2
+#define COLLISION_TYPE_AXIS_Y      3
+#define COLLISION_TYPE_AXIS_Y_NEG  4
 //!< the collision axis z collision event
-#define COLLISION_TYPE_AXIS_Z   4
+#define COLLISION_TYPE_AXIS_Z      5
+#define COLLISION_TYPE_AXIS_Z_NEG  6
 //!< the collision is a obb collision
 #define COLLISION_TYPE_OBB      8

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

@@ -112 +112 @@
         }
         break;
+        
+      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 )
+        {
+          Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
+          Vector backoff = dirX * front * -1.0f;
+          
+          entity->setAbsCoor(entity->getLastAbsCoor());
+         // entity->shiftCoor(backoff);
+        }
+        // object is already in the wall
+        else if( ce->isInWall())
+        {
+          entity->setAbsCoor(entity->getLastAbsCoor());
+        }
+        break;
 
 
         // collision in the y-axis
-      case COLLISION_TYPE_AXIS_Y:
+      case COLLISION_TYPE_AXIS_Y_NEG:
         // calulate the height above ground
         height = collPos.y - box->halfLength[1];
@@ -149 +168 @@
         {
           entity->setAbsCoor(entity->getAbsCoor());
-          //Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize();
-          //Vector backoff = dirZ * 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
+        else if( ce->isInWall())
+        {
+          entity->setAbsCoor(entity->getLastAbsCoor());
+        }
+        break;
+        
+        
+         // collision in the z-axis
+      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 )
+        {
+         
+          Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize();
+          Vector backoff = dirZ * side*-1.0f;
+          entity->shiftCoor(backoff);
         }
         // object is already in the wall