Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h

Timestamp:

Apr 21, 2011, 6:58:23 PM (13 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) (8 diffs)

code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h

@@ -1 +1 @@
 /*
 Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
 
 This software is provided 'as-is', without any express or implied warranty.
@@ -13 +13 @@
 3. This notice may not be removed or altered from any source distribution.
 */
+
 
 #ifndef BT_DISCRETE_DYNAMICS_WORLD_H
@@ -42 +43 @@
         btAlignedObjectArray<btTypedConstraint*> m_constraints;
 
+        btAlignedObjectArray<btRigidBody*> m_nonStaticRigidBodies;
+
         btVector3       m_gravity;
 
@@ -50 +53 @@
         bool    m_ownsIslandManager;
         bool    m_ownsConstraintSolver;
+        bool    m_synchronizeAllMotionStates;
 
         btAlignedObjectArray<btActionInterface*>        m_actions;
@@ -74 +78 @@
         virtual void    saveKinematicState(btScalar timeStep);
 
-        void    debugDrawSphere(btScalar radius, const btTransform& transform, const btVector3& color);
-
+        void    serializeRigidBodies(btSerializer* serializer);
 
 public:
@@ -121 +124 @@
         virtual btVector3 getGravity () const;
 
+        virtual void    addCollisionObject(btCollisionObject* collisionObject,short int collisionFilterGroup=btBroadphaseProxy::StaticFilter,short int collisionFilterMask=btBroadphaseProxy::AllFilter ^ btBroadphaseProxy::StaticFilter);
+
         virtual void    addRigidBody(btRigidBody* body);
 
@@ -127 +132 @@
         virtual void    removeRigidBody(btRigidBody* body);
 
-        void    debugDrawObject(const btTransform& worldTransform, const btCollisionShape* shape, const btVector3& color);
+        ///removeCollisionObject will first check if it is a rigid body, if so call removeRigidBody otherwise call btCollisionWorld::removeCollisionObject
+        virtual void    removeCollisionObject(btCollisionObject* collisionObject);
+
 
         void    debugDrawConstraint(btTypedConstraint* constraint);
@@ -175 +182 @@
         virtual void    removeCharacter(btActionInterface* character);
 
+        void    setSynchronizeAllMotionStates(bool synchronizeAll)
+        {
+                m_synchronizeAllMotionStates = synchronizeAll;
+        }
+        bool getSynchronizeAllMotionStates() const
+        {
+                return m_synchronizeAllMotionStates;
+        }
+
+        ///Preliminary serialization test for Bullet 2.76. Loading those files requires a separate parser (see Bullet/Demos/SerializeDemo)
+        virtual void    serialize(btSerializer* serializer);
+
 };