diff --git a/ChangeLog.txt b/ChangeLog.txt index 5ed7e2e62..f14d02e10 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,14 @@ Bullet Continuous Collision Detection and Physics Library Primary author and maintainer: Erwin Coumans +2007 Sept 7 + - Replaced several dynamic memory allocations by stack allocation and pool allocations + - Added branch-free quantized aabb bounding box overlap check, works better on Playstation 3 and XBox 360 + Thanks to Phil Knight. Also see www.cellperformance.com for related articles + - Collision algorithms and settings for the memory/stack allocator can be done using btDefaultCollisionConfiguration + This is an API change. See demos how to modify existing implementations with a one-liner. + + 2007 Aug 31 - fixed MSVC 6 build Thanks Proctoid, http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1375 diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp index ae2b34242..174dc1157 100644 --- a/msvc/6/libbulletcollision.dsp +++ b/msvc/6/libbulletcollision.dsp @@ -224,6 +224,10 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp # End Source File # Begin Source File @@ -448,6 +452,10 @@ SOURCE=..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCollisionCreateFunc.h # End Source File # Begin Source File @@ -476,6 +484,10 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.h # End Source File # Begin Source File +SOURCE=..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.h +# End Source File +# Begin Source File + SOURCE=..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.h # End Source File # Begin Source File diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index 5b489bede..d3b330f9a 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -579,9 +579,6 @@ Package=<4> Project_Dep_Name libbulletmath End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletmultithreaded - End Project Dependency - Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency @@ -696,9 +693,6 @@ Package=<4> Project_Dep_Name libbulletmath End Project Dependency Begin Project Dependency - Project_Dep_Name libbulletmultithreaded - End Project Dependency - Begin Project Dependency Project_Dep_Name libbulletopenglsupport End Project Dependency Begin Project Dependency @@ -768,18 +762,6 @@ Package=<4> ############################################################################### -Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "libbulletopenglsupport"=.\libbulletopenglsupport.dsp - Package Owner=<4> Package=<5> diff --git a/msvc/6/wksbullet_corelib.dsw b/msvc/6/wksbullet_corelib.dsw index a36667998..747f20b6a 100644 --- a/msvc/6/wksbullet_corelib.dsw +++ b/msvc/6/wksbullet_corelib.dsw @@ -39,18 +39,6 @@ Package=<4> ############################################################################### -Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Global: Package=<5> diff --git a/msvc/7/libbulletcollision.vcproj b/msvc/7/libbulletcollision.vcproj index c7760a666..5b06d2b27 100644 --- a/msvc/7/libbulletcollision.vcproj +++ b/msvc/7/libbulletcollision.vcproj @@ -333,6 +333,9 @@ + + @@ -502,6 +505,9 @@ + + @@ -523,6 +529,9 @@ + + diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index cae12e5c8..294690d0c 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -54,8 +54,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" @@ -185,13 +183,12 @@ Global {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} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.25 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.26 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.27 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.28 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.29 = {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} @@ -216,13 +213,12 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {D7036964-B44D-8207-0ACC-D838D0BDA379} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32 @@ -441,14 +437,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/7/wksbullet_corelib.sln b/msvc/7/wksbullet_corelib.sln index 4a03d7f86..70f6f1ee3 100644 --- a/msvc/7/wksbullet_corelib.sln +++ b/msvc/7/wksbullet_corelib.sln @@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Global GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Release @@ -42,14 +40,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/msvc/71/libbulletcollision.vcproj b/msvc/71/libbulletcollision.vcproj index 65d3b4e82..0621b0f3e 100644 --- a/msvc/71/libbulletcollision.vcproj +++ b/msvc/71/libbulletcollision.vcproj @@ -333,6 +333,9 @@ + + @@ -502,6 +505,9 @@ + + @@ -523,6 +529,9 @@ + + diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 10cb1ef01..204c01edc 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -54,8 +54,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" @@ -185,13 +183,12 @@ Global {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} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.25 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.26 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.27 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.28 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.29 = {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} @@ -216,13 +213,12 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {D7036964-B44D-8207-0ACC-D838D0BDA379} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32 @@ -441,14 +437,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/71/wksbullet_corelib.sln b/msvc/71/wksbullet_corelib.sln index b8bbbd2a0..661e5b8ca 100644 --- a/msvc/71/wksbullet_corelib.sln +++ b/msvc/71/wksbullet_corelib.sln @@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Global GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Release @@ -42,14 +40,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/msvc/8/libbulletcollision.vcproj b/msvc/8/libbulletcollision.vcproj index fee674add..5369e3254 100644 --- a/msvc/8/libbulletcollision.vcproj +++ b/msvc/8/libbulletcollision.vcproj @@ -333,6 +333,9 @@ + + @@ -502,6 +505,9 @@ + + @@ -523,6 +529,9 @@ + + diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index 703cd27ea..0e7d7704d 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -54,8 +54,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcolladadom.vcproj", "{6AB01C9C-9163-F400-B5C3-20D046631E17}" @@ -185,13 +183,12 @@ Global {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} + {6210A080-01C0-6D67-F1DB-669393175402}.24 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.25 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.26 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.27 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {6210A080-01C0-6D67-F1DB-669393175402}.28 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.29 = {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} @@ -216,13 +213,12 @@ Global {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} - {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {D7036964-B44D-8207-0ACC-D838D0BDA379} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {D7036964-B44D-8207-0ACC-D838D0BDA379} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32 @@ -441,14 +437,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.ActiveCfg = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32 {7C428E76-9271-6284-20F0-9B38ED6931E3}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 diff --git a/msvc/8/wksbullet_corelib.sln b/msvc/8/wksbullet_corelib.sln index c0e87643f..ce5d5ba0f 100644 --- a/msvc/8/wksbullet_corelib.sln +++ b/msvc/8/wksbullet_corelib.sln @@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmultithreaded", "libbulletmultithreaded.vcproj", "{A24D77FD-D69A-75A0-A7DC-730894C9D0F7}" -EndProject Global GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Release @@ -42,14 +40,6 @@ Global {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug.Build.0 = Debug|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.ActiveCfg = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Release.Build.0 = Release|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.ActiveCfg = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.Debug.Build.0 = Debug|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 - {A24D77FD-D69A-75A0-A7DC-730894C9D0F7}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/msvc/appBasicDemo.rc b/msvc/appBasicDemo.rc index d3ed9c71b..a0c2a8281 100644 --- a/msvc/appBasicDemo.rc +++ b/msvc/appBasicDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "BasicDemo" #ifdef CS_DEBUG diff --git a/msvc/appBspDemo.rc b/msvc/appBspDemo.rc index 2a913b6e8..d5affd91b 100644 --- a/msvc/appBspDemo.rc +++ b/msvc/appBspDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "BspDemo" #ifdef CS_DEBUG diff --git a/msvc/appBulletDino.rc b/msvc/appBulletDino.rc index c0ad25745..8b96907b7 100644 --- a/msvc/appBulletDino.rc +++ b/msvc/appBulletDino.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "BulletDino" #ifdef CS_DEBUG diff --git a/msvc/appCcdPhysicsDemo.rc b/msvc/appCcdPhysicsDemo.rc index e1b8f528a..b281ed23f 100644 --- a/msvc/appCcdPhysicsDemo.rc +++ b/msvc/appCcdPhysicsDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "CcdPhysicsDemo" #ifdef CS_DEBUG diff --git a/msvc/appColladaDemo.rc b/msvc/appColladaDemo.rc index d0641df0c..a3d46b83e 100644 --- a/msvc/appColladaDemo.rc +++ b/msvc/appColladaDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ColladaDemo" #ifdef CS_DEBUG diff --git a/msvc/appCollisionDemo.rc b/msvc/appCollisionDemo.rc index df2bae358..978fa6a48 100644 --- a/msvc/appCollisionDemo.rc +++ b/msvc/appCollisionDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "CollisionDemo" #ifdef CS_DEBUG diff --git a/msvc/appCollisionInterfaceDemo.rc b/msvc/appCollisionInterfaceDemo.rc index 4b5451c75..518200184 100644 --- a/msvc/appCollisionInterfaceDemo.rc +++ b/msvc/appCollisionInterfaceDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "CollisionInterfaceDemo" #ifdef CS_DEBUG diff --git a/msvc/appConcaveDemo.rc b/msvc/appConcaveDemo.rc index 35d45210f..5d4a0cf9f 100644 --- a/msvc/appConcaveDemo.rc +++ b/msvc/appConcaveDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ConcaveDemo" #ifdef CS_DEBUG diff --git a/msvc/appConstraintDemo.rc b/msvc/appConstraintDemo.rc index 3411f5c28..d2582b149 100644 --- a/msvc/appConstraintDemo.rc +++ b/msvc/appConstraintDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ConstraintDemo" #ifdef CS_DEBUG diff --git a/msvc/appContinuousConvexCollision.rc b/msvc/appContinuousConvexCollision.rc index 12bf9955b..64988f531 100644 --- a/msvc/appContinuousConvexCollision.rc +++ b/msvc/appContinuousConvexCollision.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ContinuousConvexCollision" #ifdef CS_DEBUG diff --git a/msvc/appConvexDecompositionDemo.rc b/msvc/appConvexDecompositionDemo.rc index e4f0a1180..3a39d81fc 100644 --- a/msvc/appConvexDecompositionDemo.rc +++ b/msvc/appConvexDecompositionDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "ConvexDecompositionDemo" #ifdef CS_DEBUG diff --git a/msvc/appDoublePrecisionDemo.rc b/msvc/appDoublePrecisionDemo.rc index b7efe1950..659e4d20d 100644 --- a/msvc/appDoublePrecisionDemo.rc +++ b/msvc/appDoublePrecisionDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "DoublePrecisionDemo" #ifdef CS_DEBUG diff --git a/msvc/appEPAPenDepthDemo.rc b/msvc/appEPAPenDepthDemo.rc index 819c67637..8f9e7b691 100644 --- a/msvc/appEPAPenDepthDemo.rc +++ b/msvc/appEPAPenDepthDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "EPAPenDepthDemo" #ifdef CS_DEBUG diff --git a/msvc/appGjkConvexCastDemo.rc b/msvc/appGjkConvexCastDemo.rc index 1a93d38a3..59f002dcc 100644 --- a/msvc/appGjkConvexCastDemo.rc +++ b/msvc/appGjkConvexCastDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "GjkConvexCastDemo" #ifdef CS_DEBUG diff --git a/msvc/appMovingConcaveDemo.rc b/msvc/appMovingConcaveDemo.rc index 55a4e944a..e86b66666 100644 --- a/msvc/appMovingConcaveDemo.rc +++ b/msvc/appMovingConcaveDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "MovingConcaveDemo" #ifdef CS_DEBUG diff --git a/msvc/appRagdollDemo.rc b/msvc/appRagdollDemo.rc index c8e8fad7a..59a4dcb92 100644 --- a/msvc/appRagdollDemo.rc +++ b/msvc/appRagdollDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "RagdollDemo" #ifdef CS_DEBUG diff --git a/msvc/appRaytracer.rc b/msvc/appRaytracer.rc index 548f731d1..dcf920af0 100644 --- a/msvc/appRaytracer.rc +++ b/msvc/appRaytracer.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "Raytracer" #ifdef CS_DEBUG diff --git a/msvc/appSimplexDemo.rc b/msvc/appSimplexDemo.rc index 9efcbf366..76d4f5a05 100644 --- a/msvc/appSimplexDemo.rc +++ b/msvc/appSimplexDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "SimplexDemo" #ifdef CS_DEBUG diff --git a/msvc/appUserCollisionAlgorithm.rc b/msvc/appUserCollisionAlgorithm.rc index 7fa0a850c..e27667fc2 100644 --- a/msvc/appUserCollisionAlgorithm.rc +++ b/msvc/appUserCollisionAlgorithm.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "UserCollisionAlgorithm" #ifdef CS_DEBUG diff --git a/msvc/appVehicleDemo.rc b/msvc/appVehicleDemo.rc index d51dfe0c2..bc7343894 100644 --- a/msvc/appVehicleDemo.rc +++ b/msvc/appVehicleDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 56, 0, 0 -PRODUCTVERSION 2, 56, 0, 0 +FILEVERSION 2, 57, 0, 0 +PRODUCTVERSION 2, 57, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.56" - VALUE "FileVersion", "2.56" + VALUE "ProductVersion", "2.57" + VALUE "FileVersion", "2.57" VALUE "LegalCopyright", "Copyright (c) 2005-2007 Erwin Coumans" VALUE "FileDescription", "VehicleDemo" #ifdef CS_DEBUG diff --git a/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp b/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp index 9fb18eb2e..bc5680652 100644 --- a/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp +++ b/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp @@ -22,6 +22,7 @@ subject to the following restrictions: #include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h" #include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h" #include "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h" +#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h" btDefaultCollisionConfiguration::btDefaultCollisionConfiguration() :m_persistentManifoldPoolSize(16384), @@ -42,6 +43,10 @@ m_collisionAlgorithmMaxElementSize(0) m_boxSphereCF = new btSphereBoxCollisionAlgorithm::CreateFunc; m_boxSphereCF->m_swapped = true; + m_sphereTriangleCF = new btSphereTriangleCollisionAlgorithm::CreateFunc; + m_triangleSphereCF = new btSphereTriangleCollisionAlgorithm::CreateFunc; + m_triangleSphereCF->m_swapped = true; + ///calculate maximum element size, big enough to fit any collision algorithm in the memory pool int maxSize = sizeof(btConvexConvexAlgorithm); @@ -66,6 +71,9 @@ btDefaultCollisionConfiguration::~btDefaultCollisionConfiguration() delete m_sphereSphereCF; delete m_sphereBoxCF; delete m_boxSphereCF; + delete m_sphereTriangleCF; + delete m_triangleSphereCF; + } @@ -111,6 +119,17 @@ btCollisionAlgorithmCreateFunc* btDefaultCollisionConfiguration::getCollisionAlg return m_boxSphereCF; } + if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE ) && (proxyType1==TRIANGLE_SHAPE_PROXYTYPE)) + { + return m_sphereTriangleCF; + } + + if ((proxyType0 == TRIANGLE_SHAPE_PROXYTYPE ) && (proxyType1==SPHERE_SHAPE_PROXYTYPE)) + { + return m_triangleSphereCF; + } + + if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConvex(proxyType1)) { return m_convexConvexCreateFunc; diff --git a/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h b/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h index 1cf8f4d81..cf1e69fd9 100644 --- a/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h +++ b/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h @@ -42,6 +42,8 @@ class btDefaultCollisionConfiguration : public btCollisionConfiguration btCollisionAlgorithmCreateFunc* m_sphereSphereCF; btCollisionAlgorithmCreateFunc* m_sphereBoxCF; btCollisionAlgorithmCreateFunc* m_boxSphereCF; + btCollisionAlgorithmCreateFunc* m_sphereTriangleCF; + btCollisionAlgorithmCreateFunc* m_triangleSphereCF; public: