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

improved multi-platform support for SoftBodyDemo

Browse Source
This commit is contained in:
erwin.coumans
2008-03-30 23:22:30 +00:00
parent d4698cb3d5
commit 726b9c2ac2
9 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftBodyDemo )
SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo )

15
Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
View File

@@ -20,7 +20,6 @@ subject to the following restrictions:
//Note: some of those settings need 'DO_WALL' demo
//#define USE_KINEMATIC_GROUND 1
//#define PRINT_CONTACT_STATISTICS 1
//#define REGISTER_BOX_BOX 1 //needs to be used in combination with REGISTER_CUSTOM_COLLISION_ALGORITHM
//#define USER_DEFINED_FRICTION_MODEL 1
//#define USE_CUSTOM_NEAR_CALLBACK 1
//#define CENTER_OF_MASS_SHIFT 1
@@ -29,16 +28,12 @@ subject to the following restrictions:
//#define USE_PARALLEL_SOLVER 1 //experimental parallel solver
//#define USE_PARALLEL_DISPATCHER 1
//following define allows to compare/replace Bullet's constraint solver with ODE quickstep
//this define requires to either add the libquickstep library (win32, see msvc/8/libquickstep.vcproj) or manually add the files from Extras/quickstep
//from Bullet 2.68 onwards ODE Quickstep constraint solver is optional part of Bullet, re-distributed under the ZLib license with permission of Russell L. Smith
//#define COMPARE_WITH_QUICKSTEP 1
#include "btBulletDynamicsCommon.h"
#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
#ifdef REGISTER_BOX_BOX
#include "../Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.h"
#endif //REGISTER_BOX_BOX
#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h"
#ifdef USE_PARALLEL_DISPATCHER
@@ -60,9 +55,6 @@ subject to the following restrictions:
#endif//USE_PARALLEL_DISPATCHER
#ifdef COMPARE_WITH_QUICKSTEP
#include "../Extras/quickstep/OdeConstraintSolver.h"
#endif //COMPARE_WITH_QUICKSTEP
#include "LinearMath/btQuickprof.h"
#include "LinearMath/btIDebugDraw.h"
@@ -419,12 +411,9 @@ int maxNumOutstandingTasks = 4;
// m_broadphase = new btSimpleBroadphase;
//box-box is in Extras/AlternativeCollisionAlgorithms:it requires inclusion of those files
#ifdef REGISTER_BOX_BOX
m_dispatcher->registerCollisionCreateFunc(BOX_SHAPE_PROXYTYPE,BOX_SHAPE_PROXYTYPE,new BoxBoxCollisionAlgorithm::CreateFunc);
#endif //REGISTER_BOX_BOX
#ifdef COMPARE_WITH_QUICKSTEP
m_solver = new OdeConstraintSolver();
m_solver = new btOdeQuickstepConstraintSolver();
#else

2
Demos/Jamfile
View File

@@ -82,7 +82,7 @@ SubInclude TOP Demos ConcaveDemo ;
SubInclude TOP Demos ConstraintDemo ;
SubInclude TOP Demos RagdollDemo ;
SubInclude TOP Demos GenericJointDemo ;
SubInclude TOP Demos SoftBodyDemo ;
SubInclude TOP Demos SoftDemo ;
SubInclude TOP Demos ContinuousConvexCollision ;
SubInclude TOP Demos GjkConvexCastDemo ;
SubInclude TOP Demos Raytracer ;

2
Demos/SoftDemo/Jamfile
View File

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

4
Demos/SoftDemo/SoftDemo.cpp
View File

@@ -23,8 +23,8 @@ subject to the following restrictions:
#include "LinearMath/btQuickprof.h"
#include "LinearMath/btIDebugDraw.h"
#include "BMF_Api.h"
#include "demos\gimpacttestdemo\bunnymesh.h"
#include "demos\gimpacttestdemo\torusmesh.h"
#include "../GimpactTestDemo/BunnyMesh.h"
#include "../GimpactTestDemo/TorusMesh.h"
#include <stdio.h> //printf debugging
static float gCollisionMargin = 0.05f/*0.05f*/;

5
src/BulletDynamics/CMakeLists.txt
View File

@@ -24,6 +24,7 @@ ADD_LIBRARY(LibBulletDynamics
ConstraintSolver/btOdeContactJoint.h
ConstraintSolver/btOdeJoint.cpp
ConstraintSolver/btOdeJoint.h
ConstraintSolver/btOdeSolverBody.h
ConstraintSolver/btOdeQuickstepConstraintSolver.cpp
ConstraintSolver/btOdeQuickstepConstraintSolver.h
ConstraintSolver/btOdeTypedJoint.cpp
@@ -43,4 +44,8 @@ ADD_LIBRARY(LibBulletDynamics
Vehicle/btRaycastVehicle.h
Vehicle/btWheelInfo.cpp
Vehicle/btWheelInfo.h
btSoftBody.cpp
btSoftBody.h
btSoftBodyHelpers.cpp
btSparseSDF.h
)

0
src/BulletDynamics/ConstraintSolver/btOdeSolverBody.cpp
View File

1
src/BulletDynamics/Jamfile
View File

@@ -3,6 +3,7 @@ SubDir TOP src BulletDynamics ;
Description bulletdynamics : "Bullet Rigidbody Dynamics" ;
Library bulletdynamics :
[ Wildcard ConstraintSolver : *.h *.cpp ]
[ Wildcard SoftBody : *.h *.cpp ]
[ Wildcard Dynamics : *.h *.cpp ]
[ Wildcard Vehicle : *.h *.cpp ]
;

5
src/BulletDynamics/SoftBody/btSparseSDF.h
View File

@@ -17,6 +17,9 @@ subject to the following restrictions:
#ifndef _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
#define _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
#include "BulletCollision/NarrowphaseCollision/btGjkEpa2.h"
template <const int CELLSIZE>
struct btSparseSdf
{
@@ -310,4 +313,4 @@ struct btSparseSdf
}
};
#endif
#endif