updated 3.14 (fixed diagionalization bug)

MADEAPPS · Feb 26, 2020 · 406794f · 406794f
1 parent 4d754e4
commit 406794f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/applications/demosSandbox/sdkDemos/DemoEntityManager.cpp b/applications/demosSandbox/sdkDemos/DemoEntityManager.cpp
@@ -36,7 +36,7 @@
 //#define DEFAULT_SCENE	1		// coefficients of friction
 //#define DEFAULT_SCENE	2		// coefficients of restitution
 //#define DEFAULT_SCENE	3		// newton cradle
-#define DEFAULT_SCENE	4		// gyroscope precession
+//#define DEFAULT_SCENE	4		// gyroscope precession
 //#define DEFAULT_SCENE	5		// closest distance
 //#define DEFAULT_SCENE	6		// primitive collision
 //#define DEFAULT_SCENE	7		// kinematic bodies
@@ -60,7 +60,7 @@
 //#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	28		// construction vehicle
 //#define DEFAULT_SCENE	29		// six axis manipulator
 //#define DEFAULT_SCENE	30		// hexapod Robot
 //#define DEFAULT_SCENE	31		// basic rag doll
@@ -323,7 +323,7 @@ DemoEntityManager::DemoEntityManager ()
 //	m_autoSleepMode = false;
 //	m_broadPhaseType = 1;
 //	m_solverPasses = 4;
-//	m_workerThreads = 8;
+	m_workerThreads = 8;
 //	m_solverSubSteps = 2;
 //	m_showRaycastHit = true;
 //	m_showCenterOfMass = false;

diff --git a/applications/demosSandbox/sdkDemos/demos/ConstructionVehicle.cpp b/applications/demosSandbox/sdkDemos/demos/ConstructionVehicle.cpp
@@ -1092,7 +1092,7 @@ void ConstructionVehicle (DemoEntityManager* const scene)
 	matrix.m_posit.m_y += 1.5f;
 	vehicleManager->m_player = vehicleManager->CreateExcavator("excavator.ngd", matrix);
 
-#if 1
+#if 0
 	// stress test parallel solver
 	dFloat separation = 8.0f;
 	matrix.m_posit.m_z += separation;

diff --git a/sdk/dgNewton/Newton.h b/sdk/dgNewton/Newton.h
@@ -24,7 +24,7 @@
 
 
 #define NEWTON_MAJOR_VERSION 3 
-#define NEWTON_MINOR_VERSION 15 
+#define NEWTON_MINOR_VERSION 14 
 
 #include <dgTypes.h>
 

diff --git a/sdk/dgNewtonReferenceGPU/dllmain.cpp b/sdk/dgNewtonReferenceGPU/dllmain.cpp
@@ -53,6 +53,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
 	if (!(info.m_ecx & (1 << 28))) {
 		return FALSE;
 	}
-	return TRUE;
+//	return TRUE;
+	return FALSE;
 }
 #endif