diff --git a/Demos/GimpactTestDemo/GimpactTestDemo.cpp b/Demos/GimpactTestDemo/GimpactTestDemo.cpp index 408f1715e..5cf14c19c 100644 --- a/Demos/GimpactTestDemo/GimpactTestDemo.cpp +++ b/Demos/GimpactTestDemo/GimpactTestDemo.cpp @@ -56,6 +56,27 @@ Real dts = 1.0 / 60.0; +GimpactConcaveDemo::~GimpactConcaveDemo() +{ + delete m_dynamicsWorld; + + delete m_indexVertexArrays; + delete m_trimeshShape; + + delete m_indexVertexArrays2; + delete m_trimeshShape2; + + delete m_gimpactCollisionCreateFunc; + + delete m_collisionConfiguration; + delete m_dispatcher; + delete m_broadphase; + delete m_constraintSolver; + +} + + + //------------------------------------------------------------------------------ ///User can override this material combiner by implementing gContactAddedCallback and setting body0->m_collisionFlags |= btCollisionObject::customMaterialCallback; inline btScalar calculateCombinedFriction(float friction0,float friction1) @@ -280,6 +301,7 @@ void GimpactConcaveDemo::initGImpactCollision() NUM_VERTICES, (Real*) &gVertices[0],sizeof(Real)*3); + #ifdef BULLET_GIMPACT #ifdef BULLET_GIMPACT_CONVEX_DECOMPOSITION btGImpactConvexDecompositionShape * trimesh = new diff --git a/Demos/GimpactTestDemo/GimpactTestDemo.h b/Demos/GimpactTestDemo/GimpactTestDemo.h index be6ab04d7..f56a6bcfb 100644 --- a/Demos/GimpactTestDemo/GimpactTestDemo.h +++ b/Demos/GimpactTestDemo/GimpactTestDemo.h @@ -65,24 +65,8 @@ public: { } - virtual ~GimpactConcaveDemo() - { - delete m_dynamicsWorld; + virtual ~GimpactConcaveDemo(); - delete m_indexVertexArrays; - delete m_trimeshShape; - - delete m_indexVertexArrays2; - delete m_trimeshShape2; - - delete m_gimpactCollisionCreateFunc; - - delete m_collisionConfiguration; - delete m_dispatcher; - delete m_broadphase; - delete m_constraintSolver; - - } void initGImpactCollision(); void initPhysics(); diff --git a/msvc/6/appAllBulletDemos.dsp b/msvc/6/appAllBulletDemos.dsp index f0483153b..bf67fb59b 100644 --- a/msvc/6/appAllBulletDemos.dsp +++ b/msvc/6/appAllBulletDemos.dsp @@ -45,11 +45,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 "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Extras" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexDecomposition" +# 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\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" +# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appAllBulletDemos\appAllBulletDemos.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 @@ -76,11 +76,11 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "..\..\out\release_dbl6\build\appAllBulletDemos\" # 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" +# 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\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" +# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appAllBulletDemos\appAllBulletDemos.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 @@ -108,11 +108,11 @@ SOURCE="$(InputPath)" # 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" +# 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\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" +# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appAllBulletDemos\appAllBulletDemos.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 @@ -139,11 +139,11 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appAllBulletDemos\" # 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" +# 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\appAllBulletDemos\appAllBulletDemos.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Extras" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexDecomposition" +# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appAllBulletDemos\appAllBulletDemos.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 @@ -194,14 +194,34 @@ SOURCE=..\..\Demos\AllBulletDemos\..\ConcaveDemo\ConcavePhysicsDemo.cpp # End Source File # Begin Source File +SOURCE=..\..\Demos\AllBulletDemos\..\ConstraintDemo\ConstraintDemo.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Demos\AllBulletDemos\..\ConvexDecompositionDemo\ConvexDecompositionDemo.cpp # End Source File # Begin Source File +SOURCE=..\..\Demos\AllBulletDemos\..\GimpactTestDemo\GimpactTestDemo.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Demos\AllBulletDemos\..\GjkConvexCastDemo\LinearConvexCastDemo.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Demos\AllBulletDemos\..\RagdollDemo\RagdollDemo.cpp # End Source File # Begin Source File +SOURCE=..\..\Demos\AllBulletDemos\..\Raytracer\Raytracer.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Demos\AllBulletDemos\..\VehicleDemo\VehicleDemo.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Demos\AllBulletDemos\DemoEntries.cpp # End Source File # Begin Source File diff --git a/msvc/6/appConstraintDemo.dsp b/msvc/6/appConstraintDemo.dsp index 541d18548..ca8f2ea8a 100644 --- a/msvc/6/appConstraintDemo.dsp +++ b/msvc/6/appConstraintDemo.dsp @@ -172,6 +172,10 @@ SOURCE="$(InputPath)" SOURCE=..\..\Demos\ConstraintDemo\ConstraintDemo.cpp # End Source File +# Begin Source File + +SOURCE=..\..\Demos\ConstraintDemo\main.cpp +# End Source File # End Group # Begin Group "Header Files" diff --git a/msvc/6/appGimpactTestDemo.dsp b/msvc/6/appGimpactTestDemo.dsp index 2bf2df42b..fc7bd329c 100644 --- a/msvc/6/appGimpactTestDemo.dsp +++ b/msvc/6/appGimpactTestDemo.dsp @@ -172,6 +172,10 @@ SOURCE="$(InputPath)" SOURCE=..\..\Demos\GimpactTestDemo\GimpactTestDemo.cpp # End Source File +# Begin Source File + +SOURCE=..\..\Demos\GimpactTestDemo\main.cpp +# End Source File # End Group # Begin Group "Header Files" diff --git a/msvc/6/appGjkConvexCastDemo.dsp b/msvc/6/appGjkConvexCastDemo.dsp index a77017b76..63bfc0638 100644 --- a/msvc/6/appGjkConvexCastDemo.dsp +++ b/msvc/6/appGjkConvexCastDemo.dsp @@ -172,6 +172,10 @@ SOURCE="$(InputPath)" SOURCE=..\..\Demos\GjkConvexCastDemo\LinearConvexCastDemo.cpp # End Source File +# Begin Source File + +SOURCE=..\..\Demos\GjkConvexCastDemo\main.cpp +# End Source File # End Group # Begin Group "Header Files" diff --git a/msvc/6/appRaytracer.dsp b/msvc/6/appRaytracer.dsp index e1a9d54f1..d922bade9 100644 --- a/msvc/6/appRaytracer.dsp +++ b/msvc/6/appRaytracer.dsp @@ -170,6 +170,10 @@ SOURCE="$(InputPath)" # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Demos\Raytracer\main.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Demos\Raytracer\Raytracer.cpp # End Source File # End Group diff --git a/msvc/6/appVehicleDemo.dsp b/msvc/6/appVehicleDemo.dsp index 88604d828..068a0eaa0 100644 --- a/msvc/6/appVehicleDemo.dsp +++ b/msvc/6/appVehicleDemo.dsp @@ -170,6 +170,10 @@ SOURCE="$(InputPath)" # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\Demos\VehicleDemo\main.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Demos\VehicleDemo\VehicleDemo.cpp # End Source File # End Group diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index ad358b989..03f8de0a4 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "appAllBulletDemos"=.\appAllBulletDemos.dsp - Package Owner=<4> +Project: "appAllBulletDemos"=".\appAllBulletDemos.dsp" - Package Owner=<4> Package=<5> {{{ @@ -27,13 +27,19 @@ Package=<4> 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: "appBasicDemo"=.\appBasicDemo.dsp - Package Owner=<4> +Project: "appBasicDemo"=".\appBasicDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -57,7 +63,7 @@ Package=<4> ############################################################################### -Project: "appBspDemo"=.\appBspDemo.dsp - Package Owner=<4> +Project: "appBspDemo"=".\appBspDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -81,7 +87,7 @@ Package=<4> ############################################################################### -Project: "appBulletDino"=.\appBulletDino.dsp - Package Owner=<4> +Project: "appBulletDino"=".\appBulletDino.dsp" - Package Owner=<4> Package=<5> {{{ @@ -105,7 +111,7 @@ Package=<4> ############################################################################### -Project: "appCcdPhysicsDemo"=.\appCcdPhysicsDemo.dsp - Package Owner=<4> +Project: "appCcdPhysicsDemo"=".\appCcdPhysicsDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -129,40 +135,7 @@ Package=<4> ############################################################################### -Project: "appColladaDemo"=.\appColladaDemo.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libBulletColladaConverter - End Project Dependency - 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 libbulletopenglsupport - End Project Dependency - Begin Project Dependency - Project_Dep_Name libcolladadom - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblibxml - End Project Dependency -}}} - -############################################################################### - -Project: "appCollisionDemo"=.\appCollisionDemo.dsp - Package Owner=<4> +Project: "appCollisionDemo"=".\appCollisionDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -186,7 +159,7 @@ Package=<4> ############################################################################### -Project: "appCollisionInterfaceDemo"=.\appCollisionInterfaceDemo.dsp - Package Owner=<4> +Project: "appCollisionInterfaceDemo"=".\appCollisionInterfaceDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -210,7 +183,7 @@ Package=<4> ############################################################################### -Project: "appConcaveDemo"=.\appConcaveDemo.dsp - Package Owner=<4> +Project: "appConcaveDemo"=".\appConcaveDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -234,7 +207,7 @@ Package=<4> ############################################################################### -Project: "appConstraintDemo"=.\appConstraintDemo.dsp - Package Owner=<4> +Project: "appConstraintDemo"=".\appConstraintDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -258,7 +231,7 @@ Package=<4> ############################################################################### -Project: "appContinuousConvexCollision"=.\appContinuousConvexCollision.dsp - Package Owner=<4> +Project: "appContinuousConvexCollision"=".\appContinuousConvexCollision.dsp" - Package Owner=<4> Package=<5> {{{ @@ -282,7 +255,7 @@ Package=<4> ############################################################################### -Project: "appConvexDecompositionDemo"=.\appConvexDecompositionDemo.dsp - Package Owner=<4> +Project: "appConvexDecompositionDemo"=".\appConvexDecompositionDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -309,7 +282,7 @@ Package=<4> ############################################################################### -Project: "appDoublePrecisionDemo"=.\appDoublePrecisionDemo.dsp - Package Owner=<4> +Project: "appDoublePrecisionDemo"=".\appDoublePrecisionDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -333,7 +306,7 @@ Package=<4> ############################################################################### -Project: "appEPAPenDepthDemo"=.\appEPAPenDepthDemo.dsp - Package Owner=<4> +Project: "appEPAPenDepthDemo"=".\appEPAPenDepthDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -360,7 +333,7 @@ Package=<4> ############################################################################### -Project: "appGenericJointDemo"=.\appGenericJointDemo.dsp - Package Owner=<4> +Project: "appGenericJointDemo"=".\appGenericJointDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -384,7 +357,7 @@ Package=<4> ############################################################################### -Project: "appGimpactTestDemo"=.\appGimpactTestDemo.dsp - Package Owner=<4> +Project: "appGimpactTestDemo"=".\appGimpactTestDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -417,7 +390,7 @@ Package=<4> ############################################################################### -Project: "appGjkConvexCastDemo"=.\appGjkConvexCastDemo.dsp - Package Owner=<4> +Project: "appGjkConvexCastDemo"=".\appGjkConvexCastDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -441,7 +414,7 @@ Package=<4> ############################################################################### -Project: "appMovingConcaveDemo"=.\appMovingConcaveDemo.dsp - Package Owner=<4> +Project: "appMovingConcaveDemo"=".\appMovingConcaveDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -468,7 +441,7 @@ Package=<4> ############################################################################### -Project: "appRagdollDemo"=.\appRagdollDemo.dsp - Package Owner=<4> +Project: "appRagdollDemo"=".\appRagdollDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -492,7 +465,7 @@ Package=<4> ############################################################################### -Project: "appRaytracer"=.\appRaytracer.dsp - Package Owner=<4> +Project: "appRaytracer"=".\appRaytracer.dsp" - Package Owner=<4> Package=<5> {{{ @@ -516,7 +489,7 @@ Package=<4> ############################################################################### -Project: "appSimplexDemo"=.\appSimplexDemo.dsp - Package Owner=<4> +Project: "appSimplexDemo"=".\appSimplexDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -540,7 +513,7 @@ Package=<4> ############################################################################### -Project: "appUserCollisionAlgorithm"=.\appUserCollisionAlgorithm.dsp - Package Owner=<4> +Project: "appUserCollisionAlgorithm"=".\appUserCollisionAlgorithm.dsp" - Package Owner=<4> Package=<5> {{{ @@ -564,7 +537,7 @@ Package=<4> ############################################################################### -Project: "appVehicleDemo"=.\appVehicleDemo.dsp - Package Owner=<4> +Project: "appVehicleDemo"=".\appVehicleDemo.dsp" - Package Owner=<4> Package=<5> {{{ @@ -588,7 +561,7 @@ Package=<4> ############################################################################### -Project: "grpall_bullet"=.\grpall_bullet.dsp - Package Owner=<4> +Project: "grpall_bullet"=".\grpall_bullet.dsp" - Package Owner=<4> Package=<5> {{{ @@ -612,9 +585,6 @@ Package=<4> Project_Dep_Name appCcdPhysicsDemo End Project Dependency Begin Project Dependency - Project_Dep_Name appColladaDemo - End Project Dependency - Begin Project Dependency Project_Dep_Name appCollisionDemo End Project Dependency Begin Project Dependency @@ -687,9 +657,6 @@ Package=<4> Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency - Project_Dep_Name libcolladadom - End Project Dependency - Begin Project Dependency Project_Dep_Name libconvexdecomposition End Project Dependency Begin Project Dependency @@ -702,16 +669,13 @@ Package=<4> Project_Dep_Name libglui End Project Dependency Begin Project Dependency - Project_Dep_Name liblibxml - End Project Dependency - Begin Project Dependency Project_Dep_Name libquickstep End Project Dependency }}} ############################################################################### -Project: "grpapps_bullet"=.\grpapps_bullet.dsp - Package Owner=<4> +Project: "grpapps_bullet"=".\grpapps_bullet.dsp" - Package Owner=<4> Package=<5> {{{ @@ -735,9 +699,6 @@ Package=<4> Project_Dep_Name appCcdPhysicsDemo End Project Dependency Begin Project Dependency - Project_Dep_Name appColladaDemo - End Project Dependency - Begin Project Dependency Project_Dep_Name appCollisionDemo End Project Dependency Begin Project Dependency @@ -792,7 +753,7 @@ Package=<4> ############################################################################### -Project: "grplibs_bullet"=.\grplibs_bullet.dsp - Package Owner=<4> +Project: "grplibs_bullet"=".\grplibs_bullet.dsp" - Package Owner=<4> Package=<5> {{{ @@ -822,9 +783,6 @@ Package=<4> Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency - Project_Dep_Name libcolladadom - End Project Dependency - Begin Project Dependency Project_Dep_Name libconvexdecomposition End Project Dependency Begin Project Dependency @@ -837,16 +795,13 @@ Package=<4> Project_Dep_Name libglui End Project Dependency Begin Project Dependency - Project_Dep_Name liblibxml - End Project Dependency - Begin Project Dependency Project_Dep_Name libquickstep End Project Dependency }}} ############################################################################### -Project: "libboxbox"=.\libboxbox.dsp - Package Owner=<4> +Project: "libBulletColladaConverter"=".\libBulletColladaConverter.dsp" - Package Owner=<4> Package=<5> {{{ @@ -858,7 +813,7 @@ Package=<4> ############################################################################### -Project: "libBulletColladaConverter"=.\libBulletColladaConverter.dsp - Package Owner=<4> +Project: "libGIMPACT"=".\libGIMPACT.dsp" - Package Owner=<4> Package=<5> {{{ @@ -870,7 +825,7 @@ Package=<4> ############################################################################### -Project: "libbulletcollision"=.\libbulletcollision.dsp - Package Owner=<4> +Project: "libGIMPACTUtils"=".\libGIMPACTUtils.dsp" - Package Owner=<4> Package=<5> {{{ @@ -882,7 +837,7 @@ Package=<4> ############################################################################### -Project: "libbulletdynamics"=.\libbulletdynamics.dsp - Package Owner=<4> +Project: "libboxbox"=".\libboxbox.dsp" - Package Owner=<4> Package=<5> {{{ @@ -894,7 +849,7 @@ Package=<4> ############################################################################### -Project: "libbulletmath"=.\libbulletmath.dsp - Package Owner=<4> +Project: "libbulletcollision"=".\libbulletcollision.dsp" - Package Owner=<4> Package=<5> {{{ @@ -906,7 +861,7 @@ Package=<4> ############################################################################### -Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4> +Project: "libbulletdynamics"=".\libbulletdynamics.dsp" - Package Owner=<4> Package=<5> {{{ @@ -918,7 +873,7 @@ Package=<4> ############################################################################### -Project: "libbulletopenglsupport"=.\libbulletopenglsupport.dsp - Package Owner=<4> +Project: "libbulletmath"=".\libbulletmath.dsp" - Package Owner=<4> Package=<5> {{{ @@ -930,7 +885,7 @@ Package=<4> ############################################################################### -Project: "libcolladadom"=.\libcolladadom.dsp - Package Owner=<4> +Project: "libbulletmultithreaded"=".\libbulletmultithreaded.dsp" - Package Owner=<4> Package=<5> {{{ @@ -942,7 +897,7 @@ Package=<4> ############################################################################### -Project: "libconvexdecomposition"=.\libconvexdecomposition.dsp - Package Owner=<4> +Project: "libbulletopenglsupport"=".\libbulletopenglsupport.dsp" - Package Owner=<4> Package=<5> {{{ @@ -954,7 +909,7 @@ Package=<4> ############################################################################### -Project: "libGIMPACT"=.\libGIMPACT.dsp - Package Owner=<4> +Project: "libconvexdecomposition"=".\libconvexdecomposition.dsp" - Package Owner=<4> Package=<5> {{{ @@ -966,7 +921,7 @@ Package=<4> ############################################################################### -Project: "libGIMPACTUtils"=.\libGIMPACTUtils.dsp - Package Owner=<4> +Project: "libglui"=".\libglui.dsp" - Package Owner=<4> Package=<5> {{{ @@ -978,31 +933,7 @@ Package=<4> ############################################################################### -Project: "libglui"=.\libglui.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblibxml"=.\liblibxml.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libquickstep"=.\libquickstep.dsp - Package Owner=<4> +Project: "libquickstep"=".\libquickstep.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/msvc/7/appAllBulletDemos.vcproj b/msvc/7/appAllBulletDemos.vcproj index bd571f586..1d050b0f7 100644 --- a/msvc/7/appAllBulletDemos.vcproj +++ b/msvc/7/appAllBulletDemos.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\release7\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\release7\build\appAllBulletDemos\" ObjectFile="..\..\out\release7\build\appAllBulletDemos\" @@ -81,7 +81,7 @@ @@ -102,7 +102,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\release_dbl7\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\release_dbl7\build\appAllBulletDemos\" ObjectFile="..\..\out\release_dbl7\build\appAllBulletDemos\" @@ -146,7 +146,7 @@ @@ -172,7 +172,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\debug7\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\debug7\build\appAllBulletDemos\" ObjectFile="..\..\out\debug7\build\appAllBulletDemos\" @@ -219,7 +219,7 @@ @@ -245,7 +245,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\debug_dbl7\build\appAllBulletDemos\" ObjectFile="..\..\out\debug_dbl7\build\appAllBulletDemos\" @@ -289,7 +289,7 @@ @@ -319,12 +319,27 @@ + + + + + + + + + + diff --git a/msvc/7/appConstraintDemo.vcproj b/msvc/7/appConstraintDemo.vcproj index 777616711..1948e2499 100644 --- a/msvc/7/appConstraintDemo.vcproj +++ b/msvc/7/appConstraintDemo.vcproj @@ -304,6 +304,9 @@ + + + + + + + + diff --git a/msvc/7/appVehicleDemo.vcproj b/msvc/7/appVehicleDemo.vcproj index 5c2e44c87..0a632d0c1 100644 --- a/msvc/7/appVehicleDemo.vcproj +++ b/msvc/7/appVehicleDemo.vcproj @@ -301,6 +301,9 @@ + + diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index 82958a961..468992579 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -93,7 +93,9 @@ Global {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 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {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} {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} diff --git a/msvc/71/appAllBulletDemos.vcproj b/msvc/71/appAllBulletDemos.vcproj index 719c621ff..c4d89904e 100644 --- a/msvc/71/appAllBulletDemos.vcproj +++ b/msvc/71/appAllBulletDemos.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\release71\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\release71\build\appAllBulletDemos\" ObjectFile="..\..\out\release71\build\appAllBulletDemos\" @@ -81,7 +81,7 @@ @@ -102,7 +102,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\release_dbl71\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\release_dbl71\build\appAllBulletDemos\" ObjectFile="..\..\out\release_dbl71\build\appAllBulletDemos\" @@ -146,7 +146,7 @@ @@ -172,7 +172,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\debug71\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\debug71\build\appAllBulletDemos\" ObjectFile="..\..\out\debug71\build\appAllBulletDemos\" @@ -219,7 +219,7 @@ @@ -245,7 +245,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\debug_dbl71\build\appAllBulletDemos\" ObjectFile="..\..\out\debug_dbl71\build\appAllBulletDemos\" @@ -289,7 +289,7 @@ @@ -319,12 +319,27 @@ + + + + + + + + + + diff --git a/msvc/71/appConstraintDemo.vcproj b/msvc/71/appConstraintDemo.vcproj index a84507854..88cfcba27 100644 --- a/msvc/71/appConstraintDemo.vcproj +++ b/msvc/71/appConstraintDemo.vcproj @@ -304,6 +304,9 @@ + + + + + + + + diff --git a/msvc/71/appVehicleDemo.vcproj b/msvc/71/appVehicleDemo.vcproj index 4a6874c55..753a99c5b 100644 --- a/msvc/71/appVehicleDemo.vcproj +++ b/msvc/71/appVehicleDemo.vcproj @@ -301,6 +301,9 @@ + + diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 29c7ef0ea..3773501c6 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -93,7 +93,9 @@ Global {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 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {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} {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} diff --git a/msvc/8/appAllBulletDemos.vcproj b/msvc/8/appAllBulletDemos.vcproj index 5a2675f9a..e0370a4d3 100644 --- a/msvc/8/appAllBulletDemos.vcproj +++ b/msvc/8/appAllBulletDemos.vcproj @@ -32,7 +32,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\release8\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\release8\build\appAllBulletDemos\" ObjectFile="..\..\out\release8\build\appAllBulletDemos\" @@ -81,7 +81,7 @@ @@ -102,7 +102,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\release_dbl8\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\release_dbl8\build\appAllBulletDemos\" ObjectFile="..\..\out\release_dbl8\build\appAllBulletDemos\" @@ -146,7 +146,7 @@ @@ -172,7 +172,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\debug8\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\debug8\build\appAllBulletDemos\" ObjectFile="..\..\out\debug8\build\appAllBulletDemos\" @@ -219,7 +219,7 @@ @@ -245,7 +245,7 @@ OptimizeForProcessor="1" ExceptionHandling="0" AdditionalOptions=" " - AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition" + AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Extras;..\..\Demos\OpenGL;..\..\Extras\ConvexDecomposition;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils" PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appAllBulletDemos\appAllBulletDemos.pch" AssemblerListingLocation="..\..\out\debug_dbl8\build\appAllBulletDemos\" ObjectFile="..\..\out\debug_dbl8\build\appAllBulletDemos\" @@ -289,7 +289,7 @@ @@ -319,12 +319,27 @@ + + + + + + + + + + diff --git a/msvc/8/appConstraintDemo.vcproj b/msvc/8/appConstraintDemo.vcproj index 03f350d23..308a2b7cd 100644 --- a/msvc/8/appConstraintDemo.vcproj +++ b/msvc/8/appConstraintDemo.vcproj @@ -304,6 +304,9 @@ + + + + + + + + diff --git a/msvc/8/appVehicleDemo.vcproj b/msvc/8/appVehicleDemo.vcproj index c2093754f..34b9f3cad 100644 --- a/msvc/8/appVehicleDemo.vcproj +++ b/msvc/8/appVehicleDemo.vcproj @@ -301,6 +301,9 @@ + + diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index e510dbf20..121912b46 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -93,7 +93,9 @@ Global {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 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {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} {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} diff --git a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp index 598603ce7..554915a70 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp @@ -30,6 +30,11 @@ btTriangleIndexVertexArray::btTriangleIndexVertexArray(int numTriangles,int* tri } +btTriangleIndexVertexArray::~btTriangleIndexVertexArray() +{ + +} + void btTriangleIndexVertexArray::getLockedVertexIndexBase(unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& vertexStride,unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart) { btAssert(subpart< getNumSubParts() ); diff --git a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h index 1432d2661..3441a8325 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h +++ b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h @@ -18,6 +18,8 @@ subject to the following restrictions: #include "btStridingMeshInterface.h" #include "LinearMath/btAlignedObjectArray.h" +#include "LinearMath/btScalar.h" + ///IndexedMesh indexes into existing vertex and index arrays, in a similar way OpenGL glDrawElements ///instead of the number of indices, we pass the number of triangles @@ -57,6 +59,8 @@ public: { } + virtual ~btTriangleIndexVertexArray(); + //just to be backwards compatible btTriangleIndexVertexArray(int numTriangleIndices,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride);