From fc333d2e1826a4a7ea03e75ab60d3d2a57e862bd Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Wed, 13 Feb 2008 08:15:58 +0000 Subject: [PATCH] updated Jam and CMake build files for new Extras/ConvexHull library --- Demos/AllBulletDemos/CMakeLists.txt | 4 ++-- Demos/BasicDemo/CMakeLists.txt | 2 +- Demos/BspDemo/CMakeLists.txt | 2 +- Demos/CcdPhysicsDemo/CMakeLists.txt | 2 +- Demos/ColladaDemo/CMakeLists.txt | 4 ++-- Demos/ConstraintDemo/CMakeLists.txt | 2 +- Demos/ConvexDecompositionDemo/Jamfile | 4 +++- Demos/GenericJointDemo/CMakeLists.txt | 2 +- Demos/Jamfile | 8 ++++++-- Demos/MovingConcaveDemo/CMakeLists.txt | 2 +- Demos/MultiThreadedDemo/CMakeLists.txt | 2 +- Demos/OpenGL/CMakeLists.txt | 2 +- Demos/OpenGL/Jamfile | 9 +++++++-- Demos/RagdollDemo/CMakeLists.txt | 2 +- Demos/UserCollisionAlgorithm/CMakeLists.txt | 2 +- Demos/VehicleDemo/CMakeLists.txt | 2 +- Extras/BulletColladaConverter/CMakeLists.txt | 2 +- Extras/BulletColladaConverter/Jamfile | 3 ++- .../SpuRaycastTask/SpuRaycastTask.cpp | 6 +++--- src/BulletCollision/CMakeLists.txt | 2 -- src/LinearMath/CMakeLists.txt | 2 -- 21 files changed, 37 insertions(+), 29 deletions(-) diff --git a/Demos/AllBulletDemos/CMakeLists.txt b/Demos/AllBulletDemos/CMakeLists.txt index 0f95d34c0..11f6cab7a 100644 --- a/Demos/AllBulletDemos/CMakeLists.txt +++ b/Demos/AllBulletDemos/CMakeLists.txt @@ -48,11 +48,11 @@ ELSE (WIN32) ENDIF (WIN32) 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/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/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 } ) LINK_LIBRARIES( -LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibBulletMultiThreaded LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibGIMPACT LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibConvexHull LibBulletMultiThreaded LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(AllBulletDemos diff --git a/Demos/BasicDemo/CMakeLists.txt b/Demos/BasicDemo/CMakeLists.txt index be7e84bed..f59647bd5 100644 --- a/Demos/BasicDemo/CMakeLists.txt +++ b/Demos/BasicDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(BasicDemo diff --git a/Demos/BspDemo/CMakeLists.txt b/Demos/BspDemo/CMakeLists.txt index 018015468..57016da0b 100644 --- a/Demos/BspDemo/CMakeLists.txt +++ b/Demos/BspDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( - LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} + LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(BspPhysicsDemo diff --git a/Demos/CcdPhysicsDemo/CMakeLists.txt b/Demos/CcdPhysicsDemo/CMakeLists.txt index b30a05796..22ae02c25 100644 --- a/Demos/CcdPhysicsDemo/CMakeLists.txt +++ b/Demos/CcdPhysicsDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(CcdPhysicsDemo diff --git a/Demos/ColladaDemo/CMakeLists.txt b/Demos/ColladaDemo/CMakeLists.txt index 69a079814..8ccd2c881 100644 --- a/Demos/ColladaDemo/CMakeLists.txt +++ b/Demos/ColladaDemo/CMakeLists.txt @@ -48,11 +48,11 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${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 } +${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 } ) LINK_LIBRARIES( -LibBulletColladaConverter LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibBulletColladaConverter LibColladaDom LibXML LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(ColladaDemo diff --git a/Demos/ConstraintDemo/CMakeLists.txt b/Demos/ConstraintDemo/CMakeLists.txt index 85e72b442..0e4bf5648 100644 --- a/Demos/ConstraintDemo/CMakeLists.txt +++ b/Demos/ConstraintDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(ConstraintDemo diff --git a/Demos/ConvexDecompositionDemo/Jamfile b/Demos/ConvexDecompositionDemo/Jamfile index c1900c1e2..01c4741a8 100644 --- a/Demos/ConvexDecompositionDemo/Jamfile +++ b/Demos/ConvexDecompositionDemo/Jamfile @@ -10,11 +10,13 @@ SubDir TOP Demos ConvexDecompositionDemo ; CFlags $(<) : [ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ] + [ FIncludes $(TOP)/Extras/ConvexHull ] ; MsvcIncDirs $(<) : "../../Demos/OpenGL" - "../../Extras/ConvexDecomposition" ; + "../../Extras/ConvexDecomposition" + "../../Extras/ConvexHull" ; } ExtraDemo2 ConvexDecompositionDemo : [ Wildcard *.h *.cpp ] ; diff --git a/Demos/GenericJointDemo/CMakeLists.txt b/Demos/GenericJointDemo/CMakeLists.txt index a015f98a8..d6ed0a208 100644 --- a/Demos/GenericJointDemo/CMakeLists.txt +++ b/Demos/GenericJointDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(GenericJointDemo diff --git a/Demos/Jamfile b/Demos/Jamfile index d161217b1..3d929c1b4 100644 --- a/Demos/Jamfile +++ b/Demos/Jamfile @@ -8,12 +8,14 @@ if $(GLUT.AVAILABLE) = "yes" rule BulletDemo { Application $(<) : $(>) : noinstall console nomanifest ; - LinkWith $(<) : bulletopenglsupport bulletdynamics bulletcollision bulletmath ; + LinkWith $(<) : bulletopenglsupport convexhull bulletdynamics bulletcollision bulletmath ; CFlags $(<) : [ FIncludes $(TOP)/Demos/OpenGL ] + [ FIncludes $(TOP)/Extras/ConvexHull ] ; MsvcIncDirs $(<) : "../../Demos/OpenGL" + "../../Extras/ConvexHull" "../../src" ; } } @@ -35,17 +37,19 @@ if $(GLUT.AVAILABLE) = "yes" rule FrameWorkDemo { Application $(<) : $(>) : noinstall console nomanifest ; - LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport bulletmultithreaded convexdecomposition bulletdynamics bulletcollision bulletmath glui ; + LinkWith $(<) : GIMPACTUtils GIMPACT bulletopenglsupport bulletmultithreaded convexdecomposition convexhull bulletdynamics bulletcollision bulletmath glui ; CFlags $(<) : [ FIncludes $(TOP)/Extras ] [ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ] + [ FIncludes $(TOP)/Extras/ConvexHull ] [ FIncludes $(TOP)/Extras/GIMPACT/include ] [ FIncludes $(TOP)/Extras/GIMPACTUtils ] ; MsvcIncDirs $(<) : "../../Extras" "../../src" + "../../Extras/ConvexHull" "../../Demos/OpenGL" "../../Extras/ConvexDecomposition" "../../Extras/GIMPACT/include" diff --git a/Demos/MovingConcaveDemo/CMakeLists.txt b/Demos/MovingConcaveDemo/CMakeLists.txt index 7c85b6d6c..7bae10fd0 100644 --- a/Demos/MovingConcaveDemo/CMakeLists.txt +++ b/Demos/MovingConcaveDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACT/include ${BULLET_PHYSICS_SOURCE_DIR} ) LINK_LIBRARIES( -LibGIMPACT LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibGIMPACT LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(MovingConcaveDemo diff --git a/Demos/MultiThreadedDemo/CMakeLists.txt b/Demos/MultiThreadedDemo/CMakeLists.txt index b07352ca0..894622894 100644 --- a/Demos/MultiThreadedDemo/CMakeLists.txt +++ b/Demos/MultiThreadedDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletMultiThreaded LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibOpenGLSupport LibConvexHull LibBulletMultiThreaded LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(MultiThreadedDemo diff --git a/Demos/OpenGL/CMakeLists.txt b/Demos/OpenGL/CMakeLists.txt index 337d3ad52..aa5c8ee84 100644 --- a/Demos/OpenGL/CMakeLists.txt +++ b/Demos/OpenGL/CMakeLists.txt @@ -47,7 +47,7 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/src } +${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull } ) ADD_LIBRARY(LibOpenGLSupport diff --git a/Demos/OpenGL/Jamfile b/Demos/OpenGL/Jamfile index eec188c44..2f4cf79b9 100644 --- a/Demos/OpenGL/Jamfile +++ b/Demos/OpenGL/Jamfile @@ -9,10 +9,15 @@ if $(GLUT.AVAILABLE) = "yes" [ Wildcard *.h *.cpp ] : noinstall ; -CFlags bulletopenglsupport : +CFlags bulletopenglsupport : [ FIncludes $(TOP)/Extras/ConvexHull ] ; -LibDepends bulletopenglsupport : bulletdynamics ; +bulletopenglsupport.CFLAGS = [ FIncludes $(TOP)/Extras/ConvexHull ] ; +#same for msvcgen +MsvcGenConfig bulletopenglsupport.INCDIRS : $(TOP)/Extras/ConvexHull ; + + +LibDepends bulletopenglsupport : bulletdynamics convexhull ; ExternalLibs bulletopenglsupport : GLUT ; } diff --git a/Demos/RagdollDemo/CMakeLists.txt b/Demos/RagdollDemo/CMakeLists.txt index 02c9188aa..5bded436d 100644 --- a/Demos/RagdollDemo/CMakeLists.txt +++ b/Demos/RagdollDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(RagdollDemo diff --git a/Demos/UserCollisionAlgorithm/CMakeLists.txt b/Demos/UserCollisionAlgorithm/CMakeLists.txt index ccafd94cf..d6fc9fc4c 100644 --- a/Demos/UserCollisionAlgorithm/CMakeLists.txt +++ b/Demos/UserCollisionAlgorithm/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( - LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} + LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(UserCollisionAlgorithm diff --git a/Demos/VehicleDemo/CMakeLists.txt b/Demos/VehicleDemo/CMakeLists.txt index 4fbd04ab0..2147b1889 100644 --- a/Demos/VehicleDemo/CMakeLists.txt +++ b/Demos/VehicleDemo/CMakeLists.txt @@ -52,7 +52,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( - LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} + LibOpenGLSupport LibConvexHull LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) ADD_EXECUTABLE(VehicleDemo diff --git a/Extras/BulletColladaConverter/CMakeLists.txt b/Extras/BulletColladaConverter/CMakeLists.txt index 7456e387a..299ab7626 100644 --- a/Extras/BulletColladaConverter/CMakeLists.txt +++ b/Extras/BulletColladaConverter/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 +${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ) ADD_LIBRARY(LibBulletColladaConverter diff --git a/Extras/BulletColladaConverter/Jamfile b/Extras/BulletColladaConverter/Jamfile index 7b33a9067..021efd18f 100644 --- a/Extras/BulletColladaConverter/Jamfile +++ b/Extras/BulletColladaConverter/Jamfile @@ -3,7 +3,7 @@ SubDir TOP Extras BulletColladaConverter ; #IncludeDir Extras/BulletColladaConverter ; Library BulletColladaConverter : [ Wildcard . : *.h *.cpp ] : noinstall ; -CFlags BulletColladaConverter : [ FIncludes $(TOP)/Extras/BulletColladaConverter ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ] [ FIncludes $(TOP)/Extras/LibXML ] [ FIncludes $(TOP)/Extras/LibXML/include ] ; +CFlags BulletColladaConverter : [ FIncludes $(TOP)/Extras/BulletColladaConverter ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ] [ FIncludes $(TOP)/Extras/LibXML ] [ FIncludes $(TOP)/Extras/LibXML/include ] [ FIncludes $(TOP)/Extras/ConvexHull ] ; LibDepends BulletColladaConverter : colladadom libxml ; @@ -13,6 +13,7 @@ LibDepends BulletColladaConverter : colladadom libxml ; "../../Extras/COLLADA_DOM/include/1.4" "../../Extras/LibXML" "../../Extras/LibXML/include" + "../../Extras/ConvexHull" ; diff --git a/Extras/BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.cpp b/Extras/BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.cpp index 8fff2239f..925f03ce9 100644 --- a/Extras/BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.cpp +++ b/Extras/BulletMultiThreaded/SpuRaycastTask/SpuRaycastTask.cpp @@ -289,7 +289,7 @@ void spuWalkStacklessQuantizedTreeAgainstRay(RaycastTask_LocalStoreMemory* lsMem bounds[0] = lsMemPtr->bvhShapeData.getOptimizedBvh()->unQuantize(rootNode->m_quantizedAabbMin); bounds[1] = lsMemPtr->bvhShapeData.getOptimizedBvh()->unQuantize(rootNode->m_quantizedAabbMax); #ifdef RAYAABB2 - rayBoxOverlap = true;//btRayAabb2 (raySource, rayDirection, sign, bounds, param, 0.0, lambda_max); + rayBoxOverlap = btRayAabb2 (raySource, rayDirection, sign, bounds, param, 0.0, lambda_max); #else rayBoxOverlap = btRayAabb(raySource, rayTarget, bounds[0], bounds[1], param, normal); #endif @@ -344,8 +344,8 @@ void performRaycastAgainstConcave (RaycastGatheredObjectData* gatheredObjectData unsigned short int quantizedQueryAabbMin[3]; unsigned short int quantizedQueryAabbMax[3]; - lsMemPtr->bvhShapeData.getOptimizedBvh()->quantizeWithClamp(quantizedQueryAabbMin,aabbMin); - lsMemPtr->bvhShapeData.getOptimizedBvh()->quantizeWithClamp(quantizedQueryAabbMax,aabbMax); + lsMemPtr->bvhShapeData.getOptimizedBvh()->quantizeWithClamp(quantizedQueryAabbMin,aabbMin,0); + lsMemPtr->bvhShapeData.getOptimizedBvh()->quantizeWithClamp(quantizedQueryAabbMax,aabbMax,1); QuantizedNodeArray& nodeArray = lsMemPtr->bvhShapeData.getOptimizedBvh()->getQuantizedNodeArray(); //spu_printf("SPU: numNodes = %d\n",nodeArray.size()); diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index b8df4c1ba..a8ada5837 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -89,8 +89,6 @@ ADD_LIBRARY(LibBulletCollision CollisionShapes/btPolyhedralConvexShape.h CollisionShapes/btTetrahedronShape.cpp CollisionShapes/btTetrahedronShape.h - CollisionShapes/btShapeHull.h - CollisionShapes/btShapeHull.cpp CollisionShapes/btSphereShape.cpp CollisionShapes/btSphereShape.h CollisionShapes/btStaticPlaneShape.cpp diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt index d443951a9..1d2228ce0 100644 --- a/src/LinearMath/CMakeLists.txt +++ b/src/LinearMath/CMakeLists.txt @@ -17,7 +17,6 @@ ADD_LIBRARY(LibLinearMath btMinMax.h btQuaternion.h btStackAlloc.h - btConvexHull.h btGeometryUtil.h btMotionState.h btTransform.h @@ -28,7 +27,6 @@ ADD_LIBRARY(LibLinearMath btTypedUserInfo.h btTransformUtil.h btQuickprof.cpp - btConvexHull.cpp btGeometryUtil.cpp btAlignedAllocator.cpp )