Changeset 8393 for code/trunk/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp

Timestamp:

May 3, 2011, 5:07:42 AM (13 years ago)

Author:

rgrieder

Message:

Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).

You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.

File:

• code/trunk/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (modified) (2 diffs)

code/trunk/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp

@@ -79 +79 @@
                 infoGlobal.m_timeStep = timeStep;
                 m_constraintSolver->prepareSolve(0,numManifolds);
-                m_constraintSolver->solveGroup(0,0,manifoldPtr, numManifolds,0,0,infoGlobal,m_debugDrawer, m_stackAlloc,m_dispatcher1);
+                m_constraintSolver->solveGroup(&getCollisionObjectArray()[0],getNumCollisionObjects(),manifoldPtr, numManifolds,0,0,infoGlobal,m_debugDrawer, m_stackAlloc,m_dispatcher1);
                 m_constraintSolver->allSolved(infoGlobal,m_debugDrawer, m_stackAlloc);
         }
@@ -155 +155 @@
         }
 }
+
+void    btSimpleDynamicsWorld::addRigidBody(btRigidBody* body, short group, short mask)
+{
+        body->setGravity(m_gravity);
+
+        if (body->getCollisionShape())
+        {
+                addCollisionObject(body,group,mask);
+        }
+}
+
+
+void    btSimpleDynamicsWorld::debugDrawWorld()
+{
+
+}
+                                
+void    btSimpleDynamicsWorld::addAction(btActionInterface* action)
+{
+
+}
+
+void    btSimpleDynamicsWorld::removeAction(btActionInterface* action)
+{
+
+}
+
 
 void    btSimpleDynamicsWorld::updateAabbs()