Changeset 8930 in orxonox.OLD for branches

Timestamp:

Jun 30, 2006, 12:07:58 AM (18 years ago)

Author:

bottac

Message:

 

Location:

branches/single_player_map/src/lib

Files:

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

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

@@ -130 +130 @@
         else if( ce->isInWall())
         {
-          entity->setAbsCoor(entity->getLastAbsCoor());
+         // entity->setAbsCoor(entity->getLastAbsCoor());
         }
         break;

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

@@ -1061 +1061 @@
     if(this->outputFraction < 1.0f) {
       out.x = dest1.x + (dest1.x -position1.x) * this->outputFraction;
-      dest1 = dest1 + (dest1 -position1) * this->outputFraction;
+      dest1 = position1 + (dest1 -position1) * this->outputFraction;
       xCollision = true;
       testPlane = this->collPlane;
     }
-    if(this->outputAllSolid || !this->outputStartsOut) {
+    if(this->outputAllSolid ) {
+      
+      this->collPlane = new plane;
+      this->collPlane->x = 0.0f;
+      this->collPlane->y = 0.0f;
+      this->collPlane->z = 0.0f;
+      testPlane = this->collPlane;
       SolidFlag = true;
       xCollision = true;
@@ -1085 +1091 @@
       if(this->outputFraction < 1.0f ) {
         out.z = out.z = dest2.z + (dest2.z -position2.z) * this->outputFraction;
-        dest2 = dest2 + (dest2 -position2) * this->outputFraction;
+        dest2 = position2 + (dest2 -position2) * this->outputFraction;
         zCollision = true;
         testPlane = this->collPlane;
 
       }
-      if(this->outputAllSolid || !this->outputStartsOut) {
+      if(this->outputAllSolid ) {
+        this->collPlane = new plane;
+        this->collPlane->x = 0.0f;
+        this->collPlane->y = 0.0f;
+        this->collPlane->z = 0.0f;
+        testPlane = this->collPlane;
+
         SolidFlag = true;
         zCollision = true;