Changeset 9054 in orxonox.OLD for branches/single_player_map/src/lib/collision_reaction
- Timestamp:
- Jul 3, 2006, 5:44:03 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/single_player_map/src/lib/collision_reaction/cr_physics_ground_walk.cc
r9050 r9054 102 102 Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize(); 103 103 Vector backoff = dirX * front; 104 entity->shiftCoor(backoff); 104 105 entity->setAbsCoor(entity->getLastAbsCoor()); 106 // entity->shiftCoor(backoff); 105 107 } 106 108 // object is already in the wall 107 109 else if( ce->isInWall()) 108 110 { 109 //entity->setAbsCoor(entity->getLastAbsCoor());111 entity->setAbsCoor(entity->getLastAbsCoor()); 110 112 } 111 113 break; … … 146 148 if( side <= 0.0f ) 147 149 { 148 149 Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize();150 Vector backoff = dirZ * side;151 //entity->shiftCoor(backoff);150 entity->setAbsCoor(entity->getAbsCoor()); 151 //Vector dirZ = entity->getAbsDirZ(); dirZ.y = 0.0f; dirZ.normalize(); 152 //Vector backoff = dirZ * side; 153 //entity->shiftCoor(backoff); 152 154 } 153 155 // object is already in the wall 154 156 else if( ce->isInWall()) 155 157 { 156 //entity->setAbsCoor(entity->getLastAbsCoor());158 entity->setAbsCoor(entity->getLastAbsCoor()); 157 159 } 158 160 break;
Note: See TracChangeset
for help on using the changeset viewer.
