PhysX 3.4, APEX 1.4 patch release @22017166

4 files changed, 89 insertions, 2 deletions

diff --git a/PhysX_3.4/Source/LowLevelCloth/src/windows/CuCloth.h b/PhysX_3.4/Source/LowLevelCloth/src/windows/CuCloth.h
index 28ebc36a..dd14dceb 100644
--- a/PhysX_3.4/Source/LowLevelCloth/src/windows/CuCloth.h
+++ b/PhysX_3.4/Source/LowLevelCloth/src/windows/CuCloth.h
@@ -74,8 +74,9 @@ struct CuConstraints
 
 class CuCloth : protected CuContextLock
 {
-  public:
 	CuCloth& operator=(const CuCloth&);
+
+public:
 	typedef CuFactory FactoryType;
 	typedef CuFabric FabricType;
 	typedef CuContextLock ContextLockType;
diff --git a/PhysX_3.4/Source/LowLevelCloth/src/windows/CuClothCreate.cpp b/PhysX_3.4/Source/LowLevelCloth/src/windows/CuClothCreate.cpp
new file mode 100644
index 00000000..b1a59de6
--- /dev/null
+++ b/PhysX_3.4/Source/LowLevelCloth/src/windows/CuClothCreate.cpp
@@ -0,0 +1,45 @@
+// 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.  
+
+#include "PxgBroadPhase.h"
+
+namespace physx
+{
+
+	extern "C" void initClothKernels0();	
+
+	void createPxgCloth()
+	{
+#if !PX_PHYSX_GPU_EXPORTS
+		//this call is needed to force PhysXClothGpu linkage as Static Library!
+		initClothKernels0();		
+#endif
+	}
+
+}
diff --git a/PhysX_3.4/Source/LowLevelCloth/src/windows/CuClothCreate.h b/PhysX_3.4/Source/LowLevelCloth/src/windows/CuClothCreate.h
new file mode 100644
index 00000000..6064b355
--- /dev/null
+++ b/PhysX_3.4/Source/LowLevelCloth/src/windows/CuClothCreate.h
@@ -0,0 +1,41 @@
+// 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 PXG_CLOTH_CREATE_H
+#define PXG_CLOTH_CREATE_H
+
+
+namespace physx
+{
+	
+	//this is needed to force PhysXClothGpu linkage as Static Library!
+	void createPxgCloth();
+}
+
+#endif
diff --git a/PhysX_3.4/Source/LowLevelCloth/src/windows/CuSolver.cpp b/PhysX_3.4/Source/LowLevelCloth/src/windows/CuSolver.cpp
index a20e9e0d..c65e3c61 100644
--- a/PhysX_3.4/Source/LowLevelCloth/src/windows/CuSolver.cpp
+++ b/PhysX_3.4/Source/LowLevelCloth/src/windows/CuSolver.cpp
@@ -541,7 +541,7 @@ void cloth::CuSolver::interCollision()
 }
 
 cloth::CuSolver::ClothSolverTask::ClothSolverTask(FunctionPtr functionPtr, const char* name)
-: mSolver(0), mFunctionPtr(functionPtr), mName(name)
+: Cm::Task(0), mSolver(0), mFunctionPtr(functionPtr), mName(name)
 {
 }