Changeset 8699 in orxonox.OLD for branches/bsp_model/src/lib/collision_reaction

Timestamp:

Jun 22, 2006, 2:32:46 AM (19 years ago)

Author:

patrick

Message:

bsp: the collision reaction now is adjusted to the object size

File:

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

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

@@ -23 +23 @@
 #include "world_entity.h"
 #include "cr_physics_ground_walk.h"
+
+#include "aabb.h"
+
+#include "debug.h"
 
 #include <vector>
@@ -56 +60 @@
   Vector normal = ce->getGroundNormal();
 
+  AABB* box = ce->getEntityB()->getModelAABB();
 
-  Vector height = ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor();
-  if(ce->getGroundNormal().len() <= 0.1f)
+  Vector center = ce->getEntityB()->getAbsCoor() /*+ box->center*/;
+  Vector collisionPos = ce->getCollisionPosition() - center;
+
+  float objSize = box->halfLength[1];
+
+  if( normal.len() <= 0.1f)
   {
     collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
     return;
   }
-  if(height.y < -3.6)
+
+  if( collisionPos.y <= -(objSize + 0.1f))
   {
     downspeed++;
-    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.03*downspeed,0.0));
-
+    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0, -0.03 * downspeed, 0.0));
   }
   else
   {
-    if(height.y > -3.5  && height.y <    3.9)
+    if( collisionPos.y > -objSize  &&
+        collisionPos.y < (objSize + 0.4))
     {
       //if(downspeed <= 0) downspeed =1;
-      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,height.y+3.55,0.0));
-      //collision->getEntityB()->setVelocity(Vector(0.0,0.0,0.0));
+      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() +
+                                          Vector(0.0, collisionPos.y + objSize + 0.1, 0.0));
     }
       downspeed = 0;
@@ -81 +91 @@
 
 
-  /*
-  PRINTF(0)("Collision with Ground: \n");
-  collision->getEntityB()->getAbsCoor().debug();
-  collision->getEntityB()->setVelocity(Vector());
-  collision->getEntityB()->setAbsCoor(this->lastPositions[1]);
-
-  */
 }