Created a KX_SoftBodyDeformer for real-time soft bodies.

[blender.git] / extern / bullet2 / src / BulletCollision / CollisionShapes / btScaledBvhTriangleMeshShape.h

diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
index 8e1d29fc005325d08aa66ebef1730990c9e0333d..0a1ef8ce5cb9dff3f63be4478e934b6dc0ffb6af 100644 (file)
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
@@ -39,7 +39,7 @@ public:
        virtual int     getShapeType() const
        {
                //use un-used 'FAST_CONCAVE_MESH_PROXYTYPE' for now, later add SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE to btBroadphaseProxy.h
        virtual int     getShapeType() const
        {
                //use un-used 'FAST_CONCAVE_MESH_PROXYTYPE' for now, later add SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE to btBroadphaseProxy.h

-               return FAST_CONCAVE_MESH_PROXYTYPE;
+               return SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE;

        }
 
        virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
        }
 
        virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;


@@ -49,6 +49,16 @@ public:
 
        virtual void    processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
 
        virtual void    processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 

+       btBvhTriangleMeshShape* getChildShape()
+       {
+               return m_bvhTriMeshShape;
+       }
+
+       const btBvhTriangleMeshShape*   getChildShape() const
+       {
+               return m_bvhTriMeshShape;
+       }
+

        //debugging
        virtual const char*     getName()const {return "SCALEDBVHTRIANGLEMESH";}
 
        //debugging
        virtual const char*     getName()const {return "SCALEDBVHTRIANGLEMESH";}