Changeset 8923 in orxonox.OLD

Timestamp:

Jun 29, 2006, 10:09:28 PM (18 years ago)

Author:

patrick

Message:

ground collision detection advanc

File:

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

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

@@ -59 +59 @@
 void CRPhysicsGroundWalk::reactToCollision(Collision* collision)
 {
-  CollisionEvent* ce = collision->getCollisionEvents().front();
-  Vector normal = ce->getGroundNormal();
-  // normal.normalize();
-
-
-  float height;
+
   AABB* box = collision->getEntityB()->getModelAABB();
   WorldEntity* entity = collision->getEntityB();
@@ -75 +70 @@
 
 
-  // collision position maths
-  Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
-
   float CR_MAX_WALK_HEIGHT = 2.0f;
   float CR_THRESHOLD = 0.2f;
 
-  //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);
-  //
-
-  switch( ce->getType())
-  {
-
-    case COLLISION_TYPE_AXIS_X:
-
-      break;
-
-    case COLLISION_TYPE_AXIS_Y:
-
-      height = collPos.y - box->halfLength[1];
-
-      PRINTF(0)("height: %f\n", height);
-      PRINTF(0)("in wall %i\n", ce->isInWall());
-
-      // 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;
-      break;
-
-
-    case COLLISION_TYPE_AXIS_Z:
-
-      break;
-
-  }
-
+  float height;
+
+
+   const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
+   std::vector<CollisionEvent*>::const_iterator it = collisionEvents->begin();
+   for(; it != collisionEvents->end(); it++)
+   {
+
+     CollisionEvent* ce = (*it);
+     Vector normal = ce->getGroundNormal();
+
+     // collision position maths
+     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:
+         PRINTF(0)("AXIS X\n");
+         break;
+
+
+       // collision in the y-axis
+       case COLLISION_TYPE_AXIS_Y:
+         // calulate the height above ground
+         height = collPos.y - box->halfLength[1];
+
+         PRINTF(0)("height: %f\n", height);
+         PRINTF(0)("in wall %i\n", ce->isInWall());
+
+         // 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;
+
+
+       // collision in the z-axis
+       case COLLISION_TYPE_AXIS_Z:
+         PRINTF(0)("AXIS Y\n");
+         break;
+     }
+   }