Changeset 9054 in orxonox.OLD

Timestamp:

Jul 3, 2006, 5:44:03 PM (18 years ago)

Author:

bottac

Message:

<

Location:

branches/single_player_map/src/lib

Files:

• collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• graphics/importer/bsp_manager.cc (modified) (1 diff)
• graphics/importer/bsp_manager.h (modified) (1 diff)

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

@@ -102 +102 @@
           Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
           Vector backoff = dirX * front;
-          entity->shiftCoor(backoff);
+          
+          entity->setAbsCoor(entity->getLastAbsCoor());
+         // entity->shiftCoor(backoff);
         }
         // object is already in the wall
         else if( ce->isInWall())
         {
-//           entity->setAbsCoor(entity->getLastAbsCoor());
+              entity->setAbsCoor(entity->getLastAbsCoor());
         }
         break;
@@ -146 +148 @@
         if( side <= 0.0f )
         {
-        
-          Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize();
-          Vector backoff = dirZ * side;
-//          entity->shiftCoor(backoff);
+          entity->setAbsCoor(entity->getAbsCoor());
+          //Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize();
+          //Vector backoff = dirZ * side;
+          //entity->shiftCoor(backoff);
         }
         // object is already in the wall
         else if( ce->isInWall())
         {
-//           entity->setAbsCoor(entity->getLastAbsCoor());
+          entity->setAbsCoor(entity->getLastAbsCoor());
         }
         break;

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

@@ -986 +986 @@
 
   if( box != NULL) {
-    position = worldEntity->getAbsCoor() +  box->center + Vector(0.0, 1.0, 0.0) * box->halfLength[1] * 0.001;
+    position = worldEntity->getAbsCoor() +  box->center + Vector(0.0, 1.0, 0.0) * box->halfLength[1] * 1.0f;
     dest     = worldEntity->getAbsCoor() +  box->center - Vector(0.0, 1.0, 0.0) * (box->halfLength[1] + BSP_Y_OFFSET) *   100;
 

branches/single_player_map/src/lib/graphics/importer/bsp_manager.h

@@ -30 +30 @@
 #define BSP_X_OFFSET 40.0f
 #define BSP_Y_OFFSET 40.0f
-#define BSP_Z_OFFSET 20.0f
+#define BSP_Z_OFFSET 40.0f