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

fixed build/project files

Browse Source
This commit is contained in:
erwin.coumans
2008-04-10 21:28:37 +00:00
parent 1139c06a4d
commit fd5057ec5a
27 changed files with 604 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/AllBulletDemos/CMakeLists.txt
View File

@@ -49,11 +49,11 @@ ELSE (WIN32)
ENDIF (WIN32) ENDIF (WIN32)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(AllBulletDemos ADD_EXECUTABLE(AllBulletDemos

3
Demos/AllBulletDemos/Jamfile
View File

@@ -19,8 +19,5 @@ FrameWorkDemo 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
; ;

2
Demos/BasicDemo/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(BasicDemo ADD_EXECUTABLE(BasicDemo

2
Demos/Benchmarks/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(Benchmarks ADD_EXECUTABLE(Benchmarks

2
Demos/BspDemo/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(BspPhysicsDemo ADD_EXECUTABLE(BspPhysicsDemo

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 SoftDemo ) SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo )

2
Demos/CcdPhysicsDemo/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(CcdPhysicsDemo ADD_EXECUTABLE(CcdPhysicsDemo

2
Demos/CharacterDemo/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(CharacterDemo ADD_EXECUTABLE(CharacterDemo

4
Demos/ColladaDemo/CMakeLists.txt
View File

@@ -48,11 +48,11 @@ ELSE (WIN32)
ENDIF (WIN32) ENDIF (WIN32)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter $(BULLET_PHYSICS_SOURCE_DIR)/Extras/ConvexHull ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibBulletColladaConverter LibColladaDom LibXML LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibBulletColladaConverter LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(ColladaDemo ADD_EXECUTABLE(ColladaDemo

2
Demos/ConstraintDemo/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(ConstraintDemo ADD_EXECUTABLE(ConstraintDemo

2
Demos/GenericJointDemo/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(GenericJointDemo ADD_EXECUTABLE(GenericJointDemo

5
Demos/Jamfile
View File

@@ -8,7 +8,7 @@ if $(GLUT.AVAILABLE) = "yes"
rule BulletDemo rule BulletDemo
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletopenglsupport convexhull bulletdynamics bulletcollision bulletmath ; LinkWith $(<) : bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/ConvexHull ] [ FIncludes $(TOP)/Extras/ConvexHull ]
@@ -37,7 +37,7 @@ if $(GLUT.AVAILABLE) = "yes"
rule FrameWorkDemo rule FrameWorkDemo
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport bulletmultithreaded convexdecomposition convexhull bulletdynamics bulletcollision bulletmath glui ; LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport convexdecomposition bulletdynamics bulletcollision bulletmath glui ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Extras ] [ FIncludes $(TOP)/Extras ]
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
@@ -80,6 +80,7 @@ SubInclude TOP Demos GimpactTestDemo ;
SubInclude TOP Demos MovingConcaveDemo ; SubInclude TOP Demos MovingConcaveDemo ;
SubInclude TOP Demos ConcaveDemo ; SubInclude TOP Demos ConcaveDemo ;
SubInclude TOP Demos ConstraintDemo ; SubInclude TOP Demos ConstraintDemo ;
SubInclude TOP Demos SliderConstraintDemo ;
SubInclude TOP Demos RagdollDemo ; SubInclude TOP Demos RagdollDemo ;
SubInclude TOP Demos GenericJointDemo ; SubInclude TOP Demos GenericJointDemo ;
SubInclude TOP Demos SoftDemo ; SubInclude TOP Demos SoftDemo ;

2
Demos/MovingConcaveDemo/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include ${BULLET_PHYSICS_SOURCE_DIR}
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibGIMPACT LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibGIMPACT LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(MovingConcaveDemo ADD_EXECUTABLE(MovingConcaveDemo

2
Demos/MultiThreadedDemo/CMakeLists.txt
View File

@@ -53,7 +53,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletMultiThreaded LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletMultiThreaded LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(MultiThreadedDemo ADD_EXECUTABLE(MultiThreadedDemo

26
Demos/MultiThreadedDemo/Jamfile
View File

@@ -1,3 +1,27 @@
SubDir TOP Demos MultiThreadedDemo ; SubDir TOP Demos MultiThreadedDemo ;
FrameWorkDemo MultiThreadedDemo : [ Wildcard *.h *.cpp ] ; #some demos need extra functionality, Collada / ConvexDecomposition etc.
rule ExtraDemo4
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletopenglsupport bulletmultithreaded bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/BulletMultiThreaded ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
"../../Extras/BulletColladaConverter"
"../../Extras/COLLADA_DOM/include"
"../../Extras/COLLADA_DOM/include/1.4"
"../../Extras/LibXML"
"../../Extras/LibXML/include" ;
}
ExtraDemo4 MultiThreadedDemo : [ Wildcard *.h *.cpp ] ;
MsvcIncDirs MultiThreadedDemo : "../../Extras/BulletMultiThreaded" ;

2
Demos/OpenGL/GL_ShapeDrawer.cpp
View File

@@ -41,7 +41,7 @@ subject to the following restrictions:
#include "BulletCollision/CollisionShapes/btUniformScalingShape.h" #include "BulletCollision/CollisionShapes/btUniformScalingShape.h"
#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h" #include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
/// ///
#include "btShapeHull.h" #include "BulletCollision/CollisionShapes/btShapeHull.h"
#include "LinearMath/btTransformUtil.h" #include "LinearMath/btTransformUtil.h"

13
Demos/OpenGL/Jamfile
View File

@@ -9,18 +9,11 @@ if $(GLUT.AVAILABLE) = "yes"
[ Wildcard *.h *.cpp ] : noinstall [ Wildcard *.h *.cpp ] : noinstall
; ;
CFlags bulletopenglsupport : [ FIncludes $(TOP)/Extras/ConvexHull ]
;
MsvcIncDirs bulletopenglsupport :
"../../Extras/ConvexHull" ;
bulletopenglsupport.CFLAGS = [ FIncludes $(TOP)/Extras/ConvexHull ] ;
#same for msvcgen
MsvcGenConfig bulletopenglsupport.INCDIRS : $(TOP)/Extras/ConvexHull ;
LibDepends bulletopenglsupport : bulletdynamics convexhull ;
LibDepends bulletopenglsupport : bulletdynamics ;
ExternalLibs bulletopenglsupport : GLUT ; ExternalLibs bulletopenglsupport : GLUT ;
} }

2
Demos/RagdollDemo/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(RagdollDemo ADD_EXECUTABLE(RagdollDemo

5
Demos/SoftDemo/CMakeLists.txt
View File

@@ -52,14 +52,11 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(SoftBodyDemo ADD_EXECUTABLE(SoftBodyDemo
main.cpp main.cpp
btSoftBodyRigidBodyCollisionConfiguration.cpp
btSoftRigidCollisionAlgorithm.cpp
btSoftSoftCollisionAlgorithm.cpp
SoftDemo.cpp SoftDemo.cpp
) )

2
Demos/UserCollisionAlgorithm/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(UserCollisionAlgorithm ADD_EXECUTABLE(UserCollisionAlgorithm

2
Demos/VehicleDemo/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
) )
ADD_EXECUTABLE(VehicleDemo ADD_EXECUTABLE(VehicleDemo

2
src/BulletCollision/CMakeLists.txt
View File

@@ -95,6 +95,8 @@ ADD_LIBRARY(LibBulletCollision
CollisionShapes/btTetrahedronShape.h CollisionShapes/btTetrahedronShape.h
CollisionShapes/btSphereShape.cpp CollisionShapes/btSphereShape.cpp
CollisionShapes/btSphereShape.h CollisionShapes/btSphereShape.h
CollisionShapes/btShapeHull.h
CollisionShapes/btShapeHull.cpp
CollisionShapes/btStaticPlaneShape.cpp CollisionShapes/btStaticPlaneShape.cpp
CollisionShapes/btStaticPlaneShape.h CollisionShapes/btStaticPlaneShape.h
CollisionShapes/btStridingMeshInterface.cpp CollisionShapes/btStridingMeshInterface.cpp

2
src/BulletCollision/CollisionShapes/btShapeHull.cpp
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
*/ */
#include "btShapeHull.h" #include "btShapeHull.h"
#include "btConvexHull.h" #include "LinearMath/btConvexHull.h"
#define NUM_UNITSPHERE_POINTS 42 #define NUM_UNITSPHERE_POINTS 42

12
src/BulletDynamics/CMakeLists.txt
View File

@@ -16,6 +16,8 @@ ADD_LIBRARY(LibBulletDynamics
ConstraintSolver/btPoint2PointConstraint.h ConstraintSolver/btPoint2PointConstraint.h
ConstraintSolver/btSequentialImpulseConstraintSolver.cpp ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
ConstraintSolver/btSequentialImpulseConstraintSolver.h ConstraintSolver/btSequentialImpulseConstraintSolver.h
ConstraintSolver/btSliderConstraint.cpp
ConstraintSolver/btSliderConstraint.h
ConstraintSolver/btSolve2LinearConstraint.cpp ConstraintSolver/btSolve2LinearConstraint.cpp
ConstraintSolver/btSolve2LinearConstraint.h ConstraintSolver/btSolve2LinearConstraint.h
ConstraintSolver/btTypedConstraint.cpp ConstraintSolver/btTypedConstraint.cpp
@@ -48,4 +50,14 @@ ADD_LIBRARY(LibBulletDynamics
SoftBody/btSoftBody.h SoftBody/btSoftBody.h
SoftBody/btSoftBodyHelpers.cpp SoftBody/btSoftBodyHelpers.cpp
SoftBody/btSparseSDF.h SoftBody/btSparseSDF.h
SoftBody/btDbvt.cpp
SoftBody/btDbvt.h
SoftBody/btSoftBodyHelpers.h
SoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
SoftBody/btSoftRigidCollisionAlgorithm.cpp
SoftBody/btSoftRigidCollisionAlgorithm.h
SoftBody/btSoftSoftCollisionAlgorithm.cpp
SoftBody/btSoftSoftCollisionAlgorithm.h
SoftBody/btSoftRigidDynamicsWorld.h
SoftBody/btSoftRigidDynamicsWorld.cpp
) )

8
src/BulletDynamics/SoftBody/btDbvt.cpp
View File

@@ -438,18 +438,14 @@ removeleaf(this,leaf);
deletenode(this,leaf); deletenode(this,leaf);
} }
// //
void btDbvt::collide(btDbvt* tree, void btDbvt::collide(btDbvt* tree,
ICollide* icollide) const ICollide* icollide) const
{ {
if(tree->m_root&&m_root) if(tree->m_root&&m_root)
{ {
struct sStkElm
{
const Node* a;
const Node* b;
sStkElm(const Node* na,const Node* nb) : a(na),b(nb) {}
};
btAlignedObjectArray<sStkElm> stack; btAlignedObjectArray<sStkElm> stack;
stack.reserve(128); stack.reserve(128);
stack.push_back(sStkElm(m_root,tree->m_root)); stack.push_back(sStkElm(m_root,tree->m_root));

7
src/BulletDynamics/SoftBody/btDbvt.h
View File

@@ -68,6 +68,13 @@ struct btDbvt
}; };
// Interfaces // Interfaces
struct sStkElm
{
const Node* a;
const Node* b;
sStkElm(const Node* na,const Node* nb) : a(na),b(nb) {}
};
/* ICollide */ /* ICollide */
struct ICollide struct ICollide
{ {

2
src/LinearMath/CMakeLists.txt
View File

@@ -15,6 +15,8 @@ ADD_LIBRARY(LibLinearMath
btHashMap.h btHashMap.h
btScalar.h btScalar.h
btAabbUtil2.h btAabbUtil2.h
btConvexHull.h
btConvexHull.cpp
btMinMax.h btMinMax.h
btQuaternion.h btQuaternion.h
btStackAlloc.h btStackAlloc.h