Initial commit:

PhysX 3.4.0 Update @ 21294896
APEX 1.4.0 Update @ 21275617

[CL 21300167]

1 files changed, 70 insertions, 0 deletions

diff --git a/PhysX_3.4/Source/SimulationController/src/ScElementInteractionMarker.h b/PhysX_3.4/Source/SimulationController/src/ScElementInteractionMarker.h
new file mode 100644
index 00000000..01210737
--- /dev/null
+++ b/PhysX_3.4/Source/SimulationController/src/ScElementInteractionMarker.h
@@ -0,0 +1,70 @@
+// 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_COLLISION_ELEMENT_INTERACTION_MARKER
+#define PX_COLLISION_ELEMENT_INTERACTION_MARKER
+
+#include "ScElementSimInteraction.h"
+
+namespace physx
+{
+namespace Sc
+{
+
+	class ElementInteractionMarker : public ElementSimInteraction
+	{
+	public:
+		PX_INLINE ElementInteractionMarker(ElementSim& element0, ElementSim& element1, bool createParallel = false);
+		virtual ~ElementInteractionMarker();
+
+		//---------- Interaction ----------
+		virtual bool onActivate(void*);
+		virtual bool onDeactivate(PxU32 infoFlag);
+		//-----------------------------------
+	};
+
+} // namespace Sc
+
+
+PX_INLINE Sc::ElementInteractionMarker::ElementInteractionMarker(ElementSim& element0, ElementSim& element1, bool createParallel) :
+	ElementSimInteraction(element0, element1, InteractionType::eMARKER, InteractionFlag::eRB_ELEMENT|InteractionFlag::eFILTERABLE)
+{
+	if (!createParallel)
+	{
+		bool active = registerInActors();
+		PX_UNUSED(active);
+		PX_ASSERT(!active);
+		getScene().registerInteraction(this, false);
+	}
+}
+
+}
+
+#endif //PX_COLLISION_SHAPEINTERACTIONMARKER