Changeset 8836 in orxonox.OLD

Timestamp:

Jun 27, 2006, 5:08:43 PM (18 years ago)

Author:

patrick

Message:

spl: collision reaction similar as it was but doesn't stick to the ground yet

File:

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

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

@@ -66 +66 @@
   //   collision->getEntityB()->getAbsCoor().debug();
 
-  Vector height;
+  float height;
   AABB* box = collision->getEntityB()->getModelAABB();
+  WorldEntity* entity = collision->getEntityB();
+
+  float CR_MAX_WALK_HEIGHT = 2.0f;
 
   if( box != NULL)
@@ -73 +76 @@
 
     Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
-    PRINTF(0)("height: %f          , model height: %f\n", collPos.y, box->halfLength[1]);
+    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));
+    }
+
 
   }
+
+
+
+
 
 #if 0
@@ -126 +143 @@
       {
         //if(downspeed <= 0) downspeed =1;
-        collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0, -height.y  +  box->halfLength[1] + 2.0f/* 0.00001 *//*height.y+3.500005 + 10.0*/,0.0));
+        collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0, -height.y  +  box->halfLength[1] + 2.0f,0.0));
         //collision->getEntityB()->setVelocity(Vector(0.0,0.0,0.0));
         downspeed = 0;