adding final 3.14 build

MADEAPPS · Dec 24, 2019 · 52c9b6e · 52c9b6e
1 parent 9395a78
commit 52c9b6e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 454 deletions.
diff --git a/applications/demosSandbox/projects/visualStudio_2013/demosSandbox.vcxproj b/applications/demosSandbox/projects/visualStudio_2013/demosSandbox.vcxproj
@@ -55,7 +55,6 @@
     <ClCompile Include="..\..\sdkDemos\demos\ContinueCollision.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\ConvexCast.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\BalancingCharacter.cpp" />
-    <ClCompile Include="..\..\sdkDemos\demos\DynamicRagdoll.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\HeavyVehicles.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\HeighFieldCollision.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\Hexapod.cpp" />

diff --git a/applications/demosSandbox/projects/visualStudio_2013/demosSandbox.vcxproj.filters b/applications/demosSandbox/projects/visualStudio_2013/demosSandbox.vcxproj.filters
@@ -51,9 +51,6 @@
     <ClCompile Include="..\..\sdkDemos\toolBox\dHighResolutionTimer.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sdkDemos\demos\DynamicRagdoll.cpp">
-      <Filter>demos</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sdkDemos\demos\HeavyVehicles.cpp">
       <Filter>demos</Filter>
     </ClCompile>

diff --git a/applications/demosSandbox/projects/visualStudio_2013/imgui.ini b/applications/demosSandbox/projects/visualStudio_2013/imgui.ini
@@ -35,6 +35,6 @@ Collapsed=0
 
 [User Interface]
 Pos=995,20
-Size=292,352
+Size=289,262
 Collapsed=0
 
diff --git a/applications/demosSandbox/projects/visualStudio_2015/demosSandbox.vcxproj b/applications/demosSandbox/projects/visualStudio_2015/demosSandbox.vcxproj
@@ -55,7 +55,6 @@
     <ClCompile Include="..\..\sdkDemos\demos\ConstructionVehicle.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\ContinueCollision.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\ConvexCast.cpp" />
-    <ClCompile Include="..\..\sdkDemos\demos\DynamicRagdoll.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\FlatLandGame.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\HeavyVehicles.cpp" />
     <ClCompile Include="..\..\sdkDemos\demos\HeighFieldCollision.cpp" />

diff --git a/applications/demosSandbox/projects/visualStudio_2015/demosSandbox.vcxproj.filters b/applications/demosSandbox/projects/visualStudio_2015/demosSandbox.vcxproj.filters
@@ -51,9 +51,6 @@
     <ClCompile Include="..\..\sdkDemos\toolBox\dHighResolutionTimer.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sdkDemos\demos\DynamicRagdoll.cpp">
-      <Filter>demos</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sdkDemos\demos\HeavyVehicles.cpp">
       <Filter>demos</Filter>
     </ClCompile>

diff --git a/applications/demosSandbox/sdkDemos/DemoEntityManager.cpp b/applications/demosSandbox/sdkDemos/DemoEntityManager.cpp
@@ -59,21 +59,20 @@
 //#define DEFAULT_SCENE	24		// simple convex fracturing 
 //#define DEFAULT_SCENE	25		// multi ray casting using the threading Job scheduler
 //#define DEFAULT_SCENE	26		// standard joints
-#define DEFAULT_SCENE	27		// servo joints
-//#define DEFAULT_SCENE	28		// construction vehicle
+//#define DEFAULT_SCENE	27		// servo joints
+#define DEFAULT_SCENE	28		// construction vehicle
 //#define DEFAULT_SCENE	29		// six axis manipulator
 //#define DEFAULT_SCENE	30		// hexapod Robot
 //#define DEFAULT_SCENE	31		// basic rag doll
 //#define DEFAULT_SCENE	32		// balancing character
-//#define DEFAULT_SCENE	33		// dynamic rag doll
-//#define DEFAULT_SCENE	34		// single body vehicle
-//#define DEFAULT_SCENE	35		// super Car
-//#define DEFAULT_SCENE	36		// heavy vehicles
-//#define DEFAULT_SCENE	37		// basic player controller
-//#define DEFAULT_SCENE	38		// animated player controller
-//#define DEFAULT_SCENE	39		// advanced player controller
-//#define DEFAULT_SCENE	40		// cloth patch			
-//#define DEFAULT_SCENE	41		// soft bodies	
+//#define DEFAULT_SCENE	33		// single body vehicle
+//#define DEFAULT_SCENE	34		// super Car
+//#define DEFAULT_SCENE	35		// heavy vehicles
+//#define DEFAULT_SCENE	36		// basic player controller
+//#define DEFAULT_SCENE	37		// animated player controller
+//#define DEFAULT_SCENE	38		// advanced player controller
+//#define DEFAULT_SCENE	39		// cloth patch			
+//#define DEFAULT_SCENE	40		// soft bodies	
 
 /// demos forward declaration 
 void Friction (DemoEntityManager* const scene);
