Compile fixes

Added getOwnsBvh to btBvhTriangleMeshShape
This commit is contained in:
john.mccutchan
2008-07-10 23:22:29 +00:00
parent 1c0fa00bc7
commit 31dfbf55e1
4 changed files with 9 additions and 2 deletions

View File

@@ -53,7 +53,9 @@ subject to the following restrictions:
#endif #endif
#if DBVT_USE_MEMMOVE #if DBVT_USE_MEMMOVE
#ifndef __CELLOS_LV2__
#include <memory.h> #include <memory.h>
#endif
#include <string.h> #include <string.h>
#endif #endif

View File

@@ -399,7 +399,7 @@ public:
{ {
} }
virtual void processAllOverlappingPairs(btOverlapCallback*,const btDispatcher* /*dispatcher*/) virtual void processAllOverlappingPairs(btOverlapCallback*,btDispatcher* /*dispatcher*/)
{ {
} }

View File

@@ -408,7 +408,7 @@ void btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
btGjkEpaPenetrationDepthSolver gjkEpaPenetrationSolver; btGjkEpaPenetrationDepthSolver gjkEpaPenetrationSolver;
bool result = false; bool result = false;
btContinuousConvexCollision convexCaster1(castShape,convexShape,&simplexSolver,&gjkEpaPenetrationSolver); btContinuousConvexCollision convexCaster1(castShape,convexShape,&simplexSolver,&gjkEpaPenetrationSolver);
//btGjkConvexCast convexCaster2(castShape,convexShape,&simplexSolver); //btGjkConvexCast convexCaster2(castShape,convexShape,&simplexSolver);
//btSubsimplexConvexCast convexCaster3(castShape,convexShape,&simplexSolver); //btSubsimplexConvexCast convexCaster3(castShape,convexShape,&simplexSolver);

View File

@@ -43,6 +43,11 @@ public:
virtual ~btBvhTriangleMeshShape(); virtual ~btBvhTriangleMeshShape();
bool getOwnsBvh () const
{
return m_ownsBvh;
}
virtual int getShapeType() const virtual int getShapeType() const
{ {
return TRIANGLE_MESH_SHAPE_PROXYTYPE; return TRIANGLE_MESH_SHAPE_PROXYTYPE;