Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h')
-rw-r--r--extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h b/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
index 43f32bea5a1..05431cfce15 100644
--- a/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
+++ b/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
@@ -105,6 +105,7 @@ protected:
public:
btGImpactShapeInterface()
{
+ m_shapeType=GIMPACT_SHAPE_PROXYTYPE;
m_localAABB.invalidate();
m_needs_update = true;
localScaling.setValue(1.f,1.f,1.f);
@@ -880,6 +881,8 @@ Set of btGImpactMeshShapePart parts
*/
class btGImpactMeshShape : public btGImpactShapeInterface
{
+ btStridingMeshInterface* m_meshInterface;
+
protected:
btAlignedObjectArray<btGImpactMeshShapePart*> m_mesh_parts;
void buildMeshParts(btStridingMeshInterface * meshInterface)
@@ -906,6 +909,7 @@ protected:
public:
btGImpactMeshShape(btStridingMeshInterface * meshInterface)
{
+ m_meshInterface = meshInterface;
buildMeshParts(meshInterface);
}
@@ -921,6 +925,15 @@ public:
}
+ btStridingMeshInterface* getMeshInterface()
+ {
+ return m_meshInterface;
+ }
+
+ const btStridingMeshInterface* getMeshInterface() const
+ {
+ return m_meshInterface;
+ }
int getMeshPartCount() const
{
@@ -1032,12 +1045,12 @@ public:
}
//! call when reading child shapes
- virtual void lockChildShapes()
+ virtual void lockChildShapes() const
{
btAssert(0);
}
- virtual void unlockChildShapes()
+ virtual void unlockChildShapes() const
{
btAssert(0);
}