updated build files

This commit is contained in:
erwin.coumans
2008-05-10 19:24:39 +00:00
parent e334254a7b
commit 649709dc2d
6 changed files with 14 additions and 6 deletions

View File

@@ -947,7 +947,7 @@ static void Init_Tetra(SoftDemo* pdemo)
pdemo->toggleIdle(); pdemo->toggleIdle();
} }
unsigned current_demo=1; unsigned current_demo=0;
void SoftDemo::clientResetScene() void SoftDemo::clientResetScene()
{ {
@@ -976,12 +976,12 @@ void SoftDemo::clientResetScene()
/* Init */ /* Init */
void (*demofncs[])(SoftDemo*)= void (*demofncs[])(SoftDemo*)=
{ {
Init_Cloth,
Init_Cutting1, Init_Cutting1,
#ifdef BT_SOFTBODY_USE_STL #ifdef BT_SOFTBODY_USE_STL
Init_TetraBunny, Init_TetraBunny,
Init_TetraCube, Init_TetraCube,
#endif //BT_SOFTBODY_USE_STL #endif //BT_SOFTBODY_USE_STL
Init_Cloth,
Init_Pressure, Init_Pressure,
Init_Volume, Init_Volume,
Init_Ropes, Init_Ropes,

View File

@@ -34,6 +34,10 @@ ADD_LIBRARY(LibBulletMultiThreaded
SpuNarrowPhaseCollisionTask/SpuContactResult.cpp SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
SpuNarrowPhaseCollisionTask/SpuContactResult.h SpuNarrowPhaseCollisionTask/SpuContactResult.h
SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp
SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.cpp
SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.h
SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp
SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h
SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h
SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h
SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h

View File

@@ -87,6 +87,9 @@ struct btDbvt
/* ICollide */ /* ICollide */
struct ICollide struct ICollide
{ {
virtual ~ICollide()
{
}
virtual void Process(const Node*,const Node*)=0; virtual void Process(const Node*,const Node*)=0;
virtual void Process(const Node*)=0; virtual void Process(const Node*)=0;
virtual bool Descent(const Node*)=0; virtual bool Descent(const Node*)=0;

View File

@@ -12,6 +12,10 @@ ADD_LIBRARY(LibBulletCollision
BroadphaseCollision/btCollisionAlgorithm.h BroadphaseCollision/btCollisionAlgorithm.h
BroadphaseCollision/btDispatcher.cpp BroadphaseCollision/btDispatcher.cpp
BroadphaseCollision/btDispatcher.h BroadphaseCollision/btDispatcher.h
BroadphaseCollision/btDbvtBroadphase.cpp
BroadphaseCollision/btDbvtBroadphase.h
BroadphaseCollision/btDbvt.cpp
BroadphaseCollision/btDbvt.h
BroadphaseCollision/btMultiSapBroadphase.cpp BroadphaseCollision/btMultiSapBroadphase.cpp
BroadphaseCollision/btMultiSapBroadphase.h BroadphaseCollision/btMultiSapBroadphase.h
BroadphaseCollision/btOverlappingPairCache.cpp BroadphaseCollision/btOverlappingPairCache.cpp

View File

@@ -8,10 +8,6 @@ ADD_LIBRARY(LibBulletSoftBody
btSoftBody.h btSoftBody.h
btSoftBodyHelpers.cpp btSoftBodyHelpers.cpp
btSparseSDF.h btSparseSDF.h
btDbvtBroadphase.cpp
btDbvtBroadphase.h
btDbvt.cpp
btDbvt.h
btSoftBodyHelpers.h btSoftBodyHelpers.h
btSoftBodyRigidBodyCollisionConfiguration.cpp btSoftBodyRigidBodyCollisionConfiguration.cpp
btSoftRigidCollisionAlgorithm.cpp btSoftRigidCollisionAlgorithm.cpp

View File

@@ -120,6 +120,7 @@ public:
/* ImplicitFn */ /* ImplicitFn */
struct ImplicitFn struct ImplicitFn
{ {
virtual ~ImplicitFn() {}
virtual btScalar Eval(const btVector3& x)=0; virtual btScalar Eval(const btVector3& x)=0;
}; };