Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified) (3 diffs)

code/branches/kicklib/src/external/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h

@@ -42 +42 @@
 protected:
                 btInternalTickCallback m_internalTickCallback;
+                btInternalTickCallback m_internalPreTickCallback;
                 void*   m_worldUserInfo;
 
@@ -50 +51 @@
 
                 btDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* broadphase,btCollisionConfiguration* collisionConfiguration)
-                :btCollisionWorld(dispatcher,broadphase,collisionConfiguration), m_internalTickCallback(0), m_worldUserInfo(0)
+                :btCollisionWorld(dispatcher,broadphase,collisionConfiguration), m_internalTickCallback(0),m_internalPreTickCallback(0), m_worldUserInfo(0)
                 {
                 }
@@ -103 +104 @@
 
                 /// Set the callback for when an internal tick (simulation substep) happens, optional user info
-                void setInternalTickCallback(btInternalTickCallback cb, void* worldUserInfo=0) 
+                void setInternalTickCallback(btInternalTickCallback cb, void* worldUserInfo=0,bool isPreTick=false) 
                 { 
-                        m_internalTickCallback = cb; 
+                        if (isPreTick)
+                        {
+                                m_internalPreTickCallback = cb;
+                        } else
+                        {
+                                m_internalTickCallback = cb; 
+                        }
                         m_worldUserInfo = worldUserInfo;
                 }