@@ -112,7 +111,6 @@ void UserPlaneCollision (DemoEntityManager* const scene);
 void UserHeightFieldCollision (DemoEntityManager* const scene);
 void PassiveRagdoll (DemoEntityManager* const scene);
 void BalancingCharacter (DemoEntityManager* const scene);
-void DynamicRagdoll (DemoEntityManager* const scene);
 void ServoJoints (DemoEntityManager* const scene);
 void ConstructionVehicle (DemoEntityManager* const scene);
 void StandardJoints (DemoEntityManager* const scene);
@@ -154,7 +152,6 @@ DemoEntityManager::SDKDemos DemoEntityManager::m_demosSelection[] =
 	{"Hexapod walker", "show using inverse dynamics to control robots", Hexapod },
 	{"Passive rag doll", "demonstrate passive rag doll", PassiveRagdoll},
 	{"Balancing character", "demonstrate dynamic character", BalancingCharacter},
-	{"Dynamic rag doll", "demonstrate dynamic rag doll", DynamicRagdoll},
 	{"Single body car", "show a generalized coordinate system body", SingleBodyCar },
 	{"Super car", "implement a hight performance sport car", SuperCar},
 	{"Heavy vehicles", "implement military type heavy Vehicles", MilitaryTransport},
@@ -330,7 +327,7 @@ DemoEntityManager::DemoEntityManager ()
 //	m_autoSleepMode = false;
 //	m_broadPhaseType = 1;
 //	m_solverPasses = 4;
-//	m_workerThreads = 4;
+	m_workerThreads = 4;
 //	m_solverSubSteps = 2;
 //	m_showRaycastHit = true;
 //	m_showNormalForces = true;

diff --git a/applications/demosSandbox/sdkDemos/demos/ConstructionVehicle.cpp b/applications/demosSandbox/sdkDemos/demos/ConstructionVehicle.cpp
@@ -13,12 +13,11 @@
 #include "SkyBox.h"
 #include "DemoMesh.h"
 #include "DemoCamera.h"
+#include "DebugDisplay.h"
 #include "PhysicsUtils.h"
 #include "TargaToOpenGl.h"
-#include "DemoEntityManager.h"
 #include "dWoodFracture.h"
-
-#include "DebugDisplay.h"
+#include "DemoEntityManager.h"
 #include "HeightFieldPrimitive.h"
 
 #define ARTICULATED_VEHICLE_CAMERA_HIGH_ABOVE_HEAD		3.0f
@@ -786,18 +785,18 @@ class ArticulatedVehicleManagerManager: public dModelManager
 
 		NewtonMaterialSetCallbackUserData (world, material, material, this);
 		NewtonMaterialSetCollisionCallback (world, material, material, StandardAABBOverlapTest, NULL);
-		NewtonMaterialSetDefaultElasticity(world, material, material, 0.1f);
+		NewtonMaterialSetDefaultElasticity(world, material, material, 0.0f);
 		NewtonMaterialSetDefaultFriction(world, material, material, 0.9f, 0.9f);
 
 		NewtonMaterialSetCallbackUserData(world, material, threadMaterialID, this);
 		NewtonMaterialSetCollisionCallback (world, material, threadMaterialID, StandardAABBOverlapTest, NULL);
-		NewtonMaterialSetDefaultElasticity(world, material, threadMaterialID, 0.1f);
+		NewtonMaterialSetDefaultElasticity(world, material, threadMaterialID, 0.0f);
 		NewtonMaterialSetDefaultFriction(world, material, threadMaterialID, 0.9f, 0.9f);
 
 		NewtonMaterialSetCallbackUserData(world, threadMaterialID, threadMaterialID, this);
 		NewtonMaterialSetCollisionCallback (world, threadMaterialID, threadMaterialID, StandardAABBOverlapTest, NULL);
 		NewtonMaterialSetContactGenerationCallback (world, threadMaterialID, threadMaterialID, ThreadStaticContactsGeneration);
-		NewtonMaterialSetDefaultElasticity(world, threadMaterialID, threadMaterialID, 0.1f);
+		NewtonMaterialSetDefaultElasticity(world, threadMaterialID, threadMaterialID, 0.0f);
 		NewtonMaterialSetDefaultFriction(world, threadMaterialID, threadMaterialID, 0.9f, 0.9f);
 	}