OSDN Git Service

-made new bullet patch, renamed old patch due to it being found in the Bullet trunk
[skyscrapersim/skyscraper.git] / bullet-changes.patch
1 diff -urN a/src/BulletDynamics/Character/btKinematicCharacterController.cpp b/src/BulletDynamics/Character/btKinematicCharacterController.cpp
2 --- a/src/BulletDynamics/Character/btKinematicCharacterController.cpp   2014-01-10 15:47:47.572520001 -0600
3 +++ b/src/BulletDynamics/Character/btKinematicCharacterController.cpp   2014-01-10 15:48:52.389223177 -0600
4 @@ -607,8 +607,11 @@
5  void btKinematicCharacterController::preStep (  btCollisionWorld* collisionWorld)
6  {
7         
8 -       int numPenetrationLoops = 0;
9 +       //this causes other objects to 'push' character, and is turned off because
10 +        //it interferes with stairs stepping
11 +       /*int numPenetrationLoops = 0;
12         m_touchingContact = false;
13 +
14         while (recoverFromPenetration (collisionWorld))
15         {
16                 numPenetrationLoops++;
17 @@ -618,7 +621,7 @@
18                         //printf("character could not recover from penetration = %d\n", numPenetrationLoops);
19                         break;
20                 }
21 -       }
22 +       }*/
23  
24         m_currentPosition = m_ghostObject->getWorldTransform().getOrigin();
25         m_targetPosition = m_currentPosition;