From 3df41a478d04ee68c411cc703bf74f4b5db2981c Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 11 Apr 2008 18:56:49 +0000 Subject: [PATCH] moved/updated projectfiles for new BulletSoftBody library --- Demos/AllBulletDemos/CMakeLists.txt | 3 --- Demos/Jamfile | 15 ++++++++++++++- Demos/SoftDemo/Jamfile | 2 +- Demos/SoftDemo/SoftDemo.cpp | 6 +++--- Demos/SoftDemo/SoftDemo.h | 2 +- src/BulletSoftBody/btSoftBody.h | 4 ++-- .../btSoftRigidCollisionAlgorithm.cpp | 2 +- src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp | 6 +++--- .../btSoftSoftCollisionAlgorithm.cpp | 2 +- 9 files changed, 26 insertions(+), 16 deletions(-) diff --git a/Demos/AllBulletDemos/CMakeLists.txt b/Demos/AllBulletDemos/CMakeLists.txt index 4367ca3a5..ecf16a806 100644 --- a/Demos/AllBulletDemos/CMakeLists.txt +++ b/Demos/AllBulletDemos/CMakeLists.txt @@ -76,9 +76,6 @@ ADD_EXECUTABLE(AllBulletDemos ../GjkConvexCastDemo/LinearConvexCastDemo.cpp ../VehicleDemo/VehicleDemo.cpp ../SoftDemo/SoftDemo.cpp - ../SoftDemo/btSoftBodyRigidBodyCollisionConfiguration.cpp - ../SoftDemo/btSoftSoftCollisionAlgorithm.cpp - ../SoftDemo/btSoftRigidCollisionAlgorithm.cpp ../ConstraintDemo/ConstraintDemo.cpp ) diff --git a/Demos/Jamfile b/Demos/Jamfile index 13c57ded6..e7617581b 100644 --- a/Demos/Jamfile +++ b/Demos/Jamfile @@ -20,6 +20,19 @@ if $(GLUT.AVAILABLE) = "yes" } } +rule BulletSoftBodyDemo +{ + Application $(<) : $(>) : noinstall console nomanifest ; + LinkWith $(<) : bulletopenglsupport bulletsoftbody bulletdynamics bulletcollision bulletmath ; + CFlags $(<) : + [ FIncludes $(TOP)/src ] + [ FIncludes $(TOP)/Demos/OpenGL ] + ; + MsvcIncDirs $(<) : + "../../Demos/OpenGL" + "../../src" ; +} + rule BulletBasicDemo { Application $(<) : $(>) : noinstall console nomanifest ; @@ -37,7 +50,7 @@ if $(GLUT.AVAILABLE) = "yes" rule FrameWorkDemo { Application $(<) : $(>) : noinstall console nomanifest ; - LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport convexdecomposition bulletdynamics bulletcollision bulletmath glui ; + LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport bulletsoftbody convexdecomposition bulletdynamics bulletcollision bulletmath glui ; CFlags $(<) : [ FIncludes $(TOP)/Extras ] [ FIncludes $(TOP)/Demos/OpenGL ] diff --git a/Demos/SoftDemo/Jamfile b/Demos/SoftDemo/Jamfile index 3e765a81f..d7abfa02e 100644 --- a/Demos/SoftDemo/Jamfile +++ b/Demos/SoftDemo/Jamfile @@ -1,3 +1,3 @@ SubDir TOP Demos SoftDemo ; -BulletDemo SoftBodyDemo : [ Wildcard *.h *.cpp ] ; +BulletSoftBodyDemo SoftBodyDemo : [ Wildcard *.h *.cpp ] ; diff --git a/Demos/SoftDemo/SoftDemo.cpp b/Demos/SoftDemo/SoftDemo.cpp index 555be66a1..d25d30142 100644 --- a/Demos/SoftDemo/SoftDemo.cpp +++ b/Demos/SoftDemo/SoftDemo.cpp @@ -17,7 +17,7 @@ subject to the following restrictions: #include "btBulletDynamicsCommon.h" -#include "BulletDynamics/SoftBody/btSoftRigidDynamicsWorld.h" +#include "BulletSoftBody/btSoftRigidDynamicsWorld.h" #include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h" #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" @@ -28,8 +28,8 @@ subject to the following restrictions: #include "../GimpactTestDemo/TorusMesh.h" #include //printf debugging #include "LinearMath/btConvexHull.h" -#include "btSoftBodyRigidBodyCollisionConfiguration.h" -#include "BulletDynamics/SoftBody/btSoftBodyHelpers.h" +#include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" +#include "BulletSoftBody/btSoftBodyHelpers.h" static float gCollisionMargin = 0.05f/*0.05f*/; #include "SoftDemo.h" diff --git a/Demos/SoftDemo/SoftDemo.h b/Demos/SoftDemo/SoftDemo.h index 5c348373e..12c42c422 100644 --- a/Demos/SoftDemo/SoftDemo.h +++ b/Demos/SoftDemo/SoftDemo.h @@ -20,7 +20,7 @@ subject to the following restrictions: #include "DemoApplication.h" #include "LinearMath/btAlignedObjectArray.h" -#include "BulletDynamics/SoftBody/btSoftBody.h" +#include "BulletSoftBody/btSoftBody.h" class btBroadphaseInterface; diff --git a/src/BulletSoftBody/btSoftBody.h b/src/BulletSoftBody/btSoftBody.h index 67094b84c..2ffec085a 100644 --- a/src/BulletSoftBody/btSoftBody.h +++ b/src/BulletSoftBody/btSoftBody.h @@ -25,8 +25,8 @@ subject to the following restrictions: #include "BulletCollision/CollisionShapes/btConcaveShape.h" #include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" -#include "BulletDynamics/SoftBody/btSparseSDF.h" -#include "BulletDynamics/SoftBody/btDbvt.h" +#include "btSparseSDF.h" +#include "btDbvt.h" class btBroadphaseInterface; class btCollisionDispatcher; diff --git a/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp b/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp index c8c1b8ef3..936205920 100644 --- a/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp +++ b/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp @@ -18,7 +18,7 @@ subject to the following restrictions: #include "BulletCollision/CollisionShapes/btSphereShape.h" #include "BulletCollision/CollisionShapes/btBoxShape.h" #include "BulletCollision/CollisionDispatch/btCollisionObject.h" -#include "BulletDynamics/SoftBody/btSoftBody.h" +#include "btSoftBody.h" ///TODO: include all the shapes that the softbody can collide with ///alternatively, implement special case collision algorithms (just like for rigid collision shapes) diff --git a/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp b/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp index e4541b6fd..944245bbc 100644 --- a/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp +++ b/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp @@ -18,8 +18,8 @@ subject to the following restrictions: #include "LinearMath/btQuickprof.h" //softbody & helpers -#include "BulletDynamics/SoftBody/btSoftBody.h" -#include "BulletDynamics/SoftBody/btSoftBodyHelpers.h" +#include "btSoftBody.h" +#include "btSoftBodyHelpers.h" btSoftRigidDynamicsWorld::btSoftRigidDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration) :btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration) @@ -129,4 +129,4 @@ void btSoftRigidDynamicsWorld::debugDrawWorld() } } } -} \ No newline at end of file +} diff --git a/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp b/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp index d03d82999..f623ce349 100644 --- a/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp +++ b/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp @@ -17,7 +17,7 @@ subject to the following restrictions: #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" #include "BulletCollision/CollisionShapes/btBoxShape.h" #include "BulletCollision/CollisionDispatch/btCollisionObject.h" -#include "BulletDynamics/SoftBody/btSoftBody.h" +#include "btSoftBody.h" #define USE_PERSISTENT_CONTACTS 1