AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2025-01-10 17:30:12 +00:00
Code Issues Releases Wiki Activity

register sphere-triangle dedicated collision algo by default.

Browse Source 
updated projectfiles and ChangeLog.txt
This commit is contained in:
ejcoumans 2007-09-08 06:46:01 +00:00
parent be8cc0bc24
commit 7f1bf0b78f
35 changed files with 184 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog.txt
View File

@ -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

12
msvc/6/libbulletcollision.dsp
View File

@ -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

18
msvc/6/wksbullet.dsw
View File

@ -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>

12
msvc/6/wksbullet_corelib.dsw
View File

@ -39,18 +39,6 @@ Package=<4>
###############################################################################
Project: "libbulletmultithreaded"=.\libbulletmultithreaded.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>

9
msvc/7/libbulletcollision.vcproj
View File

@ -333,6 +333,9 @@
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp">
</File>
@ -502,6 +505,9 @@
<File
RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionCreateFunc.h">
</File>
@ -523,6 +529,9 @@
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.h">
</File>

36
msvc/7/wksbullet.sln
View File

@ -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

10
msvc/7/wksbullet_corelib.sln
View File

@ -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

9
msvc/71/libbulletcollision.vcproj
View File

@ -333,6 +333,9 @@
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp">
</File>
@ -502,6 +505,9 @@
<File
RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionCreateFunc.h">
</File>
@ -523,6 +529,9 @@
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.h">
</File>

36
msvc/71/wksbullet.sln
View File

@ -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

10
msvc/71/wksbullet_corelib.sln
View File

@ -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

9
msvc/8/libbulletcollision.vcproj
View File

@ -333,6 +333,9 @@
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp">
</File>
@ -502,6 +505,9 @@
<File
RelativePath="..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionConfiguration.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCollisionCreateFunc.h">
</File>
@ -523,6 +529,9 @@
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.h">
</File>
<File
RelativePath="..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.h">
</File>

36
msvc/8/wksbullet.sln
View File

@ -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

10
msvc/8/wksbullet_corelib.sln
View File

@ -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

8
msvc/appBasicDemo.rc
View File

@ -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

8
msvc/appBspDemo.rc
View File

@ -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

8
msvc/appBulletDino.rc
View File

@ -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

8
msvc/appCcdPhysicsDemo.rc
View File

@ -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

8
msvc/appColladaDemo.rc
View File

@ -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

8
msvc/appCollisionDemo.rc
View File

@ -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

8
msvc/appCollisionInterfaceDemo.rc
View File

@ -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

8
msvc/appConcaveDemo.rc
View File

@ -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

8
msvc/appConstraintDemo.rc
View File

@ -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

8
msvc/appContinuousConvexCollision.rc
View File

@ -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

8
msvc/appConvexDecompositionDemo.rc
View File

@ -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

8
msvc/appDoublePrecisionDemo.rc
View File

@ -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

8
msvc/appEPAPenDepthDemo.rc
View File

@ -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

8
msvc/appGjkConvexCastDemo.rc
View File

@ -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

8
msvc/appMovingConcaveDemo.rc
View File

@ -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

8
msvc/appRagdollDemo.rc
View File

@ -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

8
msvc/appRaytracer.rc
View File

@ -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

8
msvc/appSimplexDemo.rc
View File

@ -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

8
msvc/appUserCollisionAlgorithm.rc
View File

@ -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

8
msvc/appVehicleDemo.rc
View File

@ -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

19
src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
View File

@ -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;

2
src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
View File

@ -42,6 +42,8 @@ class btDefaultCollisionConfiguration : public btCollisionConfiguration
btCollisionAlgorithmCreateFunc* m_sphereSphereCF;
btCollisionAlgorithmCreateFunc* m_sphereBoxCF;
btCollisionAlgorithmCreateFunc* m_boxSphereCF;
btCollisionAlgorithmCreateFunc* m_sphereTriangleCF;
btCollisionAlgorithmCreateFunc* m_triangleSphereCF;
public: