Changeset 8863 in orxonox.OLD

Timestamp:

Jun 28, 2006, 3:29:25 PM (18 years ago)

Author:

patrick

Message:

reverted the collision reaction

File:

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

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

@@ -66 +66 @@
   //   collision->getEntityB()->getAbsCoor().debug();
 
-  float height;
+  Vector height;
   AABB* box = collision->getEntityB()->getModelAABB();
   WorldEntity* entity = collision->getEntityB();
@@ -73 +73 @@
   float CR_THRESHOLD = 0.2f;
 
-  if( box != NULL)
-  {
-
-    Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
-    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())
-    {
-
-    }
-
-
-
-  }
+//   if( box != NULL)
+//   {
+//
+//     Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
+//     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())
+//     {
+//
+//     }
+//
+//
+//
+//   }
 
 
@@ -101 +101 @@
 
 
-#if 0
+// #if 0
   if( box != NULL)
     height = ( ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() )*(-1.0f) ;
@@ -158 +158 @@
 
   }// if(box!= NULL)
-#endif
+// #endif
   /*
   PRINTF(0)("Collision with Ground: \n");