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">