PhysX 3.4, APEX 1.4 patch release @25256367

22 files changed, 27 insertions, 27 deletions

diff --git a/PhysX_3.4/Source/PhysX/src/NpAggregate.cpp b/PhysX_3.4/Source/PhysX/src/NpAggregate.cpp
index cc98e656..d71de59c 100644
--- a/PhysX_3.4/Source/PhysX/src/NpAggregate.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpAggregate.cpp
@@ -380,7 +380,7 @@ NpAggregate* NpAggregate::createObject(PxU8*& address, PxDeserializationContext&
 	return obj;
 }
 
-void NpAggregate::requires(PxProcessPxBaseCallback& c)
+void NpAggregate::requiresObjects(PxProcessPxBaseCallback& c)
 {
 	for(PxU32 i=0; i < mNbActors; i++)
 	{
diff --git a/PhysX_3.4/Source/PhysX/src/NpAggregate.h b/PhysX_3.4/Source/PhysX/src/NpAggregate.h
index b09eb8f7..71c0bf60 100644
--- a/PhysX_3.4/Source/PhysX/src/NpAggregate.h
+++ b/PhysX_3.4/Source/PhysX/src/NpAggregate.h
@@ -55,7 +55,7 @@ public:
 	    virtual	        void	     	exportExtraData(PxSerializationContext& stream);
 						void			importExtraData(PxDeserializationContext& context);
 						void			resolveReferences(PxDeserializationContext& context);
-	    virtual	        void			requires(PxProcessPxBaseCallback& c);
+	    virtual	        void			requiresObjects(PxProcessPxBaseCallback& c);
 		static			NpAggregate*	createObject(PxU8*& address, PxDeserializationContext& context);
 		static			void			getBinaryMetaData(PxOutputStream& stream);
 //~PX_SERIALIZATION
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulation.cpp b/PhysX_3.4/Source/PhysX/src/NpArticulation.cpp
index 1486441a..09098f10 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulation.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulation.cpp
@@ -41,7 +41,7 @@ namespace physx
 {
 
 // PX_SERIALIZATION
-void NpArticulation::requires(PxProcessPxBaseCallback& c)
+void NpArticulation::requiresObjects(PxProcessPxBaseCallback& c)
 {
 	// Collect articulation links
 	const PxU32 nbLinks = mArticulationLinks.size();
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulation.h b/PhysX_3.4/Source/PhysX/src/NpArticulation.h
index f167df3f..a050e054 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulation.h
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulation.h
@@ -66,7 +66,7 @@ public:
 	virtual			void						exportExtraData(PxSerializationContext& stream);
 					void						importExtraData(PxDeserializationContext& context);
 					void						resolveReferences(PxDeserializationContext& context);
-	virtual	        void						requires(PxProcessPxBaseCallback& c);
+	virtual	        void						requiresObjects(PxProcessPxBaseCallback& c);
 	static			NpArticulation*				createObject(PxU8*& address, PxDeserializationContext& context);
 	static			void						getBinaryMetaData(PxOutputStream& stream);
 //~PX_SERIALIZATION
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.h b/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.h
index 3c48e537..4e69ab7f 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.h
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.h
@@ -60,7 +60,7 @@ public:
 	static		void				getBinaryMetaData(PxOutputStream& stream);
 				void				exportExtraData(PxSerializationContext&)	{}
 				void				importExtraData(PxDeserializationContext&)	{}
-	virtual		void				requires(PxProcessPxBaseCallback&){}	
+	virtual		void				requiresObjects(PxProcessPxBaseCallback&){}	
 	virtual		bool			    isSubordinate()  const	 { return true; }           
 //~PX_SERIALIZATION
 									NpArticulationJoint(NpArticulationLink& parent, 
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulationLink.cpp b/PhysX_3.4/Source/PhysX/src/NpArticulationLink.cpp
index fc1411e8..76f2df45 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulationLink.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulationLink.cpp
@@ -41,9 +41,9 @@
 using namespace physx;
 
 // PX_SERIALIZATION
-void NpArticulationLink::requires(PxProcessPxBaseCallback& c)
+void NpArticulationLink::requiresObjects(PxProcessPxBaseCallback& c)
 {
-	NpArticulationLinkT::requires(c);
+	NpArticulationLinkT::requiresObjects(c);
 	
 	if(mInboundJoint)
 		c.process(*mInboundJoint);
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulationLink.h b/PhysX_3.4/Source/PhysX/src/NpArticulationLink.h
index fd220b97..a6b78f8d 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulationLink.h
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulationLink.h
@@ -82,7 +82,7 @@ public:
 				void				importExtraData(PxDeserializationContext& context);
 				void				registerReferences(PxSerializationContext& stream);
 				void				resolveReferences(PxDeserializationContext& context);
-	virtual		void				requires(PxProcessPxBaseCallback& c);
+	virtual		void				requiresObjects(PxProcessPxBaseCallback& c);
 	virtual		bool			    isSubordinate()  const	 { return true; } 
 	static		NpArticulationLink*	createObject(PxU8*& address, PxDeserializationContext& context);
 	static		void				getBinaryMetaData(PxOutputStream& stream);		
diff --git a/PhysX_3.4/Source/PhysX/src/NpConstraint.h b/PhysX_3.4/Source/PhysX/src/NpConstraint.h
index 426080eb..f69267d0 100644
--- a/PhysX_3.4/Source/PhysX/src/NpConstraint.h
+++ b/PhysX_3.4/Source/PhysX/src/NpConstraint.h
@@ -64,7 +64,7 @@ public:
 					void							exportExtraData(PxSerializationContext&)	{}
 					void							importExtraData(PxDeserializationContext&)	{ }
 					void							resolveReferences(PxDeserializationContext& context);
-	virtual			void							requires(PxProcessPxBaseCallback&){}
+	virtual			void							requiresObjects(PxProcessPxBaseCallback&){}
 	virtual		    bool			                isSubordinate()  const	 { return true; }  
 //~PX_SERIALIZATION
 													NpConstraint(PxRigidActor* actor0, PxRigidActor* actor1, PxConstraintConnector& connector, const PxConstraintShaderTable& shaders, PxU32 dataSize);
diff --git a/PhysX_3.4/Source/PhysX/src/NpMaterial.h b/PhysX_3.4/Source/PhysX/src/NpMaterial.h
index 0f17e2de..1014a7ce 100644
--- a/PhysX_3.4/Source/PhysX/src/NpMaterial.h
+++ b/PhysX_3.4/Source/PhysX/src/NpMaterial.h
@@ -67,7 +67,7 @@ public:
 	static		void				getBinaryMetaData(PxOutputStream& stream);
 				void				exportExtraData(PxSerializationContext&)	{}
 				void				importExtraData(PxDeserializationContext&) {}
-	virtual		void				requires(PxProcessPxBaseCallback&){}
+	virtual		void				requiresObjects(PxProcessPxBaseCallback&){}
 //~PX_SERIALIZATION
 									NpMaterial(const Sc::MaterialCore& desc);
 									~NpMaterial();
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplate.h b/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplate.h
index 7a6413b7..046cbf7c 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplate.h
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplate.h
@@ -52,7 +52,7 @@ private:
 public:
 // PX_SERIALIZATION
 											NpRigidActorTemplate(PxBaseFlags baseFlags) : ActorTemplateClass(baseFlags), mShapeManager(PxEmpty), mIndex(0xFFFFFFFF)	{}
-	virtual			void					requires(PxProcessPxBaseCallback& c);
+	virtual			void					requiresObjects(PxProcessPxBaseCallback& c);
 	virtual			void					exportExtraData(PxSerializationContext& stream);
 					void					importExtraData(PxDeserializationContext& context);
 					void					resolveReferences(PxDeserializationContext& context);
@@ -127,7 +127,7 @@ protected:
 // PX_SERIALIZATION
 
 template<class APIClass>
-void NpRigidActorTemplate<APIClass>::requires(PxProcessPxBaseCallback& c)
+void NpRigidActorTemplate<APIClass>::requiresObjects(PxProcessPxBaseCallback& c)
 {
 	// export shapes
 	PxU32 nbShapes = mShapeManager.getNbShapes();
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.cpp b/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.cpp
index 8328dcef..c00f48ba 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.cpp
@@ -42,9 +42,9 @@ NpRigidDynamic::~NpRigidDynamic()
 }
 
 // PX_SERIALIZATION
-void NpRigidDynamic::requires(PxProcessPxBaseCallback& c)
+void NpRigidDynamic::requiresObjects(PxProcessPxBaseCallback& c)
 {
-	NpRigidDynamicT::requires(c);
+	NpRigidDynamicT::requiresObjects(c);
 }
 
 NpRigidDynamic* NpRigidDynamic::createObject(PxU8*& address, PxDeserializationContext& context)
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.h b/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.h
index a53b02b6..6f71fa31 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.h
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.h
@@ -54,7 +54,7 @@ public:
 // PX_SERIALIZATION
 									NpRigidDynamic(PxBaseFlags baseFlags) : NpRigidDynamicT(baseFlags) {}
 
-	virtual		void				requires(PxProcessPxBaseCallback& c);
+	virtual		void				requiresObjects(PxProcessPxBaseCallback& c);
 
 	static		NpRigidDynamic*		createObject(PxU8*& address, PxDeserializationContext& context);
 	static		void				getBinaryMetaData(PxOutputStream& stream);	
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidStatic.cpp b/PhysX_3.4/Source/PhysX/src/NpRigidStatic.cpp
index b963287a..dcaa0f21 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidStatic.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidStatic.cpp
@@ -47,9 +47,9 @@ NpRigidStatic::~NpRigidStatic()
 }
 
 // PX_SERIALIZATION
-void NpRigidStatic::requires(PxProcessPxBaseCallback& c)
+void NpRigidStatic::requiresObjects(PxProcessPxBaseCallback& c)
 {
-	NpRigidStaticT::requires(c);	
+	NpRigidStaticT::requiresObjects(c);	
 }
 
 NpRigidStatic* NpRigidStatic::createObject(PxU8*& address, PxDeserializationContext& context)
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidStatic.h b/PhysX_3.4/Source/PhysX/src/NpRigidStatic.h
index 4d2cc5df..a02e82da 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidStatic.h
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidStatic.h
@@ -59,7 +59,7 @@ class NpRigidStatic : public NpRigidStaticT
 public:
 // PX_SERIALIZATION
 											NpRigidStatic(PxBaseFlags baseFlags) : NpRigidStaticT(baseFlags), mRigidStatic(PxEmpty) {}
-	virtual			void					requires(PxProcessPxBaseCallback& c);
+	virtual			void					requiresObjects(PxProcessPxBaseCallback& c);
 	static			NpRigidStatic*			createObject(PxU8*& address, PxDeserializationContext& context);
 	static			void					getBinaryMetaData(PxOutputStream& stream);
 //~PX_SERIALIZATION
diff --git a/PhysX_3.4/Source/PhysX/src/NpSerializerAdapter.cpp b/PhysX_3.4/Source/PhysX/src/NpSerializerAdapter.cpp
index a25f3779..8e4f1160 100644
--- a/PhysX_3.4/Source/PhysX/src/NpSerializerAdapter.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpSerializerAdapter.cpp
@@ -92,7 +92,7 @@ namespace physx
 		};
 
 		RequiresCallback callback(s);
-		dynamic.requires(callback);
+		dynamic.requiresObjects(callback);
 	}
 
 	template<>
@@ -124,7 +124,7 @@ namespace physx
 		};
 
 		RequiresCallback callback(s);
-		shape.requires(callback);
+		shape.requiresObjects(callback);
 	}
 
 	template<>
diff --git a/PhysX_3.4/Source/PhysX/src/NpShape.cpp b/PhysX_3.4/Source/PhysX/src/NpShape.cpp
index 5bd5e8ad..ed08809d 100644
--- a/PhysX_3.4/Source/PhysX/src/NpShape.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpShape.cpp
@@ -104,7 +104,7 @@ void NpShape::importExtraData(PxDeserializationContext& context)
 	context.readName(mName);
 }
 
