PhysX 3.4.1, APEX 1.4.1 Release @22845541v3.4.1

2 files changed, 2 insertions, 63 deletions

diff --git a/PhysX_3.4/Source/PhysXGpu/include/PxPhysXGpu.h b/PhysX_3.4/Source/PhysXGpu/include/PxPhysXGpu.h
index 7ad1a9f5..c0f5d34f 100644
--- a/PhysX_3.4/Source/PhysXGpu/include/PxPhysXGpu.h
+++ b/PhysX_3.4/Source/PhysXGpu/include/PxPhysXGpu.h
@@ -33,11 +33,11 @@
 
 #include "task/PxTask.h"
 
-#include "Pxg.h"
 #include "Ps.h"
 #include "PsArray.h"
 #include "PxSceneGpu.h"
 #include "foundation/PxBounds3.h"
+#include "common/PxPhysXCommonConfig.h"
 #include "CmPhysXCommon.h"
 
 namespace physx
@@ -214,7 +214,7 @@ public:
 	virtual Dy::Context* createGpuDynamicsContext(Cm::FlushPool& taskPool, PxsKernelWranglerManager* gpuKernelWragler, 
 		PxGpuDispatcher* gpuDispatcher, PxGraphicsContextManager* graphicsContextManager,
 		const PxgDynamicsMemoryConfig& config, IG::IslandSim* accurateIslandSim, const PxU32 maxNumPartitions, 
-		const bool enableStabilization, const bool useEnhancedDeterminism, const bool useAdaptiveForce, 
+		const bool enableStabilization, const bool useEnhancedDeterminism, const bool useAdaptiveForce, const PxReal maxBiasCoefficient,
 		const PxU32 gpuComputeVersion, PxvSimStats& simStats, PxsHeapMemoryAllocatorManager* heapMemoryManager) = 0;
 
 };
diff --git a/PhysX_3.4/Source/PhysXGpu/include/Pxg.h b/PhysX_3.4/Source/PhysXGpu/include/Pxg.h
deleted file mode 100644
index ff1f1801..00000000
--- a/PhysX_3.4/Source/PhysXGpu/include/Pxg.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and related documentation and
-// any modifications thereto. Any use, reproduction, disclosure, or
-// distribution of this software and related documentation without an express
-// license agreement from NVIDIA Corporation is strictly prohibited.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
-// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
-// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
-
-
-#ifndef PX_GPU_NX
-#define PX_GPU_NX
-
-#include "foundation/Px.h"
-#include "PxPhysXConfig.h"
-
-#if PX_SUPPORT_GPU_PHYSX
-
-// define API function declaration
-#if PX_WINDOWS 
-	#if defined PX_PHYSX_GPU_EXPORTS
-	#define PX_PHYSX_GPU_API __declspec(dllexport)
-	#else
-	#define PX_PHYSX_GPU_API __declspec(dllimport)
-	#endif
-#elif PX_UNIX_FAMILY
-	#define PX_PHYSX_GPU_API PX_UNIX_EXPORT
-#else
-	#define PX_PHYSX_GPU_API
-#endif
-
-#ifndef PX_C_EXPORT
-#define PX_C_EXPORT extern "C"
-#endif
-
-#else // PX_SUPPORT_GPU_PHYSX
-#pragma message("Pxg.h is only supported on GPGPU platforms!")
-#endif // PX_SUPPORT_GPU_PHYSX
-
-#endif // PX_GPU_NX
-