Changeset 9003 in orxonox.OLD for trunk/src/lib/collision_reaction

Timestamp:

Jul 2, 2006, 1:36:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

File:

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

trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -23 +23 @@
 #include "world_entity.h"
 #include "cr_physics_ground_walk.h"
+#include "collision_reaction.h"
 
 #include <vector>
@@ -58 +59 @@
 void CRPhysicsGroundWalk::reactToCollision(Collision* collision)
 {
-  CollisionEvent* ce = collision->getCollisionEvents().front();
-  Vector normal = ce->getGroundNormal();
-  // normal.normalize();
-
-  // put it back
-  //   PRINTF(0)("putting it back to lastPos: \n");
-  //   this->lastPositions[0].debug();
-  //   PRINTF(0)("current pos:\n");
-  //   collision->getEntityB()->getAbsCoor().debug();
-
-  float height;
+
   AABB* box = collision->getEntityB()->getModelAABB();
   WorldEntity* entity = collision->getEntityB();
-
-  // collision position maths
-  Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
-
-  float CR_MAX_WALK_HEIGHT = 2.0f;
-  float CR_THRESHOLD = 0.2f;
 
   if( box == NULL)
@@ -85 +70 @@
 
 
-  switch( ce->getType())
+  float CR_MAX_WALK_HEIGHT = 2.0f;
+  float CR_THRESHOLD = 0.2f;
+
+  float height = 0;
+  float front = 0;
+  float side = 0;
+
+  //PRINTF(0)("collision raction======================================\n");
+
+  const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
+  std::vector<CollisionEvent*>::const_iterator it = collisionEvents->begin();
+  for(; it != collisionEvents->end(); it++)
   {
-    case COLLISION_TYPE_AXIS_Y:
-
-      height = collPos.y - box->halfLength[1];
-     // PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
-     // PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
-
-      // object is beneath the plane (ground)
-      if( height <= 0.0f )
-      {
-        entity->shiftCoor(Vector(0, -height, 0));
-      }
-      // object is already in the wall
-      else if( ce->isInWall())
-      {
-        entity->setAbsCoor(entity->getLastAbsCoor());
-      }
-      break;
-
-
-    case COLLISION_TYPE_AXIS_X:
-    case COLLISION_TYPE_AXIS_Z:
-      break;
-
-    }
-
-
+
+    CollisionEvent* ce = (*it);
+    Vector normal = ce->getGroundNormal();
+
+    // calculate the collision position
+    Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
+
+    // test the 3 axis differently
+    switch( ce->getType())
+    {
+        // collision in the x-axis
+      case COLLISION_TYPE_AXIS_X:
+        front = collPos.x - box->halfLength[0]; // should be [0]
+
+        // object is beneath the plane (ground)
+        if( front <= 0.0f )
+        {
+          Vector backoff = entity->getAbsDirX() * front;
+//           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:
+        // calulate the height above ground
+        height = collPos.y - box->halfLength[1];
+
+
+        // object is beneath the plane (ground)
+        if( height <= 0.0f )
+        {
+          entity->shiftCoor(Vector(0.0f, -height, 0.0f));
+          entity->setOnGround(true);
+        }
+        // object is already in the wall
+        else if( ce->isInWall())
+        {
+          entity->setAbsCoor(entity->getLastAbsCoor());
+        }
+        else
+        {
+          // entity is not on ground
+          entity->setOnGround(false);
+        }
+        break;
+
+
+        // collision in the z-axis
+      case COLLISION_TYPE_AXIS_Z:
+
+        side = collPos.z - box->halfLength[2]; // should be [2]
+
+        // object is beneath the plane (ground)
+        if( side <= 0.0f )
+        {
+          Vector backoff = entity->getAbsDirX() * side;
+//           entity->shiftCoor(backoff);
+        }
+        // object is already in the wall
+        else if( ce->isInWall())
+        {
+//           entity->setAbsCoor(entity->getLastAbsCoor());
+        }
+        break;
+    }
+  }
+  //PRINTF(0)("collision distances: x: %f, y: %f, z: %f\n", front, height, side);
 
 
@@ -126 +169 @@
 
 
-  if( box != NULL) {
-
-
-    if(ce->getCollisionPosition().x <= 0.9 && ce->getGroundNormal().len() <= 1.4f) {
+  if( box != NULL)
+  {
+
+
+    if(ce->getCollisionPosition().x <= 0.9 && ce->getGroundNormal().len() <= 1.4f)
+    {
       collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
       return;
     }
-    if(ce->getCollisionPosition().z <= 0.9 && ce->getGroundNormal().len() <= 1.4f) {
+    if(ce->getCollisionPosition().z <= 0.9 && ce->getGroundNormal().len() <= 1.4f)
+    {
       collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
       return;
     }
 
-    if(ce->getGroundNormal().len() <= 0.1f) {
+    if(ce->getGroundNormal().len() <= 0.1f)
+    {
       collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
       return;
@@ -144 +191 @@
 
 
-    if(ce->getGroundNormal().len() >= 1.4f) {
+    if(ce->getGroundNormal().len() >= 1.4f)
+    {
       downspeed++;
       collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.08*downspeed,0.0));
@@ -164 +212 @@
 
     }
-    else {
+    else
+    {
       if(height.y <  box->halfLength[1] + 0.0f   /* && height.y  >  - 55.0f*/) // below ground
       {
@@ -194 +243 @@
  */
 void CRPhysicsGroundWalk::update(WorldEntity* owner)
-{
-
-}
-
-
+{}
+
+