Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved/updated projectfiles for new BulletSoftBody library

Browse Source
This commit is contained in:
erwin.coumans
2008-04-11 18:56:49 +00:00
parent 5024d06366
commit 3df41a478d
9 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Demos/AllBulletDemos/CMakeLists.txt
View File

@@ -76,9 +76,6 @@ ADD_EXECUTABLE(AllBulletDemos
../GjkConvexCastDemo/LinearConvexCastDemo.cpp ../GjkConvexCastDemo/LinearConvexCastDemo.cpp
../VehicleDemo/VehicleDemo.cpp ../VehicleDemo/VehicleDemo.cpp
../SoftDemo/SoftDemo.cpp ../SoftDemo/SoftDemo.cpp
../SoftDemo/btSoftBodyRigidBodyCollisionConfiguration.cpp
../SoftDemo/btSoftSoftCollisionAlgorithm.cpp
../SoftDemo/btSoftRigidCollisionAlgorithm.cpp
../ConstraintDemo/ConstraintDemo.cpp ../ConstraintDemo/ConstraintDemo.cpp
) )

15
Demos/Jamfile
View File

@@ -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 rule BulletBasicDemo
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
@@ -37,7 +50,7 @@ if $(GLUT.AVAILABLE) = "yes"
rule FrameWorkDemo rule FrameWorkDemo
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport convexdecomposition bulletdynamics bulletcollision bulletmath glui ; LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport bulletsoftbody convexdecomposition bulletdynamics bulletcollision bulletmath glui ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Extras ] [ FIncludes $(TOP)/Extras ]
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]

2
Demos/SoftDemo/Jamfile
View File

@@ -1,3 +1,3 @@
SubDir TOP Demos SoftDemo ; SubDir TOP Demos SoftDemo ;
BulletDemo SoftBodyDemo : [ Wildcard *.h *.cpp ] ; BulletSoftBodyDemo SoftBodyDemo : [ Wildcard *.h *.cpp ] ;

6
Demos/SoftDemo/SoftDemo.cpp
View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#include "btBulletDynamicsCommon.h" #include "btBulletDynamicsCommon.h"
#include "BulletDynamics/SoftBody/btSoftRigidDynamicsWorld.h" #include "BulletSoftBody/btSoftRigidDynamicsWorld.h"
#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h" #include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
@@ -28,8 +28,8 @@ subject to the following restrictions:
#include "../GimpactTestDemo/TorusMesh.h" #include "../GimpactTestDemo/TorusMesh.h"
#include <stdio.h> //printf debugging #include <stdio.h> //printf debugging
#include "LinearMath/btConvexHull.h" #include "LinearMath/btConvexHull.h"
#include "btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h"
#include "BulletDynamics/SoftBody/btSoftBodyHelpers.h" #include "BulletSoftBody/btSoftBodyHelpers.h"
static float gCollisionMargin = 0.05f/*0.05f*/; static float gCollisionMargin = 0.05f/*0.05f*/;
#include "SoftDemo.h" #include "SoftDemo.h"

2
Demos/SoftDemo/SoftDemo.h
View File

@@ -20,7 +20,7 @@ subject to the following restrictions:
#include "DemoApplication.h" #include "DemoApplication.h"
#include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btAlignedObjectArray.h"
#include "BulletDynamics/SoftBody/btSoftBody.h" #include "BulletSoftBody/btSoftBody.h"
class btBroadphaseInterface; class btBroadphaseInterface;

4
src/BulletSoftBody/btSoftBody.h
View File

@@ -25,8 +25,8 @@ subject to the following restrictions:
#include "BulletCollision/CollisionShapes/btConcaveShape.h" #include "BulletCollision/CollisionShapes/btConcaveShape.h"
#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" #include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
#include "BulletDynamics/SoftBody/btSparseSDF.h" #include "btSparseSDF.h"
#include "BulletDynamics/SoftBody/btDbvt.h" #include "btDbvt.h"
class btBroadphaseInterface; class btBroadphaseInterface;
class btCollisionDispatcher; class btCollisionDispatcher;

2
src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
View File

@@ -18,7 +18,7 @@ subject to the following restrictions:
#include "BulletCollision/CollisionShapes/btSphereShape.h" #include "BulletCollision/CollisionShapes/btSphereShape.h"
#include "BulletCollision/CollisionShapes/btBoxShape.h" #include "BulletCollision/CollisionShapes/btBoxShape.h"
#include "BulletCollision/CollisionDispatch/btCollisionObject.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 ///TODO: include all the shapes that the softbody can collide with
///alternatively, implement special case collision algorithms (just like for rigid collision shapes) ///alternatively, implement special case collision algorithms (just like for rigid collision shapes)

6
src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
View File

@@ -18,8 +18,8 @@ subject to the following restrictions:
#include "LinearMath/btQuickprof.h" #include "LinearMath/btQuickprof.h"
//softbody & helpers //softbody & helpers
#include "BulletDynamics/SoftBody/btSoftBody.h" #include "btSoftBody.h"
#include "BulletDynamics/SoftBody/btSoftBodyHelpers.h" #include "btSoftBodyHelpers.h"
btSoftRigidDynamicsWorld::btSoftRigidDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration) btSoftRigidDynamicsWorld::btSoftRigidDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration)
:btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration) :btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration)
@@ -129,4 +129,4 @@ void btSoftRigidDynamicsWorld::debugDrawWorld()
} }
} }
} }
} }

2
src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
#include "BulletCollision/CollisionShapes/btBoxShape.h" #include "BulletCollision/CollisionShapes/btBoxShape.h"
#include "BulletCollision/CollisionDispatch/btCollisionObject.h" #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
#include "BulletDynamics/SoftBody/btSoftBody.h" #include "btSoftBody.h"
#define USE_PERSISTENT_CONTACTS 1 #define USE_PERSISTENT_CONTACTS 1