Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h
- Timestamp:
- Apr 21, 2011, 6:58:23 PM (13 years ago)
- Location:
- code/branches/kicklib2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib2
- Property svn:mergeinfo changed
-
code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h
r5781 r8284 42 42 protected: 43 43 btInternalTickCallback m_internalTickCallback; 44 btInternalTickCallback m_internalPreTickCallback; 44 45 void* m_worldUserInfo; 45 46 … … 50 51 51 52 btDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* broadphase,btCollisionConfiguration* collisionConfiguration) 52 :btCollisionWorld(dispatcher,broadphase,collisionConfiguration), m_internalTickCallback(0), m_worldUserInfo(0)53 :btCollisionWorld(dispatcher,broadphase,collisionConfiguration), m_internalTickCallback(0),m_internalPreTickCallback(0), m_worldUserInfo(0) 53 54 { 54 55 } … … 103 104 104 105 /// Set the callback for when an internal tick (simulation substep) happens, optional user info 105 void setInternalTickCallback(btInternalTickCallback cb, void* worldUserInfo=0 )106 void setInternalTickCallback(btInternalTickCallback cb, void* worldUserInfo=0,bool isPreTick=false) 106 107 { 107 m_internalTickCallback = cb; 108 if (isPreTick) 109 { 110 m_internalPreTickCallback = cb; 111 } else 112 { 113 m_internalTickCallback = cb; 114 } 108 115 m_worldUserInfo = worldUserInfo; 109 116 }
Note: See TracChangeset
for help on using the changeset viewer.