diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp index 5298982e8..09470cf87 100644 --- a/msvc/6/libbulletcollision.dsp +++ b/msvc/6/libbulletcollision.dsp @@ -284,6 +284,10 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.cpp # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexInternalShape.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexShape.cpp # End Source File # Begin Source File @@ -356,6 +360,10 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleMeshShape.cpp # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp # End Source File # Begin Source File @@ -528,6 +536,10 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.h # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexInternalShape.h +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexShape.h # End Source File # Begin Source File @@ -604,6 +616,10 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btTriangleShape.h # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.h +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.h # End Source File # Begin Source File diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index 7e95d47f1..5b489bede 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -351,18 +351,6 @@ Package=<4> ############################################################################### -Project: "appGPUphysics"=.\appGPUphysics.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "appMovingConcaveDemo"=.\appMovingConcaveDemo.dsp - Package Owner=<4> Package=<5> @@ -561,9 +549,6 @@ 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 appMovingConcaveDemo End Project Dependency Begin Project Dependency @@ -669,9 +654,6 @@ 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 appMovingConcaveDemo End Project Dependency Begin Project Dependency diff --git a/msvc/7/libbulletcollision.vcproj b/msvc/7/libbulletcollision.vcproj index 9d91ee58c..b93845a79 100644 --- a/msvc/7/libbulletcollision.vcproj +++ b/msvc/7/libbulletcollision.vcproj @@ -378,6 +378,9 @@ + + @@ -432,6 +435,9 @@ + + @@ -562,6 +568,9 @@ + + @@ -619,6 +628,9 @@ + + diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index a61434cbe..cae12e5c8 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -28,8 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appEPAPenDepthDemo", "appEP 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}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRagdollDemo", "appRagdollDemo.vcproj", "{EFEF2072-51F9-DAE8-AC38-3E653C680F74}" @@ -177,24 +175,23 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {6210A080-01C0-6D67-F1DB-669393175402}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} {6210A080-01C0-6D67-F1DB-669393175402}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.25 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {6210A080-01C0-6D67-F1DB-669393175402}.26 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.27 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.28 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.29 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6210A080-01C0-6D67-F1DB-669393175402}.30 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {6210A080-01C0-6D67-F1DB-669393175402}.31 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.25 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.26 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.27 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.28 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.29 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.30 = {D7036964-B44D-8207-0ACC-D838D0BDA379} {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 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD} @@ -209,13 +206,12 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} @@ -341,14 +337,6 @@ 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 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.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 diff --git a/msvc/71/libbulletcollision.vcproj b/msvc/71/libbulletcollision.vcproj index 02214e66e..f01607e43 100644 --- a/msvc/71/libbulletcollision.vcproj +++ b/msvc/71/libbulletcollision.vcproj @@ -378,6 +378,9 @@ + + @@ -432,6 +435,9 @@ + + @@ -562,6 +568,9 @@ + + @@ -619,6 +628,9 @@ + + diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 9e073d500..10cb1ef01 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -28,8 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appEPAPenDepthDemo", "appEP 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}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRagdollDemo", "appRagdollDemo.vcproj", "{EFEF2072-51F9-DAE8-AC38-3E653C680F74}" @@ -177,24 +175,23 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {6210A080-01C0-6D67-F1DB-669393175402}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} {6210A080-01C0-6D67-F1DB-669393175402}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.25 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {6210A080-01C0-6D67-F1DB-669393175402}.26 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.27 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.28 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.29 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6210A080-01C0-6D67-F1DB-669393175402}.30 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {6210A080-01C0-6D67-F1DB-669393175402}.31 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.25 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.26 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.27 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.28 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.29 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.30 = {D7036964-B44D-8207-0ACC-D838D0BDA379} {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 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD} @@ -209,13 +206,12 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} @@ -341,14 +337,6 @@ 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 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.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 diff --git a/msvc/8/libbulletcollision.vcproj b/msvc/8/libbulletcollision.vcproj index 7f3b6ce11..69b284797 100644 --- a/msvc/8/libbulletcollision.vcproj +++ b/msvc/8/libbulletcollision.vcproj @@ -378,6 +378,9 @@ + + @@ -432,6 +435,9 @@ + + @@ -562,6 +568,9 @@ + + @@ -619,6 +628,9 @@ + + diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index f5b68bbb0..703cd27ea 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -28,8 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appEPAPenDepthDemo", "appEP 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}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRagdollDemo", "appRagdollDemo.vcproj", "{EFEF2072-51F9-DAE8-AC38-3E653C680F74}" @@ -177,24 +175,23 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {6210A080-01C0-6D67-F1DB-669393175402}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} {6210A080-01C0-6D67-F1DB-669393175402}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {6210A080-01C0-6D67-F1DB-669393175402}.14 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {6210A080-01C0-6D67-F1DB-669393175402}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {6210A080-01C0-6D67-F1DB-669393175402}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {6210A080-01C0-6D67-F1DB-669393175402}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {6210A080-01C0-6D67-F1DB-669393175402}.19 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.21 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} - {6210A080-01C0-6D67-F1DB-669393175402}.22 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.23 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.24 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.25 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {6210A080-01C0-6D67-F1DB-669393175402}.26 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.27 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.28 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.29 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {6210A080-01C0-6D67-F1DB-669393175402}.30 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {6210A080-01C0-6D67-F1DB-669393175402}.31 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {6210A080-01C0-6D67-F1DB-669393175402}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {6210A080-01C0-6D67-F1DB-669393175402}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {6210A080-01C0-6D67-F1DB-669393175402}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {6210A080-01C0-6D67-F1DB-669393175402}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {6210A080-01C0-6D67-F1DB-669393175402}.18 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.20 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} + {6210A080-01C0-6D67-F1DB-669393175402}.21 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.22 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.23 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.25 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.26 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.27 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.28 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.29 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.30 = {D7036964-B44D-8207-0ACC-D838D0BDA379} {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 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD} @@ -209,13 +206,12 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {E2707D44-8B82-55F1-6C5A-D03B19159248} {9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3} {9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1} - {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F} - {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {2D714360-B8EC-F8E0-ED74-E95336301075} - {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} - {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60F71B6A-F888-C449-EF49-268BB9F7C963} - {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {60A1DC9D-F837-3923-E9DE-A7925394A578} - {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.20 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {2D714360-B8EC-F8E0-ED74-E95336301075} + {9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {EFEF2072-51F9-DAE8-AC38-3E653C680F74} + {9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {60F71B6A-F888-C449-EF49-268BB9F7C963} + {9E59B16D-0924-409C-1611-DF2207A0053F}.17 = {60A1DC9D-F837-3923-E9DE-A7925394A578} + {9E59B16D-0924-409C-1611-DF2207A0053F}.18 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.19 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {B6257B39-1C3C-09FF-BD85-AAC75B140A19} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} @@ -341,14 +337,6 @@ 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 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.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