-void NpShape::requires(PxProcessPxBaseCallback& c)
+void NpShape::requiresObjects(PxProcessPxBaseCallback& c)
 {
 	//meshes
 	PxBase* mesh = NULL;
diff --git a/PhysX_3.4/Source/PhysX/src/NpShape.h b/PhysX_3.4/Source/PhysX/src/NpShape.h
index d1f2bd1c..aa2a705e 100644
--- a/PhysX_3.4/Source/PhysX/src/NpShape.h
+++ b/PhysX_3.4/Source/PhysX/src/NpShape.h
@@ -82,7 +82,7 @@ public:
 												NpShape(PxBaseFlags baseFlags);
 	virtual			void						exportExtraData(PxSerializationContext& stream);
 					void						importExtraData(PxDeserializationContext& context);
-	virtual			void						requires(PxProcessPxBaseCallback& c);
+	virtual			void						requiresObjects(PxProcessPxBaseCallback& c);
 					void						resolveReferences(PxDeserializationContext& context);
 	static			NpShape*					createObject(PxU8*& address, PxDeserializationContext& context);
 	static			void						getBinaryMetaData(PxOutputStream& stream);
diff --git a/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.cpp b/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.cpp
index f91029cd..2933c64f 100644
--- a/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.cpp
+++ b/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.cpp
@@ -73,7 +73,7 @@ void NpCloth::resolveReferences(PxDeserializationContext& context)
 	mCloth.resolveReferences(mClothFabric->getScClothFabric());	
 }
 
