From 718b73371fb1fca73b9d6124ef5d4b0d4fd48494 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Thu, 14 Jun 2007 13:06:05 +0000 Subject: [PATCH] removed 'processAllTrianglesBruteForce' autogenerated new visual studio projectfiles --- Demos/BasicDemo/BasicDemo.cpp | 2 +- Demos/OpenGL/GL_ShapeDrawer.cpp | 2 +- Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp | 1 + msvc/7/appBasicDemo.vcproj | 9 +++++++-- msvc/7/appBspDemo.vcproj | 9 +++++++-- msvc/7/appBulletDino.vcproj | 9 +++++++-- msvc/7/appCcdPhysicsDemo.vcproj | 9 +++++++-- msvc/7/appColladaDemo.vcproj | 9 +++++++-- msvc/7/appCollisionDemo.vcproj | 9 +++++++-- msvc/7/appCollisionInterfaceDemo.vcproj | 9 +++++++-- msvc/7/appConcaveDemo.vcproj | 9 +++++++-- msvc/7/appConstraintDemo.vcproj | 9 +++++++-- msvc/7/appContinuousConvexCollision.vcproj | 9 +++++++-- msvc/7/appConvexDecompositionDemo.vcproj | 9 +++++++-- msvc/7/appDoublePrecisionDemo.vcproj | 9 +++++++-- msvc/7/appEPAPenDepthDemo.vcproj | 9 +++++++-- msvc/7/appGjkConvexCastDemo.vcproj | 9 +++++++-- msvc/7/appMovingConcaveDemo.vcproj | 9 +++++++-- msvc/7/appRaytracer.vcproj | 9 +++++++-- msvc/7/appSimplexDemo.vcproj | 9 +++++++-- msvc/7/appUserCollisionAlgorithm.vcproj | 9 +++++++-- msvc/7/appVehicleDemo.vcproj | 9 +++++++-- msvc/7/grpall_bullet.vcproj | 5 +++++ msvc/7/grpapps_bullet.vcproj | 5 +++++ msvc/7/grplibs_bullet.vcproj | 5 +++++ msvc/7/libGIMPACT.vcproj | 5 +++++ msvc/7/libGIMPACTBullet.vcproj | 5 +++++ msvc/7/libboxbox.vcproj | 5 +++++ msvc/7/libbulletcollision.vcproj | 5 +++++ msvc/7/libbulletdynamics.vcproj | 5 +++++ msvc/7/libbulletmath.vcproj | 5 +++++ msvc/7/libbulletmultithreaded.vcproj | 5 +++++ msvc/7/libbulletopenglsupport.vcproj | 5 +++++ msvc/7/libcolladadom.vcproj | 5 +++++ msvc/7/libconvexdecomposition.vcproj | 5 +++++ msvc/7/liblibxml.vcproj | 5 +++++ msvc/7/libquickstep.vcproj | 5 +++++ msvc/71/appBasicDemo.vcproj | 9 +++++++-- msvc/71/appBspDemo.vcproj | 9 +++++++-- msvc/71/appBulletDino.vcproj | 9 +++++++-- msvc/71/appCcdPhysicsDemo.vcproj | 9 +++++++-- msvc/71/appColladaDemo.vcproj | 9 +++++++-- msvc/71/appCollisionDemo.vcproj | 9 +++++++-- msvc/71/appCollisionInterfaceDemo.vcproj | 9 +++++++-- msvc/71/appConcaveDemo.vcproj | 9 +++++++-- msvc/71/appConstraintDemo.vcproj | 9 +++++++-- msvc/71/appContinuousConvexCollision.vcproj | 9 +++++++-- msvc/71/appConvexDecompositionDemo.vcproj | 9 +++++++-- msvc/71/appDoublePrecisionDemo.vcproj | 9 +++++++-- msvc/71/appEPAPenDepthDemo.vcproj | 9 +++++++-- msvc/71/appGjkConvexCastDemo.vcproj | 9 +++++++-- msvc/71/appMovingConcaveDemo.vcproj | 9 +++++++-- msvc/71/appRaytracer.vcproj | 9 +++++++-- msvc/71/appSimplexDemo.vcproj | 9 +++++++-- msvc/71/appUserCollisionAlgorithm.vcproj | 9 +++++++-- msvc/71/appVehicleDemo.vcproj | 9 +++++++-- msvc/71/grpall_bullet.vcproj | 5 +++++ msvc/71/grpapps_bullet.vcproj | 5 +++++ msvc/71/grplibs_bullet.vcproj | 5 +++++ msvc/71/libGIMPACT.vcproj | 5 +++++ msvc/71/libGIMPACTBullet.vcproj | 5 +++++ msvc/71/libboxbox.vcproj | 5 +++++ msvc/71/libbulletcollision.vcproj | 5 +++++ msvc/71/libbulletdynamics.vcproj | 5 +++++ msvc/71/libbulletmath.vcproj | 5 +++++ msvc/71/libbulletmultithreaded.vcproj | 5 +++++ msvc/71/libbulletopenglsupport.vcproj | 5 +++++ msvc/71/libcolladadom.vcproj | 5 +++++ msvc/71/libconvexdecomposition.vcproj | 5 +++++ msvc/71/liblibxml.vcproj | 5 +++++ msvc/71/libquickstep.vcproj | 5 +++++ msvc/8/appBasicDemo.vcproj | 9 +++++++-- msvc/8/appBspDemo.vcproj | 9 +++++++-- msvc/8/appBulletDino.vcproj | 9 +++++++-- msvc/8/appCcdPhysicsDemo.vcproj | 9 +++++++-- msvc/8/appColladaDemo.vcproj | 9 +++++++-- msvc/8/appCollisionDemo.vcproj | 9 +++++++-- msvc/8/appCollisionInterfaceDemo.vcproj | 9 +++++++-- msvc/8/appConcaveDemo.vcproj | 9 +++++++-- msvc/8/appConstraintDemo.vcproj | 9 +++++++-- msvc/8/appContinuousConvexCollision.vcproj | 9 +++++++-- msvc/8/appConvexDecompositionDemo.vcproj | 9 +++++++-- msvc/8/appDoublePrecisionDemo.vcproj | 9 +++++++-- msvc/8/appEPAPenDepthDemo.vcproj | 9 +++++++-- msvc/8/appGjkConvexCastDemo.vcproj | 9 +++++++-- msvc/8/appMovingConcaveDemo.vcproj | 9 +++++++-- msvc/8/appRaytracer.vcproj | 9 +++++++-- msvc/8/appSimplexDemo.vcproj | 9 +++++++-- msvc/8/appUserCollisionAlgorithm.vcproj | 9 +++++++-- msvc/8/appVehicleDemo.vcproj | 9 +++++++-- msvc/8/grpall_bullet.vcproj | 5 +++++ msvc/8/grpapps_bullet.vcproj | 5 +++++ msvc/8/grplibs_bullet.vcproj | 5 +++++ msvc/8/libGIMPACT.vcproj | 5 +++++ msvc/8/libGIMPACTBullet.vcproj | 5 +++++ msvc/8/libboxbox.vcproj | 5 +++++ msvc/8/libbulletcollision.vcproj | 5 +++++ msvc/8/libbulletdynamics.vcproj | 5 +++++ msvc/8/libbulletmath.vcproj | 5 +++++ msvc/8/libbulletmultithreaded.vcproj | 5 +++++ msvc/8/libbulletopenglsupport.vcproj | 5 +++++ msvc/8/libcolladadom.vcproj | 5 +++++ msvc/8/libconvexdecomposition.vcproj | 5 +++++ msvc/8/liblibxml.vcproj | 5 +++++ msvc/8/libquickstep.vcproj | 5 +++++ src/BulletCollision/CollisionShapes/btConcaveShape.h | 3 --- .../CollisionShapes/btTriangleMeshShape.cpp | 7 +------ .../CollisionShapes/btTriangleMeshShape.h | 2 -- 108 files changed, 628 insertions(+), 127 deletions(-) diff --git a/Demos/BasicDemo/BasicDemo.cpp b/Demos/BasicDemo/BasicDemo.cpp index 59ca25d05..4211c9eed 100644 --- a/Demos/BasicDemo/BasicDemo.cpp +++ b/Demos/BasicDemo/BasicDemo.cpp @@ -33,7 +33,7 @@ btScalar gCollisionMargin = btScalar(0.05); #include "GlutStuff.h" #ifdef USE_PARALLEL_DISPATCHER -#include "SpuGatheringCollisionDispatcher.h" +#include "../../Extras/BulletMultiThreaded/SpuGatheringCollisionDispatcher.h" #endif//USE_PARALLEL_DISPATCHER diff --git a/Demos/OpenGL/GL_ShapeDrawer.cpp b/Demos/OpenGL/GL_ShapeDrawer.cpp index f668eea3e..cb3254cdb 100644 --- a/Demos/OpenGL/GL_ShapeDrawer.cpp +++ b/Demos/OpenGL/GL_ShapeDrawer.cpp @@ -520,7 +520,7 @@ void GL_ShapeDrawer::drawOpenGL(btScalar* m, const btCollisionShape* shape, cons GlDrawcallback drawCallback; drawCallback.m_wireframe = (debugMode & btIDebugDraw::DBG_DrawWireframe)!=0; - concaveMesh->processAllTrianglesBruteForce(&drawCallback,aabbMin,aabbMax); + concaveMesh->processAllTriangles(&drawCallback,aabbMin,aabbMax); } #endif diff --git a/Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp b/Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp index e245ca1be..fc6303bdc 100644 --- a/Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp +++ b/Extras/GIMPACTBullet/btGIMPACTMeshShape.cpp @@ -289,6 +289,7 @@ void btGIMPACTMeshShape::calculateLocalInertia(btScalar mass,btVector3& inertia) + void btGIMPACTMeshShape::processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const { diff --git a/msvc/7/appBasicDemo.vcproj b/msvc/7/appBasicDemo.vcproj index f2b47c4dc..8c01c7c7b 100644 --- a/msvc/7/appBasicDemo.vcproj +++ b/msvc/7/appBasicDemo.vcproj @@ -190,7 +190,7 @@ GenerateDebugInformation="TRUE" IgnoreDefaultLibraryNames="LIBC,LIBCD" OutputFile="..\..\DebugBasicDemo.exe" - SubSystem="1" + SubSystem="2" AdditionalOptions=" " AdditionalDependencies="glut32.lib" IgnoreImportLibrary="TRUE" @@ -236,6 +236,11 @@ ATLMinimizesCRunTimeLibraryUsage="FALSE">