Changeset 10618 in orxonox.OLD for trunk/src/lib/collision_reaction/cr_physics_full_walk.cc

Timestamp:

Apr 4, 2007, 12:13:53 PM (18 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/lib/collision_reaction (modified) (1 prop)
• src/lib/collision_reaction/cr_physics_full_walk.cc (modified) (1 diff)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/src/lib/collision_reaction/cr_physics_full_walk.cc

@@ -163 +163 @@
 
 
+ case CoRe::CREngine::CR_COLLISION_TYPE_WAY:
+          // calulate the height above ground
+          height = collPos.len() - box->halfLength[1];
+
+
+          // object is beneath the plane (ground)
+          //         if(height >= 0.0f && height <= 0.0001f) break ;// Do nothing
+          if( height < 0.0f  )
+          {
+            entity->shiftCoor(Vector(0.0f, -height + 0.5f, 0.0f));
+            entity->setOnGround(true);
+          }
+          // object is already in the wall
+          else if( ce->isInWall())
+          {
+            entity->setAbsCoor(entity->getLastAbsCoor());
+            PRINTF(0)("ground collision: reset pos\n");
+          }
+          else
+          {
+            // entity is not on ground
+            entity->setOnGround(false);
+          }
+          break;
+
+
           /* collision in the Z-AXIS */
         case CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Z:

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs