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

updated Jamfile build system for reorganized files/folders

Browse Source
This commit is contained in:
erwin.coumans
2008-10-11 05:23:00 +00:00
parent b6f0434832
commit 22a79e61b1
20 changed files with 58 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
View File

@@ -23,17 +23,17 @@ subject to the following restrictions:
//#define BATCH_RAYCASTER //#define BATCH_RAYCASTER
#ifdef BATCH_RAYCASTER #ifdef BATCH_RAYCASTER
#include "../../Extras/BulletMultiThreaded/SpuBatchRaycaster.h" #include "BulletMultiThreaded/SpuBatchRaycaster.h"
static SpuBatchRaycaster* gBatchRaycaster = NULL; static SpuBatchRaycaster* gBatchRaycaster = NULL;
#endif #endif
#ifdef USE_LIBSPE2 #ifdef USE_LIBSPE2
#include "../../Extras/BulletMultiThreaded/SpuLibspe2Support.h" #include "BulletMultiThreaded/SpuLibspe2Support.h"
#elif defined (WIN32) #elif defined (WIN32)
#include "../../Extras/BulletMultiThreaded/Win32ThreadSupport.h" #include "BulletMultiThreaded/Win32ThreadSupport.h"
#else #else
//other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added) //other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added)
#include "../../Extras/BulletMultiThreaded/SequentialThreadSupport.h" #include "BulletMultiThreaded/SequentialThreadSupport.h"
#endif //USE_LIBSPE2 #endif //USE_LIBSPE2
static btVector3* gVertices=0; static btVector3* gVertices=0;

5
Demos/EPAPenDepthDemo/Jamfile
View File

@@ -6,7 +6,7 @@ SubDir TOP Demos EPAPenDepthDemo ;
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GIMPACT bulletopenglsupport bulletdynamics bulletcollision bulletmath ; LinkWith $(<) : bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/GIMPACT/include ] [ FIncludes $(TOP)/Extras/GIMPACT/include ]
@@ -14,8 +14,7 @@ SubDir TOP Demos EPAPenDepthDemo ;
; ;
MsvcIncDirs $(<) : MsvcIncDirs $(<) :
"../../Demos/OpenGL" "../../Demos/OpenGL" ;
"../../Extras/GIMPACT/include" ;
} }
ExtraDemo4 EPAPenDepthDemo : [ Wildcard *.h *.cpp ] ; ExtraDemo4 EPAPenDepthDemo : [ Wildcard *.h *.cpp ] ;

8
Demos/GimpactTestDemo/GimpactTestDemo.h
View File

@@ -27,16 +27,16 @@ class btDefaultCollisionConfiguration;
#ifdef BULLET_GIMPACT #ifdef BULLET_GIMPACT
#include "GIMPACT/Bullet/btGImpactCollisionAlgorithm.h" #include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
#ifdef BULLET_GIMPACT_CONVEX_DECOMPOSITION #ifdef BULLET_GIMPACT_CONVEX_DECOMPOSITION
#include "btGImpactConvexDecompositionShape.h" #include "../Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.h"
#endif #endif
#else #else
#include "btConcaveConcaveCollisionAlgorithm.h" #include "BulletCollision/Gimpact/btConcaveConcaveCollisionAlgorithm.h"
#include "btGIMPACTMeshShape.h" #include "BulletCollision/Gimpact/btGIMPACTMeshShape.h"
#endif #endif

4
Demos/GimpactTestDemo/Jamfile
View File

@@ -6,16 +6,14 @@ SubDir TOP Demos GimpactTestDemo ;
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport bulletdynamics bulletcollision bulletmath ; LinkWith $(<) : GIMPACTUtils bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/GIMPACT/include ]
[ FIncludes $(TOP)/Extras/GIMPACTUtils ] [ FIncludes $(TOP)/Extras/GIMPACTUtils ]
; ;
MsvcIncDirs $(<) : MsvcIncDirs $(<) :
"../../Demos/OpenGL" "../../Demos/OpenGL"
"../../Extras/GIMPACT/include"
"../../Extras/GIMPACTUtils" "../../Extras/GIMPACTUtils"
; ;
} }

4
Demos/Jamfile
View File

@@ -50,13 +50,12 @@ if $(GLUT.AVAILABLE) = "yes"
rule FrameWorkDemo rule FrameWorkDemo
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport bulletsoftbody convexdecomposition bulletdynamics bulletcollision bulletmath glui ; LinkWith $(<) : GIMPACTUtils bulletopenglsupport bulletsoftbody convexdecomposition bulletdynamics bulletcollision bulletmath glui ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Extras ] [ FIncludes $(TOP)/Extras ]
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/ConvexDecomposition ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ]
[ FIncludes $(TOP)/Extras/ConvexHull ] [ FIncludes $(TOP)/Extras/ConvexHull ]
[ FIncludes $(TOP)/Extras/GIMPACT/include ]
[ FIncludes $(TOP)/Extras/GIMPACTUtils ] [ FIncludes $(TOP)/Extras/GIMPACTUtils ]
; ;
MsvcIncDirs $(<) : MsvcIncDirs $(<) :
@@ -65,7 +64,6 @@ if $(GLUT.AVAILABLE) = "yes"
"../../Extras/ConvexHull" "../../Extras/ConvexHull"
"../../Demos/OpenGL" "../../Demos/OpenGL"
"../../Extras/ConvexDecomposition" "../../Extras/ConvexDecomposition"
"../../Extras/GIMPACT/include"
"../../Extras/GIMPACTUtils" "../../Extras/GIMPACTUtils"
; ;

4
Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp
View File

@@ -20,8 +20,8 @@ subject to the following restrictions:
#include "LinearMath/btIDebugDraw.h" #include "LinearMath/btIDebugDraw.h"
#include "LinearMath/btQuickprof.h" #include "LinearMath/btQuickprof.h"
#include "LinearMath/btDefaultMotionState.h" #include "LinearMath/btDefaultMotionState.h"
#include "GIMPACT/Bullet/btGImpactShape.h" #include "BulletCollision/Gimpact/btGImpactShape.h"
#include "GIMPACT/Bullet/btGImpactCollisionAlgorithm.h" #include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"

6
Demos/MovingConcaveDemo/Jamfile
View File

@@ -6,16 +6,14 @@ SubDir TOP Demos MovingConcaveDemo ;
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GIMPACT bulletopenglsupport bulletdynamics bulletcollision bulletmath ; LinkWith $(<) : bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/GIMPACT/include ]
; ;
MsvcIncDirs $(<) : MsvcIncDirs $(<) :
"../../Demos/OpenGL" "../../Demos/OpenGL" ;
"../../Extras/GIMPACT/include" ;
} }
ExtraDemo1 MovingConcaveDemo : [ Wildcard *.h *.cpp ] ; ExtraDemo1 MovingConcaveDemo : [ Wildcard *.h *.cpp ] ;

22
Demos/MultiThreadedDemo/MultiThreadedDemo.cpp
View File

@@ -21,29 +21,29 @@ subject to the following restrictions:
#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h" #include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h"
#ifdef USE_PARALLEL_DISPATCHER #ifdef USE_PARALLEL_DISPATCHER
#include "../../Extras/BulletMultiThreaded/SpuGatheringCollisionDispatcher.h" #include "BulletMultiThreaded/SpuGatheringCollisionDispatcher.h"
#include "../../Extras/BulletMultiThreaded/PlatformDefinitions.h" #include "BulletMultiThreaded/PlatformDefinitions.h"
#ifdef USE_LIBSPE2 #ifdef USE_LIBSPE2
#include "../../Extras/BulletMultiThreaded/SpuLibspe2Support.h" #include "BulletMultiThreaded/SpuLibspe2Support.h"
#elif defined (WIN32) #elif defined (WIN32)
#include "../../Extras/BulletMultiThreaded/Win32ThreadSupport.h" #include "BulletMultiThreaded/Win32ThreadSupport.h"
#include "../../Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" #include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
#elif defined (USE_PTHREADS) #elif defined (USE_PTHREADS)
#include "../../Extras/BulletMultiThreaded/PosixThreadSupport.h" #include "BulletMultiThreaded/PosixThreadSupport.h"
#include "../../Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" #include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
#else #else
//other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added) //other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added)
#include "../../Extras/BulletMultiThreaded/SequentialThreadSupport.h" #include "BulletMultiThreaded/SequentialThreadSupport.h"
#include "../../Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" #include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
#endif //USE_LIBSPE2 #endif //USE_LIBSPE2
#ifdef USE_PARALLEL_SOLVER #ifdef USE_PARALLEL_SOLVER
#include "../../Extras/BulletMultiThreaded/SpuParallelSolver.h" #include "BulletMultiThreaded/SpuParallelSolver.h"
#include "../../Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h" #include "BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h"
#endif //USE_PARALLEL_SOLVER #endif //USE_PARALLEL_SOLVER
#endif//USE_PARALLEL_DISPATCHER #endif//USE_PARALLEL_DISPATCHER

