diff --git a/msvc/6/appAllBulletDemos.dsp b/msvc/6/appAllBulletDemos.dsp index 9017ad21d..06ccc2ca3 100644 --- a/msvc/6/appAllBulletDemos.dsp +++ b/msvc/6/appAllBulletDemos.dsp @@ -266,6 +266,10 @@ SOURCE=..\..\Demos\AllBulletDemos\..\DynamicControlDemo\MotorDemo.cpp # End Source File # Begin Source File +SOURCE=..\..\Demos\AllBulletDemos\..\ForkLiftDemo\ForkLiftDemo.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Demos\AllBulletDemos\..\GimpactTestDemo\GimpactTestDemo.cpp # End Source File # Begin Source File @@ -290,10 +294,6 @@ SOURCE=..\..\Demos\AllBulletDemos\..\SoftDemo\SoftDemo.cpp # End Source File # Begin Source File -SOURCE=..\..\Demos\AllBulletDemos\..\VehicleDemo\VehicleDemo.cpp -# End Source File -# Begin Source File - SOURCE=..\..\Demos\AllBulletDemos\DemoEntries.cpp # End Source File # Begin Source File diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw index c5223ac5b..5ae93d735 100644 --- a/msvc/6/wksbullet.dsw +++ b/msvc/6/wksbullet.dsw @@ -747,6 +747,30 @@ Package=<4> ############################################################################### +Project: "appTerrainDemo"=.\appTerrainDemo.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libbulletcollision + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletdynamics + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletmath + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbulletopenglsupport + End Project Dependency +}}} + +############################################################################### + Project: "appUserCollisionAlgorithm"=.\appUserCollisionAlgorithm.dsp - Package Owner=<4> Package=<5> @@ -894,6 +918,9 @@ Package=<4> Project_Dep_Name appSoftBodyDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appTerrainDemo + End Project Dependency + Begin Project Dependency Project_Dep_Name appUserCollisionAlgorithm End Project Dependency Begin Project Dependency @@ -1041,6 +1068,9 @@ Package=<4> Project_Dep_Name appSoftBodyDemo End Project Dependency Begin Project Dependency + Project_Dep_Name appTerrainDemo + End Project Dependency + Begin Project Dependency Project_Dep_Name appUserCollisionAlgorithm End Project Dependency Begin Project Dependency diff --git a/msvc/7/appAllBulletDemos.vcproj b/msvc/7/appAllBulletDemos.vcproj index e3f54caac..0284bff5e 100644 --- a/msvc/7/appAllBulletDemos.vcproj +++ b/msvc/7/appAllBulletDemos.vcproj @@ -472,6 +472,9 @@ + + @@ -490,9 +493,6 @@ - - diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln index e204e4a67..d6807a7ce 100644 --- a/msvc/7/wksbullet.sln +++ b/msvc/7/wksbullet.sln @@ -60,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSliderConstraintDemo", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSoftBodyDemo", "appSoftBodyDemo.vcproj", "{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appTerrainDemo", "appTerrainDemo.vcproj", "{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}" @@ -234,6 +236,10 @@ Global {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.4 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -272,21 +278,22 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.27 = {60A1DC9D-F837-3923-E9DE-A7925394A578} {6210A080-01C0-6D67-F1DB-669393175402}.28 = {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE} {6210A080-01C0-6D67-F1DB-669393175402}.29 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9} - {6210A080-01C0-6D67-F1DB-669393175402}.30 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.31 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.32 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} - {6210A080-01C0-6D67-F1DB-669393175402}.33 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.34 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.35 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.36 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {6210A080-01C0-6D67-F1DB-669393175402}.37 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.38 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} - {6210A080-01C0-6D67-F1DB-669393175402}.39 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.40 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.41 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.42 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.43 = {0E48992F-80FB-7458-8BAF-A7054C73558F} - {6210A080-01C0-6D67-F1DB-669393175402}.44 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.30 = {7FE87C67-4B29-D636-0AEC-BFFCE47A2164} + {6210A080-01C0-6D67-F1DB-669393175402}.31 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.32 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.33 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} + {6210A080-01C0-6D67-F1DB-669393175402}.34 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.35 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.36 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.38 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.39 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {6210A080-01C0-6D67-F1DB-669393175402}.40 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.41 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.42 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.43 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.44 = {0E48992F-80FB-7458-8BAF-A7054C73558F} + {6210A080-01C0-6D67-F1DB-669393175402}.45 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940} @@ -317,8 +324,9 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.27 = {60A1DC9D-F837-3923-E9DE-A7925394A578} {9E59B16D-0924-409C-1611-DF2207A0053F}.28 = {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE} {9E59B16D-0924-409C-1611-DF2207A0053F}.29 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9} - {9E59B16D-0924-409C-1611-DF2207A0053F}.30 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.31 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.30 = {7FE87C67-4B29-D636-0AEC-BFFCE47A2164} + {9E59B16D-0924-409C-1611-DF2207A0053F}.31 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.32 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} @@ -694,6 +702,18 @@ Global {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDll.Build.0 = DebugDll|Win32 {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Release.ActiveCfg = Release|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Release.Build.0 = Release|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDll.ActiveCfg = ReleaseDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDll.Build.0 = ReleaseDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Debug.ActiveCfg = Debug|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Debug.Build.0 = Debug|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDll.ActiveCfg = DebugDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDll.Build.0 = DebugDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Release.ActiveCfg = Release|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.ReleaseDll.ActiveCfg = ReleaseDll|Win32 diff --git a/msvc/71/appAllBulletDemos.vcproj b/msvc/71/appAllBulletDemos.vcproj index 7d9961ce0..afac31649 100644 --- a/msvc/71/appAllBulletDemos.vcproj +++ b/msvc/71/appAllBulletDemos.vcproj @@ -472,6 +472,9 @@ + + @@ -490,9 +493,6 @@ - - diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln index 8691fc09b..ae7e78eea 100644 --- a/msvc/71/wksbullet.sln +++ b/msvc/71/wksbullet.sln @@ -60,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSliderConstraintDemo", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSoftBodyDemo", "appSoftBodyDemo.vcproj", "{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appTerrainDemo", "appTerrainDemo.vcproj", "{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}" @@ -234,6 +236,10 @@ Global {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.4 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -272,21 +278,22 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.27 = {60A1DC9D-F837-3923-E9DE-A7925394A578} {6210A080-01C0-6D67-F1DB-669393175402}.28 = {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE} {6210A080-01C0-6D67-F1DB-669393175402}.29 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9} - {6210A080-01C0-6D67-F1DB-669393175402}.30 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.31 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.32 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} - {6210A080-01C0-6D67-F1DB-669393175402}.33 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.34 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.35 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.36 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {6210A080-01C0-6D67-F1DB-669393175402}.37 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.38 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} - {6210A080-01C0-6D67-F1DB-669393175402}.39 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.40 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.41 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.42 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.43 = {0E48992F-80FB-7458-8BAF-A7054C73558F} - {6210A080-01C0-6D67-F1DB-669393175402}.44 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.30 = {7FE87C67-4B29-D636-0AEC-BFFCE47A2164} + {6210A080-01C0-6D67-F1DB-669393175402}.31 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.32 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.33 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} + {6210A080-01C0-6D67-F1DB-669393175402}.34 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.35 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.36 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.38 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.39 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {6210A080-01C0-6D67-F1DB-669393175402}.40 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.41 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.42 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.43 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.44 = {0E48992F-80FB-7458-8BAF-A7054C73558F} + {6210A080-01C0-6D67-F1DB-669393175402}.45 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940} @@ -317,8 +324,9 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.27 = {60A1DC9D-F837-3923-E9DE-A7925394A578} {9E59B16D-0924-409C-1611-DF2207A0053F}.28 = {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE} {9E59B16D-0924-409C-1611-DF2207A0053F}.29 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9} - {9E59B16D-0924-409C-1611-DF2207A0053F}.30 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.31 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.30 = {7FE87C67-4B29-D636-0AEC-BFFCE47A2164} + {9E59B16D-0924-409C-1611-DF2207A0053F}.31 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.32 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} @@ -694,6 +702,18 @@ Global {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDll.Build.0 = DebugDll|Win32 {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Release.ActiveCfg = Release|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Release.Build.0 = Release|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDll.ActiveCfg = ReleaseDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDll.Build.0 = ReleaseDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Debug.ActiveCfg = Debug|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Debug.Build.0 = Debug|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDll.ActiveCfg = DebugDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDll.Build.0 = DebugDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Release.ActiveCfg = Release|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.ReleaseDll.ActiveCfg = ReleaseDll|Win32 diff --git a/msvc/8/appAllBulletDemos.vcproj b/msvc/8/appAllBulletDemos.vcproj index 9b871ee09..93f505119 100644 --- a/msvc/8/appAllBulletDemos.vcproj +++ b/msvc/8/appAllBulletDemos.vcproj @@ -472,6 +472,9 @@ + + @@ -490,9 +493,6 @@ - - diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln index 03a61ca92..7a8db1b10 100644 --- a/msvc/8/wksbullet.sln +++ b/msvc/8/wksbullet.sln @@ -60,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSliderConstraintDemo", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSoftBodyDemo", "appSoftBodyDemo.vcproj", "{106E3D23-110E-5DD8-4A6A-D8A2250C43C9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appTerrainDemo", "appTerrainDemo.vcproj", "{7FE87C67-4B29-D636-0AEC-BFFCE47A2164}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}" @@ -234,6 +236,10 @@ Global {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.4 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3} {330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} {330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} @@ -272,21 +278,22 @@ Global {6210A080-01C0-6D67-F1DB-669393175402}.27 = {60A1DC9D-F837-3923-E9DE-A7925394A578} {6210A080-01C0-6D67-F1DB-669393175402}.28 = {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE} {6210A080-01C0-6D67-F1DB-669393175402}.29 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9} - {6210A080-01C0-6D67-F1DB-669393175402}.30 = {330B5049-6935-5CE6-79B7-28F570962895} - {6210A080-01C0-6D67-F1DB-669393175402}.31 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} - {6210A080-01C0-6D67-F1DB-669393175402}.32 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} - {6210A080-01C0-6D67-F1DB-669393175402}.33 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} - {6210A080-01C0-6D67-F1DB-669393175402}.34 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} - {6210A080-01C0-6D67-F1DB-669393175402}.35 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} - {6210A080-01C0-6D67-F1DB-669393175402}.36 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} - {6210A080-01C0-6D67-F1DB-669393175402}.37 = {7C428E76-9271-6284-20F0-9B38ED6931E3} - {6210A080-01C0-6D67-F1DB-669393175402}.38 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} - {6210A080-01C0-6D67-F1DB-669393175402}.39 = {6AB01C9C-9163-F400-B5C3-20D046631E17} - {6210A080-01C0-6D67-F1DB-669393175402}.40 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} - {6210A080-01C0-6D67-F1DB-669393175402}.41 = {B1B5F775-54A9-2437-E4AC-7E817E492142} - {6210A080-01C0-6D67-F1DB-669393175402}.42 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} - {6210A080-01C0-6D67-F1DB-669393175402}.43 = {0E48992F-80FB-7458-8BAF-A7054C73558F} - {6210A080-01C0-6D67-F1DB-669393175402}.44 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} + {6210A080-01C0-6D67-F1DB-669393175402}.30 = {7FE87C67-4B29-D636-0AEC-BFFCE47A2164} + {6210A080-01C0-6D67-F1DB-669393175402}.31 = {330B5049-6935-5CE6-79B7-28F570962895} + {6210A080-01C0-6D67-F1DB-669393175402}.32 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {6210A080-01C0-6D67-F1DB-669393175402}.33 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} + {6210A080-01C0-6D67-F1DB-669393175402}.34 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} + {6210A080-01C0-6D67-F1DB-669393175402}.35 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} + {6210A080-01C0-6D67-F1DB-669393175402}.36 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A} + {6210A080-01C0-6D67-F1DB-669393175402}.37 = {A24D77FD-D69A-75A0-A7DC-730894C9D0F7} + {6210A080-01C0-6D67-F1DB-669393175402}.38 = {7C428E76-9271-6284-20F0-9B38ED6931E3} + {6210A080-01C0-6D67-F1DB-669393175402}.39 = {C04EA8AC-D96C-0E1F-0823-094C1010F087} + {6210A080-01C0-6D67-F1DB-669393175402}.40 = {6AB01C9C-9163-F400-B5C3-20D046631E17} + {6210A080-01C0-6D67-F1DB-669393175402}.41 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3} + {6210A080-01C0-6D67-F1DB-669393175402}.42 = {B1B5F775-54A9-2437-E4AC-7E817E492142} + {6210A080-01C0-6D67-F1DB-669393175402}.43 = {81819498-F4A8-E0CA-8ED5-724E27AB34E7} + {6210A080-01C0-6D67-F1DB-669393175402}.44 = {0E48992F-80FB-7458-8BAF-A7054C73558F} + {6210A080-01C0-6D67-F1DB-669393175402}.45 = {A0958CD9-0E39-4A77-3711-9B488F508FBF} {9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {7CE54E12-D3D5-878F-9CC5-786265A3F9CE} {9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {3578834A-4B06-DE6F-78AC-FE11F7226D35} {9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {67034B5D-16DD-DC97-82F6-23B9E6108940} @@ -317,8 +324,9 @@ Global {9E59B16D-0924-409C-1611-DF2207A0053F}.27 = {60A1DC9D-F837-3923-E9DE-A7925394A578} {9E59B16D-0924-409C-1611-DF2207A0053F}.28 = {E7461CAA-D8C1-90D0-FB1E-FCD4F340FAAE} {9E59B16D-0924-409C-1611-DF2207A0053F}.29 = {106E3D23-110E-5DD8-4A6A-D8A2250C43C9} - {9E59B16D-0924-409C-1611-DF2207A0053F}.30 = {330B5049-6935-5CE6-79B7-28F570962895} - {9E59B16D-0924-409C-1611-DF2207A0053F}.31 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} + {9E59B16D-0924-409C-1611-DF2207A0053F}.30 = {7FE87C67-4B29-D636-0AEC-BFFCE47A2164} + {9E59B16D-0924-409C-1611-DF2207A0053F}.31 = {330B5049-6935-5CE6-79B7-28F570962895} + {9E59B16D-0924-409C-1611-DF2207A0053F}.32 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {ED51AA4D-82EF-089C-CD6D-91CF224E2A9E} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE} {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319} @@ -694,6 +702,18 @@ Global {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDll.Build.0 = DebugDll|Win32 {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 {106E3D23-110E-5DD8-4A6A-D8A2250C43C9}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Release.ActiveCfg = Release|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Release.Build.0 = Release|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDll.ActiveCfg = ReleaseDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDll.Build.0 = ReleaseDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Debug.ActiveCfg = Debug|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.Debug.Build.0 = Debug|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDll.ActiveCfg = DebugDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDll.Build.0 = DebugDll|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32 + {7FE87C67-4B29-D636-0AEC-BFFCE47A2164}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Release.ActiveCfg = Release|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32 {330B5049-6935-5CE6-79B7-28F570962895}.ReleaseDll.ActiveCfg = ReleaseDll|Win32