-void NpCloth::requires(PxProcessPxBaseCallback& c)
+void NpCloth::requiresObjects(PxProcessPxBaseCallback& c)
 {
 	c.process(*mClothFabric);
 }
diff --git a/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.h b/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.h
index a7bf279d..29cdefa7 100644
--- a/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.h
+++ b/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.h
@@ -57,7 +57,7 @@ class NpCloth : public NpClothT
 public:
 // PX_SERIALIZATION
 									NpCloth(PxBaseFlags baseFlags);
-	virtual		void				requires(PxProcessPxBaseCallback& c);
+	virtual		void				requiresObjects(PxProcessPxBaseCallback& c);
 	virtual		void				exportExtraData(PxSerializationContext& stream) { mCloth.exportExtraData(stream); }
 				void				importExtraData(PxDeserializationContext& context) { mCloth.importExtraData(context); }
 				void				resolveReferences(PxDeserializationContext& context);
diff --git a/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.h b/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.h
index 41a7cad8..b31014d1 100644
--- a/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.h
+++ b/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.h
@@ -63,7 +63,7 @@ public:
 	static		NpClothFabric*				createObject(PxU8*& address, PxDeserializationContext&);
 	static		void						getBinaryMetaData(PxOutputStream& stream);
 				void						resolveReferences(PxDeserializationContext&) {}
