Context Navigation

collision_reaction

Timestamp:

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

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

Property svn:ignore

old	new
16	16	OrxonoxPlayability.kdevses
17	17	OrxonoxPlayability.kdevelop.pcs
	18	orxonox.backtrace
	19	orxonox.kdevses
	20	orxonox.kdevelop.pcs

r10013	r10618
62	62	CR_COLLISION_TYPE_AXIS_Z, //!< collision on z axis
63	63	CR_COLLISION_TYPE_AXIS_Z_NEG, //!< collision on negative z axis
	64	CR_COLLISION_TYPE_WAY, //!< collision on the way from last to current position
64	65	CR_COLLISION_TYPE_OBB, //!< object aligned bounding box collide
65	66

-                      r10013
+                      r10618
+ 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:

Note: See TracChangeset for help on using the changeset viewer.