Initial commit:

PhysX 3.4.0 Update @ 21294896
APEX 1.4.0 Update @ 21275617

[CL 21300167]

5 files changed, 352 insertions, 0 deletions

diff --git a/APEX_1.4/samples_v2/SampleDestructionHelloWorld/Main.cpp b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/Main.cpp
new file mode 100644
index 00000000..69491b0b
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/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 Destruction 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/SampleDestructionHelloWorld/SampleSceneController.cpp b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleSceneController.cpp
new file mode 100644
index 00000000..0ff6f84d
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleSceneController.cpp
@@ -0,0 +1,104 @@
+/*
+* 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 "PxMath.h"
+
+using namespace nvidia;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//												Scenes Setup
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+SampleSceneController::AssetDescription SampleSceneController::ASSETS[] = 
+{
+	{ "Wall_PC", "Wall" },
+	{ "arch", "arch" },
+	{ "Bunny", "Bunny" },
+	{ "block", "block" },
+	{ "Fence", "Fence" },
+	{ "Post", "Post" },
+	{ "Sheet", "Sheet" },
+	{ "Moai_PC", "Moai_PC" }
+};
+
+int SampleSceneController::getAssetsCount()
+{
+	return sizeof(ASSETS) / sizeof(ASSETS[0]);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+SampleSceneController::SampleSceneController(CFirstPersonCamera* camera, ApexController& apex)
+: mApex(apex), mCamera(camera), mActor(NULL)
+{
+}
+
+SampleSceneController::~SampleSceneController()
+{
+}
+
+void SampleSceneController::onSampleStart()
+{
+	// setup camera
+	DirectX::XMVECTORF32 lookAtPt = { 0, 10, 0, 0 };
+	DirectX::XMVECTORF32 eyePt = { 0, 20, 60, 0 };
+	mCamera->SetViewParams(eyePt, lookAtPt);
+	mCamera->SetRotateButtons(false, false, true, false);
+	mCamera->SetEnablePositionMovement(true);
+
+	// spawn actor
+	setCurrentAsset(0);
+}
+
+void SampleSceneController::setCurrentAsset(int num)
+{
+	int assetsCount = getAssetsCount();
+	num = nvidia::PxClamp(num, 0, assetsCount - 1);
+
+	mCurrentAsset = num;
+	if(mActor != NULL)
+	{
+		mApex.removeActor(mActor);
+		mActor = NULL;
+	}
+	mActor = mApex.spawnDestructibleActor(ASSETS[num].model);
+}
+
+void SampleSceneController::fire(float mouseX, float mouseY)
+{
+	PxVec3 eyePos, pickDir;
+	mApex.getEyePoseAndPickDir(mouseX, mouseY, eyePos, pickDir);
+
+	if (pickDir.normalize() > 0)
+	{
+		float time;
+		PxVec3 normal;
+		const int chunkIndex = mActor->rayCast(time, normal, eyePos, pickDir, DestructibleActorRaycastFlags::AllChunks);
+		if (chunkIndex != ModuleDestructibleConst::INVALID_CHUNK_INDEX)
+		{
+			mActor->applyDamage(PX_MAX_F32, 0.0f, eyePos + time * pickDir, pickDir, chunkIndex);
+		}
+	}
+}
diff --git a/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleSceneController.h b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleSceneController.h
new file mode 100644
index 00000000..0260cc8b
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleSceneController.h
@@ -0,0 +1,56 @@
+/*
+* 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"
+
+class CFirstPersonCamera;
+
+class SampleSceneController : public ISampleController
+{
+public:
+	SampleSceneController(CFirstPersonCamera* camera, ApexController& apex);
+	virtual ~SampleSceneController();
+
+	struct AssetDescription
+	{
+		const char* model;
+		const char* uiName;
+	};
+	static AssetDescription ASSETS[];
+	static int getAssetsCount();
+
+	void setCurrentAsset(int);
+
+	int getCurrentAsset()
+	{
+		return mCurrentAsset;
+	}
+
+	virtual void onSampleStart();
+
+	// commands
+	void fire(float mouseX, float mouseY);
+
+private:
+	SampleSceneController& operator= (SampleSceneController&);
+
+	int mCurrentAsset;
+
+	ApexController& mApex;
+	CFirstPersonCamera* mCamera;
+
+	DestructibleActor* mActor;
+};
+
+#endif
\ No newline at end of file
diff --git a/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleUIController.cpp b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleUIController.cpp
new file mode 100644
index 00000000..6dba504a
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleUIController.cpp
@@ -0,0 +1,97 @@
+/*
+* 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'");
+
+	UINT assetsCount = (UINT)SampleSceneController::getAssetsCount();
+	TwEnumVal* enumAssets = new TwEnumVal[assetsCount];
+	for(UINT i = 0; i < assetsCount; i++)
+	{
+		enumAssets[i].Value = (int)i;
+		enumAssets[i].Label = SampleSceneController::ASSETS[i].uiName;
+	}
+	TwType enumSceneType = TwDefineEnum("Assets", enumAssets, assetsCount);
+	delete[] enumAssets;
+	TwAddVarCB(sampleBar, "Assets", enumSceneType, SampleUIController::setCurrentScene,
+	           SampleUIController::getCurrentScene, this, "group='Select Scene'");
+
+	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("VISUALIZE_DESTRUCTIBLE_SUPPORT", "Destructible", 1.0f, "DestructibleSupport");
+	mCommonUIController->addApexDebugRenderParam("RenderNormals");
+	mCommonUIController->addApexDebugRenderParam("RenderTangents");
+	mCommonUIController->addApexDebugRenderParam("Bounds");
+
+	mCommonUIController->addHintLine("Apply damage - LMB");
+}
+
+LRESULT SampleUIController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	PX_UNUSED(hWnd);
+	PX_UNUSED(wParam);
+	PX_UNUSED(lParam);
+
+	if(uMsg == WM_LBUTTONDOWN)
+	{
+		short mouseX = (short)LOWORD(lParam);
+		short mouseY = (short)HIWORD(lParam);
+		mScene->fire(mouseX / static_cast<float>(mWidth), mouseY / static_cast<float>(mHeight));
+	}
+
+	return 1;
+}
+
+void SampleUIController::BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc)
+{
+	PX_UNUSED(pDevice);
+
+	mWidth = pBackBufferSurfaceDesc->Width;
+	mHeight = pBackBufferSurfaceDesc->Height;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//												UI Callbacks
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void TW_CALL SampleUIController::setCurrentScene(const void* value, void* clientData)
+{
+	SampleUIController* controller = static_cast<SampleUIController*>(clientData);
+	controller->mScene->setCurrentAsset(*static_cast<const int*>(value));
+}
+
+void TW_CALL SampleUIController::getCurrentScene(void* value, void* clientData)
+{
+	SampleUIController* controller = static_cast<SampleUIController*>(clientData);
+	*static_cast<int*>(value) = controller->mScene->getCurrentAsset();
+}
diff --git a/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleUIController.h b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/SampleUIController.h
new file mode 100644
index 00000000..aba590cd
--- /dev/null
+++ b/APEX_1.4/samples_v2/SampleDestructionHelloWorld/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