6
Extras/CMakeLists.txt
View File

@@ -1,5 +1 @@
if (CMAKE_SIZEOF_VOID_P MATCHES "8") SUBDIRS( glui ConvexDecomposition BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils )
SUBDIRS( glui ConvexDecomposition BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils GIMPACT )
else (CMAKE_SIZEOF_VOID_P MATCHES "8")
SUBDIRS( glui ConvexDecomposition BulletMultiThreaded BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils GIMPACT )
endif (CMAKE_SIZEOF_VOID_P MATCHES "8")

4
Extras/GIMPACTUtils/Jamfile
View File

@@ -1,10 +1,8 @@
SubDir TOP Extras GIMPACTUtils ; SubDir TOP Extras GIMPACTUtils ;
#IncludeDir Extras/GIMPACT/include ;
Library GIMPACTUtils : [ Wildcard . : */.h *.cpp ] : noinstall ; Library GIMPACTUtils : [ Wildcard . : */.h *.cpp ] : noinstall ;
CFlags GIMPACTUtils : [ FIncludes $(TOP)/Extras/GIMPACT/include ] [ FIncludes $(TOP)/Extras/GIMPACTUtils ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ] ; CFlags GIMPACTUtils : [ FIncludes $(TOP)/Extras/GIMPACTUtils ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ] ;
LibDepends GIMPACTUtils : GIMPACT ;
LibDepends GIMPACTUtils : convexdecomposition ; LibDepends GIMPACTUtils : convexdecomposition ;
MsvcIncDirs GIMPACTUtils : MsvcIncDirs GIMPACTUtils :

2
Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.h
View File

@@ -25,7 +25,7 @@ subject to the following restrictions:
#define GIMPACT_CONVEX_DECOMPOSITION_SHAPE_H #define GIMPACT_CONVEX_DECOMPOSITION_SHAPE_H
#include "GIMPACT/Bullet/btGImpactShape.h" // box tree class #include "BulletCollision/Gimpact/btGImpactShape.h" // box tree class

2
Extras/Jamfile
View File

@@ -5,10 +5,8 @@ SubInclude TOP Extras COLLADA_DOM ;
SubInclude TOP Extras glui ; SubInclude TOP Extras glui ;
SubInclude TOP Extras LibXML ; SubInclude TOP Extras LibXML ;
SubInclude TOP Extras BulletColladaConverter ; SubInclude TOP Extras BulletColladaConverter ;
SubInclude TOP Extras BulletMultiThreaded ;
#SubInclude TOP Extras EPA ; #SubInclude TOP Extras EPA ;
#SubInclude TOP Extras ExtraSolid35 ; #SubInclude TOP Extras ExtraSolid35 ;
SubInclude TOP Extras GIMPACT ;
SubInclude TOP Extras GIMPACTUtils ; SubInclude TOP Extras GIMPACTUtils ;
#GPUphysics needs 'make', not jam compatible build yet: #GPUphysics needs 'make', not jam compatible build yet:
#SubInclude TOP Extras GPUphysics ; #SubInclude TOP Extras GPUphysics ;

10
src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
View File

