Changeset 8932 in orxonox.OLD

Timestamp:

Jun 30, 2006, 12:46:36 AM (18 years ago)

Author:

patrick

Message:

working with directions

Location:

branches/single_player_map/src/lib

Files:

• collision_reaction/cr_physics_ground_walk.cc (modified) (4 diffs)
• graphics/importer/bsp_manager.cc (modified) (3 diffs)

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

@@ -98 +98 @@
         front = collPos.x - box->halfLength[0];
 
-//         PRINTF(0)("front: %f\n", front);
-//         PRINTF(0)("in wall %i\n", ce->isInWall());
-
         // object is beneath the plane (ground)
         if( front <= 0.0f )
         {
-//           entity->shiftCoor(Vector(front, 0.0f, 0.0f));
+          Vector backoff = entity->getAbsDirX() * front;
+          entity->shiftCoor(backoff);
         }
         // object is already in the wall
@@ -119 +117 @@
         height = collPos.y - box->halfLength[1];
 
-//         PRINTF(0)("height: %f\n", height);
-//         PRINTF(0)("in wall %i\n", ce->isInWall());
 
         // object is beneath the plane (ground)
@@ -130 +126 @@
         else if( ce->isInWall())
         {
-         // entity->setAbsCoor(entity->getLastAbsCoor());
+          entity->setAbsCoor(entity->getLastAbsCoor());
         }
         break;
@@ -140 +136 @@
         side = collPos.z - box->halfLength[2];
 
-//         PRINTF(0)("side: %f\n", side);
-//         PRINTF(0)("in wall %i\n", ce->isInWall());
-
         // object is beneath the plane (ground)
         if( side <= 0.0f )
         {
-//           entity->shiftCoor(Vector(front, 0.0f, 0.0f));
+          entity->shiftCoor(Vector(0.0f, 0.0f, side));
         }
         // object is already in the wall

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

@@ -989 +989 @@
     dest     = worldEntity->getAbsCoor() +  box->center - box->axis[1] * box->halfLength[1]  * 40.0f;
 
-    position1 = worldEntity->getAbsCoor() +  box->center + box->axis[0] * box->halfLength[0] * 2.0f;
-    dest1     = worldEntity->getAbsCoor() +  box->center - box->axis[0] * box->halfLength[0] * 2.0f;
+    position1 = worldEntity->getAbsCoor() +  box->center + box->axis[0] * box->halfLength[0] * 10.0f;
+    dest1     = worldEntity->getAbsCoor() +  box->center - box->axis[0] * box->halfLength[0] * 10.0f;
 
 
@@ -1066 +1066 @@
     }
     if(this->outputAllSolid ) {
-      
+
       this->collPlane = new plane;
       this->collPlane->x = 0.0f;
@@ -1120 +1120 @@
 }
   if(xCollision) {
-    worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z),dest1 , SolidFlag);
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z),dest1 , SolidFlag);
   }
   if(zCollision) {
-    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), dest2 , SolidFlag);
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), dest2 , SolidFlag);
   }