Changeset 9096 in orxonox.OLD for branches/presentation

Timestamp:

Jul 4, 2006, 3:30:35 AM (18 years ago)

Author:

patrick

Message:

collision reaction works again

Location:

branches/presentation/src/lib

Files:

• collision_reaction/cr_physics_ground_walk.cc (modified) (5 diffs)
• graphics/importer/bsp_manager.cc (modified) (2 diffs)

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

@@ -70 +70 @@
 
 
-  float CR_MAX_WALK_HEIGHT = 2.0f;
+  float CR_MAX_WALK_HEIGHT = 10.0f;
   float CR_THRESHOLD = 0.2f;
 
@@ -77 +77 @@
   float side = 0;
 
-  //PRINTF(0)("collision raction======================================\n");
 
   const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
@@ -117 +116 @@
 
         // object is beneath the plane (ground)
-        if( front <= 0.0f )
+        if( front <= 0.0f)
         {
           Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
-          Vector backoff = dirX * front * -1.0f;
+          Vector backoff = dirX * front;
 
           entity->setAbsCoor(entity->getLastAbsCoor());
@@ -134 +133 @@
 
         // collision in the y-axis
-      case COLLISION_TYPE_AXIS_Y:
+      case COLLISION_TYPE_AXIS_Y_NEG:
         // calulate the height above ground
         height = collPos.y - box->halfLength[1];
@@ -141 +140 @@
         // object is beneath the plane (ground)
 //         if(height >= 0.0f && height <= 0.0001f) break ;// Do nothing
-        if( height < 0.0f )
+        if( height < 0.0f /*&& height < -CR_MAX_WALK_HEIGHT*/)
         {
           entity->shiftCoor(Vector(0.0f, -height + 0.00001, 0.0f));

branches/presentation/src/lib/graphics/importer/bsp_manager.cc

@@ -961 +961 @@
 
 
-
+  this->checkCollisionX(worldEntity);
+  this->checkCollisionY(worldEntity);
+  this->checkCollisionZ(worldEntity);
 
 
@@ -1287 +1289 @@
   if( box != NULL)
   {
-    up   = position +  box->center + dirY * (box->halfLength[1]  + BSP_Y_OFFSET);
+    up   = position +  box->center + dirY * (box->halfLength[1]/*  + BSP_Y_OFFSET*/);
     down = position +  box->center - dirY * (box->halfLength[1]  + BSP_Y_OFFSET);
   }