@@ -15,6 +15,16 @@ subject to the following restrictions:
#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
btPolyhedralConvexShape::btPolyhedralConvexShape() :btConvexInternalShape(),
m_localAabbMin(1,1,1),
m_localAabbMax(-1,-1,-1),
m_isLocalAabbValid(false),
m_optionalHull(0)
{
}
btVector3 btPolyhedralConvexShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0)const btVector3 btPolyhedralConvexShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0)const
{ {
int i; int i;

10
src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
View File

@@ -31,17 +31,9 @@ protected:
btVector3 m_localAabbMax; btVector3 m_localAabbMax;
bool m_isLocalAabbValid; bool m_isLocalAabbValid;
btPolyhedralConvexShape() :btConvexInternalShape(),
m_localAabbMin(1,1,1),
m_localAabbMax(-1,-1,-1),
m_isLocalAabbValid(false),
m_optionalHull(0)
{
}
public: public:
btPolyhedralConvexShape();
//brute force implementations //brute force implementations

1
src/BulletCollision/Jamfile
View File

@@ -3,6 +3,7 @@ SubDir TOP src BulletCollision ;
Description bulletcollision : "Bullet Collision Detection" ; Description bulletcollision : "Bullet Collision Detection" ;
Library bulletcollision : Library bulletcollision :
[ Wildcard Gimpact : *.h *.cpp ]
[ Wildcard BroadphaseCollision : *.h *.cpp ] [ Wildcard BroadphaseCollision : *.h *.cpp ]
[ Wildcard CollisionDispatch : *.h *.cpp ] [ Wildcard CollisionDispatch : *.h *.cpp ]
[ Wildcard CollisionShapes : *.h *.cpp ] [ Wildcard CollisionShapes : *.h *.cpp ]

1
src/BulletMultiThreaded/CMakeLists.txt
View File

@@ -1,5 +1,4 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletMultiThreaded/
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src
) )

8
src/BulletMultiThreaded/Jamfile
View File

@@ -1,12 +1,12 @@
SubDir TOP Extras BulletMultiThreaded ; SubDir TOP src BulletMultiThreaded ;
#IncludeDir Extras/BulletMultiThreaded ; #IncludeDir src/BulletMultiThreaded ;
Library bulletmultithreaded : [ Wildcard . : */.h *.cpp ] [ Wildcard SpuNarrowPhaseCollisionTask : *.h *.cpp ] [ Wildcard SpuSolverTask : *.h *.cpp ] : noinstall ; Library bulletmultithreaded : [ Wildcard . : */.h *.cpp ] [ Wildcard SpuNarrowPhaseCollisionTask : *.h *.cpp ] [ Wildcard SpuSolverTask : *.h *.cpp ] : noinstall ;
CFlags bulletmultithreaded : [ FIncludes $(TOP)/Extras/BulletMultiThreaded ] ; CFlags bulletmultithreaded : [ FIncludes $(TOP)/src/BulletMultiThreaded ] ;
LibDepends bulletmultithreaded : ; LibDepends bulletmultithreaded : ;
MsvcIncDirs bulletmultithreaded : MsvcIncDirs bulletmultithreaded :
"../../Extras/BulletMultiThreaded" ; "../../src/BulletMultiThreaded" ;
InstallHeader [ Wildcard *.h ] : bulletmultithreaded ; InstallHeader [ Wildcard *.h ] : bulletmultithreaded ;

4
src/BulletMultiThreaded/PosixThreadSupport.h
View File

@@ -111,6 +111,10 @@ public:
///tell the task scheduler we are done with the SPU tasks ///tell the task scheduler we are done with the SPU tasks
virtual void stopSPU(); virtual void stopSPU();
virtual void setNumTasks(int numTasks)
{
}
}; };
#endif // POSIX_THREAD_SUPPORT_H #endif // POSIX_THREAD_SUPPORT_H

8
src/CMakeLists.txt
View File

@@ -1 +1,7 @@
SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath ) if (CMAKE_SIZEOF_VOID_P MATCHES "8")
SUBDIRS( BulletSoftBody BulletCollision BulletDynamics Linea
rMath )
else (CMAKE_SIZEOF_VOID_P MATCHES "8")
SUBDIRS( BulletMultiThreaded BulletSoftBody BulletCollision BulletDynamics Linea
rMath )
endif (CMAKE_SIZEOF_VOID_P MATCHES "8")

3
src/Jamfile
View File

@@ -1,8 +1,7 @@
SubDir TOP src ; SubDir TOP src ;
SubInclude TOP src BulletMultiThreaded ;
SubInclude TOP src BulletSoftBody ; SubInclude TOP src BulletSoftBody ;
SubInclude TOP src BulletCollision ; SubInclude TOP src BulletCollision ;
SubInclude TOP src BulletDynamics ; SubInclude TOP src BulletDynamics ;
SubInclude TOP src LinearMath ; SubInclude TOP src LinearMath ;
Recurse InstallHeader : .h ; Recurse InstallHeader : .h ;