Initial commit:

PhysX 3.4.0 Update @ 21294896
APEX 1.4.0 Update @ 21275617

[CL 21300167]

1 files changed, 94 insertions, 0 deletions

diff --git a/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h
new file mode 100644
index 00000000..da2f8234
--- /dev/null
+++ b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h
@@ -0,0 +1,94 @@
+// 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-2016 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_PHYSICS_NP_PARTICLEFLUID
+#define PX_PHYSICS_NP_PARTICLEFLUID
+
+#include "PxPhysXConfig.h"
+
+#if PX_USE_PARTICLE_SYSTEM_API
+
+#include "NpParticleSystem.h"
+
+namespace physx
+{
+
+class NpParticleFluid;
+
+typedef NpParticleBaseTemplate<PxParticleFluid, NpParticleFluid> NpParticleFluidT;
+class NpParticleFluid : public NpParticleFluidT
+{
+//= ATTENTION! =====================================================================================
+// Changing the data layout of this class breaks the binary serialization format.  See comments for 
+// PX_BINARY_SERIAL_VERSION.  If a modification is required, please adjust the getBinaryMetaData 
+// function.  If the modification is made on a custom branch, please change PX_BINARY_SERIAL_VERSION
+// accordingly.
+//==================================================================================================
+public:
+// PX_SERIALIZATION
+											NpParticleFluid(PxBaseFlags baseFlags) : NpParticleFluidT(baseFlags)	{}
+	virtual		void						requires(PxProcessPxBaseCallback&){}	
+	virtual		void						exportExtraData(PxSerializationContext& stream) { mParticleSystem.exportExtraData(stream); }
+				void						importExtraData(PxDeserializationContext& context) { mParticleSystem.importExtraData(context); }
+	static		NpParticleFluid*			createObject(PxU8*& address, PxDeserializationContext& context);
+	static		void						getBinaryMetaData(PxOutputStream& stream);
+//~PX_SERIALIZATION
+											NpParticleFluid(PxU32 maxParticles, bool perParticleRestOffset);
+	virtual									~NpParticleFluid();
+
+	//---------------------------------------------------------------------------------
+	// PxParticleFluid implementation
+	//---------------------------------------------------------------------------------
+	virtual		PxActorType::Enum			getType() const { return PxActorType::ePARTICLE_FLUID; }
+
+	virtual		void*						is(PxActorType::Enum type);
+	virtual		const void*					is(PxActorType::Enum type)								const;
+
+	virtual		PxParticleFluidReadData*	lockParticleFluidReadData(PxDataAccessFlags flags);
+	virtual		PxParticleFluidReadData*	lockParticleFluidReadData();
+
+	virtual		PxReal						getStiffness()											const;
+	virtual		void 						setStiffness(PxReal);
+	virtual		PxReal						getViscosity()											const;
+	virtual		void 						setViscosity(PxReal);
+	
+	virtual		PxReal						getRestParticleDistance()								const;
+	virtual		void						setRestParticleDistance(PxReal);
+
+private:
+	typedef NpParticleBaseTemplate<PxParticleFluid, NpParticleFluid> ParticleSystemTemplateClass;
+				
+};
+
+}
+
+#endif // PX_USE_PARTICLE_SYSTEM_API
+
+#endif