diff --git a/Demos/BasicDemo/BasicDemo.cpp b/Demos/BasicDemo/BasicDemo.cpp index 0baa1b59e..2c359bf70 100644 --- a/Demos/BasicDemo/BasicDemo.cpp +++ b/Demos/BasicDemo/BasicDemo.cpp @@ -13,14 +13,16 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ + //#define USE_GROUND_BOX 1 #define PRINT_CONTACT_STATISTICS 1 +//#define CHECK_MEMORY_LEAKS 1 + int gNumObjects = 120; #define HALF_EXTENTS 1.f #include "btBulletDynamicsCommon.h" #include "LinearMath/btIDebugDraw.h" #include "GLDebugDrawer.h" -#include "BMF_Api.h" #include //printf debugging float deltaTime = 1.f/60.f; float gCollisionMargin = 0.05f; @@ -37,11 +39,15 @@ int main(int argc,char** argv) BasicDemo ccdDemo; ccdDemo.initPhysics(); ccdDemo.setCameraDistance(50.f); + +#ifdef CHECK_MEMORY_LEAKS ccdDemo.exitPhysics(); - - //return glutmain(argc, argv,640,480,"Bullet Physics Demo. http://bullet.sf.net",&ccdDemo); +#else + return glutmain(argc, argv,640,480,"Bullet Physics Demo. http://bullet.sf.net",&ccdDemo); +#endif + + //default glut doesn't return from mainloop return 0; - } diff --git a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp index 3550aa649..42b4fe2e5 100644 --- a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp +++ b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp @@ -19,7 +19,7 @@ subject to the following restrictions: #define REGISTER_CUSTOM_COLLISION_ALGORITHM 1 #include "btBulletDynamicsCommon.h" - +#include "../Extras/quickstep/OdeConstraintSolver.h" #include "LinearMath/btQuickprof.h" #include "LinearMath/btIDebugDraw.h" #include "GLDebugDrawer.h" @@ -47,11 +47,12 @@ bool useCompound = false;//true;//false; #ifdef _DEBUG -const int gNumObjects = 120; +const int gNumObjects = 1024; #else const int gNumObjects = 120;//try this in release mode: 3000. never go above 16384, unless you increate maxNumObjects value in DemoApplication.cp #endif + const int maxNumObjects = 32760; int shapeIndex[maxNumObjects]; @@ -76,8 +77,8 @@ btCollisionShape* shapePtr[numShapes] = new btBoxShape (btVector3(50,10,50)), #endif - new btCylinderShape (btVector3(CUBE_HALF_EXTENTS-gCollisionMargin,CUBE_HALF_EXTENTS-gCollisionMargin,CUBE_HALF_EXTENTS-gCollisionMargin)), - //new btBoxShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)), + //new btCylinderShape (btVector3(1-gCollisionMargin,CUBE_HALF_EXTENTS-gCollisionMargin,1-gCollisionMargin)), + new btBoxShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)), new btSphereShape (CUBE_HALF_EXTENTS- 0.05f), //new btConeShape(CUBE_HALF_EXTENTS,2.f*CUBE_HALF_EXTENTS), @@ -249,7 +250,8 @@ void CcdPhysicsDemo::initPhysics() dispatcher->registerCollisionCreateFunc(SPHERE_SHAPE_PROXYTYPE,SPHERE_SHAPE_PROXYTYPE,new btSphereSphereCollisionAlgorithm::CreateFunc); #endif //REGISTER_CUSTOM_COLLISION_ALGORITHM - btSequentialImpulseConstraintSolver* solver = new btSequentialImpulseConstraintSolver; + //btSequentialImpulseConstraintSolver* solver = new btSequentialImpulseConstraintSolver; + btConstraintSolver* solver = new OdeConstraintSolver(); m_dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher,broadphase,solver); m_dynamicsWorld->setGravity(btVector3(0,-10,0)); diff --git a/Extras/GPUphysics/GPU_physics_demo.cpp b/Extras/GPUphysics/GPU_physics_demo.cpp index b4dd7a776..74218f69b 100644 --- a/Extras/GPUphysics/GPU_physics_demo.cpp +++ b/Extras/GPUphysics/GPU_physics_demo.cpp @@ -907,7 +907,12 @@ void help () int main ( int argc, char **argv ) { +#ifdef WIN32 + //until there is a first GPU that works under VertexTextureSupport under WIN32, disable it +bool disableVertexTextureSupport = true; +#else bool disableVertexTextureSupport = false ; +#endif debugOpt = DRAW_ALL ; for ( int i = 1 ; i < argc ; i++ ) diff --git a/Extras/quickstep/OdeConstraintSolver.cpp b/Extras/quickstep/OdeConstraintSolver.cpp index c38cae8d6..bd6c2f877 100644 --- a/Extras/quickstep/OdeConstraintSolver.cpp +++ b/Extras/quickstep/OdeConstraintSolver.cpp @@ -54,8 +54,12 @@ class BU_Joint; //see below -//to bridge with ODE quickstep, we make a temp copy of the rigidbodies in each simultion island, stored in an array of size MAX_RIGIDBODIES -#define MAX_QUICKSTEP_RIGIDBODIES 8192 +//to bridge with ODE quickstep, we make a temp copy of the rigidbodies in each simultion island +#define ODE_MAX_SOLVER_BODIES 16384 +#define ODE_MAX_SOLVER_JOINTS 65535 +static OdeSolverBody gSolverBodyArray[ODE_MAX_SOLVER_BODIES]; +static ContactJoint gJointArray[ODE_MAX_SOLVER_JOINTS]; + OdeConstraintSolver::OdeConstraintSolver(): m_cfm(0.f),//1e-5f), @@ -65,10 +69,6 @@ m_erp(0.4f) - - - - //iterative lcp and penalty method float OdeConstraintSolver::solveGroup(btPersistentManifold** manifoldPtr, int numManifolds,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer) { @@ -76,9 +76,9 @@ float OdeConstraintSolver::solveGroup(btPersistentManifold** manifoldPtr, int nu m_CurJoint = 0; int numBodies = 0; - OdeSolverBody* odeBodies [MAX_QUICKSTEP_RIGIDBODIES]; + OdeSolverBody* odeBodies [ODE_MAX_SOLVER_BODIES]; int numJoints = 0; - BU_Joint* joints [MAX_QUICKSTEP_RIGIDBODIES*4]; + BU_Joint* joints [ODE_MAX_SOLVER_JOINTS]; for (int j=0;jm_friction * m_body1->m_friction; + float friction = 0.25;//FRICTION_CONSTANT ;//* m_body0->m_friction * m_body1->m_friction; // first friction direction if (m_numRows >= 2) diff --git a/Extras/quickstep/SorLcp.cpp b/Extras/quickstep/SorLcp.cpp index 3eb46a856..31447157a 100644 --- a/Extras/quickstep/SorLcp.cpp +++ b/Extras/quickstep/SorLcp.cpp @@ -25,10 +25,7 @@ #ifdef USE_SOR_SOLVER -// SOR LCP taken from ode quickstep, -// todo: write own successive overrelaxation gauss-seidel, or jacobi iterative solver - - +// SOR LCP taken from ode quickstep, for comparisons to Bullet sequential impulse solver. #include "LinearMath/btScalar.h" #include "BulletDynamics/Dynamics/btRigidBody.h" @@ -648,8 +645,8 @@ void SolveInternal1 (float global_cfm, dMULTIPLY2_333 (tmp,body[i]->m_invI,body[i]->m_R); dMULTIPLY0_333 (invI+i*12,body[i]->m_R,tmp); // compute rotational force - dMULTIPLY0_331 (tmp,I+i*12,body[i]->m_angularVelocity); - dCROSS (body[i]->m_tacc,-=,body[i]->m_angularVelocity,tmp); +// dMULTIPLY0_331 (tmp,I+i*12,body[i]->m_angularVelocity); +// dCROSS (body[i]->m_tacc,-=,body[i]->m_angularVelocity,tmp); } diff --git a/msvc/6/grpapps_bullet.dsp b/msvc/6/grpapps_bullet.dsp index a40a69feb..0f5557a1b 100644 --- a/msvc/6/grpapps_bullet.dsp +++ b/msvc/6/grpapps_bullet.dsp @@ -43,11 +43,11 @@ RSC=rc.exe # 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 "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" +# 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 "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,11 +75,11 @@ SOURCE="$(InputPath)" # 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 /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" +# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/msvc/6/libquickstep.dsp b/msvc/6/libquickstep.dsp new file mode 100644 index 000000000..c70fce6a8 --- /dev/null +++ b/msvc/6/libquickstep.dsp @@ -0,0 +1,151 @@ +# Microsoft Developer Studio Project File - Name="libquickstep" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libquickstep - 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 "libquickstep.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 "libquickstep.mak" CFG="libquickstep - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libquickstep - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "libquickstep - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libquickstep - 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\libquickstep\" +# PROP Intermediate_Dir "..\..\out\release6\build\libquickstep\" +# 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 "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\quickstep\src" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libquickstep\libquickstep.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\quickstep\src" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\out\release6\libs\libquickstep.lib" +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 /subsystem:windows +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libquickstep - 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\libquickstep\" +# PROP Intermediate_Dir "..\..\out\debug6\build\libquickstep\" +# 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 /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\quickstep\src" +# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libquickstep\libquickstep.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\quickstep\src" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\out\debug6\libs\libquickstep_d.lib" +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 /subsystem:windows +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "libquickstep - Win32 Release" +# Name "libquickstep - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Extras\quickstep\OdeConstraintSolver.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Extras\quickstep\OdeContactJoint.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Extras\quickstep\OdeJoint.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Extras\quickstep\OdeSolverBody.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Extras\quickstep\SorLcp.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\Extras\quickstep\OdeConstraintSolver.h +# End Source File +# Begin Source File + +SOURCE=..\..\Extras\quickstep\odecontactjoint.h +# End Source File +# Begin Source File + +SOURCE=..\..\Extras\quickstep\OdeJoint.h +# End Source File +# Begin Source File + +SOURCE=..\..\Extras\quickstep\OdeSolverBody.h +# End Source File +# Begin Source File + +SOURCE=..\..\Extras\quickstep\SorLcp.h +# End Source File +# End Group +# End Target +# End Project diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index 7a1310c5b..abef3c8a8 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -294,6 +294,18 @@ Package=<4> ############################################################################### +Project: "appGPUphysics"=.\appGPUphysics.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "appRaytracer"=.\appRaytracer.dsp - Package Owner=<4> Package=<5> @@ -408,6 +420,9 @@ Package=<4> Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appGPUphysics + End Project Dependency + Begin Project Dependency Project_Dep_Name appRaytracer End Project Dependency Begin Project Dependency @@ -483,6 +498,9 @@ Package=<4> Project_Dep_Name appGjkConvexCastDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appGPUphysics + End Project Dependency + Begin Project Dependency Project_Dep_Name appRaytracer End Project Dependency Begin Project Dependency diff --git a/msvc/7/grpapps_bullet.vcproj b/msvc/7/grpapps_bullet.vcproj index ebb69a789..23786ec86 100644 --- a/msvc/7/grpapps_bullet.vcproj +++ b/msvc/7/grpapps_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\release7\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\release7\build\grpapps_bullet\" ObjectFile="..\..\out\release7\build\grpapps_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\debug7\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\debug7\build\grpapps_bullet\" ObjectFile="..\..\out\debug7\build\grpapps_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/7/libquickstep.vcproj b/msvc/7/libquickstep.vcproj new file mode 100644 index 000000000..ff4aa315b --- /dev/null +++ b/msvc/7/libquickstep.vcproj @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index 5f0429526..2cf2c85f6 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -22,6 +22,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}" @@ -130,16 +132,17 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {6210A080-01C0-6D67-F1DB-669393175402}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {7284F809-AF30-6315-88C6-86F1C0798760} @@ -151,9 +154,10 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -207,6 +211,10 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32 diff --git a/msvc/71/grpapps_bullet.vcproj b/msvc/71/grpapps_bullet.vcproj index 1c7284d00..5c7478eec 100644 --- a/msvc/71/grpapps_bullet.vcproj +++ b/msvc/71/grpapps_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\release71\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\release71\build\grpapps_bullet\" ObjectFile="..\..\out\release71\build\grpapps_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\debug71\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\debug71\build\grpapps_bullet\" ObjectFile="..\..\out\debug71\build\grpapps_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/71/libquickstep.vcproj b/msvc/71/libquickstep.vcproj new file mode 100644 index 000000000..ac3f3baeb --- /dev/null +++ b/msvc/71/libquickstep.vcproj @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 70751cf26..06d760e8f 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -22,6 +22,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}" @@ -130,16 +132,17 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {6210A080-01C0-6D67-F1DB-669393175402}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {7284F809-AF30-6315-88C6-86F1C0798760} @@ -151,9 +154,10 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -207,6 +211,10 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32 diff --git a/msvc/8/grpapps_bullet.vcproj b/msvc/8/grpapps_bullet.vcproj index f7c192f45..30edddbfc 100644 --- a/msvc/8/grpapps_bullet.vcproj +++ b/msvc/8/grpapps_bullet.vcproj @@ -30,7 +30,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\release8\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\release8\build\grpapps_bullet\" ObjectFile="..\..\out\release8\build\grpapps_bullet\" @@ -78,7 +78,7 @@ @@ -103,7 +103,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include" PrecompiledHeaderFile="..\..\out\debug8\build\grpapps_bullet\grpapps_bullet.pch" AssemblerListingLocation="..\..\out\debug8\build\grpapps_bullet\" ObjectFile="..\..\out\debug8\build\grpapps_bullet\" @@ -149,7 +149,7 @@ diff --git a/msvc/8/libquickstep.vcproj b/msvc/8/libquickstep.vcproj new file mode 100644 index 000000000..bb634e51d --- /dev/null +++ b/msvc/8/libquickstep.vcproj @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index 90bb5ec82..b00cdf6ce 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -22,6 +22,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}" @@ -130,16 +132,17 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {6210A080-01C0-6D67-F1DB-669393175402}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} {6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {7284F809-AF30-6315-88C6-86F1C0798760} @@ -151,9 +154,10 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164} {9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {69C821C7-1E18-D894-068D-C55E063F4859} {9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} + {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -207,6 +211,10 @@ Global {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32 {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 + {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32 {60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32