Initial commit:

PhysX 3.4.0 Update @ 21294896
APEX 1.4.0 Update @ 21275617

[CL 21300167]

1 files changed, 270 insertions, 0 deletions

diff --git a/PhysX_3.4/Source/PhysX/src/NpActorTemplate.h b/PhysX_3.4/Source/PhysX/src/NpActorTemplate.h
new file mode 100644
index 00000000..0236bdbc
--- /dev/null
+++ b/PhysX_3.4/Source/PhysX/src/NpActorTemplate.h
@@ -0,0 +1,270 @@
+// 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_ACTOR_TEMPLATE
+#define PX_PHYSICS_NP_ACTOR_TEMPLATE
+
+#include "PsUserAllocated.h"
+#include "NpWriteCheck.h"
+#include "NpReadCheck.h"
+#include "NpActor.h"
+#include "ScbActor.h"
+#include "NpScene.h"
+
+namespace physx
+{
+
+// PT: only API (virtual) functions should be implemented here. Other shared non-virtual functions should go to NpActor.
+
+/**
+This is an API class. API classes run in a different thread than the simulation.
+For the sake of simplicity they have their own methods, and they do not call simulation
+methods directly. To set simulation state, they also have their own custom set
+methods in the implementation classes.
+
+Changing the data layout of this class breaks the binary serialization format.
+See comments for PX_BINARY_SERIAL_VERSION.
+*/
+template<class APIClass>
+class NpActorTemplate : public APIClass, public NpActor, public Ps::UserAllocated
+{
+//= 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.
+//==================================================================================================
+	PX_NOCOPY(NpActorTemplate)
+public:
+// PX_SERIALIZATION
+											NpActorTemplate(PxBaseFlags baseFlags) : APIClass(baseFlags), NpActor(PxEmpty) {}
+	virtual	void							exportExtraData(PxSerializationContext& stream) { NpActor::exportExtraData(stream); }
+			void							importExtraData(PxDeserializationContext& context) { NpActor::importExtraData(context);	}
+	virtual void							resolveReferences(PxDeserializationContext& context) { NpActor::resolveReferences(context);		}
+//~PX_SERIALIZATION
+
+											NpActorTemplate(PxType concreteType, PxBaseFlags baseFlags, const char* name, void* userData);
+	virtual									~NpActorTemplate();
+
+	//---------------------------------------------------------------------------------
+	// PxActor implementation
+	//---------------------------------------------------------------------------------
+	virtual		void						release()												{ NpActor::release(*this);	}
+
+	// The rule is: If an API method is used somewhere in here, it has to be redeclared, else GCC whines
+	virtual		PxActorType::Enum			getType() const = 0;
+
+	virtual		PxScene*					getScene()				const;
+	
+	// Debug name
+	virtual		void						setName(const char*);
+	virtual		const char*					getName()				const;
+
+	virtual		PxBounds3					getWorldBounds(float inflation=1.01f) const = 0;
+
+	// Flags
+	virtual		void						setActorFlag(PxActorFlag::Enum flag, bool value);
+	virtual		void						setActorFlags(PxActorFlags inFlags);
+	virtual		PxActorFlags				getActorFlags() const;
+
+	// Dominance
+	virtual		void						setDominanceGroup(PxDominanceGroup dominanceGroup);
+	virtual		PxDominanceGroup			getDominanceGroup() const;
+
+	// Multiclient
+	virtual		void						setOwnerClient( PxClientID inClient );
+	virtual		PxClientID					getOwnerClient() const;
+	virtual		void						setClientBehaviorFlags(PxActorClientBehaviorFlags);
+	virtual		PxActorClientBehaviorFlags	getClientBehaviorFlags() const;
+
+	// Aggregates
+	virtual		PxAggregate*				getAggregate()	const	{ return NpActor::getAggregate();	}
+
+	//---------------------------------------------------------------------------------
+	// Miscellaneous
+	//---------------------------------------------------------------------------------
+protected:
+	PX_FORCE_INLINE void					setActorFlagInternal(PxActorFlag::Enum flag, bool value);
+	PX_FORCE_INLINE void					setActorFlagsInternal(PxActorFlags inFlags);
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+template<class APIClass>
+NpActorTemplate<APIClass>::NpActorTemplate(PxType concreteType,
+										   PxBaseFlags baseFlags,
+										   const char* name,
+										   void* actorUserData)
+:APIClass(concreteType, baseFlags),
+NpActor(name)
+{
+	// don't ref Scb actor here, it hasn't been assigned yet
+
+	APIClass::userData = actorUserData;
+}
+
+
+template<class APIClass>
+NpActorTemplate<APIClass>::~NpActorTemplate()
+{
+	NpActor::onActorRelease(this);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// PT: this one is very slow
+template<class APIClass>
+PxScene* NpActorTemplate<APIClass>::getScene() const
+{
+	return NpActor::getAPIScene(*this);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template<class APIClass>
+void NpActorTemplate<APIClass>::setName(const char* debugName)
+{
+	NP_WRITE_CHECK(NpActor::getOwnerScene(*this));
+	mName = debugName;
+
+#if PX_SUPPORT_PVD
+		Scb::Scene* scbScene = getScbFromPxActor(*this).getScbSceneForAPI();
+		Scb::Actor& scbActor = NpActor::getScbFromPxActor(*this);
+		//Name changing is not bufferred
+		if(scbScene)
+			scbScene->getScenePvdClient().updatePvdProperties(&scbActor);	
+#endif
+}
+
+template<class APIClass>
+const char* NpActorTemplate<APIClass>::getName() const
+{
+	NP_READ_CHECK(NpActor::getOwnerScene(*this));
+	return mName;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template<class APIClass>
+void NpActorTemplate<APIClass>::setDominanceGroup(PxDominanceGroup dominanceGroup)
+{
+	NP_WRITE_CHECK(NpActor::getOwnerScene(*this));
+	NpActor::getScbFromPxActor(*this).setDominanceGroup(dominanceGroup);
+}
+
+
+template<class APIClass>
+PxDominanceGroup NpActorTemplate<APIClass>::getDominanceGroup() const
+{
+	NP_READ_CHECK(NpActor::getOwnerScene(*this));
+	return NpActor::getScbFromPxActor(*this).getDominanceGroup();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template<class APIClass>
+void NpActorTemplate<APIClass>::setOwnerClient( PxClientID inId )
+{
+	if ( NpActor::getOwnerScene(*this) != NULL )
+	{
+		Ps::getFoundation().error(PxErrorCode::eINVALID_OPERATION, __FILE__, __LINE__, 
+				"Attempt to set the client id when an actor is already in a scene.");
+	}
+	else
+		NpActor::getScbFromPxActor(*this).setOwnerClient( inId );
+}
+
+template<class APIClass>
+PxClientID NpActorTemplate<APIClass>::getOwnerClient() const
+{
+	return NpActor::getScbFromPxActor(*this).getOwnerClient();
+}
+
+template<class APIClass>
+void NpActorTemplate<APIClass>::setClientBehaviorFlags(PxActorClientBehaviorFlags bits)
+{
+	NP_WRITE_CHECK(NpActor::getOwnerScene(*this));
+	NpActor::getScbFromPxActor(*this).setClientBehaviorFlags(bits);
+}
+
+template<class APIClass>
+PxActorClientBehaviorFlags NpActorTemplate<APIClass>::getClientBehaviorFlags() const
+{
+	NP_READ_CHECK(NpActor::getOwnerScene(*this));
+	return NpActor::getScbFromPxActor(*this).getClientBehaviorFlags();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template<class APIClass>
+PX_FORCE_INLINE void NpActorTemplate<APIClass>::setActorFlagInternal(PxActorFlag::Enum flag, bool value)
+{
+	Scb::Actor& a = NpActor::getScbFromPxActor(*this);
+	if (value)
+		a.setActorFlags( a.getActorFlags() | flag );
+	else
+		a.setActorFlags( a.getActorFlags() & (~PxActorFlags(flag)) );
+}
+
+template<class APIClass>
+PX_FORCE_INLINE void NpActorTemplate<APIClass>::setActorFlagsInternal(PxActorFlags inFlags)
+{
+	Scb::Actor& a = NpActor::getScbFromPxActor(*this);
+	a.setActorFlags( inFlags );
+}
+
+template<class APIClass>
+void NpActorTemplate<APIClass>::setActorFlag(PxActorFlag::Enum flag, bool value)
+{
+	NP_WRITE_CHECK(NpActor::getOwnerScene(*this));
+
+	setActorFlagInternal(flag, value);
+}
+
+template<class APIClass>
+void NpActorTemplate<APIClass>::setActorFlags(PxActorFlags inFlags)
+{
+	NP_WRITE_CHECK(NpActor::getOwnerScene(*this));
+	
+	setActorFlagsInternal(inFlags);
+}
+
+template<class APIClass>
+PxActorFlags NpActorTemplate<APIClass>::getActorFlags() const
+{
+	NP_READ_CHECK(NpActor::getOwnerScene(*this));
+	return NpActor::getScbFromPxActor(*this).getActorFlags();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+}
+
+#endif