Initial commit:

PhysX 3.4.0 Update @ 21294896
APEX 1.4.0 Update @ 21275617

[CL 21300167]

1 files changed, 115 insertions, 0 deletions

diff --git a/APEX_1.4/shared/external/include/SamplePlaneActor.h b/APEX_1.4/shared/external/include/SamplePlaneActor.h
new file mode 100644
index 00000000..65b7b2f0
--- /dev/null
+++ b/APEX_1.4/shared/external/include/SamplePlaneActor.h
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * NVIDIA CORPORATION and its licensors retain all intellectual property
+ * and proprietary rights in and to this software, 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.
+ */
+
+#ifndef __SAMPLE_PLANE_ACTOR_H__
+#define __SAMPLE_PLANE_ACTOR_H__
+
+#include "SampleShapeActor.h"
+
+#include "PxScene.h"
+#include "PxRigidStatic.h"
+#include "geometry/PxPlaneGeometry.h"
+namespace physx
+{
+class PxMaterial;
+}
+
+#include <PsMathUtils.h>
+
+#include <Renderer.h>
+#include <RendererMeshContext.h>
+#include <RendererGridShape.h>
+
+
+class SamplePlaneActor : public SampleShapeActor
+{
+public:
+	SamplePlaneActor(SampleRenderer::Renderer* renderer,
+	                 SampleFramework::SampleMaterialAsset& material,
+	                 physx::PxScene& physxScene,
+	                 const physx::PxVec3& pos,
+	                 const physx::PxVec3& normal,
+	                 physx::PxMaterial* PxMaterial,
+	                 bool useGroupsMask,
+	                 nvidia::apex::RenderDebugInterface* rdebug = NULL)
+		: SampleShapeActor(rdebug)
+		, mRendererGridShape(NULL)
+	{
+		mRenderer = renderer;
+		if (!PxMaterial)
+			physxScene.getPhysics().getMaterials(&PxMaterial, 1);
+		createActor(physxScene, pos, normal, PxMaterial, useGroupsMask);
+
+		// default is X_UP
+		mRendererGridShape = new SampleRenderer::RendererGridShape(*mRenderer, 10, 1.0f, false, SampleRenderer::RendererGridShape::UP_X);
+
+		mRendererMeshContext.material         = material.getMaterial();
+		mRendererMeshContext.materialInstance = material.getMaterialInstance();
+		mRendererMeshContext.mesh             = mRendererGridShape->getMesh();
+		mRendererMeshContext.transform        = &mTransform;
+
+		if (rdebug)
+		{
+			mBlockId = RENDER_DEBUG_IFACE(rdebug)->beginDrawGroup(mTransform);
+			RENDER_DEBUG_IFACE(rdebug)->addToCurrentState(RENDER_DEBUG::DebugRenderState::SolidShaded);
+			static uint32_t pcount /* = 0 */;
+			RENDER_DEBUG_IFACE(rdebug)->setCurrentColor(0xFFFFFF);
+			RENDER_DEBUG_IFACE(rdebug)->setCurrentTextScale(0.5f);
+			RENDER_DEBUG_IFACE(rdebug)->addToCurrentState(RENDER_DEBUG::DebugRenderState::CenterText);
+			RENDER_DEBUG_IFACE(rdebug)->addToCurrentState(RENDER_DEBUG::DebugRenderState::CameraFacing);
+			RENDER_DEBUG_IFACE(rdebug)->debugText(physx::PxVec3(0, 1.0f + 0.01f, 0), "Sample Plane:%d", pcount++);
+			RENDER_DEBUG_IFACE(rdebug)->endDrawGroup();
+		}
+	}
+
+	virtual ~SamplePlaneActor()
+	{
+		if (mRendererGridShape)
+		{
+			delete mRendererGridShape;
+			mRendererGridShape = NULL;
+		}
+	}
+
+private:
+	void createActor(physx::PxScene& physxScene,
+	                 const physx::PxVec3& pos,
+	                 const physx::PxVec3& normal,
+	                 physx::PxMaterial* PxMaterial,
+	                 bool useGroupsMask)
+	{
+		//physx::PxMat33 m33(nvidia::rotFrom2Vectors(physx::PxVec3(0, 1, 0), normal));
+		physx::PxMat33 m33(physx::shdfnd::rotFrom2Vectors(physx::PxVec3(1, 0, 0), normal));
+		mTransform = physx::PxMat44(m33, pos);
+
+		//physx::PxTransform pose(pos, physx::PxQuat(nvidia::rotFrom2Vectors(physx::PxVec3(1, 0, 0), normal)));
+		physx::PxTransform pose	= physx::PxTransform(mTransform);
+		pose.q.normalize();
+		physx::PxRigidStatic* actor = physxScene.getPhysics().createRigidStatic(pose);
+		PX_ASSERT(actor);
+
+		physx::PxPlaneGeometry planeGeom;
+		physx::PxShape* shape = actor->createShape(planeGeom, *PxMaterial);
+		PX_ASSERT(shape);
+		if (shape && useGroupsMask)
+		{
+			shape->setSimulationFilterData(physx::PxFilterData(1, 0, ~0u, 0));
+			shape->setQueryFilterData(physx::PxFilterData(1, 0, ~0u, 0));
+		}
+		SCOPED_PHYSX_LOCK_WRITE(&physxScene);
+		physxScene.addActor(*actor);
+		mPhysxActor = actor;
+	}
+
+private:
+	SampleRenderer::RendererGridShape* mRendererGridShape;
+};
+
+#endif