Created a KX_SoftBodyDeformer for real-time soft bodies.

[blender.git] / extern / bullet2 / src / BulletSoftBody / btSoftRigidDynamicsWorld.h

diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
index d0010b65aadbb1910d3f8b3b3d89fb85c32ba081..aa8795d897b6b10d8b745d07e3f374159c63bb36 100644 (file)
--- a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
@@ -13,12 +13,12 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
 3. This notice may not be removed or altered from any source distribution.
 */
 

-#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
-

 #ifndef BT_SOFT_RIGID_DYNAMICS_WORLD_H
 #define BT_SOFT_RIGID_DYNAMICS_WORLD_H
 
 #ifndef BT_SOFT_RIGID_DYNAMICS_WORLD_H
 #define BT_SOFT_RIGID_DYNAMICS_WORLD_H
 

-class btSoftBody;
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
+#include "btSoftBody.h"
+

 typedef        btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
 
 class btSoftRigidDynamicsWorld : public btDiscreteDynamicsWorld
 typedef        btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
 
 class btSoftRigidDynamicsWorld : public btDiscreteDynamicsWorld


@@ -29,7 +29,8 @@ class btSoftRigidDynamicsWorld : public btDiscreteDynamicsWorld
        bool                    m_drawNodeTree;
        bool                    m_drawFaceTree;
        bool                    m_drawClusterTree;
        bool                    m_drawNodeTree;
        bool                    m_drawFaceTree;
        bool                    m_drawClusterTree;

-               
+       btSoftBodyWorldInfo m_sbi;
+

 protected:
        
        virtual void    predictUnconstraintMotion(btScalar timeStep);
 protected:
        
        virtual void    predictUnconstraintMotion(btScalar timeStep);


@@ -40,7 +41,6 @@ protected:
 
        void    solveSoftBodiesConstraints();
 
 
        void    solveSoftBodiesConstraints();
 

-       

 
 public:
        
 
 public:
        


@@ -57,6 +57,15 @@ public:
        int             getDrawFlags() const { return(m_drawFlags); }
        void    setDrawFlags(int f)     { m_drawFlags=f; }
 
        int             getDrawFlags() const { return(m_drawFlags); }
        void    setDrawFlags(int f)     { m_drawFlags=f; }
 

+       btSoftBodyWorldInfo&    getWorldInfo()
+       {
+               return m_sbi;
+       }
+       const btSoftBodyWorldInfo&      getWorldInfo() const
+       {
+               return m_sbi;
+       }
+

                        
        btSoftBodyArray& getSoftBodyArray()
        {
                        
        btSoftBodyArray& getSoftBodyArray()
        {