Added GIMPACT integration for moving concave meshes (interaction with all other Bullet collision shapes)
Thanks a lot to Francisco León Nájera for the contribution!
This commit is contained in:
ejcoumans
@@ -24,6 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appMovingConcaveDemo", "appMovingConcaveDemo.vcproj", "{2D714360-B8EC-F8E0-ED74-E95336301075}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}"
|
||||
@@ -50,6 +52,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcolladadom", "libcollada
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vcproj", "{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTBullet", "libGIMPACTBullet.vcproj", "{1B60957B-504A-C45E-7B5C-9AA77F133898}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
|
||||
EndProject
|
||||
Global
|
||||
@@ -68,14 +74,18 @@ Global
|
||||
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
|
||||
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
|
||||
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
|
||||
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
|
||||
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.7 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
|
||||
{255A379C-F159-5362-4024-D5ADB9F5FBD2}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.7 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
|
||||
{2707A1D2-F23C-0C78-B99B-AA148865D6DD}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
|
||||
{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
|
||||
{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
|
||||
@@ -86,7 +96,9 @@ Global
|
||||
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
|
||||
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
|
||||
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
|
||||
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
|
||||
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
|
||||
{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
|
||||
{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
|
||||
{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
|
||||
@@ -113,11 +125,22 @@ Global
|
||||
{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
|
||||
{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
|
||||
{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
|
||||
{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
|
||||
{69C821C7-1E18-D894-068D-C55E063F4859}.7 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
|
||||
{69C821C7-1E18-D894-068D-C55E063F4859}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
|
||||
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
|
||||
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
|
||||
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.7 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
|
||||
{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
|
||||
{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
|
||||
@@ -146,17 +169,20 @@ Global
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.10 = {69C821C7-1E18-D894-068D-C55E063F4859}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.11 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.16 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.17 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.18 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.19 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.20 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.21 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.22 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.12 = {2D714360-B8EC-F8E0-ED74-E95336301075}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.13 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.14 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.15 = {330B5049-6935-5CE6-79B7-28F570962895}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.16 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.17 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.21 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.22 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.23 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.24 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
|
||||
{6210A080-01C0-6D67-F1DB-669393175402}.25 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
|
||||
@@ -169,17 +195,20 @@ Global
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {69C821C7-1E18-D894-068D-C55E063F4859}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {2D714360-B8EC-F8E0-ED74-E95336301075}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {330B5049-6935-5CE6-79B7-28F570962895}
|
||||
{9E59B16D-0924-409C-1611-DF2207A0053F}.16 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
|
||||
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32
|
||||
@@ -230,6 +259,10 @@ Global
|
||||
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32
|
||||
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32
|
||||
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.Release.ActiveCfg = Release|Win32
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.Release.Build.0 = Release|Win32
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.Debug.ActiveCfg = Debug|Win32
|
||||
{2D714360-B8EC-F8E0-ED74-E95336301075}.Debug.Build.0 = Debug|Win32
|
||||
{60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32
|
||||
{60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32
|
||||
{60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32
|
||||
@@ -282,6 +315,14 @@ Global
|
||||
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Release.Build.0 = Release|Win32
|
||||
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.ActiveCfg = Debug|Win32
|
||||
{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}.Debug.Build.0 = Debug|Win32
|
||||
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Release.ActiveCfg = Release|Win32
|
||||
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Release.Build.0 = Release|Win32
|
||||
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.ActiveCfg = Debug|Win32
|
||||
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.Build.0 = Debug|Win32
|
||||
{1B60957B-504A-C45E-7B5C-9AA77F133898}.Release.ActiveCfg = Release|Win32
|
||||
{1B60957B-504A-C45E-7B5C-9AA77F133898}.Release.Build.0 = Release|Win32
|
||||
{1B60957B-504A-C45E-7B5C-9AA77F133898}.Debug.ActiveCfg = Debug|Win32
|
||||
{1B60957B-504A-C45E-7B5C-9AA77F133898}.Debug.Build.0 = Debug|Win32
|
||||
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.ActiveCfg = Release|Win32
|
||||
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.Build.0 = Release|Win32
|
||||
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Debug.ActiveCfg = Debug|Win32
|
||||
|
||||
Reference in New Issue
Block a user