PhysX 3.4, APEX 1.4 patch release @22017166

3 files changed, 84 insertions, 10 deletions

diff --git a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.cpp b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.cpp
index 30db1038..adf4f4f6 100644
--- a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.cpp
+++ b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.cpp
@@ -29,8 +29,7 @@
 #include "PxMetaDataObjects.h"
 #include "PxExtensionMetaDataObjects.h"
 #include "ExtJointMetaDataExtensions.h" 
-#include "SnRepXSerializerImpl.h"
-#include "PxJointRepXSerializer.h"
+#include "SnJointRepXSerializer.h"
 
 namespace physx { 
 
@@ -127,7 +126,7 @@ namespace physx {
 		writeAllProperties( inObj, inWriter, inTempBuffer, *inCollection );
 	}
 	
-	// explicit instantiations
+	// explicit template instantiations
 	template struct PxJointRepXSerializer<PxFixedJoint>;
 	template struct PxJointRepXSerializer<PxDistanceJoint>;
 	template struct PxJointRepXSerializer<PxD6Joint>;
diff --git a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.h b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.h
new file mode 100644
index 00000000..24bb77f2
--- /dev/null
+++ b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.h
@@ -0,0 +1,72 @@
+// 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 SN_JOINT_REPX_SERIALIZER_H
+#define SN_JOINT_REPX_SERIALIZER_H
+/** \addtogroup RepXSerializers
+  @{
+*/
+
+#include "extensions/PxRepXSimpleType.h"
+#include "SnRepXSerializerImpl.h"
+
+#if !PX_DOXYGEN
+namespace physx
+{
+#endif
+	
+	class XmlReader;
+	class XmlMemoryAllocator;
+	class XmlWriter;
+	class MemoryBuffer;
+	
+	template<typename TJointType>
+	struct PxJointRepXSerializer : public RepXSerializerImpl<TJointType>
+	{
+		PxJointRepXSerializer(PxAllocatorCallback& inAllocator) : RepXSerializerImpl<TJointType>(inAllocator) {}
+		virtual PxRepXObject fileToObject(XmlReader& inReader, XmlMemoryAllocator& inAllocator, PxRepXInstantiationArgs& inArgs, PxCollection* inCollection);
+		virtual void objectToFileImpl(const TJointType* inObj, PxCollection* inCollection, XmlWriter& inWriter, MemoryBuffer& inTempBuffer, PxRepXInstantiationArgs&);
+		virtual TJointType* allocateObject(PxRepXInstantiationArgs&) { return NULL; }
+	};
+
+#if PX_SUPPORT_EXTERN_TEMPLATE
+	// explicit template instantiations declarations
+	extern template struct PxJointRepXSerializer<PxD6Joint>;
+	extern template struct PxJointRepXSerializer<PxDistanceJoint>;
+	extern template struct PxJointRepXSerializer<PxFixedJoint>;
+	extern template struct PxJointRepXSerializer<PxPrismaticJoint>;
+	extern template struct PxJointRepXSerializer<PxRevoluteJoint>;
+	extern template struct PxJointRepXSerializer<PxSphericalJoint>;
+#endif
+
+#if !PX_DOXYGEN
+} // namespace physx
+#endif
+
+/** @} */
+#endif
diff --git a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXCoreSerializer.h b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXCoreSerializer.h
index 5b59926d..bf8a250a 100644
--- a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXCoreSerializer.h
+++ b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXCoreSerializer.h
@@ -39,9 +39,6 @@ namespace physx
 {
 #endif
 
-	template<typename TLiveType>
-	struct RepXSerializerImpl;
-	
 	class XmlReader;
 	class XmlMemoryAllocator;
 	class XmlWriter;
@@ -140,11 +137,17 @@ namespace physx
 	template<typename TParticleType>
 	struct PxParticleRepXSerializer : RepXSerializerImpl<TParticleType>
 	{
-		PxParticleRepXSerializer( PxAllocatorCallback& inCallback ) : RepXSerializerImpl<TParticleType>( inCallback ) {}
-		virtual void objectToFileImpl( const TParticleType*, PxCollection*, XmlWriter&, MemoryBuffer&, PxRepXInstantiationArgs& );
-		virtual PxRepXObject fileToObject( XmlReader&, XmlMemoryAllocator&, PxRepXInstantiationArgs&, PxCollection* );
-		virtual TParticleType* allocateObject( PxRepXInstantiationArgs& ) { return NULL; }	
+		PxParticleRepXSerializer(PxAllocatorCallback& inCallback) : RepXSerializerImpl<TParticleType>(inCallback) {}
+		virtual void objectToFileImpl(const TParticleType*, PxCollection*, XmlWriter&, MemoryBuffer&, PxRepXInstantiationArgs&);
+		virtual PxRepXObject fileToObject(XmlReader&, XmlMemoryAllocator&, PxRepXInstantiationArgs&, PxCollection*);
+		virtual TParticleType* allocateObject(PxRepXInstantiationArgs&) { return NULL; }
 	};
+
+#if PX_SUPPORT_EXTERN_TEMPLATE
+	// explicit template instantiations declarations
+	extern template struct PxParticleRepXSerializer<PxParticleSystem>;
+	extern template struct PxParticleRepXSerializer<PxParticleFluid>;
+#endif
 #endif
 
 #if !PX_DOXYGEN