-	virtual		void						requires(PxProcessPxBaseCallback&){}
+	virtual		void						requiresObjects(PxProcessPxBaseCallback&){}
 //~PX_SERIALIZATION
 											NpClothFabric();
 
diff --git a/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h
index e729447d..92211c03 100644
--- a/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h
+++ b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h
@@ -54,7 +54,7 @@ class NpParticleFluid : public NpParticleFluidT
 public:
 // PX_SERIALIZATION
 											NpParticleFluid(PxBaseFlags baseFlags) : NpParticleFluidT(baseFlags)	{}
-	virtual		void						requires(PxProcessPxBaseCallback&){}	
+	virtual		void						requiresObjects(PxProcessPxBaseCallback&){}	
 	virtual		void						exportExtraData(PxSerializationContext& stream) { mParticleSystem.exportExtraData(stream); }
 				void						importExtraData(PxDeserializationContext& context) { mParticleSystem.importExtraData(context); }
 	static		NpParticleFluid*			createObject(PxU8*& address, PxDeserializationContext& context);
diff --git a/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.h b/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.h
index e95780b7..45a10ef7 100644
--- a/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.h
+++ b/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.h
@@ -67,7 +67,7 @@ class NpParticleSystem : public NpParticleSystemT
 public:
 // PX_SERIALIZATION
 									NpParticleSystem(PxBaseFlags baseFlags) : NpParticleSystemT(baseFlags) {}
-	virtual		void				requires(PxProcessPxBaseCallback&) {}	
+	virtual		void				requiresObjects(PxProcessPxBaseCallback&) {}	
 	virtual		void				exportExtraData(PxSerializationContext& stream) { mParticleSystem.exportExtraData(stream); }
 				void				importExtraData(PxDeserializationContext& context) { mParticleSystem.importExtraData(context); }
 	static		NpParticleSystem*	createObject(PxU8*& address, PxDeserializationContext& context);