Initial commit:

PhysX 3.4.0 Update @ 21294896
APEX 1.4.0 Update @ 21275617

[CL 21300167]

5 files changed, 310 insertions, 0 deletions

diff --git a/APEX_1.4/samples_v2/SampleClothingHelloWorld/Main.cpp b/APEX_1.4/samples_v2/SampleClothingHelloWorld/Main.cpp
new file mode 100644
index 00000000..a45eb8f1
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleClothingHelloWorld/Main.cpp
@@ -0,0 +1,53 @@
+#include "Utils.h"
+
+#include <DirectXMath.h>
+#include "XInput.h"
+#include "DXUTMisc.h"
+#include "DXUTCamera.h"
+
+#include "ApexController.h"
+#include "ApexRenderer.h"
+#include "CommonUIController.h"
+#include "SampleUIController.h"
+#include "SampleSceneController.h"
+
+#include "PxPhysicsAPI.h"
+
+#include "SampleManager.h"
+
+int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
+{
+	PX_UNUSED(hInstance);
+	PX_UNUSED(hPrevInstance);
+	PX_UNUSED(lpCmdLine);
+	PX_UNUSED(nCmdShow);
+
+
+// Enable run-time memory check for debug builds.
+#if defined(DEBUG) | defined(_DEBUG)
+	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+	AllocConsole();
+#endif
+
+	SampleManager* sampleManager = new SampleManager(L"APEX Clothing Sample: Hello World");
+
+	CFirstPersonCamera camera;
+
+	auto apexController = ApexController(physx::PxDefaultSimulationFilterShader, &camera);
+	auto apexRender = ApexRenderer(&camera, apexController);
+	auto sceneController = SampleSceneController(&camera, apexController);
+	auto commonUiController = CommonUIController(&camera, &apexRender, &apexController);
+	auto sampleUIController = SampleUIController(&sceneController, &commonUiController);
+
+	sampleManager->addControllerToFront(&apexController);
+	sampleManager->addControllerToFront(&apexRender);
+	sampleManager->addControllerToFront(&sceneController);
+	sampleManager->addControllerToFront(&sampleUIController);
+	sampleManager->addControllerToFront(&commonUiController);
+
+	int result = sampleManager->run();
+
+	delete sampleManager;
+
+	return result;
+}
diff --git a/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleSceneController.cpp b/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleSceneController.cpp
new file mode 100644
index 00000000..fa2949bc
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleSceneController.cpp
@@ -0,0 +1,88 @@
+/*
+* 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.
+*/
+
+#include "SampleSceneController.h"
+#include "Apex.h"
+#include "ApexRenderer.h" // for matrix conversion
+#include <DirectXMath.h>
+#include "XInput.h"
+#include "DXUTMisc.h"
+#pragma warning(push)
+#pragma warning(disable : 4481) // Suppress "nonstandard extension used" warning
+#include "DXUTCamera.h"
+#pragma warning(pop)
+
+#include "ApexResourceCallback.h"
+#include "ClothingCollision.h"
+
+#include "PxMath.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+SampleSceneController::SampleSceneController(CFirstPersonCamera* camera, ApexController& apex)
+: mApex(apex), mCamera(camera), mActor(NULL), mTime(0)
+{
+}
+
+SampleSceneController::~SampleSceneController()
+{
+}
+
+void SampleSceneController::onSampleStart()
+{
+	// setup camera
+	DirectX::XMVECTORF32 lookAtPt = { 0, 45, 0, 0 };
+	DirectX::XMVECTORF32 eyePt = { 0, 50, 100, 0 };
+	mCamera->SetViewParams(eyePt, lookAtPt);
+	mCamera->SetRotateButtons(false, false, true, false);
+	mCamera->SetEnablePositionMovement(true);
+
+	// spawn actor
+	mActor = mApex.spawnClothingActor("plane32");
+
+	nvidia::PxMat44 globalPose = nvidia::PxMat44(nvidia::PxIdentity);
+	globalPose(1, 1) = 0;
+	globalPose(2, 2) = 0;
+	globalPose(1, 2) = 1;
+	globalPose(2, 1) = -1;
+
+	globalPose.setPosition(PxVec3(0, -40, 0));
+
+	mActor->updateState(globalPose, NULL, 0, 0, ClothingTeleportMode::TeleportAndReset);
+}
+
+void SampleSceneController::Animate(double dt)
+{
+	for (std::map<PxRigidDynamic*, ClothingSphere*>::iterator it = mSpheres.begin(); it != mSpheres.end(); it++)
+	{
+		(*it).second->setPosition((*it).first->getGlobalPose().p);
+	}
+
+	mTime += dt;
+
+	mActor->setWind(0.9f, PxVec3(30 + 7 * PxSin(mTime), 0, 40 + 10 * PxCos(mTime)));
+}
+
+void SampleSceneController::throwSphere()
+{
+	PxVec3 eyePos = XMVECTORToPxVec4(mCamera->GetEyePt()).getXYZ();
+	PxVec3 lookAtPos = XMVECTORToPxVec4(mCamera->GetLookAtPt()).getXYZ();
+	PhysXPrimitive* box = mApex.spawnPhysXPrimitiveBox(PxTransform(eyePos));
+	PxRigidDynamic* rigidDynamic = box->getActor()->is<PxRigidDynamic>();
+	box->setColor(DirectX::XMFLOAT3(1, 1, 1));
+
+	PxVec3 dir = (lookAtPos - eyePos).getNormalized();
+	rigidDynamic->setLinearVelocity(dir * 50);
+
+	ClothingSphere* sphere = mActor->createCollisionSphere(rigidDynamic->getGlobalPose().p, 5);
+	mSpheres[rigidDynamic] = sphere;
+}
diff --git a/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleSceneController.h b/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleSceneController.h
new file mode 100644
index 00000000..3482e882
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleSceneController.h
@@ -0,0 +1,47 @@
+/*
+* 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 SCENE_CONTROLLER_H
+#define SCENE_CONTROLLER_H
+
+#include "ApexController.h"
+#include "SampleManager.h"
+#include "PhysXPrimitive.h"
+
+#include <map>
+
+class CFirstPersonCamera;
+
+class SampleSceneController : public ISampleController
+{
+public:
+	SampleSceneController(CFirstPersonCamera* camera, ApexController& apex);
+	virtual ~SampleSceneController();
+
+	virtual void onSampleStart();
+	virtual void Animate(double dt);
+
+	// commands
+	void throwSphere();
+
+private:
+
+	SampleSceneController& operator= (SampleSceneController&);
+
+	std::map<PxRigidDynamic*, ClothingSphere*> mSpheres;
+
+	ApexController& mApex;
+	CFirstPersonCamera* mCamera;
+
+	ClothingActor* mActor;
+	double mTime;
+};
+
+#endif
\ No newline at end of file
diff --git a/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleUIController.cpp b/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleUIController.cpp
new file mode 100644
index 00000000..7de0f051
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleUIController.cpp
@@ -0,0 +1,80 @@
+/*
+* 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.
+*/
+
+#include "SampleUIController.h"
+#include "SampleSceneController.h"
+#include "CommonUIController.h"
+
+
+SampleUIController::SampleUIController(SampleSceneController* s, CommonUIController* c) : mScene(s), mCommonUIController(c)
+{
+}
+
+void SampleUIController::onInitialize()
+{
+	TwBar* sampleBar = TwNewBar("Sample");
+	PX_UNUSED(sampleBar);
+	TwDefine("Sample color='19 25 59' alpha=128 text=light size='200 150' iconified=false valueswidth=150 position='12 480' label='Select Asset'");
+
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eBODY_ANG_VELOCITY);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eBODY_LIN_VELOCITY);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eBODY_MASS_AXES);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eCOLLISION_AABBS);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eCOLLISION_SHAPES);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eCOLLISION_AXES);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eCOLLISION_COMPOUNDS);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eCOLLISION_FNORMALS);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eCOLLISION_EDGES);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eCOLLISION_STATIC);
+	mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::eCOLLISION_DYNAMIC);
+
+	mCommonUIController->addApexDebugRenderParam("LodBenefits");
+	mCommonUIController->addApexDebugRenderParam("RenderNormals");
+	mCommonUIController->addApexDebugRenderParam("RenderTangents");
+	mCommonUIController->addApexDebugRenderParam("Bounds");
+	mCommonUIController->addApexDebugRenderParam("PhysicsMeshWire", "Clothing", 0.9f, "Clothing Physics Mesh(Wire)");
+	mCommonUIController->addApexDebugRenderParam("SolverMode", "Clothing", 1.0f, "SolverMode");
+	mCommonUIController->addApexDebugRenderParam("Wind", "Clothing", 0.1f, "Wind");
+	mCommonUIController->addApexDebugRenderParam("Velocities", "Clothing", 0.1f, "Velocities");
+	mCommonUIController->addApexDebugRenderParam("SkinnedPositions", "Clothing", 1.0f, "Clothing Skinned Positions");
+	mCommonUIController->addApexDebugRenderParam("Backstop", "Clothing", 1.0f, "Backstop");
+	mCommonUIController->addApexDebugRenderParam("MaxDistance", "Clothing", 1.0f, "MaxDistance");
+	mCommonUIController->addApexDebugRenderParam("LengthFibers", "Clothing", 1.0f, "LengthFibers");
+	mCommonUIController->addApexDebugRenderParam("CrossSectionFibers", "Clothing", 1.0f, "CrossSectionFibers");
+	mCommonUIController->addApexDebugRenderParam("TethersActive", "Clothing", 1.0f, "TethersActive");
+	mCommonUIController->addApexDebugRenderParam("SelfCollision", "Clothing", 1.0f, "SelfCollision");
+	mCommonUIController->addApexDebugRenderParam("CollisionShapes", "Clothing", 1.0f, "Solid Clothing Collision");
+}
+
+LRESULT SampleUIController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	PX_UNUSED(hWnd);
+	PX_UNUSED(wParam);
+	PX_UNUSED(lParam);
+
+	if(uMsg == WM_LBUTTONDOWN)
+	{
+		mScene->throwSphere();
+	}
+
+	return 1;
+}
+
+void SampleUIController::BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc)
+{
+	PX_UNUSED(pDevice);
+
+	mWidth = pBackBufferSurfaceDesc->Width;
+	mHeight = pBackBufferSurfaceDesc->Height;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//									UI Callbacks
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleUIController.h b/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleUIController.h
new file mode 100644
index 00000000..aba590cd
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleClothingHelloWorld/SampleUIController.h
@@ -0,0 +1,42 @@
+/*
+* 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_UI_CONTROLLER_H
+#define SAMPLE_UI_CONTROLLER_H
+
+#include "SampleManager.h"
+#include <DirectXMath.h>
+#include "AntTweakBar.h"
+
+class SampleSceneController;
+class CommonUIController;
+
+class SampleUIController : public ISampleController
+{
+  public:
+	SampleUIController(SampleSceneController* s, CommonUIController* c);
+
+	virtual void onInitialize();
+	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+	virtual void BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc);
+
+	static void TW_CALL setCurrentScene(const void* value, void* clientData);
+	static void TW_CALL getCurrentScene(void* value, void* clientData);
+
+  private:
+	SampleSceneController* mScene;
+	CommonUIController* mCommonUIController;
+	TwBar* mSettingsBar;
+
+	UINT mWidth;
+	UINT mHeight;
+};
+
+#endif
\ No newline at end of file