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

Timestamp:

Jun 26, 2006, 3:43:40 PM (19 years ago)

Author:

patrick

Message:

merged the bsp model branche back to trunk and some npc code changes

File:

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

trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -25 +25 @@
 
 #include <vector>
+
+#include "aabb.h"
 
 using namespace std;
@@ -62 +64 @@
   //   collision->getEntityB()->getAbsCoor().debug();
 
+  Vector height;
+  AABB* box = collision->getEntityB()->getModelAABB();
+  
+  
+  
+  if(box!=NULL)
+    height = ( ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() )*(-1.0f) ;
+  else
+    height = ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() ;
 
-  Vector height = ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor();
-
-  if(ce->getCollisionPosition().x <= 0.9 && ce->getGroundNormal().len() <= 1.4f) {
-    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
-    return;
-  }
-  if(ce->getGroundNormal().len() <= 0.1f) {
-    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
-    return;
-  }
-  if(ce->getGroundNormal().len() >= 1.4f) {
-    downspeed++;
-    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.08*downspeed,0.0));
-    return;
-  }
+  if(box!=NULL) {
 
 
-  if(height.y < -3.510001 + 10.0) // Above ground
-  {
-    if(height.y > -15.6) // Snap in
-    {
-      downspeed = 0;
-      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,height.y+3.500005 + 10.0,0.0));
-    } else
-    {
+    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) {
+      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
+      return;
+    }
+
+    if(ce->getGroundNormal().len() <= 0.1f) {
+      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
+      return;
+    }
+    
+    
+    if(ce->getGroundNormal().len() >= 1.4f) {
       downspeed++;
       collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.08*downspeed,0.0));
+      return;
     }
 
-  }
-  else {
-    if(height.y > -3.50000 + 10.0  && height.y <    9.9+ 10.0) // below ground
+
+    if(height.y > box->halfLength[1] + 0.0f ) // Above ground
     {
-      //if(downspeed <= 0) downspeed =1;
-      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0, 0.00001 /*height.y+3.500005 + 10.0*/,0.0));
-      //collision->getEntityB()->setVelocity(Vector(0.0,0.0,0.0));
-      downspeed = 0;
+      if(height.y < box->halfLength[1] + 1.3f) // Snap in
+      {
+        downspeed = 0;
+        collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() - Vector(0.0,height.y  - box->halfLength[1] - 0.0f,0.0));
+      } else
+      {
+        downspeed++;
+        collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.08*downspeed,0.0));
+      }
+
+    }
+    else {
+      if(height.y <  box->halfLength[1] + 0.0f   /* && height.y  >  - 55.0f*/) // below ground
+      {
+        //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()->setVelocity(Vector(0.0,0.0,0.0));
+        downspeed = 0;
+      }
+
     }
 
-  }
-
-
+  }// if(box!= NULL)
   /*
   PRINTF(0)("Collision with Ground: \n");