diff --git a/Extras/BulletMultiThreaded/SpuFakeDma.cpp b/Extras/BulletMultiThreaded/SpuFakeDma.cpp index 74f42f659..471f95c2e 100644 --- a/Extras/BulletMultiThreaded/SpuFakeDma.cpp +++ b/Extras/BulletMultiThreaded/SpuFakeDma.cpp @@ -20,6 +20,18 @@ void* cellDmaLargeGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag #endif } +void* cellDmaSmallGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid) +{ +#if defined (__CELLOS_LV2__) || defined (USE_LIBSPE2) + cellDmaGetSmall(ls,ea,size,tag,tid,rid); + return ls; +#else + return (void*)(uint32_t)ea; +#endif +} + + + void* cellDmaGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid) { diff --git a/Extras/BulletMultiThreaded/SpuFakeDma.h b/Extras/BulletMultiThreaded/SpuFakeDma.h index b6dc22c96..ad04377d4 100644 --- a/Extras/BulletMultiThreaded/SpuFakeDma.h +++ b/Extras/BulletMultiThreaded/SpuFakeDma.h @@ -25,11 +25,7 @@ #define DEBUG_DMA #ifdef DEBUG_DMA #define dUASSERT(a,b) if (!(a)) { printf(b);} -#ifdef USE_ADDR64 -#define uintsize unsigned long long -#else -#define uintsize unsigned int -#endif +#define uintsize ppu_address_t #define cellDmaLargeGet(ls, ea, size, tag, tid, rid) if ( (((uintsize)ls%16) != ((uintsize)ea%16)) || ((((uintsize)ea%16) || ((uintsize)ls%16)) && (( ((uintsize)ls%16) != ((uintsize)size%16) ) || ( ((uintsize)ea%16) != ((uintsize)size%16) ) ) ) || ( ((uintsize)size%16) && ((uintsize)size!=1) && ((uintsize)size!=2) && ((uintsize)size!=4) && ((uintsize)size!=8) ) || (size >= 16384) || !(uintsize)ls || !(uintsize)ea) { \ dUASSERT( (((uintsize)ea % 16) == 0) || (size < 16), "XDR Address not aligned: "); \ @@ -116,6 +112,7 @@ int stallingUnalignedDmaSmallGet(void *ls, uint64_t ea, uint32_t size); void* cellDmaLargeGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid); void* cellDmaGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid); +void* cellDmaSmallGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid); #endif //FAKE_DMA_H diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp index 986084a3b..3a3e4380b 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp @@ -272,7 +272,6 @@ SIMD_FORCE_INLINE void small_cache_read(void* buffer, ppu_address_t ea, size_t s } -#ifdef USE_LIBSPE2 SIMD_FORCE_INLINE void small_cache_read_triple( void* ls0, ppu_address_t ea0, void* ls1, ppu_address_t ea1, void* ls2, ppu_address_t ea2, @@ -290,18 +289,18 @@ SIMD_FORCE_INLINE void small_cache_read_triple( void* ls0, ppu_address_t ea0, char* localStore0 = (char*)ls0; uint32_t last4BitsOffset = ea0 & 0x0f; char* tmpTarget0 = tmpBuffer0 + last4BitsOffset; - cellDmaSmallGet(tmpTarget0,ea0,size,DMA_TAG(1),0,0); + cellDmaSmallGetReadOnly(tmpTarget0,ea0,size,DMA_TAG(1),0,0); char* localStore1 = (char*)ls1; last4BitsOffset = ea1 & 0x0f; char* tmpTarget1 = tmpBuffer1 + last4BitsOffset; - cellDmaSmallGet(tmpTarget1,ea1,size,DMA_TAG(1),0,0); + cellDmaSmallGetReadOnly(tmpTarget1,ea1,size,DMA_TAG(1),0,0); char* localStore2 = (char*)ls2; last4BitsOffset = ea2 & 0x0f; char* tmpTarget2 = tmpBuffer2 + last4BitsOffset; - cellDmaSmallGet(tmpTarget2,ea2,size,DMA_TAG(1),0,0); + cellDmaSmallGetReadOnly(tmpTarget2,ea2,size,DMA_TAG(1),0,0); cellDmaWaitTagStatusAll( DMA_MASK(1) ); @@ -316,7 +315,6 @@ SIMD_FORCE_INLINE void small_cache_read_triple( void* ls0, ppu_address_t ea0, } -#endif @@ -350,17 +348,10 @@ public: int* indexBasePtr = (int*)(m_lsMemPtr->gIndexMesh.m_triangleIndexBase+triangleIndex*m_lsMemPtr->gIndexMesh.m_triangleIndexStride); - ///DMA the indices -#ifdef USE_LIBSPE2 small_cache_read_triple(&m_lsMemPtr->spuIndices[0],(ppu_address_t)&indexBasePtr[0], &m_lsMemPtr->spuIndices[1],(ppu_address_t)&indexBasePtr[1], &m_lsMemPtr->spuIndices[2],(ppu_address_t)&indexBasePtr[2], sizeof(int)); -#else - small_cache_read(&m_lsMemPtr->spuIndices[0],(ppu_address_t)&indexBasePtr[0],sizeof(int)); - small_cache_read(&m_lsMemPtr->spuIndices[1],(ppu_address_t)&indexBasePtr[1],sizeof(int)); - small_cache_read(&m_lsMemPtr->spuIndices[2],(ppu_address_t)&indexBasePtr[2],sizeof(int)); -#endif // spu_printf("SPU index0=%d ,",spuIndices[0]); // spu_printf("SPU index1=%d ,",spuIndices[1]); @@ -380,16 +371,10 @@ public: ///handle un-aligned vertices... //another DMA for each vertex -#ifdef USE_LIBSPE2 small_cache_read_triple(&spuUnscaledVertex[0],(ppu_address_t)&graphicsbasePtr[0], &spuUnscaledVertex[1],(ppu_address_t)&graphicsbasePtr[1], &spuUnscaledVertex[2],(ppu_address_t)&graphicsbasePtr[2], sizeof(btScalar)); -#else - small_cache_read(&spuUnscaledVertex[0],(ppu_address_t)&graphicsbasePtr[0],sizeof(btScalar)); - small_cache_read(&spuUnscaledVertex[1],(ppu_address_t)&graphicsbasePtr[1],sizeof(btScalar)); - small_cache_read(&spuUnscaledVertex[2],(ppu_address_t)&graphicsbasePtr[2],sizeof(btScalar)); -#endif spuTriangleVertices[j] = btVector3( spuUnscaledVertex[0]*meshScaling.getX(), diff --git a/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp b/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp index c8e113ae8..6307053e5 100644 --- a/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp +++ b/Extras/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp @@ -35,7 +35,7 @@ Written by: Marten Svanfeldt #endif //NOTE! When changing this, make sure the package sizes etc below are updated -#define TEMP_STORAGE_SIZE (100*1024) +#define TEMP_STORAGE_SIZE (150*1024) #define CONSTRAINT_MAX_SIZE (46*16) struct SolverTask_LocalStoreMemory diff --git a/msvc/6/appAllBulletDemos.dsp b/msvc/6/appAllBulletDemos.dsp index c4036df73..4d85bbbad 100644 --- a/msvc/6/appAllBulletDemos.dsp +++ b/msvc/6/appAllBulletDemos.dsp @@ -222,6 +222,10 @@ SOURCE=..\..\Demos\AllBulletDemos\..\GjkConvexCastDemo\LinearConvexCastDemo.cpp # End Source File # Begin Source File +SOURCE=..\..\Demos\AllBulletDemos\..\MultiThreadedDemo\MultiThreadedDemo.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Demos\AllBulletDemos\..\RagdollDemo\RagdollDemo.cpp # End Source File # Begin Source File diff --git a/msvc/6/appHelloWorld.dsp b/msvc/6/appHelloWorld.dsp new file mode 100644 index 000000000..c449f4b32 --- /dev/null +++ b/msvc/6/appHelloWorld.dsp @@ -0,0 +1,185 @@ +# Microsoft Developer Studio Project File - Name="appHelloWorld" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=appHelloWorld - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "appHelloWorld.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "appHelloWorld.mak" CFG="appHelloWorld - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "appHelloWorld - Win32 DebugDoublePrecision" (based on "Win32 (x86) Console Application") +!MESSAGE "appHelloWorld - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "appHelloWorld - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Console Application") +!MESSAGE "appHelloWorld - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "appHelloWorld - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "release" +# PROP BASE Intermediate_Dir "release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\out\release6\build\appHelloWorld\" +# PROP Intermediate_Dir "..\..\out\release6\build\appHelloWorld\" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appHelloWorld\appHelloWorld.res" /i "." /i "..\.." /i "..\..\src" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /OPT:NOREF /out:"..\..\HelloWorld.exe" /subsystem:console +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appHelloWorld - Win32 ReleaseDoublePrecision" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries +# PROP BASE Output_Dir "release_dbl" +# PROP BASE Intermediate_Dir "release_dbl" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries +# PROP Output_Dir "..\..\out\release_dbl6\build\appHelloWorld\" +# PROP Intermediate_Dir "..\..\out\release_dbl6\build\appHelloWorld\" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appHelloWorld\appHelloWorld.res" /i "." /i "..\.." /i "..\..\src" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /out:"..\..\HelloWorld.exe" /subsystem:console +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appHelloWorld - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "debug" +# PROP BASE Intermediate_Dir "debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\out\debug6\build\appHelloWorld\" +# PROP Intermediate_Dir "..\..\out\debug6\build\appHelloWorld\" +# PROP Ignore_Export_Lib 1 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appHelloWorld\appHelloWorld.res" /i "." /i "..\.." /i "..\..\src" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /out:"..\..\HelloWorld.exe" /subsystem:console +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appHelloWorld - Win32 DebugDoublePrecision" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries +# PROP BASE Output_Dir "debug_dbl" +# PROP BASE Intermediate_Dir "debug_dbl" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries +# PROP Output_Dir "..\..\out\debug_dbl6\build\appHelloWorld\" +# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appHelloWorld\" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appHelloWorld\appHelloWorld.res" /i "." /i "..\.." /i "..\..\src" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib /nologo /version:4.0 /machine:I386 /out:"..\..\HelloWorld.exe" /subsystem:console +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "appHelloWorld - Win32 Release" +# Name "appHelloWorld - Win32 ReleaseDoublePrecision" +# Name "appHelloWorld - Win32 Debug" +# Name "appHelloWorld - Win32 DebugDoublePrecision" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Demos\HelloWorld\HelloWorld.cpp +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\msvc\appHelloWorld.rc +# End Source File +# End Group +# End Target +# End Project diff --git a/msvc/6/appMultiThreadedDemo.dsp b/msvc/6/appMultiThreadedDemo.dsp new file mode 100644 index 000000000..46f289cb0 --- /dev/null +++ b/msvc/6/appMultiThreadedDemo.dsp @@ -0,0 +1,197 @@ +# Microsoft Developer Studio Project File - Name="appMultiThreadedDemo" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=appMultiThreadedDemo - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "appMultiThreadedDemo.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "appMultiThreadedDemo.mak" CFG="appMultiThreadedDemo - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "appMultiThreadedDemo - Win32 DebugDoublePrecision" (based on "Win32 (x86) Console Application") +!MESSAGE "appMultiThreadedDemo - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "appMultiThreadedDemo - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Console Application") +!MESSAGE "appMultiThreadedDemo - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "appMultiThreadedDemo - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "release" +# PROP BASE Intermediate_Dir "release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\out\release6\build\appMultiThreadedDemo\" +# PROP Intermediate_Dir "..\..\out\release6\build\appMultiThreadedDemo\" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib /nologo /version:4.0 /machine:I386 /OPT:NOREF /out:"..\..\MultiThreadedDemo.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appMultiThreadedDemo - Win32 ReleaseDoublePrecision" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries +# PROP BASE Output_Dir "release_dbl" +# PROP BASE Intermediate_Dir "release_dbl" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries +# PROP Output_Dir "..\..\out\release_dbl6\build\appMultiThreadedDemo\" +# PROP Intermediate_Dir "..\..\out\release_dbl6\build\appMultiThreadedDemo\" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib /nologo /version:4.0 /machine:I386 /out:"..\..\MultiThreadedDemo.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appMultiThreadedDemo - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "debug" +# PROP BASE Intermediate_Dir "debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\out\debug6\build\appMultiThreadedDemo\" +# PROP Intermediate_Dir "..\..\out\debug6\build\appMultiThreadedDemo\" +# PROP Ignore_Export_Lib 1 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /out:"..\..\MultiThreadedDemo.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "appMultiThreadedDemo - Win32 DebugDoublePrecision" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries +# PROP BASE Output_Dir "debug_dbl" +# PROP BASE Intermediate_Dir "debug_dbl" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries +# PROP Output_Dir "..\..\out\debug_dbl6\build\appMultiThreadedDemo\" +# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appMultiThreadedDemo\" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appMultiThreadedDemo\appMultiThreadedDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386 +# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib /nologo /version:4.0 /machine:I386 /out:"..\..\MultiThreadedDemo.exe" /subsystem:console /libpath:"..\..\Glut" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "appMultiThreadedDemo - Win32 Release" +# Name "appMultiThreadedDemo - Win32 ReleaseDoublePrecision" +# Name "appMultiThreadedDemo - Win32 Debug" +# Name "appMultiThreadedDemo - Win32 DebugDoublePrecision" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Demos\MultiThreadedDemo\main.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Demos\MultiThreadedDemo\MultiThreadedDemo.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Demos\MultiThreadedDemo\MultiThreadedDemo.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\msvc\appMultiThreadedDemo.rc +# End Source File +# End Group +# End Target +# End Project diff --git a/msvc/6/libbulletmultithreaded.dsp b/msvc/6/libbulletmultithreaded.dsp index 5b5266829..ff54eebd0 100644 --- a/msvc/6/libbulletmultithreaded.dsp +++ b/msvc/6/libbulletmultithreaded.dsp @@ -176,6 +176,10 @@ SOURCE=..\..\Extras\BulletMultiThreaded\btThreadSupportInterface.cpp # End Source File # Begin Source File +SOURCE=..\..\Extras\BulletMultiThreaded\SequentialThreadSupport.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Extras\BulletMultiThreaded\SpuCollisionTaskProcess.cpp # End Source File # Begin Source File diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index f829bbe04..9714f4107 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -21,6 +21,9 @@ Package=<4> Project_Dep_Name libbulletmath End Project Dependency Begin Project Dependency + Project_Dep_Name libbulletmultithreaded + End Project Dependency + Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency @@ -447,6 +450,27 @@ Package=<4> ############################################################################### +Project: "appHelloWorld"=.\appHelloWorld.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libbulletcollision + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletdynamics + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletmath + End Project Dependency +}}} + +############################################################################### + Project: "appMovingConcaveDemo"=.\appMovingConcaveDemo.dsp - Package Owner=<4> Package=<5> @@ -474,6 +498,45 @@ Package=<4> ############################################################################### +Project: "appMultiThreadedDemo"=.\appMultiThreadedDemo.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libbulletcollision + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletdynamics + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletmath + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletmultithreaded + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletopenglsupport + End Project Dependency + Begin Project Dependency + Project_Dep_Name libconvexdecomposition + End Project Dependency + Begin Project Dependency + Project_Dep_Name libGIMPACT + End Project Dependency + Begin Project Dependency + Project_Dep_Name libGIMPACTUtils + End Project Dependency + Begin Project Dependency + Project_Dep_Name libglui + End Project Dependency +}}} + +############################################################################### + Project: "appRagdollDemo"=.\appRagdollDemo.dsp - Package Owner=<4> Package=<5> @@ -654,9 +717,15 @@ Package=<4> Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appHelloWorld + End Project Dependency + Begin Project Dependency Project_Dep_Name appMovingConcaveDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appMultiThreadedDemo + End Project Dependency + Begin Project Dependency Project_Dep_Name appRagdollDemo End Project Dependency Begin Project Dependency @@ -687,6 +756,9 @@ Package=<4> Project_Dep_Name libbulletmath End Project Dependency Begin Project Dependency + Project_Dep_Name libbulletmultithreaded + End Project Dependency + Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency @@ -774,9 +846,15 @@ Package=<4> Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appHelloWorld + End Project Dependency + Begin Project Dependency Project_Dep_Name appMovingConcaveDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appMultiThreadedDemo + End Project Dependency + Begin Project Dependency Project_Dep_Name appRagdollDemo End Project Dependency Begin Project Dependency @@ -819,6 +897,9 @@ Package=<4> Project_Dep_Name libbulletmath End Project Dependency Begin Project Dependency + Project_Dep_Name libbulletmultithreaded + End Project Dependency + Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency @@ -906,6 +987,18 @@ Package=<4> ############################################################################### +Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "libbulletopenglsupport"=.\libbulletopenglsupport.dsp - Package Owner=<4> Package=<5> diff --git a/msvc/7/appAllBulletDemos.vcproj b/msvc/7/appAllBulletDemos.vcproj index 2823b92d9..37e0512e6 100644 --- a/msvc/7/appAllBulletDemos.vcproj +++ b/msvc/7/appAllBulletDemos.vcproj @@ -340,6 +340,9 @@ + + diff --git a/msvc/7/appHelloWorld.vcproj b/msvc/7/appHelloWorld.vcproj new file mode 100644 index 000000000..337c8a40d --- /dev/null +++ b/msvc/7/appHelloWorld.vcproj @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/7/appMultiThreadedDemo.vcproj b/msvc/7/appMultiThreadedDemo.vcproj new file mode 100644 index 000000000..56855f78e --- /dev/null +++ b/msvc/7/appMultiThreadedDemo.vcproj @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/7/libbulletmultithreaded.vcproj b/msvc/7/libbulletmultithreaded.vcproj index 0784f4a2a..1431628b4 100644 --- a/msvc/7/libbulletmultithreaded.vcproj +++ b/msvc/7/libbulletmultithreaded.vcproj @@ -297,6 +297,9 @@ + + diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index 31d59c025..a14a562e1 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -34,8 +34,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGimpactTestDemo", "appGi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appHelloWorld", "appHelloWorld.vcproj", "{5239CE6A-7C7A-2170-6334-DF8EE0C44543}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMultiThreadedDemo", "appMultiThreadedDemo.vcproj", "{6D016A7B-39C8-2018-733F-22921BE94AC4}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRagdollDemo", "appRagdollDemo.vcproj", "{EFEF2072-51F9-DAE8-AC38-3E653C680F74}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" @@ -62,6 +66,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" @@ -89,11 +95,12 @@ Global {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -166,11 +173,23 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {2D714360-B8EC-F8E0-ED74-E95336301075}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {2D714360-B8EC-F8E0-ED74-E95336301075}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -208,25 +227,28 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F} {6210A080-01C0-6D67-F1DB-669393175402}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E} {6210A080-01C0-6D67-F1DB-669393175402}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} - {6210A080-01C0-6D67-F1DB-669393175402}.25 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.26 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.27 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.28 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.29 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.30 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.31 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6210A080-01C0-6D67-F1DB-669393175402}.32 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.33 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.34 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {6210A080-01C0-6D67-F1DB-669393175402}.35 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {6D016A7B-39C8-2018-733F-22921BE94AC4} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.25 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} + {6210A080-01C0-6D67-F1DB-669393175402}.26 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} + {6210A080-01C0-6D67-F1DB-669393175402}.27 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.28 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.29 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.30 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.31 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.32 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.33 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.34 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.35 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.36 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.38 = {D7036964-B44D-8207-0ACC-D838D0BDA379} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} @@ -244,25 +266,28 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F} {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E} {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543} + {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {6D016A7B-39C8-2018-733F-22921BE94AC4} + {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.23 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.24 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.13 = {D7036964-B44D-8207-0ACC-D838D0BDA379} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32 @@ -401,6 +426,14 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Release.ActiveCfg = Release|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Release.Build.0 = Release|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Debug.ActiveCfg = Debug|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Debug.Build.0 = Debug|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.Release.ActiveCfg = Release|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.Release.Build.0 = Release|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 @@ -409,6 +442,14 @@ Global {2D714360-B8EC-F8E0-ED74-E95336301075}.Debug.Build.0 = Debug|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Release.ActiveCfg = Release|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Release.Build.0 = Release|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Debug.ActiveCfg = Debug|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Debug.Build.0 = Debug|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.Release.ActiveCfg = Release|Win32 {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.Release.Build.0 = Release|Win32 {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 @@ -513,6 +554,14 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/71/appAllBulletDemos.vcproj b/msvc/71/appAllBulletDemos.vcproj index 05c35d2f6..7d613139a 100644 --- a/msvc/71/appAllBulletDemos.vcproj +++ b/msvc/71/appAllBulletDemos.vcproj @@ -340,6 +340,9 @@ + + diff --git a/msvc/71/appHelloWorld.vcproj b/msvc/71/appHelloWorld.vcproj new file mode 100644 index 000000000..7b6bd5b53 --- /dev/null +++ b/msvc/71/appHelloWorld.vcproj @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/71/appMultiThreadedDemo.vcproj b/msvc/71/appMultiThreadedDemo.vcproj new file mode 100644 index 000000000..702e32f35 --- /dev/null +++ b/msvc/71/appMultiThreadedDemo.vcproj @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/71/libbulletmultithreaded.vcproj b/msvc/71/libbulletmultithreaded.vcproj index 9c1a2fc3c..14d28025b 100644 --- a/msvc/71/libbulletmultithreaded.vcproj +++ b/msvc/71/libbulletmultithreaded.vcproj @@ -297,6 +297,9 @@ + + diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index ffbd0ccd4..1e9e4dee1 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -34,8 +34,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGimpactTestDemo", "appGi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appHelloWorld", "appHelloWorld.vcproj", "{5239CE6A-7C7A-2170-6334-DF8EE0C44543}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMultiThreadedDemo", "appMultiThreadedDemo.vcproj", "{6D016A7B-39C8-2018-733F-22921BE94AC4}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRagdollDemo", "appRagdollDemo.vcproj", "{EFEF2072-51F9-DAE8-AC38-3E653C680F74}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" @@ -62,6 +66,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" @@ -89,11 +95,12 @@ Global {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -166,11 +173,23 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {2D714360-B8EC-F8E0-ED74-E95336301075}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {2D714360-B8EC-F8E0-ED74-E95336301075}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -208,25 +227,28 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F} {6210A080-01C0-6D67-F1DB-669393175402}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E} {6210A080-01C0-6D67-F1DB-669393175402}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} - {6210A080-01C0-6D67-F1DB-669393175402}.25 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.26 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.27 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.28 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.29 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.30 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.31 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6210A080-01C0-6D67-F1DB-669393175402}.32 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.33 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.34 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {6210A080-01C0-6D67-F1DB-669393175402}.35 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {6D016A7B-39C8-2018-733F-22921BE94AC4} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.25 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} + {6210A080-01C0-6D67-F1DB-669393175402}.26 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} + {6210A080-01C0-6D67-F1DB-669393175402}.27 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.28 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.29 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.30 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.31 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.32 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.33 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.34 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.35 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.36 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.38 = {D7036964-B44D-8207-0ACC-D838D0BDA379} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} @@ -244,25 +266,28 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F} {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E} {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543} + {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {6D016A7B-39C8-2018-733F-22921BE94AC4} + {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.23 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.24 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.13 = {D7036964-B44D-8207-0ACC-D838D0BDA379} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32 @@ -401,6 +426,14 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Release.ActiveCfg = Release|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Release.Build.0 = Release|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Debug.ActiveCfg = Debug|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Debug.Build.0 = Debug|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.Release.ActiveCfg = Release|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.Release.Build.0 = Release|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 @@ -409,6 +442,14 @@ Global {2D714360-B8EC-F8E0-ED74-E95336301075}.Debug.Build.0 = Debug|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Release.ActiveCfg = Release|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Release.Build.0 = Release|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Debug.ActiveCfg = Debug|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Debug.Build.0 = Debug|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.Release.ActiveCfg = Release|Win32 {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.Release.Build.0 = Release|Win32 {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 @@ -513,6 +554,14 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/8/appAllBulletDemos.vcproj b/msvc/8/appAllBulletDemos.vcproj index 5f6b5fa73..6d7b41f1b 100644 --- a/msvc/8/appAllBulletDemos.vcproj +++ b/msvc/8/appAllBulletDemos.vcproj @@ -340,6 +340,9 @@ + + diff --git a/msvc/8/appHelloWorld.vcproj b/msvc/8/appHelloWorld.vcproj new file mode 100644 index 000000000..f9bbb436c --- /dev/null +++ b/msvc/8/appHelloWorld.vcproj @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/8/appMultiThreadedDemo.vcproj b/msvc/8/appMultiThreadedDemo.vcproj new file mode 100644 index 000000000..c415037d1 --- /dev/null +++ b/msvc/8/appMultiThreadedDemo.vcproj @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/8/libbulletmultithreaded.vcproj b/msvc/8/libbulletmultithreaded.vcproj index a8318ba46..9bdbbd9b3 100644 --- a/msvc/8/libbulletmultithreaded.vcproj +++ b/msvc/8/libbulletmultithreaded.vcproj @@ -297,6 +297,9 @@ + + diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index d0da1c155..524756c6a 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -34,8 +34,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGimpactTestDemo", "appGi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appHelloWorld", "appHelloWorld.vcproj", "{5239CE6A-7C7A-2170-6334-DF8EE0C44543}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMultiThreadedDemo", "appMultiThreadedDemo.vcproj", "{6D016A7B-39C8-2018-733F-22921BE94AC4}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRagdollDemo", "appRagdollDemo.vcproj", "{EFEF2072-51F9-DAE8-AC38-3E653C680F74}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" @@ -62,6 +66,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" @@ -89,11 +95,12 @@ Global {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {3578834A-4B06-DE6F-78AC-FE11F7226D35}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -166,11 +173,23 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {2D714360-B8EC-F8E0-ED74-E95336301075}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {2D714360-B8EC-F8E0-ED74-E95336301075}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.3 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.7 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6D016A7B-39C8-2018-733F-22921BE94AC4}.8 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -208,25 +227,28 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F} {6210A080-01C0-6D67-F1DB-669393175402}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E} {6210A080-01C0-6D67-F1DB-669393175402}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} - {6210A080-01C0-6D67-F1DB-669393175402}.25 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.26 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.27 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.28 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.29 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.30 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.31 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6210A080-01C0-6D67-F1DB-669393175402}.32 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.33 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.34 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {6210A080-01C0-6D67-F1DB-669393175402}.35 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {6D016A7B-39C8-2018-733F-22921BE94AC4} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.25 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} + {6210A080-01C0-6D67-F1DB-669393175402}.26 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} + {6210A080-01C0-6D67-F1DB-669393175402}.27 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.28 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.29 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.30 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.31 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.32 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.33 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.34 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.35 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.36 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.38 = {D7036964-B44D-8207-0ACC-D838D0BDA379} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} @@ -244,25 +266,28 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {33C16464-831E-103A-5F37-65CCD4F9191F} {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {12B291F0-1880-AFC5-26E1-26DF78EA6D2E} {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {5239CE6A-7C7A-2170-6334-DF8EE0C44543} + {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {6D016A7B-39C8-2018-733F-22921BE94AC4} + {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {9E59B16D-0924-409C-1611-DF2207A0053F}.21 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.22 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.23 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.24 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.12 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.13 = {D7036964-B44D-8207-0ACC-D838D0BDA379} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {7CE54E12-D3D5-878F-9CC5-786265A3F9CE}.Release.ActiveCfg = Release|Win32 @@ -401,6 +426,14 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Release.ActiveCfg = Release|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Release.Build.0 = Release|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Debug.ActiveCfg = Debug|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.Debug.Build.0 = Debug|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {5239CE6A-7C7A-2170-6334-DF8EE0C44543}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.Release.ActiveCfg = Release|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.Release.Build.0 = Release|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 @@ -409,6 +442,14 @@ Global {2D714360-B8EC-F8E0-ED74-E95336301075}.Debug.Build.0 = Debug|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {2D714360-B8EC-F8E0-ED74-E95336301075}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Release.ActiveCfg = Release|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Release.Build.0 = Release|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Debug.ActiveCfg = Debug|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.Debug.Build.0 = Debug|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {6D016A7B-39C8-2018-733F-22921BE94AC4}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.Release.ActiveCfg = Release|Win32 {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.Release.Build.0 = Release|Win32 {EFEF2072-51F9-DAE8-AC38-3E653C680F74}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 @@ -513,6 +554,14 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/appHelloWorld.rc b/msvc/appHelloWorld.rc new file mode 100644 index 000000000..c918a32a9 --- /dev/null +++ b/msvc/appHelloWorld.rc @@ -0,0 +1,30 @@ +// This file is generated automatically. + +1 VERSIONINFO +FILEVERSION 2, 64, 0, 0 +PRODUCTVERSION 2, 64, 0, 0 +#ifdef CS_DEBUG +FILEFLAGS 0x1 +#else +FILEFLAGS 0x0 +#endif +{ + BLOCK "StringFileInfo" + { + BLOCK "040904E4" + { + VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" + VALUE "ProductVersion", "2.64" + VALUE "FileVersion", "2.64" + VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" + VALUE "FileDescription", "HelloWorld" +#ifdef CS_DEBUG + VALUE "Comments", "Debug build" +#else + VALUE "Comments", "Release build" +#endif + VALUE "WWW", "http://www.bulletphysics.com" + } + } +} +1 ICON "../../msvc/bullet_ico.ico" diff --git a/msvc/appMultiThreadedDemo.rc b/msvc/appMultiThreadedDemo.rc new file mode 100644 index 000000000..ebf224268 --- /dev/null +++ b/msvc/appMultiThreadedDemo.rc @@ -0,0 +1,30 @@ +// This file is generated automatically. + +1 VERSIONINFO +FILEVERSION 2, 64, 0, 0 +PRODUCTVERSION 2, 64, 0, 0 +#ifdef CS_DEBUG +FILEFLAGS 0x1 +#else +FILEFLAGS 0x0 +#endif +{ + BLOCK "StringFileInfo" + { + BLOCK "040904E4" + { + VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" + VALUE "ProductVersion", "2.64" + VALUE "FileVersion", "2.64" + VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" + VALUE "FileDescription", "MultiThreadedDemo" +#ifdef CS_DEBUG + VALUE "Comments", "Debug build" +#else + VALUE "Comments", "Release build" +#endif + VALUE "WWW", "http://www.bulletphysics.com" + } + } +} +1 ICON "../../msvc/bullet_ico.ico" diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index ec4c5f6ad..a8ada5837 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -5,65 +5,128 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src } ADD_LIBRARY(LibBulletCollision BroadphaseCollision/btAxisSweep3.cpp + BroadphaseCollision/btAxisSweep3.h BroadphaseCollision/btBroadphaseProxy.cpp + BroadphaseCollision/btBroadphaseProxy.h BroadphaseCollision/btCollisionAlgorithm.cpp + BroadphaseCollision/btCollisionAlgorithm.h BroadphaseCollision/btDispatcher.cpp + BroadphaseCollision/btDispatcher.h BroadphaseCollision/btMultiSapBroadphase.cpp + BroadphaseCollision/btMultiSapBroadphase.h BroadphaseCollision/btOverlappingPairCache.cpp + BroadphaseCollision/btOverlappingPairCache.h + BroadphaseCollision/btOverlappingPairCallback.h BroadphaseCollision/btSimpleBroadphase.cpp + BroadphaseCollision/btSimpleBroadphase.h CollisionDispatch/btCollisionDispatcher.cpp + CollisionDispatch/btCollisionDispatcher.h CollisionDispatch/btCollisionObject.cpp + CollisionDispatch/btCollisionObject.h CollisionDispatch/btCollisionWorld.cpp + CollisionDispatch/btCollisionWorld.h CollisionDispatch/btCompoundCollisionAlgorithm.cpp + CollisionDispatch/btCompoundCollisionAlgorithm.h CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp + CollisionDispatch/btConvexConcaveCollisionAlgorithm.h CollisionDispatch/btDefaultCollisionConfiguration.cpp + CollisionDispatch/btDefaultCollisionConfiguration.h CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp + CollisionDispatch/btSphereSphereCollisionAlgorithm.h CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp + CollisionDispatch/btSphereBoxCollisionAlgorithm.h CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp + CollisionDispatch/btConvexPlaneCollisionAlgorithm.h CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp + CollisionDispatch/btSphereTriangleCollisionAlgorithm.h CollisionDispatch/btConvexConvexAlgorithm.cpp + CollisionDispatch/btConvexConvexAlgorithm.h CollisionDispatch/btEmptyCollisionAlgorithm.cpp + CollisionDispatch/btEmptyCollisionAlgorithm.h CollisionDispatch/btManifoldResult.cpp + CollisionDispatch/btManifoldResult.h CollisionDispatch/btSimulationIslandManager.cpp + CollisionDispatch/btSimulationIslandManager.h CollisionDispatch/btUnionFind.cpp + CollisionDispatch/btUnionFind.h CollisionDispatch/SphereTriangleDetector.cpp + CollisionDispatch/SphereTriangleDetector.h CollisionShapes/btBoxShape.cpp + CollisionShapes/btBoxShape.h CollisionShapes/btBvhTriangleMeshShape.cpp + CollisionShapes/btBvhTriangleMeshShape.h CollisionShapes/btCapsuleShape.cpp + CollisionShapes/btCapsuleShape.h CollisionShapes/btCollisionShape.cpp + CollisionShapes/btCollisionShape.h CollisionShapes/btCompoundShape.cpp + CollisionShapes/btCompoundShape.h CollisionShapes/btConcaveShape.cpp + CollisionShapes/btConcaveShape.h CollisionShapes/btConeShape.cpp + CollisionShapes/btConeShape.h CollisionShapes/btConvexHullShape.cpp + CollisionShapes/btConvexHullShape.h CollisionShapes/btConvexShape.cpp + CollisionShapes/btConvexShape.h CollisionShapes/btConvexInternalShape.cpp + CollisionShapes/btConvexInternalShape.h CollisionShapes/btConvexTriangleMeshShape.cpp + CollisionShapes/btConvexTriangleMeshShape.h CollisionShapes/btCylinderShape.cpp + CollisionShapes/btCylinderShape.h CollisionShapes/btEmptyShape.cpp + CollisionShapes/btEmptyShape.h CollisionShapes/btHeightfieldTerrainShape.cpp + CollisionShapes/btHeightfieldTerrainShape.h CollisionShapes/btMinkowskiSumShape.cpp + CollisionShapes/btMinkowskiSumShape.h CollisionShapes/btMultiSphereShape.cpp + CollisionShapes/btMultiSphereShape.h CollisionShapes/btOptimizedBvh.cpp + CollisionShapes/btOptimizedBvh.h CollisionShapes/btPolyhedralConvexShape.cpp + CollisionShapes/btPolyhedralConvexShape.h CollisionShapes/btTetrahedronShape.cpp + CollisionShapes/btTetrahedronShape.h CollisionShapes/btSphereShape.cpp + CollisionShapes/btSphereShape.h CollisionShapes/btStaticPlaneShape.cpp + CollisionShapes/btStaticPlaneShape.h CollisionShapes/btStridingMeshInterface.cpp + CollisionShapes/btStridingMeshInterface.h CollisionShapes/btTriangleCallback.cpp + CollisionShapes/btTriangleCallback.h CollisionShapes/btTriangleBuffer.cpp + CollisionShapes/btTriangleBuffer.h CollisionShapes/btTriangleIndexVertexArray.cpp + CollisionShapes/btTriangleIndexVertexArray.h CollisionShapes/btTriangleMesh.cpp + CollisionShapes/btTriangleMesh.h CollisionShapes/btTriangleMeshShape.cpp + CollisionShapes/btTriangleMeshShape.h CollisionShapes/btUniformScalingShape.cpp + CollisionShapes/btUniformScalingShape.h NarrowPhaseCollision/btContinuousConvexCollision.cpp + NarrowPhaseCollision/btContinuousConvexCollision.h NarrowPhaseCollision/btGjkEpa.cpp + NarrowPhaseCollision/btGjkEpa.h NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp + NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h NarrowPhaseCollision/btConvexCast.cpp + NarrowPhaseCollision/btConvexCast.h NarrowPhaseCollision/btGjkConvexCast.cpp + NarrowPhaseCollision/btGjkConvexCast.h NarrowPhaseCollision/btGjkPairDetector.cpp + NarrowPhaseCollision/btGjkPairDetector.h NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp + NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h NarrowPhaseCollision/btPersistentManifold.cpp + NarrowPhaseCollision/btPersistentManifold.h NarrowPhaseCollision/btRaycastCallback.cpp + NarrowPhaseCollision/btRaycastCallback.h NarrowPhaseCollision/btSubSimplexConvexCast.cpp + NarrowPhaseCollision/btSubSimplexConvexCast.h NarrowPhaseCollision/btVoronoiSimplexSolver.cpp + NarrowPhaseCollision/btVoronoiSimplexSolver.h ) diff --git a/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp index 36a9a3f92..0f3a129e2 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp @@ -35,6 +35,7 @@ int gNumManifold = 0; btCollisionDispatcher::btCollisionDispatcher (btCollisionConfiguration* collisionConfiguration): m_count(0), m_useIslands(true), + m_staticWarningReported(false), m_collisionConfiguration(collisionConfiguration) { int i; @@ -161,13 +162,19 @@ bool btCollisionDispatcher::needsCollision(btCollisionObject* body0,btCollisionO bool needsCollision = true; - //broadphase filtering already deals with this - if ((body0->isStaticObject() || body0->isKinematicObject()) && - (body1->isStaticObject() || body1->isKinematicObject())) +#ifdef BT_DEBUG + if (!m_staticWarningReported) { - printf("warning btCollisionDispatcher::needsCollision: static-static collision!\n"); + //broadphase filtering already deals with this + if ((body0->isStaticObject() || body0->isKinematicObject()) && + (body1->isStaticObject() || body1->isKinematicObject())) + { + m_staticWarningReported = true; + printf("warning btCollisionDispatcher::needsCollision: static-static collision!\n"); + } } - +#endif //BT_DEBUG + if ((!body0->isActive()) && (!body1->isActive())) needsCollision = false; else if (!body0->checkCollideWith(body1)) diff --git a/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h index 45aaa1bd9..b6b57e8ce 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h +++ b/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h @@ -47,6 +47,8 @@ class btCollisionDispatcher : public btDispatcher btAlignedObjectArray m_manifoldsPtr; bool m_useIslands; + + bool m_staticWarningReported; btManifoldResult m_defaultManifoldResult; diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt index 399badc20..a24248c44 100644 --- a/src/BulletDynamics/CMakeLists.txt +++ b/src/BulletDynamics/CMakeLists.txt @@ -5,17 +5,30 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src } ADD_LIBRARY(LibBulletDynamics ConstraintSolver/btContactConstraint.cpp + ConstraintSolver/btContactConstraint.h ConstraintSolver/btConeTwistConstraint.cpp + ConstraintSolver/btConeTwistConstraint.h ConstraintSolver/btGeneric6DofConstraint.cpp + ConstraintSolver/btGeneric6DofConstraint.h ConstraintSolver/btHingeConstraint.cpp + ConstraintSolver/btHingeConstraint.h ConstraintSolver/btPoint2PointConstraint.cpp + ConstraintSolver/btPoint2PointConstraint.h ConstraintSolver/btSequentialImpulseConstraintSolver.cpp + ConstraintSolver/btSequentialImpulseConstraintSolver.h ConstraintSolver/btSolve2LinearConstraint.cpp + ConstraintSolver/btSolve2LinearConstraint.h ConstraintSolver/btTypedConstraint.cpp + ConstraintSolver/btTypedConstraint.h Dynamics/Bullet-C-API.cpp Dynamics/btDiscreteDynamicsWorld.cpp + Dynamics/btDiscreteDynamicsWorld.h Dynamics/btSimpleDynamicsWorld.cpp + Dynamics/btSimpleDynamicsWorld.h Dynamics/btRigidBody.cpp + Dynamics/btRigidBody.h Vehicle/btRaycastVehicle.cpp + Vehicle/btRaycastVehicle.h Vehicle/btWheelInfo.cpp + Vehicle/btWheelInfo.h ) diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt index 82393547b..2e1ebf7ae 100644 --- a/src/LinearMath/CMakeLists.txt +++ b/src/LinearMath/CMakeLists.txt @@ -4,8 +4,34 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src } ) ADD_LIBRARY(LibLinearMath -btQuickprof.cpp -btGeometryUtil.cpp -btAlignedAllocator.cpp + btAlignedObjectArray.h + btList.h + btPoolAllocator.h + btRandom.h + btVector3.h + btDefaultMotionState.h + btMatrix3x3.h + btQuadWord.h + btScalar.h + btAabbUtil2.h + btGeometryUtil.cpp + btMinMax.h + btQuaternion.h + btStackAlloc.h + LibLinearMath.dir + btAlignedAllocator.cpp + btGeometryUtil.h + btMotionState.h + btQuickprof.cpp + btTransform.h + btAlignedAllocator.h + btIDebugDraw.h + btPoint3.h + btQuickprof.h + btTransformUtil.h + btQuickprof.cpp + btGeometryUtil.cpp + btAlignedAllocator.cpp ) + diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h index 971c06802..595bab49c 100644 --- a/src/LinearMath/btScalar.h +++ b/src/LinearMath/btScalar.h @@ -30,6 +30,11 @@ inline int btGetVersion() return BT_BULLET_VERSION; } +#if defined(DEBUG) || defined (_DEBUG) +#define BT_DEBUG +#endif + + #ifdef WIN32 #if defined(__MINGW32__) || defined(__CYGWIN__) || (defined (_MSC_VER) && _MSC_VER < 1300)