Removing ArtistTools and CurveEditor projects

405 files changed, 0 insertions, 83079 deletions

diff --git a/tools/ArtistTools/source/ArtistTools/main.cpp b/tools/ArtistTools/source/ArtistTools/main.cpp
deleted file mode 100644
index 74c9d89..0000000
--- a/tools/ArtistTools/source/ArtistTools/main.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "CoreLib.h"
-
-int main(int argc, char *argv[])
-{
-	return CoreLib::Inst()->CoreMain(argc, argv);
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/BlastPlugin.cpp b/tools/ArtistTools/source/BlastPlugin/BlastPlugin.cpp
deleted file mode 100644
index b89bea2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/BlastPlugin.cpp
+++ /dev/null
@@ -1,2784 +0,0 @@
-#include <QtCore/QtPlugin>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtCore/QVariant>
-
-#include <QtGui/QDesktopServices>
-
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QToolBar>
-#include <QtWidgets/QTabWidget>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QSpacerItem>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QWidget>
-
-#include <Shlwapi.h>
-#include <string>
-
-#include "PluginBlast.h"
-#include "BlastPlugin.h"
-#include "SlideSpinBox.h"
-#include "Utils.h"
-#include "CorelibUtils.h"
-#include "Settings.h"
-#include "GlobalSettings.h"
-#include "SimpleScene.h"
-#include "Camera.h"
-#include "Light.h"
-#include "ProjectParams.h"
-#include "FoundationHolder.h"
-#include "AppMainWindow.h"
-#include "ViewerOutput.h"
-#include "ExpandablePanel.h"
-#include "DisplayMeshesPanel.h"
-#include "BlastToolbar.h"
-#include "MaterialLibraryPanel.h"
-#include "MaterialAssignmentsPanel.h"
-#include "FileReferencesPanel.h"
-#include "GeneralPanel.h"
-#include "FiltersDockWidget.h"
-#include "DefaultDamagePanel.h"
-#include "FractureGeneralPanel.h"
-#include "FractureSliceSettingsPanel.h"
-#include "FractureVisualizersPanel.h"
-#include "FractureVoronoiSettingsPanel.h"
-#include "SupportPanel.h"
-#include "BlastSceneTree.h"
-#include "SceneController.h"
-
-#include <Shlwapi.h>
-#include "FbxUtil.h"
-#include "MeshData.h"
-#include "PxVec2.h"
-#include "SourceAssetOpenDlg.h"
-#include "NvBlastExtAuthoringMesh.h"
-#include "PxScene.h"
-#include "BlastController.h"
-#include "PhysXController.h"
-#include "SelectionToolController.h"
-#include "GizmoToolController.h"
-#include <QtCore/QTimer>
-#include "NvBlastExtAuthoring.h"
-#include "ResourceManager.h"
-const float tolenrance = 10e-6;
-
-QTimer gPlayTimer;
-
-// Determine whether point P in triangle ABC
-// Use this method if not volumn check does not work
-/*
-bool pointintriangle(PxVec3 A, PxVec3 B, PxVec3 C, PxVec3 P)
-{
-PxVec3 v0 = C - A;
-PxVec3 v1 = B - A;
-PxVec3 v2 = P - A;
-
-float dot00 = v0.dot(v0);
-float dot01 = v0.dot(v1);
-float dot02 = v0.dot(v2);
-float dot11 = v1.dot(v1);
-float dot12 = v1.dot(v2);
-
-float inverDeno = 1 / (dot00 * dot11 - dot01 * dot01);
-
-float u = (dot11 * dot02 - dot01 * dot12) * inverDeno;
-if (u < 0 || u > 1) // if u out of range, return directly
-{
-return false;
-}
-
-float v = (dot00 * dot12 - dot01 * dot02) * inverDeno;
-if (v < 0 || v > 1) // if v out of range, return directly
-{
-return false;
-}
-
-return u + v <= 1;
-}
-*/
-
-bool outside(int vc1, int fc1, const Vertex* pv1, const physx::PxBounds3& b1,
-	int vc2, int fc2, const Vertex* pv2, const physx::PxBounds3& b2)
-{
-	// mesh2 is not a volumn
-	if (fc2 < 4)
-	{
-		return true;
-	}
-
-	float test;
-
-	for (int nv = 0; nv < vc1; nv++)
-	{
-		Vertex v1 = pv1[nv];
-
-		if ((test = v1.p.x - b2.minimum.x) < -tolenrance)
-		{
-			return true;
-		}
-		if ((test = v1.p.y - b2.minimum.y) < -tolenrance)
-		{
-			return true;
-		}
-		if ((test = v1.p.z - b2.minimum.z) < -tolenrance)
-		{
-			return true;
-		}
-		if ((test = v1.p.x - b2.maximum.x) > tolenrance)
-		{
-			return true;
-		}
-		if ((test = v1.p.y - b2.maximum.y) > tolenrance)
-		{
-			return true;
-		}
-		if ((test = v1.p.z - b2.maximum.z) > tolenrance)
-		{
-			return true;
-		}
-
-		for (int nt = 0; nt < fc2; nt++)
-		{
-			Vertex v20 = pv2[nt * 3 + 0];
-			Vertex v21 = pv2[nt * 3 + 1];
-			Vertex v22 = pv2[nt * 3 + 2];
-
-			PxVec3 distance = v1.p - v20.p;
-
-			PxVec3 e1 = v21.p - v20.p;
-			PxVec3 e2 = v22.p - v20.p;
-			PxVec3 normal = e1.cross(e2);
-			normal = normal.getNormalized();
-
-			test = distance.dot(normal);
-			if (test > tolenrance)
-			{
-				return true;
-			}
-			/*
-			else if (test > -tolenrance)
-			{
-			if (fc2 < 4 && !pointintriangle(v20.p, v21.p, v22.p, v1.p))
-			{
-			return true;
-			}
-			}
-			*/
-		}
-	}
-
-	return false;
-}
-
-/*
-return value
--1 : meshDesc1 contains meshDesc2
-1 : meshDesc2 contains meshDesc1
-0 : no relation
-*/
-int contains(Nv::Blast::Mesh* pMesh1, Nv::Blast::Mesh* pMesh2)
-{
-	int ret = 0;
-
-	int vc1 = pMesh1->getVerticesCount();
-	int fc1 = pMesh1->getFacetCount();
-	const Vertex* pv1 = pMesh1->getVertices();
-	const physx::PxBounds3& b1 = pMesh1->getBoundingBox();
-	int vc2 = pMesh2->getVerticesCount();
-	int fc2 = pMesh2->getFacetCount();
-	const Vertex* pv2 = pMesh2->getVertices();
-	const physx::PxBounds3& b2 = pMesh2->getBoundingBox();
-
-	if (outside(vc1, fc1, pv1, b1, vc2, fc2, pv2, b2))
-	{
-		ret--;
-	}
-	if (outside(vc2, fc2, pv2, b2, vc1, fc1, pv1, b1))
-	{
-		ret++;
-	}
-
-	return ret;
-}
-
-// A singleton, sort of... To pass the events from WindowProc to the object.
-DeviceManager* g_DeviceManagerInstance = NULL;
-
-HWND g_hWnd = 0;
-BlastPlugin* gBlastPlugin = nullptr;
-
-DeviceManager* GetDeviceManager()
-{
-	return g_DeviceManagerInstance;
-}
-
-QString BlastPlugin::GetPluginName()
-{
-	return BlastPluginName;
-}
-
-bool BlastPlugin::CoreLib_RunApp()
-{
-	return true;
-}
-
-BlastPlugin::BlastPlugin()
-	: QObject()
-	, _recentProjectMenu(NV_NULL)
-	, _recentProjectRecordFile("RecentProjects", "Project")
-{
-	gBlastPlugin = this;
-}
-
-BlastPlugin::~BlastPlugin()
-{
-	gBlastPlugin = nullptr;
-}
-
-BlastPlugin& BlastPlugin::Inst()
-{
-	return *gBlastPlugin;
-}
-bool BlastPlugin::LoadRenderPlugin(std::string api)
-{
-	return PluginBlast::Create(api);
-}
-
-bool BlastPlugin::GetBoneNames(std::vector<std::string>& BoneNames)
-{
-	return true;
-}
-
-bool BlastPlugin::MainToolbar_updateValues()
-{ 
-	_mainToolbar->updateValues();
-	return true; 
-}
-
-bool BlastPlugin::CurveEditor_updateValues(int _paramId, float* _values)
-{ 
-	return true; 
-}
-
-bool BlastPlugin::CurveEditor_onUpdateValues(int _paramId, float* _values)
-{ 
-	return true; 
-}
-
-bool BlastPlugin::DisplayMeshesPanel_updateValues()
-{
-	return true; 
-}
-bool BlastPlugin::DisplayMeshesPanel_EmitToggleSignal(unsigned int id, bool visible)
-{ 
-	return true; 
-}
-
-bool BlastPlugin::Camera_LoadParameters(void* ptr, Camera* pCamera)
-{
-	nvidia::parameterized::BlastProjectParametersNS::Camera_Type* param =
-		static_cast<nvidia::parameterized::BlastProjectParametersNS::Camera_Type*>(ptr);
-
-	pCamera->_zup = param->flags == 1;
-	pCamera->_fov = param->fov;
-	pCamera->_aspectRatio = param->aspectRatio;
-	pCamera->_znear = param->znear;
-	pCamera->_zfar = param->zfar;
-	pCamera->_isPerspective = param->isPerspective;
-	memcpy(&pCamera->_eye, &param->eye, sizeof(pCamera->_eye));
-	memcpy(&pCamera->_at, &param->at, sizeof(pCamera->_at));
-	pCamera->_lookDistance = param->lookDistance;
-	memcpy(&pCamera->_orientation, &param->orientation, sizeof(pCamera->_orientation));
-	memcpy(&pCamera->_viewMatrix, &param->viewMatrix, sizeof(pCamera->_viewMatrix));
-	memcpy(&pCamera->_projectionMatrix, &param->projectionMatrix, sizeof(pCamera->_projectionMatrix));
-
-	return true;
-}
-
-bool BlastPlugin::Camera_SaveParameters(void * ptr, Camera* pCamera)
-{
-	nvidia::parameterized::BlastProjectParametersNS::Camera_Type* outParam =
-		static_cast<nvidia::parameterized::BlastProjectParametersNS::Camera_Type*>(ptr);
-
-	outParam->flags = (pCamera->_zup ? 1 : 2);
-	outParam->fov = pCamera->_fov;
-	outParam->aspectRatio = pCamera->_aspectRatio;
-	outParam->znear = pCamera->_znear;
-	outParam->zfar = pCamera->_zfar;
-	outParam->width = 0;
-	outParam->height = 0;
-	outParam->isPerspective = pCamera->_isPerspective;
-	memcpy(&outParam->eye, &pCamera->_eye, sizeof(outParam->eye));
-	memcpy(&outParam->at, &pCamera->_at, sizeof(outParam->at));
-	outParam->lookDistance = pCamera->_lookDistance;
-	memcpy(&outParam->orientation, &pCamera->_orientation, sizeof(outParam->orientation));
-	memcpy(&outParam->viewMatrix, &pCamera->_viewMatrix, sizeof(outParam->viewMatrix));
-	memcpy(&outParam->projectionMatrix, &pCamera->_projectionMatrix, sizeof(outParam->projectionMatrix));
-	return true; 
-}
-
-bool BlastPlugin::Gamepad_ToggleSimulation()
-{
-	return true; 
-}
-
-bool BlastPlugin::Gamepad_LoadSamples(QString fn)
-{
-	return true; 
-}
-
-bool BlastPlugin::Gamepad_ResetScene()
-{
-	return true; 
-}
-
-void BlastPlugin::slot_Gamepad_PlaySample()
-{
-	gPlayTimer.stop();
-	_mainToolbar->on_btnSimulatePlay_clicked();
-}
-
-bool BlastPlugin::Gamepad_PlaySample()
-{ 
-	if (_mainToolbar)
-	{
-		_mainToolbar->on_btnReset_clicked();
-		gPlayTimer.start(10);
-	}
-	return true; 
-}
-
-bool BlastPlugin::GamepadHandler_ShowHair()
-{ 
-	return true;
-}
-
-bool BlastPlugin::GamepadHandler_SpinWindStrength(float windStrength)
-{ 
-	return true; 
-}
-
-bool BlastPlugin::Gamepad_ResetAnimation()
-{ 
-	return true;
-}
-
-bool BlastPlugin::Gamepad_PlayPauseAnimation()
-{ 
-	return true;
-}
-
-bool BlastPlugin::Light_loadParameters(NvParameterized::Handle& handle, Light* pLight)
-{
-	if (pLight == nullptr)
-		return false;
-
-	NvParameterized::NvParameters* params = static_cast<NvParameterized::NvParameters*>(handle.getInterface());
-	size_t offset = 0;
-	nvidia::parameterized::BlastProjectParametersNS::Light_Type* param = nullptr;
-	params->getVarPtr(handle, (void*&)param, offset);
-
-	pLight->m_enable = param->enable;
-	pLight->m_useShadows = param->useShadows;
-	pLight->m_visualize = param->visualize;
-	pLight->m_intensity = param->intensity;
-
-	memcpy(&pLight->m_color, &param->color, sizeof(atcore_float3));
-
-	atcore_float3 axisX, axisY, axisZ, lightPos;
-	memcpy(&axisX, &param->lightAxisX, sizeof(atcore_float3));
-	memcpy(&axisY, &param->lightAxisY, sizeof(atcore_float3));
-	memcpy(&axisZ, &param->lightAxisZ, sizeof(atcore_float3));
-	memcpy(&lightPos, &param->lightPos, sizeof(atcore_float3));
-
-	pLight->SetShadowMapResolution(param->shadowMapResolution);
-
-	pLight->m_lightCamera.SetEye(lightPos);
-	pLight->m_lightCamera.SetViewMatrix(axisX, axisY, axisZ);
-	pLight->m_lightCamera.BuildViewMatrix();
-	return true; 
-}
-
-bool BlastPlugin::Light_saveParameters(NvParameterized::Handle& handle, Light* pLight)
-{
-	if (pLight == nullptr)
-		return false;
-
-	NvParameterized::NvParameters* params = static_cast<NvParameterized::NvParameters*>(handle.getInterface());
-	size_t offset = 0;
-	nvidia::parameterized::BlastProjectParametersNS::Light_Type* param = nullptr;
-	params->getVarPtr(handle, (void*&)param, offset);
-	memset((void*)param, 0, sizeof(nvidia::parameterized::BlastProjectParametersNS::Light_Type));
-
-	param->enable = pLight->m_enable;
-	param->useShadows = pLight->m_useShadows;
-	param->visualize = pLight->m_visualize;
-	param->intensity = pLight->m_intensity;
-
-	param->shadowMapResolution = pLight->m_shadowMapResolutionIndex;
-
-	memcpy(&param->color, &pLight->m_color, sizeof(atcore_float3));
-
-	{
-		atcore_float3 axisX = pLight->m_lightCamera.GetXAxis();
-		atcore_float3 axisY = pLight->m_lightCamera.GetYAxis();
-		atcore_float3 axisZ = pLight->m_lightCamera.GetZAxis();
-		atcore_float3 lightPos = pLight->m_lightCamera.GetEye();
-
-		memcpy(&param->lightAxisX, &axisX, sizeof(atcore_float3));
-		memcpy(&param->lightAxisY, &axisY, sizeof(atcore_float3));
-		memcpy(&param->lightAxisZ, &axisZ, sizeof(atcore_float3));
-		memcpy(&param->lightPos, &lightPos, sizeof(atcore_float3));
-	}
-	return true; 
-}
-
-bool BlastPlugin::SimpleScene_SimpleScene()
-{ 
-	return true; 
-}
-
-
-#include "Timer.h"
-Timer g_fpsTimer;
-
-#include "D3DWidget.h"
-#include "SampleManager.h"
-
-#include <QtWidgets/QShortcut>
-
-bool BlastPlugin::SimpleScene_Initialize(int backdoor)
-{
-	if (!CreateProjectParamsContext())
-		return false;
-
-	D3DWidget* d3dWidget = AppMainWindow::Inst().GetRenderWidget();
-	g_hWnd = (HWND)d3dWidget->winId();
-
-	RECT rc;
-	GetClientRect((HWND)g_hWnd, &rc);
-	int wBuf = rc.right - rc.left;
-	int hBuf = rc.bottom - rc.top;
-
-	DeviceCreationParameters deviceParams;
-	deviceParams.swapChainFormat = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
-	deviceParams.swapChainSampleCount = 4;
-	deviceParams.startFullscreen = false;
-	deviceParams.hWnd = g_hWnd;
-	deviceParams.backBufferWidth = wBuf;
-	deviceParams.backBufferHeight = hBuf;
-#if defined(DEBUG) | defined(_DEBUG)
-	deviceParams.createDeviceFlags = D3D11_CREATE_DEVICE_DEBUG;
-#endif
-	deviceParams.featureLevel = D3D_FEATURE_LEVEL_11_0;
-
-	DeviceManager* pDeviceManager = new DeviceManager;
-	//pDeviceManager->CreateWindowDeviceAndSwapChain(deviceParams);
-	RenderPlugin* pPlugin = RenderPlugin::Instance();
-	D3DHandles handles;
-	pDeviceManager->SetWindowHandle(g_hWnd);
-	pDeviceManager->SetWindowDeviceAndSwapChain(pPlugin->GetDeviceHandles(handles));
-	g_DeviceManagerInstance = pDeviceManager;
-	SimpleScene::Inst()->SetDeviceManager(pDeviceManager);
-
-	SampleManager* pSampleManager = new SampleManager(pDeviceManager);
-	SimpleScene::Inst()->SetSampleManager(pSampleManager);
-
-	// post build will copy samples\resources to bin\resources. If debug in VS, need set working directory to binary's folder
-
-	pSampleManager->init();
-
-	QShortcut* shortCut;
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_Q), d3dWidget);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_selecttool()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_W), d3dWidget);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_Translate()));
-	shortCut = new QShortcut(QKeySequence(Qt::Key_E), d3dWidget);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_Rotation()));
-	shortCut = new QShortcut(QKeySequence(Qt::Key_R), d3dWidget);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_Scale()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_T), d3dWidget);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_damagetool()));
-
-	//shortCut = new QShortcut(QKeySequence(Qt::Key_E), d3dWidget);
-	//connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_edittool()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_I), d3dWidget);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_addFamily()));
-	
-	_contextMenu = new QMenu();
-	action_Make_Support = new QAction(tr("Make Support"), d3dWidget);
-	_contextMenu->addAction(action_Make_Support);
-	connect(action_Make_Support, SIGNAL(triggered()), this, SLOT(slot_Make_Support()));
-
-	action_Make_Static_Support = new QAction(tr("Make Static Support"), d3dWidget);
-	_contextMenu->addAction(action_Make_Static_Support);
-	connect(action_Make_Static_Support, SIGNAL(triggered()), this, SLOT(slot_Make_Static_Support()));
-
-	action_Remove_Support = new QAction(tr("Remove Support"), d3dWidget);
-	_contextMenu->addAction(action_Remove_Support);
-	connect(action_Remove_Support, SIGNAL(triggered()), this, SLOT(slot_Remove_Support()));
-
-	//action_Bond_Chunks = new QAction(tr("Bond Chunks"), d3dWidget);
-	//_contextMenu->addAction(action_Bond_Chunks);
-	//connect(action_Bond_Chunks, SIGNAL(triggered()), this, SLOT(slot_Bond_Chunks()));
-
-	//action_Bond_Chunks_with_Joints = new QAction(tr("Bond Chunks With Joints"), d3dWidget);
-	//_contextMenu->addAction(action_Bond_Chunks_with_Joints);
-	//connect(action_Bond_Chunks_with_Joints, SIGNAL(triggered()), this, SLOT(slot_Bond_Chunks_with_Joints()));
-
-	//action_Remove_all_Bonds = new QAction(tr("Remove All Bonds"), d3dWidget);
-	//_contextMenu->addAction(action_Remove_all_Bonds);
-	//connect(action_Remove_all_Bonds, SIGNAL(triggered()), this, SLOT(slot_Remove_all_Bonds()));
-
-	connect(&gPlayTimer, SIGNAL(timeout()), this, SLOT(slot_Gamepad_PlaySample()));
-
-	return true; 
-}
-bool BlastPlugin::SimpleScene_Shutdown()
-{
-	SampleManager& sm = SimpleScene::Inst()->GetSampleManager();
-	sm.free();
-	//SimpleScene::Inst()->SetSampleManager(NV_NULL);
-
-	ReleaseProjectParamsContext();
-
-	g_DeviceManagerInstance = NV_NULL;
-
-	return true;
-}
-
-//#include "SceneController.h"
-bool BlastPlugin::SimpleScene_Clear()
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	pSampleManager->clearScene();
-
-	BlastProject::ins().clear();
-
-	BlastSceneTree::ins()->clear();
-
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-	globalSettings.m_projectFileDir.clear();
-	globalSettings.m_projectFileName.clear();
-
-	return true; 
-}
-
-bool BlastPlugin::SimpleScene_Draw_DX12()
-{ 	
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#include <Stats.h>
-namespace
-{
-	Stats				g_StatsCPU;
-	Stats				g_StatsGPU;
-
-	Stats				g_FrameStatsCPU;
-	Stats				g_FrameStatsGPU;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void BlastPlugin::ResetFrameTimer()
-{
-	g_StatsCPU.reset();
-	g_StatsGPU.reset();
-}
-
-void BlastPlugin::DrawHUD()
-{
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	if (!globalSettings.m_showHUD)
-		return;
-
-	// finish frame timer
-	g_FrameStatsCPU.add(g_StatsCPU);
-	g_FrameStatsGPU.add(g_StatsGPU);
-
-	wchar_t sz[1000];
-
-	RenderInterface::TxtHelperBegin();
-	RenderInterface::TxtHelperSetInsertionPos(2, 0);
-	RenderInterface::TxtHelperSetForegroundColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-	if (RenderInterface::GetDeviceInfoString(sz))
-		RenderInterface::TxtHelperDrawTextLine(sz);
-
-	{
-	//	const NvHair::BuildInfo& buildInfo = GetHairSDK()->getBuildInfo();
-
-	//	char releaseVersion[NvHair::BuildInfo::VERSION_BUFFER_SIZE];
-	//	buildInfo.m_versionToStringFunc(buildInfo.m_releaseVersion, releaseVersion);
-
-		swprintf_s(sz, 1000, L"Lib build: %S Release version: %S\n", "n.a.", "1.0.0");
-		RenderInterface::TxtHelperDrawTextLine(sz);
-	}
-
-	swprintf_s(sz, 1000, L"Current frame time %3.2f[%d-%d:%2.2f]\n",
-		globalSettings.m_frameTime,
-		(int)globalSettings.m_frameStartTime,
-		(int)globalSettings.m_frameEndTime,
-		globalSettings.m_animationSpeed);
-
-	RenderInterface::TxtHelperDrawTextLine(sz);
-
-	bool computeProfile = globalSettings.m_computeProfile;
-
-	//FurCharacter& character = SimpleScene::Inst()->GetFurCharacter();
-	//std::vector<HairInstance*> validInstances;
-	//character.GetValidHairInstances(validInstances);
-
-	if (globalSettings.m_computeStatistics && globalSettings.m_showHUD)
-	{
-
-		//for (int i = 0; i < validInstances.size(); i++)
-		//{
-		//	HairInstance* pHairInstance = validInstances[i];
-
-		//	NvHair::Stats& hairStats = pHairInstance->m_hairStats;
-
-		//	int totalHairs = hairStats.m_numHairs;
-		//	int totalFaces = hairStats.m_numFaces;
-
-		//	float averageNumCVsPerHair = hairStats.m_averageNumCvsPerHair;
-		//	float averageDensity = hairStats.m_averageDensity;
-		//	float averageHairsPerFace = hairStats.m_averageHairsPerFace;
-		//	float distanceLODFactor = hairStats.m_distanceLodFactor;
-		//	float detailLODFactor = hairStats.m_detailLodFactor;
-		//	float camDistance = hairStats.m_camDistance;
-
-		//	int m = pHairInstance->getDescriptor().m_splineMultiplier;
-		//	float vertsPerHair = m * (averageNumCVsPerHair - 1.0f) + 1;
-		//	float totalLines = totalHairs * vertsPerHair;
-
-		//	const char* hairName = pHairInstance->m_assetName.c_str();
-		//	std::wstring hairNameW;
-		//	std::copy(hairName, hairName + strlen(hairName), back_inserter(hairNameW));
-
-		//	swprintf_s(sz, 1000, L"Asset Name (%s), %d hairs, %d faces, %.1f lines",
-		//		hairNameW.c_str(), totalHairs, totalFaces, totalLines);
-		//	RenderInterface::TxtHelperDrawTextLine(sz);
-
-		//	swprintf_s(sz, 1000, L"    average density %.2f, avg hairs per face %.2f, avg CVs per hair %2.1f, avg render vertices per hair %3.1f",
-		//		averageDensity, averageHairsPerFace, averageNumCVsPerHair, vertsPerHair);
-		//	RenderInterface::TxtHelperDrawTextLine(sz);
-
-		//	swprintf_s(sz, 1000, L"    distance LOD Factor: %.2f, detail LOD Factor: %.2f, camera distance: %.2f",
-		//		distanceLODFactor, detailLODFactor, camDistance);
-		//	RenderInterface::TxtHelperDrawTextLine(sz);
-		//}
-	}
-
-	if (globalSettings.m_showFPS)
-	{
-		static double fps = 0;
-		static double lastFrames = GlobalSettings::Inst().m_renderFrameCnt;
-		Timer& g_fpsTimer = SimpleScene::Inst()->GetTimer();
-		static double lastFpsTime = g_fpsTimer.GetTimeInSeconds();
-		static int numFrames = 1;
-
-		static Stats lastStatsCPU;
-		static Stats lastStatsGPU;
-
-		Stats& statsGPU = g_FrameStatsGPU;
-		Stats& statsCPU = g_FrameStatsCPU;
-
-		double currentFpsTime = g_fpsTimer.GetTimeInSeconds();
-		if ((currentFpsTime - lastFpsTime) > 1.0)
-		{
-			double currentFrames = GlobalSettings::Inst().m_renderFrameCnt;
-			numFrames = currentFrames - lastFrames;
-
-			fps = numFrames / (currentFpsTime - lastFpsTime);
-
-			lastFrames = currentFrames;
-			lastFpsTime = currentFpsTime;
-
-			lastStatsGPU = statsGPU;
-			lastStatsCPU = statsCPU;
-
-			lastStatsGPU.average((float)numFrames);
-			lastStatsCPU.average((float)numFrames);
-
-			statsGPU.reset();
-			statsCPU.reset();
-		}
-
-		if (globalSettings.m_computeProfile)
-		{
-			swprintf_s(sz, 1000, L"Render time (GPU/CPU): Total %.2f/%.2fms, Hair %.2f/%.2fms, Mesh %.2f/%.2fms, Shadow %.2f/%.2fms, Stats %.2f/%.2fms",
-				lastStatsGPU.m_totalRenderTime, lastStatsCPU.m_totalRenderTime,
-				lastStatsGPU.m_hairRenderTime, lastStatsCPU.m_hairRenderTime,
-				lastStatsGPU.m_meshRenderTime, lastStatsCPU.m_meshRenderTime,
-				lastStatsGPU.m_shadowRenderTime, lastStatsCPU.m_shadowRenderTime,
-				lastStatsGPU.m_hairStatsTime, lastStatsCPU.m_hairStatsTime);
-
-			RenderInterface::TxtHelperDrawTextLine(sz);
-
-			swprintf_s(sz, 1000, L"Update time (GPU/CPU): Total %.2f/%.2fms, Hair Update %.2f/%.2fms, Mesh Skinning %.2f/%.2fms, Sim %.2f/%.2fms",
-				lastStatsGPU.m_totalUpdateTime, lastStatsCPU.m_totalUpdateTime,
-				lastStatsGPU.m_hairSkinningTime, lastStatsCPU.m_hairSkinningTime,
-				lastStatsGPU.m_meshSkinningTime, lastStatsCPU.m_meshSkinningTime,
-				lastStatsGPU.m_hairSimulationTime, lastStatsCPU.m_hairSimulationTime);
-			RenderInterface::TxtHelperDrawTextLine(sz);
-
-			{
-				float cpuMeshTime = lastStatsCPU.m_meshRenderTime + lastStatsCPU.m_meshSkinningTime;
-				float gpuMeshTime = lastStatsGPU.m_meshRenderTime + lastStatsGPU.m_meshSkinningTime;
-
-				float cpuHairTime = lastStatsCPU.m_totalRenderTime + lastStatsCPU.m_totalUpdateTime - cpuMeshTime;
-				float gpuHairTime = lastStatsGPU.m_totalRenderTime + lastStatsGPU.m_totalUpdateTime - gpuMeshTime;
-
-				float gpuFPS = 1000.0f / gpuHairTime;
-				RenderInterface::TxtHelperSetForegroundColor(0.2f, 1.0f, 0.2f, 1.0f);
-				swprintf_s(sz, 1000, L"Hair: GPU Fps %.2f, GPU time %.2fms, CPU time %.2fms",
-					gpuFPS, gpuHairTime, cpuHairTime);
-				RenderInterface::TxtHelperDrawTextLine(sz);
-			}
-
-			float gpuTime = lastStatsGPU.m_totalRenderTime + lastStatsGPU.m_totalUpdateTime;
-			float gpuFPS = 1000.0f / gpuTime;
-			RenderInterface::TxtHelperSetForegroundColor(1.0f, 0.5f, 0.5f, 1.0f);
-			swprintf_s(sz, 1000, L"Total: GPU Fps %.2f, GPU time %.2fms, CPU time %.2fms",
-				gpuFPS,
-				lastStatsGPU.m_totalRenderTime + lastStatsGPU.m_totalUpdateTime,
-				lastStatsCPU.m_totalRenderTime + lastStatsCPU.m_totalUpdateTime
-				);
-			RenderInterface::TxtHelperDrawTextLine(sz);
-
-		}
-		else
-		{
-			swprintf_s(sz, 1000, L"Fps %.2f", fps);
-			RenderInterface::TxtHelperDrawTextLine(sz);
-		}
-	}
-
-	RenderInterface::TxtHelperEnd();
-}
-
-bool BlastPlugin::SimpleScene_Draw_DX11()
-{
-	D3DWidget_paintEvent(NULL);
-	DrawHUD();
-	return true;
-}
-
-bool BlastPlugin::SimpleScene_FitCamera(atcore_float3& center, atcore_float3& extents)
-{
-	atcore_float3 bbMin = gfsdk_makeFloat3(FLT_MAX, FLT_MAX, FLT_MAX);
-	atcore_float3 bbMax = gfsdk_makeFloat3(-FLT_MAX, -FLT_MAX, -FLT_MAX);
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	PxScene& scene = pSampleManager->getPhysXController().getEditPhysXScene();
-	const PxU32 actorsCount = scene.getNbActors(PxActorTypeFlag::eRIGID_DYNAMIC);
-	if (actorsCount == 0)
-	{
-		return false;
-	}
-
-	std::vector<PxActor*> actors(actorsCount);
-	PxU32 nbActors = scene.getActors(PxActorTypeFlag::eRIGID_DYNAMIC, &actors[0], actorsCount, 0);
-	PX_ASSERT(actorsCount == nbActors);
-
-	BlastFamily* pFamily = nullptr;
-	{
-		BlastAsset* pBlastAsset = pSampleManager->getCurBlastAsset();
-		if (pBlastAsset != nullptr)
-		{
-			std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = pSampleManager->getAssetFamiliesMap();
-			std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itAFM = AssetFamiliesMap.find(pBlastAsset);
-			if (itAFM != AssetFamiliesMap.end())
-			{
-				std::vector<BlastFamily*> families = itAFM->second;
-				if (families.size() > 0)
-				{
-					pFamily = families[0];
-				}
-			}
-		}
-	}
-
-	if (pFamily == nullptr)
-	{
-		for (int act = 0; act < actorsCount; act++)
-		{
-			PxActor* actor = actors[act];
-			PxBounds3 bound = actor->getWorldBounds();
-			atcore_float3 minimum = gfsdk_makeFloat3(bound.minimum.x, bound.minimum.y, bound.minimum.z);
-			atcore_float3 maximum = gfsdk_makeFloat3(bound.maximum.x, bound.maximum.y, bound.maximum.z);
-			bbMin = gfsdk_min(bbMin, minimum);
-			bbMax = gfsdk_max(bbMax, maximum);
-		}
-	}
-	else
-	{
-		for (int act = 0; act < actorsCount; act++)
-		{
-			PxActor* actor = actors[act];
-			if (!pFamily->find(*actors[act]))
-			{
-				continue;
-			}
-			PxBounds3 bound = actor->getWorldBounds();
-			atcore_float3 minimum = gfsdk_makeFloat3(bound.minimum.x, bound.minimum.y, bound.minimum.z);
-			atcore_float3 maximum = gfsdk_makeFloat3(bound.maximum.x, bound.maximum.y, bound.maximum.z);
-			bbMin = gfsdk_min(bbMin, minimum);
-			bbMax = gfsdk_max(bbMax, maximum);
-		}
-	}
-
-	center = 0.5f * (bbMin + bbMax);
-	extents = 1.1f * (bbMax - bbMin);
-
-	return true; 
-}
-
-bool BlastPlugin::SimpleScene_ResetUpDir(bool zup)
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	pSampleManager->ResetUpDir(zup);
-	return true;
-}
-
-bool BlastPlugin::SimpleScene_UpdateCamera()
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	pSampleManager->UpdateCamera();
-	return true;
-}
-bool BlastPlugin::SimpleScene_DrawGround()
-{ 
-	return true;
-}
-bool BlastPlugin::SimpleScene_DrawWind()
-{ 
-	return true;
-}
-bool BlastPlugin::SimpleScene_DrawAxis()
-{ 
-	return true; 
-}
-
-void BlastPlugin::SimpleScene_OpenFilesByDrop(const QStringList& fileNames)
-{
-	QString projName, fbxName, bpxaName;
-	int projCount = 0, fbxCount = 0, bpxaCount = 0;
-	for (int i = 0; i < fileNames.size(); ++i)
-	{
-		QString fn = fileNames[i];
-		QFileInfo fileInfo(fn);
-		std::string ext = fileInfo.suffix().toLower().toUtf8().data();
-		if (ext == "blastproj")
-		{
-			++projCount;
-			projName = fn;
-		}
-		else if (ext == "fbx")
-		{
-			++fbxCount;
-			fbxName = fn;
-		}
-		else if (ext == "blast")
-		{
-			++bpxaCount;
-			bpxaName = fn;
-		}
-	}
-	bool bUpdateUI = false;
-	ResourceManager* pResourceManager = ResourceManager::ins();
-	if (projCount == 1)
-	{
-		QFileInfo fileInfo(projName);
-		pResourceManager->addSearchDir(fileInfo.absolutePath().toUtf8().data());
-		GlobalSettings& globalSettings = GlobalSettings::Inst();
-		globalSettings.m_projectFileDir = fileInfo.absolutePath().toUtf8().data();
-		globalSettings.m_projectFileName = fileInfo.fileName().toUtf8().data();
-		SimpleScene_LoadProject(fileInfo.absolutePath().toUtf8().data(), fileInfo.fileName().toUtf8().data());
-		bUpdateUI = true;
-	}
-	else if (fbxCount == 1)
-	{
-		QFileInfo fileInfo(fbxName);
-		pResourceManager->addSearchDir(fileInfo.absolutePath().toUtf8().data());
-		SimpleScene_LoadSceneFromFbx(fileInfo.absolutePath().toUtf8().data(), fileInfo.fileName().toUtf8().data());
-		bUpdateUI = true;
-	}
-	else if (bpxaCount == 1)
-	{
-		QFileInfo fileInfo(bpxaName);
-		pResourceManager->addSearchDir(fileInfo.absolutePath().toUtf8().data());
-		OpenBpxa(fileInfo.absolutePath().toUtf8().data(), fileInfo.fileName().toUtf8().data());
-		bUpdateUI = true;
-	}
-	if (bUpdateUI)
-	{
-		AppMainWindow::Inst().endProgress();
-		AppMainWindow::Inst().updateUI();
-	}
-}
-
-void BlastPlugin::OpenBpxa(const char* d, const char* f)
-{
-	qDebug("%s", __FUNCTION__);
-	SourceAssetOpenDlg dlg(1, &AppMainWindow::Inst());
-	QString fn = QString(d) + "/" + QString(f);
-	if (fn.length() > 1)
-		dlg.setDefaultFile(fn);
-	int res = dlg.exec();
-	if (res != QDialog::Accepted || dlg.getFile().isEmpty())
-		return;
-
-	if (!dlg.isAppend())
-	{
-		SimpleScene::Inst()->Clear();
-		// it is not nice to call AppMainWindow::Inst().updateUI(). but it helps to clear some data in former editing project.
-		// 1. open box.fbx 2. open teapot.fbx 3. now there are two materials in material list, one for box and one for teapot.
-		// need improve it later.
-		AppMainWindow::Inst().updateUI();
-	}
-
-	AppMainWindow::Inst().addRecentFile(dlg.getFile());
-
-	QFileInfo fileInfo(dlg.getFile());
-	std::string dir = QDir::toNativeSeparators(fileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-	std::string file = fileInfo.baseName().toLocal8Bit();
-
-	physx::PxTransform t(physx::PxIdentity);
-	{
-		QVector3D Position = dlg.getPosition();
-		t.p = physx::PxVec3(Position.x(), Position.y(), Position.z());
-
-		QVector3D RotationAxis = dlg.getRotationAxis();
-		physx::PxVec3 Axis = physx::PxVec3(RotationAxis.x(), RotationAxis.y(), RotationAxis.z());
-		Axis = Axis.getNormalized();
-		float RotationDegree = dlg.getRotationDegree();
-		float DEGREE_TO_RAD = acos(-1.0) / 180.0;
-		RotationDegree = RotationDegree * DEGREE_TO_RAD;
-		t.q = physx::PxQuat(RotationDegree, Axis);
-	}
-
-	AssetList::ModelAsset modelAsset;
-	modelAsset.name = file;
-	modelAsset.id = file;
-	modelAsset.file = file;
-	modelAsset.isSkinned = dlg.getSkinned();
-	modelAsset.transform = t;
-	char fullpath[MAX_PATH];
-	PathCombineA(fullpath, dir.c_str(), modelAsset.file.c_str());
-	modelAsset.fullpath = fullpath;
-	modelAsset.fullpath = modelAsset.fullpath + ".blast";
-	std::string objPath = std::string(fullpath) + ".obj";
-	std::string fbxPath = std::string(fullpath) + ".fbx";
-	bool bMeshExist = QFile::exists(objPath.c_str()) || QFile::exists(fbxPath.c_str());
-	if (bMeshExist)
-	{
-		SampleManager* pSampleManager = SampleManager::ins();
-		BlastAsset* pBlastAsset = pSampleManager->loadBlastFile(dir, file, modelAsset);
-		pSampleManager->addBlastFamily(pBlastAsset, t);
-	}
-	else
-	{
-		viewer_err("Mesh geometry does not exist!");
-	}
-}
-
-bool BlastPlugin::SimpleScene_LoadSceneFromFbx(const char* d, const char* f)
-{
-	SourceAssetOpenDlg dlg(0, &AppMainWindow::Inst());
-	QString fn = QString(d) + "/" + QString(f);
-	if (fn.length() > 1)
-		dlg.setDefaultFile(fn);
-	int res = dlg.exec();
-	if (res != QDialog::Accepted || dlg.getFile().isEmpty())
-		return false;
-	if (!dlg.isAppend())
-	{
-		SimpleScene::Inst()->Clear();
-		// it is not nice to call AppMainWindow::Inst().updateUI(). but it helps to clear some data in former editing project.
-		// 1. open box.fbx 2. open teapot.fbx 3. now there are two materials in material list, one for box and one for teapot.
-		// need improve it later.
-		AppMainWindow::Inst().updateUI();
-	}
-
-	AppMainWindow::Inst().addRecentFile(dlg.getFile());
-	QFileInfo fileInfo(dlg.getFile());
-	std::string dir = QDir::toNativeSeparators(fileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-	std::string filebase = fileInfo.baseName().toLocal8Bit();
-	std::string fbxName = fileInfo.fileName().toLocal8Bit();
-	
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-	if (!dlg.isAppend())
-	{
-		globalSettings.m_projectFileDir = dir;
-		globalSettings.m_projectFileName = filebase + ".blastProj";
-	}
-
-	char fbxFilePath[MAX_PATH];
-
-	int unitIndex = dlg.sceneUnitIndex();
-	float sceneUnit = globalSettings.getSceneUnitInCentimeters(unitIndex); //globalSettings.getSceneUnitInCentimeters();
-	bool bConvertUnit = true;
-	if (unitIndex == SCENE_UNIT_UNKNOWN)
-	{
-		// use FBX unit
-		bConvertUnit = false;
-	}
-
-	PathCombineA(fbxFilePath, dir.c_str(), fbxName.c_str());
-
-	AppMainWindow::Inst().setProgress("Initializing FBX loader", 0);
-	float fbxSceneUnit = -1.0f;
-	FbxUtil::Initialize(fbxFilePath, fbxSceneUnit, sceneUnit, bConvertUnit);
-	float fError = 0.001f;
-	if (!bConvertUnit)
-	{
-		// we intend to use FBX's unit, but if FBX has a non-supported unit, we still convert its unit.
-		bool bSupported = GlobalSettings::Inst().isSupportedUnitByUnitInCm(fbxSceneUnit);
-		if (!bSupported)
-		{
-			viewer_msg("FBX scene is scaled to unit, %f cm.", sceneUnit);
-		}
-		else
-		{
-			sceneUnit = fbxSceneUnit;
-			viewer_msg("Use FBX's default unit, %f cm.", sceneUnit);
-		}
-	}
-	else
-	{
-		if (fabs(fbxSceneUnit - sceneUnit) > fError)
-		{
-			viewer_msg("FBX scene is scaled to unit, %f cm.", sceneUnit);
-		}
-		else
-		{
-			viewer_msg("FBX has a same unit, %f cm.", sceneUnit);
-		}
-	}
-	globalSettings.setSceneUnitByUnitInCm(sceneUnit);
-
-	char rootBoneName[MAX_PATH];
-	int upAxis = 0;
-
-	FbxUtil::GetGlobalSettings(
-	&globalSettings.m_frameStartTime,
-	&globalSettings.m_frameEndTime,
-	&globalSettings.m_animationFps,
-	&upAxis, rootBoneName);
-
-	if (upAxis == 1)
-		SimpleScene::Inst()->ResetUpDir(false);
-	else if (upAxis = 2)
-		SimpleScene::Inst()->ResetUpDir(true);
-
-	SampleManager *pSampleManager = SampleManager::ins();
-
-	int numMeshes = 0;
-	char* meshNames = 0;
-	char* parents = 0;
-	char* skinned = 0;
-	FbxUtil::GetMeshInfo(&numMeshes, &meshNames, &parents, &skinned);
-
-	if (numMeshes == 0)
-	{
-		FbxUtil::Release();
-		return false;
-	}
-			 
-	if (!dlg.isPreFractured())
-	{
-		numMeshes = 1;
-	}
-
-	std::vector<Nv::Blast::Mesh*> meshes(numMeshes);
-	std::vector<int32_t> parentIds(numMeshes);
-	std::vector<std::string> materialNames(numMeshes);
-	bool bMaterial = false;
-	for (int nm = 0; nm < numMeshes; nm++)
-	{
-		const char* meshName = meshNames + nm * 128;
-
-		MeshDesc meshDesc;
-		FbxUtil::CreateMeshDescriptor(meshName, meshDesc);
-
-		MeshMaterial* pMeshMaterial = 0;
-		int numMaterials = 0;
-		FbxUtil::GetMeshMaterials(meshName, &numMaterials, &pMeshMaterial);
-		
-		if (numMaterials > 0)
-		{
-			std::string materialName = pMeshMaterial->m_name;
-			if (materialName != "" && !BlastProject::ins().isGraphicsMaterialNameExist(materialName.c_str()))
-			{
-				BlastProject::ins().addGraphicsMaterial(materialName.c_str());
-				BlastProject::ins().reloadDiffuseTexture(materialName.c_str(),
-					pMeshMaterial->m_diffuseTexture);
-				BlastProject::ins().reloadDiffuseColor(materialName.c_str(),
-					pMeshMaterial->m_diffuseColor.x,
-					pMeshMaterial->m_diffuseColor.y,
-					pMeshMaterial->m_diffuseColor.z);
-				materialNames[nm] = materialName;
-				bMaterial = true;
-			}
-		}
-		if(!bMaterial)
-		{
-			std::string materialName = BlastProject::ins().generateNewMaterialName(meshName);
-			BlastProject::ins().addGraphicsMaterial(materialName.c_str());
-			BlastProject::ins().reloadDiffuseColor(materialName.c_str(),
-				meshDesc.m_ColorRGB.x,
-				meshDesc.m_ColorRGB.y,
-				meshDesc.m_ColorRGB.z);
-			materialNames[nm] = materialName;
-		}
-		
-		SkinData skinData;
-		FbxUtil::InitializeSkinData(meshName, skinData);
-
-		meshDesc.UpdateNormal(false);
-
-		std::vector<physx::PxVec3> positions;
-		std::vector<physx::PxVec3> normals;
-		std::vector<physx::PxVec2> uv;
-		std::vector<unsigned int>  indices;
-
-		for (uint32_t nt = 0; nt < meshDesc.m_NumTriangles; nt++)
-		{
-			for (int vi = 0; vi < 3; vi++)
-			{
-				NvUInt32 nti = nt * 3 + vi;
-
-				NvUInt32 posIndex = meshDesc.m_pIndices[nti];
-				atcore_float3 pos = meshDesc.m_pVertices[posIndex];
-				positions.push_back(physx::PxVec3(pos.x, pos.y, pos.z));
-
-				atcore_float3 vertexNormal = meshDesc.m_pVertexNormals[nti];
-				normals.push_back(physx::PxVec3(vertexNormal.x, vertexNormal.y, vertexNormal.z));
-
-				atcore_float2 texcoord = meshDesc.m_pTexCoords[nti];
-				uv.push_back(physx::PxVec2(texcoord.x, texcoord.y));
-
-				indices.push_back(nti);
-			}
-		}
-
-		physx::PxVec3* nr = (!normals.empty()) ? normals.data() : 0;
-		physx::PxVec2* uvp = (!uv.empty()) ? uv.data() : 0;
-		Nv::Blast::Mesh* pMesh = NvBlastExtAuthoringCreateMesh(positions.data(), nr, uvp, static_cast<uint32_t>(positions.size()),
-			indices.data(), static_cast<uint32_t>(indices.size()));		
-		meshes[nm] = pMesh;
-
-		const char* parentName = parents + nm * 128;
-		int nfind = 0;
-		for (; nfind < numMeshes; nfind++)
-		{
-			const char* mName = meshNames + nfind * 128;
-			if (!strcmp(parentName, mName))
-			{
-				break;
-			}
-		}
-		if (nfind == numMeshes)
-		{
-			nfind = -1;
-		}
-		parentIds[nm] = nfind;
-	}
-
-	if (dlg.isAutoCompute())
-	{
-		parentIds.assign(numMeshes, -1);
-
-		std::map<int, std::vector<int>> ParentIDsMap;
-		std::map<int, std::vector<int>> ExistIDsMap;
-		bool exist;
-		for (int nm1 = 0; nm1 < numMeshes; nm1++)
-		{
-			Nv::Blast::Mesh* pMesh1 = meshes[nm1];
-			std::vector<int>& HandleList1 = ExistIDsMap[nm1];
-
-			for (int nm2 = 0; nm2 < numMeshes; nm2++)
-			{
-				if (nm1 == nm2)
-				{
-					continue;
-				}
-
-				exist = false;
-				for (int pid1 : HandleList1)
-				{
-					if (pid1 == nm2)
-					{
-						exist = true;
-						break;
-					}
-				}
-				if (exist)
-				{
-					continue;
-				}
-
-				std::vector<int>& HandleList2 = ExistIDsMap[nm2];
-				exist = false;
-				for (int pid2 : HandleList2)
-				{
-					if (pid2 == nm1)
-					{
-						exist = true;
-						break;
-					}
-				}
-				if (exist)
-				{
-					continue;
-				}
-
-				Nv::Blast::Mesh* pMesh2 = meshes[nm2];
-
-				ExistIDsMap[nm1].push_back(nm2);
-				ExistIDsMap[nm2].push_back(nm1);
-
-				/*
-				return value
-				-1 : meshDesc1 contains meshDesc2
-				1 : meshDesc2 contains meshDesc1
-				0 : no relation
-				*/
-				int ret = contains(pMesh1, pMesh2);
-				if (ret == 0)
-				{
-					continue;
-				}
-
-				if (ret == -1)
-				{
-					ParentIDsMap[nm2].push_back(nm1);
-				}
-				else if (ret == 1)
-				{
-					ParentIDsMap[nm1].push_back(nm2);
-				}
-			}
-		}
-		std::map<int, std::vector<int>>::iterator itPIM;
-		for (std::pair<int, std::vector<int>> pidPair : ParentIDsMap)
-		{
-			std::vector<int>& ParentIDsList = pidPair.second;
-			int targetSize = ParentIDsList.size();
-			if (targetSize == 0)
-			{
-				continue;
-			}
-
-			int childId = pidPair.first;
-			int parentId = ParentIDsList[0];
-			
-			if (targetSize > 1)
-			{
-				targetSize = targetSize - 1;
-				for (int pid : ParentIDsList)
-				{
-					int parentSize = 0;
-					itPIM = ParentIDsMap.find(pid);
-					if (itPIM != ParentIDsMap.end())
-					{
-						parentSize = itPIM->second.size();
-					}
-					if (parentSize == targetSize)
-					{
-						parentId = pid;
-						break;
-					}
-				}
-			}
-
-			if (parentIds[childId] == -1)
-			{
-				parentIds[childId] = parentId;
-			}
-		}
-	}
-
-	BlastAssetModelSimple* pBlastAssetModelSimple;
-	std::vector<bool> supports;
-	std::vector<bool> statics;
-	std::vector<uint8_t> joints;
-	std::vector<uint32_t> worlds;
-	pSampleManager->createAsset(&pBlastAssetModelSimple, meshes, parentIds, supports, statics, joints, worlds);
-
-	physx::PxTransform t(physx::PxIdentity);
-	{
-		QVector3D Position = dlg.getPosition();
-		t.p = physx::PxVec3(Position.x(), Position.y(), Position.z());
-
-		QVector3D RotationAxis = dlg.getRotationAxis();
-		physx::PxVec3 Axis = physx::PxVec3(RotationAxis.x(), RotationAxis.y(), RotationAxis.z());
-		Axis = Axis.getNormalized();
-		float RotationDegree = dlg.getRotationDegree();
-		float DEGREE_TO_RAD = acos(-1.0) / 180.0;
-		RotationDegree = RotationDegree * DEGREE_TO_RAD;
-		t.q = physx::PxQuat(RotationDegree, Axis);
-	}
-
-	std::string validName = filebase;
-	std::map<BlastAsset*, AssetList::ModelAsset>& assetDescMap = pSampleManager->getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itADM;
-	std::map<std::string, int> existNameMap;
-	std::map<std::string, int>::iterator itENM;
-	for (itADM = assetDescMap.begin(); itADM != assetDescMap.end(); itADM++)
-	{
-		AssetList::ModelAsset m = itADM->second;
-		existNameMap[m.id] = 0;
-	}
-	char vn[MAX_PATH];
-	for (int ind = 0; existNameMap.find(validName) != existNameMap.end(); ind++)
-	{
-		sprintf(vn, "%s_%d", filebase.c_str(), ind);
-		validName = vn;
-	}
-
-	AssetList::ModelAsset modelAsset;
-	modelAsset.name = validName;
-	modelAsset.id = validName;
-	modelAsset.file = validName;
-	modelAsset.isSkinned = dlg.getSkinned();
-	modelAsset.transform = t;
-	char fullpath[MAX_PATH];
-	PathCombineA(fullpath, dir.c_str(), filebase.c_str());
-	modelAsset.fullpath = fullpath;
-	modelAsset.fullpath = modelAsset.fullpath + ".blast";
-
-	pSampleManager->addBlastAsset(pBlastAssetModelSimple, modelAsset);
-	pSampleManager->addBlastFamily((BlastAsset*)pBlastAssetModelSimple, t);
-
-	if (materialNames.size() > 0)
-	{
-		BlastAsset* pBlastAsset = (BlastAsset*)pBlastAssetModelSimple;
-		pSampleManager->setCurrentSelectedInstance(pBlastAsset, 0);
-		pSampleManager->setMaterialForCurrentFamily(materialNames[0], true);
-		pSampleManager->setMaterialForCurrentFamily(materialNames[0], false);
-	}
-
-	std::vector<Nv::Blast::Mesh*>::iterator itMesh;
-	for (itMesh = meshes.begin(); itMesh != meshes.end(); itMesh++)
-	{
-		delete *itMesh;
-	}
-	meshes.clear();
-
-	FbxUtil::Release();
-
-	globalSettings.m_sceneLoaded = true;
-	globalSettings.m_animationIndex = 1;
-	globalSettings.m_firstFrame = true;
-
-	globalSettings.resetAnimation();
-
-	return true; 
-}
-
-bool BlastPlugin::SimpleScene_LoadProject(const char* dir, const char* file)
-{
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-	SimpleScene* pScene = SimpleScene::Inst();
-	nvidia::parameterized::BlastProjectParametersNS::ParametersStruct params;
-	if (!ProjectParamsLoad(globalSettings.getAbsoluteFilePath().c_str(), pScene))
-		return false;
-
-	return true;
-}
-bool BlastPlugin::SimpleScene_SaveProject(const char* dir, const char* file)
-{ 
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-	SimpleScene* pScene = SimpleScene::Inst();
-
-	QString saveFilePath = globalSettings.getAbsoluteFilePath().c_str();
-	QString tempFilePath = utils::GetTempFilePath().c_str();
-	if (ProjectParamsSave(tempFilePath.toUtf8().data(), pScene))
-	{
-		if (!utils::RenameFile(tempFilePath.toUtf8().data(), saveFilePath.toUtf8().data(), true /* overwrite */))
-		{
-			return false;
-		}
-		pScene->SetProjectModified(false);
-		return true;
-	}
-
-	return false;
-}
-
-
-bool BlastPlugin::SimpleScene_LoadParameters(NvParameterized::Interface* iface)
-{
-	nvidia::parameterized::BlastProjectParameters* params = static_cast<nvidia::parameterized::BlastProjectParameters*>(iface);
-
-	nvidia::parameterized::BlastProjectParametersNS::ParametersStruct& srcDesc = params->parameters();
-	copy(BlastProject::ins().getParams(), srcDesc);
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::string dir = GlobalSettings::Inst().m_projectFileDir;
-
-	int assetCount = srcDesc.blast.blastAssets.arraySizes[0];
-	BPPChunkArray& chunkArray = srcDesc.blast.chunks;
-	int chunkCount = chunkArray.arraySizes[0];
-	BPPBondArray& bondArray = srcDesc.blast.bonds;
-	int bondCount = bondArray.arraySizes[0];
-
-	for (int ac = 0; ac < assetCount; ac++)
-	{
-		BPPAsset& asset = srcDesc.blast.blastAssets.buf[ac];
-
-		std::vector<BPPAssetInstance*> instances;
-		BlastProject::ins().getAssetInstances(asset.ID, instances);
-		int instanceSize = instances.size();
-		if (instanceSize == 0)
-		{
-			continue;
-		}
-
-		AssetList::ModelAsset modelAsset;
-		modelAsset.name = asset.name.buf;
-		modelAsset.id = asset.name.buf;
-		modelAsset.file = asset.name.buf;
-		modelAsset.isSkinned = false;
-		modelAsset.fullpath = asset.name.buf;
-
-		std::vector<Nv::Blast::Mesh*> meshes;
-		std::vector<int32_t> parentIds;
-		std::vector<bool> supports;
-		std::vector<bool> statics;
-		std::vector<bool> visibles;
-
-		for (int cc = 0; cc < chunkCount; cc++)
-		{
-			BPPChunk& chunk = chunkArray.buf[cc];
-			if (chunk.asset != asset.ID)
-			{
-				continue;
-			}
-
-			std::vector<physx::PxVec3> positions;
-			std::vector<physx::PxVec3> normals;
-			std::vector<physx::PxVec3> tangents;
-			std::vector<physx::PxVec2> uv;
-			std::vector<unsigned int>  indices;
-
-			BPPVEC3Array& positionArray = chunk.graphicsMesh.positions;
-			BPPVEC3Array& normalArray = chunk.graphicsMesh.normals;
-			BPPVEC3Array& tangentArray = chunk.graphicsMesh.tangents;
-			BPPVEC2Array& uvArray = chunk.graphicsMesh.texcoords;
-			BPPI32Array& materialIDArray = chunk.graphicsMesh.materialIDs;
-
-			BPPI32Array& indexArray = chunk.graphicsMesh.positionIndexes;
-
-			int numVertices = positionArray.arraySizes[0];
-			int numIndics = indexArray.arraySizes[0];
-			int numFaces = materialIDArray.arraySizes[0];
-
-			for (uint32_t nv = 0; nv < numVertices; nv++)
-			{
-				nvidia::NvVec3& position = positionArray.buf[nv];
-				nvidia::NvVec3& normal = normalArray.buf[nv];
-				nvidia::NvVec3& tangent = tangentArray.buf[nv];
-				nvidia::NvVec2& texcoord = uvArray.buf[nv];
-
-				positions.push_back(physx::PxVec3(position.x, position.y, position.z));
-				normals.push_back(physx::PxVec3(normal.x, normal.y, normal.z));
-				tangents.push_back(physx::PxVec3(tangent.x, tangent.y, tangent.z));
-				uv.push_back(physx::PxVec2(texcoord.x, texcoord.y));
-			}
-
-			for (uint32_t ni = 0; ni < numIndics; ni++)
-			{
-				indices.push_back(indexArray.buf[ni]);
-			}
-
-			physx::PxVec3* nr = (!normals.empty()) ? normals.data() : 0;
-			physx::PxVec2* uvp = (!uv.empty()) ? uv.data() : 0;
-			Nv::Blast::Mesh* pMesh = NvBlastExtAuthoringCreateMesh(positions.data(), nr, uvp, static_cast<uint32_t>(positions.size()),
-				indices.data(), static_cast<uint32_t>(indices.size()));
-			for (uint32_t nf = 0; nf < numFaces; nf++)
-			{
-				Facet* pFacet = const_cast<Facet*>(pMesh->getFacet(nf));
-				pFacet->materialId = materialIDArray.buf[nf];
-			}
-
-			meshes.push_back(pMesh);
-
-			parentIds.push_back(chunk.parentID);
-
-			supports.push_back(chunk.support);
-
-			statics.push_back(chunk.staticFlag);
-
-			visibles.push_back(chunk.visible);
-		}
-
-		std::vector<uint8_t> joints;
-		std::vector<uint32_t> worlds;
-		for (int bc = 0; bc < bondCount; bc++)
-		{
-			BPPBond& bond = bondArray.buf[bc];
-			if (bond.asset != asset.ID)
-			{
-				continue;
-			}
-
-			uint8_t enableJoint = bond.support.enableJoint ? 1 : 0;
-			joints.push_back(enableJoint);
-
-			worlds.push_back(bond.toChunk);
-		}
-
-		BlastAssetModelSimple* pBlastAssetModelSimple;
-		pSampleManager->createAsset(&pBlastAssetModelSimple, meshes, parentIds, supports, statics, joints, worlds);
-		pSampleManager->addBlastAsset(pBlastAssetModelSimple, modelAsset, true);
-
-		BlastAsset* pBlastAsset = (BlastAsset*)pBlastAssetModelSimple;		
-		physx::PxTransform t;
-		for (int is = 0; is < instanceSize; is++)
-		{
-			BPPAssetInstance* instance = instances[is];
-			nvidia::NvVec3& postion = instance->transform.position;
-			nvidia::NvVec4& rotation = instance->transform.rotation;			
-			t.p = physx::PxVec3(postion.x, postion.y, postion.z);
-			t.q = physx::PxQuat(rotation.x, rotation.y, rotation.z, rotation.w);
-
-			BlastFamily* pBlastFamily = pSampleManager->addBlastFamily(pBlastAsset, t, true);
-			int visibleCount = visibles.size();
-			for (int vc = 0; vc < visibleCount; vc++)
-			{
-				pBlastFamily->setChunkVisible(vc, visibles[vc]);
-			}
-
-			pSampleManager->setCurrentSelectedInstance(pBlastAsset, is);
-			if (nullptr != instance->exMaterial.buf)
-			{
-				pSampleManager->setMaterialForCurrentFamily(instance->exMaterial.buf, true);
-			}
-			if (nullptr != instance->inMaterial.buf)
-			{
-				pSampleManager->setMaterialForCurrentFamily(instance->inMaterial.buf, false);
-			}
-		}
-	}
-
-	SimpleScene* pScene = SimpleScene::Inst();
-
-	if (pScene->m_pCamera)
-	{
-		pScene->m_pCamera->LoadParameters(&srcDesc.camera);
-	}
-
-	pScene->LoadCameraBookmarks(iface);
-
-	if (pScene->m_pWindCamera)
-	{
-		pScene->m_pWindCamera->LoadParameters(&srcDesc.windCamera);
-	}
-
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	// Load scene settings
-	globalSettings.m_repeatAnimation = srcDesc.scene.repeatAnimation;
-	globalSettings.m_animationSpeed = srcDesc.scene.animationSpeed;
-	globalSettings.m_showGrid = srcDesc.scene.showGrid;
-	globalSettings.m_showAxis = srcDesc.scene.showAxis;
-	globalSettings.m_zup = srcDesc.scene.upAxis == 1;
-	globalSettings.m_sceneUnitIndex = srcDesc.scene.sceneUnitIndex;
-
-	// Load render settings
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle("renderer", handle) == NvParameterized::ERROR_NONE)
-	{
-		globalSettings.m_computeStatistics = srcDesc.renderer.showStatistics;
-		globalSettings.m_showGraphicsMesh = srcDesc.renderer.showGraphicsMesh;
-		globalSettings.m_useLighting = srcDesc.renderer.useLighting;
-		globalSettings.m_showSkinnedMeshOnly = srcDesc.renderer.showSkinnedMeshOnly;
-		globalSettings.m_renderFps = srcDesc.renderer.renderFps;
-		globalSettings.m_simulationFps = srcDesc.renderer.simulationFps;
-
-		Light::LoadParameters(handle);
-	}
-
-	//// Load fbx paths
-	//if (iface->getParameterHandle("fbxFilePaths", handle) == NvParameterized::ERROR_NONE)
-	//{
-	//	int arraySize;
-	//	handle.getArraySize(arraySize);
-	//	char** strArray = new char*[arraySize];
-	//	handle.getParamStringArray(strArray, arraySize);
-	//	for (int idx = 0; idx < arraySize; ++idx)
-	//	{
-	//		pScene->LoadSceneFromFbx(
-	//			globalSettings.m_projectFileDir.c_str(),
-	//			strArray[idx]);
-	//	}
-	//	delete[] strArray;
-	//}
-
-	//// get fur character mesh setting 
-	//if (false == pScene->GetFurCharacter().LoadMeshParameters(handle))
-	//	return false;
-
-	//// Load apx paths (hair instances)
-	//if (iface->getParameterHandle("apxFilePaths", handle) == NvParameterized::ERROR_NONE)
-	//{
-	//	if (false == pScene->GetFurCharacter().LoadHairParameters(handle))
-	//		return false;
-	//}
-	return true;
-}
-
-bool BlastPlugin::SimpleScene_SaveParameters(NvParameterized::Interface* iface)
-{
-	nvidia::parameterized::BlastProjectParameters* params = static_cast<nvidia::parameterized::BlastProjectParameters*>(iface);
-	nvidia::parameterized::BlastProjectParametersNS::ParametersStruct& targetDesc = params->parameters();
-	memset(&targetDesc, sizeof(BPParams), 0);
-	BPParams& srcParams = BlastProject::ins().getParams();
-	copy(targetDesc, srcParams);
-	/*
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itADM;
-	for (itADM = AssetDescMap.begin(); itADM != AssetDescMap.end(); itADM++)
-	{
-		BlastAsset* pBlastAsset = itADM->first;
-		pSampleManager->saveAsset(pBlastAsset);
-	}
-	*/
-	SimpleScene* pScene = SimpleScene::Inst();
-
-	if (pScene->m_pCamera)
-		pScene->m_pCamera->SaveParameters(&targetDesc.camera);
-
-	pScene->SaveCameraBookmarks(iface);
-
-	if (pScene->m_pWindCamera)
-		pScene->m_pWindCamera->SaveParameters(&targetDesc.windCamera);
-
-	// Save scene settings
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	targetDesc.scene.repeatAnimation = globalSettings.m_repeatAnimation;
-	targetDesc.scene.animationSpeed = globalSettings.m_animationSpeed;
-	targetDesc.scene.showGrid = globalSettings.m_showGrid;
-	targetDesc.scene.showAxis = globalSettings.m_showAxis;
-	targetDesc.scene.upAxis = (globalSettings.m_zup) ? 1 : 2;
-	targetDesc.scene.sceneUnitIndex = globalSettings.m_sceneUnitIndex;
-
-	// Save render settings
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle("renderer", handle) == NvParameterized::ERROR_NONE)
-	{
-		targetDesc.renderer.renderFps = globalSettings.m_renderFps;
-		targetDesc.renderer.simulationFps = globalSettings.m_simulationFps;
-		targetDesc.renderer.showStatistics = globalSettings.m_computeStatistics;
-		targetDesc.renderer.showGraphicsMesh = globalSettings.m_showGraphicsMesh;
-		targetDesc.renderer.useLighting = globalSettings.m_useLighting;
-		targetDesc.renderer.showSkinnedMeshOnly = globalSettings.m_showSkinnedMeshOnly;
-
-		Light::SaveParameters(handle);
-	}
-
-	//if (iface->getParameterHandle("renderer.textureFilePath", handle) == NvParameterized::ERROR_NONE)
-	//{
-	//	std::string textureFilePath = globalSettings.getRelativePath(globalSettings.m_backgroundTextureFilePath.c_str());
-	//	handle.setParamString(textureFilePath.c_str());
-	//}
-
-	//// save hair path
-	//if (iface->getParameterHandle("apxFilePaths", handle) == NvParameterized::ERROR_NONE)
-	//	character.SaveHairParameters(handle);
-
-	return true; 
-}
-
-bool BlastPlugin::SimpleScene_LoadCameraBookmarks(NvParameterized::Interface* iface)
-{
-	return true;
-}
-
-bool BlastPlugin::SimpleScene_SaveCameraBookmarks(NvParameterized::Interface* iface)
-{
-	SimpleScene* pScene = SimpleScene::Inst();
-
-	nvidia::parameterized::BlastProjectParameters* params = static_cast<nvidia::parameterized::BlastProjectParameters*>(iface);
-	nvidia::parameterized::BlastProjectParametersNS::ParametersStruct& srcDesc = params->parameters();
-	nvidia::parameterized::BlastProjectParametersNS::CameraBookmark_DynamicArray1D_Type& bookmarks = srcDesc.cameraBookmarks;
-
-	NvParameterized::Handle cameraBookmarksHandle(iface);
-	if (iface->getParameterHandle("cameraBookmarks", cameraBookmarksHandle) != NvParameterized::ERROR_NONE)
-		return false;
-
-	int numCameraBookmarks = pScene->m_cameraBookmarks.size();
-	cameraBookmarksHandle.resizeArray(numCameraBookmarks);
-
-	for (int idx = 0; idx < numCameraBookmarks; ++idx)
-	{
-		NvParameterized::Handle cameraBookmarkHandle(cameraBookmarksHandle);
-		if (cameraBookmarksHandle.getChildHandle(idx, cameraBookmarkHandle) == NvParameterized::ERROR_NONE)
-		{
-			NvParameterized::Handle tempHandle(cameraBookmarkHandle);
-			CameraBookmark& bookmark = pScene->m_cameraBookmarks[idx];
-
-			if (ParamGetChild(cameraBookmarkHandle, tempHandle, "name"))
-			{
-				tempHandle.setParamString(bookmark.name.toStdString().c_str());
-			}
-
-			bookmark.camera.SaveParameters((void*)&(bookmarks.buf[idx].camera));
-		}
-	}
-
-	return true;
-}
-
-bool BlastPlugin::D3DWidget_resizeEvent(QResizeEvent* e)
-{ 
-	DeviceManager& deviceManager = SimpleScene::Inst()->GetDeviceManager();
-
-	int w = e->size().width();
-	int h = e->size().height();
-	WPARAM wParam = MAKEWPARAM(w, h);
-	LPARAM lParam = MAKELPARAM(w, h);
-	deviceManager.MsgProc(g_hWnd, WM_SIZE, wParam, lParam);
-
-	return true; 
-}
-
-bool BlastPlugin::D3DWidget_paintEvent(QPaintEvent* e)
-{
-	SampleManager& pSampleManager = SimpleScene::Inst()->GetSampleManager();
-	pSampleManager.run(); 
-
-	if (pSampleManager.m_bNeedRefreshTree)
-	{
-		_blastSceneTree->updateValues();
-		pSampleManager.m_bNeedRefreshTree = false;
-	}
-
-	return true;
-}
-
-bool BlastPlugin::D3DWidget_mousePressEvent(QMouseEvent* e)
-{
-	UINT uMsg = WM_LBUTTONDOWN;
-	if (e->button() == Qt::RightButton)
-	{
-		uMsg = WM_RBUTTONDOWN;
-	}
-	else if (e->button() == Qt::MidButton)
-	{
-		uMsg = WM_MBUTTONDOWN;
-	}	
-
-	int x = e->x();
-	int y = e->y();
-	WPARAM wParam = MAKEWPARAM(x, y);
-	LPARAM lParam = MAKELPARAM(x, y);
-	
-	DeviceManager& deviceManager = SimpleScene::Inst()->GetDeviceManager();
-	deviceManager.MsgProc(g_hWnd, uMsg, wParam, lParam);
-
-	return true;
-}
-
-bool BlastPlugin::D3DWidget_mouseReleaseEvent(QMouseEvent* e)
-{
-	UINT uMsg = WM_LBUTTONUP;
-	if (e->button() == Qt::RightButton)
-	{
-		uMsg = WM_RBUTTONUP;
-	}
-	else if (e->button() == Qt::MidButton)
-	{
-		uMsg = WM_MBUTTONUP;
-	}
-
-	int x = e->x();
-	int y = e->y();
-	WPARAM wParam = MAKEWPARAM(x, y);
-	LPARAM lParam = MAKELPARAM(x, y);
-
-	DeviceManager& deviceManager = SimpleScene::Inst()->GetDeviceManager();
-	deviceManager.MsgProc(g_hWnd, uMsg, wParam, lParam);
-
-	return true;
-}
-
-bool BlastPlugin::D3DWidget_mouseMoveEvent(QMouseEvent* e)
-{
-	DeviceManager& deviceManager = SimpleScene::Inst()->GetDeviceManager();
-
-	int x = e->x();
-	int y = e->y();
-	WPARAM wParam = MAKEWPARAM(x, y);
-	LPARAM lParam = MAKELPARAM(x, y);
-	deviceManager.MsgProc(g_hWnd, WM_MOUSEMOVE, wParam, lParam);
-
-	if(SampleManager::ins()->eventAlreadyHandled())
-		e->setAccepted(false);
-
-	return true;
-}
-
-bool BlastPlugin::D3DWidget_wheelEvent(QWheelEvent * e)
-{
-	DeviceManager& deviceManager = SimpleScene::Inst()->GetDeviceManager();
-
-	int delta = e->delta();
-	WPARAM wParam = MAKEWPARAM(delta, delta);
-	LPARAM lParam = MAKELPARAM(delta, delta);
-	deviceManager.MsgProc(g_hWnd, WM_MOUSEWHEEL, wParam, lParam);
-
-	return true;
-}
-
-bool BlastPlugin::D3DWidget_keyPressEvent(QKeyEvent* e)
-{ return true; }
-bool BlastPlugin::D3DWidget_keyReleaseEvent(QKeyEvent* e)
-{ return true; }
-bool BlastPlugin::D3DWidget_dragEnterEvent(QDragEnterEvent *e)
-{ return true; }
-bool BlastPlugin::D3DWidget_dragMoveEvent(QDragMoveEvent *e)
-{ return true; }
-bool BlastPlugin::D3DWidget_dragLeaveEvent(QDragLeaveEvent *e)
-{ return true; }
-bool BlastPlugin::D3DWidget_dropEvent(QDropEvent *e)
-{ return true; }
-
-bool BlastPlugin::D3DWidget_contextMenuEvent(QContextMenuEvent *e)
-{
-	QPoint pos = QCursor::pos();
-
-	std::vector<BlastChunkNode*> chunkNodes;
-	std::map<BlastAsset*, std::vector<uint32_t>> selectedAssetChunks = SampleManager::ins()->getSelectedChunks();
-	std::map<BlastAsset*, std::vector<uint32_t>>::iterator itr = selectedAssetChunks.begin();
-	for (; itr != selectedAssetChunks.end(); ++itr)
-	{
-		BlastAsset* asset = itr->first;
-		std::vector<uint32_t> selectChunks = itr->second;
-
-		std::vector<BlastChunkNode*> curChunkNodes = BlastTreeData::ins().getChunkNodeByBlastChunk(asset, selectChunks);
-		chunkNodes.insert(chunkNodes.end(), curChunkNodes.begin(), curChunkNodes.end());
-	}
-
-	{
-		std::vector<BlastChunkNode*> topChunkNodes = BlastTreeData::getTopChunkNodes(chunkNodes);
-		action_Make_Support->setEnabled(true);
-		action_Make_Static_Support->setEnabled(true);
-		action_Remove_Support->setEnabled(true);
-
-		//select chunk nodes have parent child relation ship, disable all menu items
-		if (topChunkNodes.size() < chunkNodes.size())
-		{
-			action_Make_Support->setEnabled(false);
-			action_Make_Static_Support->setEnabled(false);
-			action_Remove_Support->setEnabled(false);
-		}
-		else
-		{
-			bool allSupported = true, allStaticSupport = true, allUnSupported = true, hasLeaf = false;
-
-			for (BlastChunkNode* chunkNode : chunkNodes)
-			{
-				BPPChunk* chunk = (BPPChunk*)(chunkNode->getData());
-				if (chunk->support)
-				{
-					allUnSupported = false;
-				}
-				else
-				{
-					allSupported = false;
-				}
-
-				if (!chunk->staticFlag)
-				{
-					allStaticSupport = false;
-				}
-
-				if (BlastTreeData::isLeaf(chunkNode))
-				{
-					hasLeaf = true;
-				}
-			}
-
-			if (allSupported && !allStaticSupport)
-			{
-				action_Make_Support->setEnabled(false);
-			}
-
-			if (allStaticSupport)
-			{
-				action_Make_Static_Support->setEnabled(false);
-			}
-
-			if (allUnSupported || hasLeaf)
-			{
-				action_Remove_Support->setEnabled(false);
-			}
-		}
-	}
-
-	if (0 < chunkNodes.size())
-	{
-		_contextMenu->exec(QCursor::pos());
-	}
-
-	e->accept();
-	return true;
-}
-
-#ifdef NV_ARTISTTOOLS
-bool BlastPlugin::D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap)
-{
-	return PluginBlast::Instance()->D3D11Shaders_InitializeShadersD3D11(ShaderMap);
-}
-#endif // NV_ARTISTTOOLS
-
-bool BlastPlugin::AppMainWindow_AppMainWindow()
-{ 
-	_mainToolbar = nullptr;
-	_materialLibraryPanel = nullptr;
-	_materialAssignmentsPanel = nullptr;
-	_fileReferencesPanel = nullptr;
-	_generalPanel = nullptr;
-	_defaultDamagePanel = nullptr;
-	_fractureGeneralPanel = nullptr;
-	_fractureSliceSettingsPanel = nullptr;
-	_fractureVisualizersPanel = nullptr;
-	_fractureVoronoiSettingsPanel = nullptr;
-	_supportPanel = nullptr;
-	_fractureVoronoiSettingsExpandlePanel = nullptr;
-	_fractureSliceSettingsExpandlePanel = nullptr;
-	_blastSceneTree = nullptr;
-	_filtersDockWidget = nullptr;
-
-	BlastProject::ins().loadUserPreset();
-	BlastProject::ins().loadFracturePreset();
-	BlastProject::ins().loadFilterPreset();
-
-	return true; 
-}
-
-bool BlastPlugin::AppMainWindow_InitMenuItems(QMenuBar* pMenuBar)
-{
-	QMenu *pMenu = pMenuBar->addMenu("&Blast");
-	QAction *act;
-
-	act = new QAction("Open project file", this);
-	act->setShortcut(QKeySequence::Open);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_openProject()));
-	pMenu->addAction(act);
-
-	act = new QAction("Recents", this);
-	pMenu->addAction(act);
-	_recentProjectMenu = new QMenu("Recents", pMenuBar);
-	act->setMenu(_recentProjectMenu);
-
-	act = new QAction("Save project file", this);
-	act->setShortcut(QKeySequence::Save);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_saveProject()));
-	pMenu->addAction(act);
-
-	act = new QAction("Save project file as...", this);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_saveProjectAs()));
-	pMenu->addAction(act);
-
-	pMenu->addSeparator();
-
-	_loadRecentProject();
-
-	return true;
-}
-
-bool BlastPlugin::AppMainWindow_InitMainTab(QWidget *displayScrollAreaContents, QVBoxLayout *displayScrollAreaLayout, int idx)
-{
-	ExpandablePanel* panel = new ExpandablePanel(displayScrollAreaContents);
-	displayScrollAreaLayout->insertWidget(idx++, panel);
-	panel->SetTitle("Display Mesh Materials");
-	panel->setVisible(false);
-
-	return true;
-}
-
-bool BlastPlugin::AppMainWindow_InitPluginTab(QTabWidget* sideBarTab)
-{
-	QWidget *tabMaterial;
-	{
-		QGridLayout *gridLayoutMaterial;
-		QFrame *materialEditorArea;
-		QVBoxLayout *materialEditorAreaLayout;
-		QScrollArea *materialScrollArea;
-		QWidget *materialScrollAreaContents;
-		QVBoxLayout *materialScrollAreaLayout;
-		QSpacerItem *verticalSpacerMaterial;
-
-		tabMaterial = new QWidget();
-		tabMaterial->setObjectName(QStringLiteral("tabMaterial"));
-		gridLayoutMaterial = new QGridLayout(tabMaterial);
-		gridLayoutMaterial->setSpacing(6);
-		gridLayoutMaterial->setContentsMargins(11, 11, 11, 11);
-		gridLayoutMaterial->setObjectName(QStringLiteral("gridLayoutMaterial"));
-		gridLayoutMaterial->setContentsMargins(0, 0, 0, 0);
-		materialEditorArea = new QFrame(tabMaterial);
-		materialEditorArea->setObjectName(QStringLiteral("materialEditorArea"));
-		materialEditorAreaLayout = new QVBoxLayout(materialEditorArea);
-		materialEditorAreaLayout->setSpacing(6);
-		materialEditorAreaLayout->setContentsMargins(11, 11, 11, 11);
-		materialEditorAreaLayout->setObjectName(QStringLiteral("materialEditorAreaLayout"));
-		materialEditorAreaLayout->setContentsMargins(2, 2, 2, 2);
-
-		gridLayoutMaterial->addWidget(materialEditorArea, 1, 0, 1, 1);
-
-		materialScrollArea = new QScrollArea(tabMaterial);
-		materialScrollArea->setObjectName(QStringLiteral("materialScrollArea"));
-		materialScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-		materialScrollArea->setWidgetResizable(true);
-		materialScrollAreaContents = new QWidget();
-		materialScrollAreaContents->setObjectName(QStringLiteral("materialScrollAreaContents"));
-		materialScrollAreaContents->setGeometry(QRect(0, 0, 359, 481));
-		materialScrollAreaLayout = new QVBoxLayout(materialScrollAreaContents);
-		materialScrollAreaLayout->setSpacing(3);
-		materialScrollAreaLayout->setContentsMargins(11, 11, 11, 11);
-		materialScrollAreaLayout->setObjectName(QStringLiteral("materialScrollAreaLayout"));
-		materialScrollAreaLayout->setContentsMargins(2, 2, 2, 2);
-		verticalSpacerMaterial = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-		materialScrollAreaLayout->addItem(verticalSpacerMaterial);
-
-		materialScrollArea->setWidget(materialScrollAreaContents);
-
-		gridLayoutMaterial->addWidget(materialScrollArea, 0, 0, 1, 1);
-
-		ExpandablePanel* panel = 0;
-		int pannelCnt = 0;
-
-		panel = new ExpandablePanel(materialScrollAreaContents);
-		_materialLibraryPanel = new MaterialLibraryPanel(panel);
-		panel->AddContent(_materialLibraryPanel);
-		materialScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("Material Library");
-
-		panel = new ExpandablePanel(materialScrollAreaContents);
-		_materialAssignmentsPanel = new MaterialAssignmentsPanel(panel);
-		panel->AddContent(_materialAssignmentsPanel);
-		materialScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("Material Assignments");
-	}
-
-	QWidget *tabBlast;
-	{
-		QGridLayout *gridLayout;
-		QFrame *blastMaterialEditorArea;
-		QVBoxLayout *blastMaterialEditorAreaLayout;
-		QScrollArea *blastScrollArea;
-		QWidget *blastScrollAreaContents;
-		QVBoxLayout *blastScrollAreaLayout;
-		QSpacerItem *verticalSpacer;
-
-		tabBlast = new QWidget();
-		tabBlast->setObjectName(QStringLiteral("tabBlast"));
-		gridLayout = new QGridLayout(tabBlast);
-		gridLayout->setSpacing(6);
-		gridLayout->setContentsMargins(11, 11, 11, 11);
-		gridLayout->setObjectName(QStringLiteral("gridLayout"));
-		gridLayout->setContentsMargins(0, 0, 0, 0);
-		blastMaterialEditorArea = new QFrame(tabBlast);
-		blastMaterialEditorArea->setObjectName(QStringLiteral("blastMaterialEditorArea"));
-		blastMaterialEditorAreaLayout = new QVBoxLayout(blastMaterialEditorArea);
-		blastMaterialEditorAreaLayout->setSpacing(6);
-		blastMaterialEditorAreaLayout->setContentsMargins(11, 11, 11, 11);
-		blastMaterialEditorAreaLayout->setObjectName(QStringLiteral("blastMaterialEditorAreaLayout"));
-		blastMaterialEditorAreaLayout->setContentsMargins(2, 2, 2, 2);
-
-		gridLayout->addWidget(blastMaterialEditorArea, 1, 0, 1, 1);
-
-		blastScrollArea = new QScrollArea(tabBlast);
-		blastScrollArea->setObjectName(QStringLiteral("blastScrollArea"));
-		blastScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-		blastScrollArea->setWidgetResizable(true);
-		blastScrollAreaContents = new QWidget();
-		blastScrollAreaContents->setObjectName(QStringLiteral("blastScrollAreaContents"));
-		blastScrollAreaContents->setGeometry(QRect(0, 0, 359, 481));
-		blastScrollAreaLayout = new QVBoxLayout(blastScrollAreaContents);
-		blastScrollAreaLayout->setSpacing(3);
-		blastScrollAreaLayout->setContentsMargins(11, 11, 11, 11);
-		blastScrollAreaLayout->setObjectName(QStringLiteral("blastScrollAreaLayout"));
-		blastScrollAreaLayout->setContentsMargins(2, 2, 2, 2);
-		verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-		blastScrollAreaLayout->addItem(verticalSpacer);
-
-		blastScrollArea->setWidget(blastScrollAreaContents);
-
-		gridLayout->addWidget(blastScrollArea, 0, 0, 1, 1);
-
-		ExpandablePanel* panel = 0;
-		int pannelCnt = 0;
-
-		panel = new ExpandablePanel(blastScrollAreaContents);
-		_fileReferencesPanel = new FileReferencesPanel(panel);
-		panel->AddContent(_fileReferencesPanel);
-		blastScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("File References");
-
-		panel = new ExpandablePanel(blastScrollAreaContents);
-		_generalPanel = new GeneralPanel(panel);
-		panel->AddContent(_generalPanel);
-		blastScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("General");
-
-		panel = new ExpandablePanel(blastScrollAreaContents);
-		_supportPanel = new SupportPanel(panel);
-		panel->AddContent(_supportPanel);
-		blastScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("Support");
-
-		panel = new ExpandablePanel(blastScrollAreaContents);
-		_fractureGeneralPanel = new FractureGeneralPanel(panel);
-		panel->AddContent(_fractureGeneralPanel);
-		blastScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("Fracture General");
-
-		panel = new ExpandablePanel(blastScrollAreaContents);
-		_fractureVoronoiSettingsExpandlePanel = panel;
-		_fractureVoronoiSettingsPanel = new FractureVoronoiSettingsPanel(panel);
-		panel->AddContent(_fractureVoronoiSettingsPanel);
-		blastScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("Voronoi Settings");
-		_fractureVoronoiSettingsExpandlePanel->setVisible(true);
-
-		panel = new ExpandablePanel(blastScrollAreaContents);
-		_fractureSliceSettingsExpandlePanel = panel;
-		_fractureSliceSettingsPanel = new FractureSliceSettingsPanel(panel);
-		panel->AddContent(_fractureSliceSettingsPanel);
-		blastScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("Slice Settings");
-		_fractureSliceSettingsExpandlePanel->setVisible(false);
-
-		panel = new ExpandablePanel(blastScrollAreaContents);
-		_fractureVisualizersPanel = new FractureVisualizersPanel(panel);
-		panel->AddContent(_fractureVisualizersPanel);
-		blastScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("Visualizers");
-
-		_fractureGeneralPanel->setFracturePanels(_fractureVoronoiSettingsPanel, _fractureSliceSettingsPanel, _fractureVisualizersPanel);
-		_fractureGeneralPanel->setFractureExpandablePanels(_fractureVoronoiSettingsExpandlePanel, _fractureSliceSettingsExpandlePanel);
-		_fractureVoronoiSettingsPanel->setFractureGeneralPanel(_fractureGeneralPanel);
-		_fractureSliceSettingsPanel->setFractureGeneralPanel(_fractureGeneralPanel);
-		_fractureVisualizersPanel->setFractureGeneralPanel(_fractureGeneralPanel);
-	}
-
-	QWidget *tabDamage;
-	{
-		QGridLayout *gridLayoutDamage;
-		QFrame *damageEditorArea;
-		QVBoxLayout *damageEditorAreaLayout;
-		QScrollArea *damageScrollArea;
-		QWidget *damageScrollAreaContents;
-		QVBoxLayout *damageScrollAreaLayout;
-		QSpacerItem *verticalSpacerDamage;
-
-		tabDamage = new QWidget();
-		tabDamage->setObjectName(QStringLiteral("tabDamage"));
-		gridLayoutDamage = new QGridLayout(tabDamage);
-		gridLayoutDamage->setSpacing(6);
-		gridLayoutDamage->setContentsMargins(11, 11, 11, 11);
-		gridLayoutDamage->setObjectName(QStringLiteral("gridLayoutDamage"));
-		gridLayoutDamage->setContentsMargins(0, 0, 0, 0);
-		damageEditorArea = new QFrame(tabDamage);
-		damageEditorArea->setObjectName(QStringLiteral("damageEditorArea"));
-		damageEditorAreaLayout = new QVBoxLayout(damageEditorArea);
-		damageEditorAreaLayout->setSpacing(6);
-		damageEditorAreaLayout->setContentsMargins(11, 11, 11, 11);
-		damageEditorAreaLayout->setObjectName(QStringLiteral("damageEditorAreaLayout"));
-		damageEditorAreaLayout->setContentsMargins(2, 2, 2, 2);
-
-		gridLayoutDamage->addWidget(damageEditorArea, 1, 0, 1, 1);
-
-		damageScrollArea = new QScrollArea(tabDamage);
-		damageScrollArea->setObjectName(QStringLiteral("damageScrollArea"));
-		damageScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-		damageScrollArea->setWidgetResizable(true);
-		damageScrollAreaContents = new QWidget();
-		damageScrollAreaContents->setObjectName(QStringLiteral("damageScrollAreaContents"));
-		damageScrollAreaContents->setGeometry(QRect(0, 0, 359, 481));
-		damageScrollAreaLayout = new QVBoxLayout(damageScrollAreaContents);
-		damageScrollAreaLayout->setSpacing(3);
-		damageScrollAreaLayout->setContentsMargins(11, 11, 11, 11);
-		damageScrollAreaLayout->setObjectName(QStringLiteral("damageScrollAreaLayout"));
-		damageScrollAreaLayout->setContentsMargins(2, 2, 2, 2);
-		verticalSpacerDamage = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-		damageScrollAreaLayout->addItem(verticalSpacerDamage);
-
-		damageScrollArea->setWidget(damageScrollAreaContents);
-
-		gridLayoutDamage->addWidget(damageScrollArea, 0, 0, 1, 1);
-
-		// GWDCC-523 Blast Tool - Tabs should be arranged Blast/Damage/Materials/Settings
-		sideBarTab->insertTab(0, tabBlast, QString());
-
-		sideBarTab->setTabText(sideBarTab->indexOf(tabBlast), QApplication::translate("AppMainWindowClass", "Blast", 0));
-
-		sideBarTab->insertTab(1, tabDamage, QString());
-
-		sideBarTab->setTabText(sideBarTab->indexOf(tabDamage), QApplication::translate("AppMainWindowClass", "Damage", 0));
-
-		sideBarTab->insertTab(2, tabMaterial, QString());
-
-		sideBarTab->setTabText(sideBarTab->indexOf(tabMaterial), QApplication::translate("AppMainWindowClass", "Materials", 0));
-
-		// make Blast page as current selected
-		sideBarTab->setCurrentIndex(0);
-
-		ExpandablePanel* panel = 0;
-		int pannelCnt = 0;
-
-		panel = new ExpandablePanel(damageScrollAreaContents);
-		_defaultDamagePanel = new DefaultDamagePanel(panel);
-		panel->AddContent(_defaultDamagePanel);
-		damageScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("Default Damage");
-	}
-
-	return true;
-}
-
-bool BlastPlugin::AppMainWindow_InitUI()
-{
-	AppMainWindow* mainWindow = &AppMainWindow::Inst();
-	_mainToolbar = new BlastToolbar(mainWindow);
-	_mainToolbar->setAllowedAreas(Qt::TopDockWidgetArea);
-	_mainToolbar->setFeatures(_mainToolbar->features()&~QDockWidget::DockWidgetClosable);
-	mainWindow->addDockWidget(Qt::TopDockWidgetArea, _mainToolbar);
-
-	_filtersDockWidget = new FiltersDockWidget(mainWindow);
-	_filtersDockWidget->setAllowedAreas(Qt::LeftDockWidgetArea);
-	_filtersDockWidget->setFeatures(_filtersDockWidget->features()&~QDockWidget::DockWidgetClosable);
-	mainWindow->addDockWidget(Qt::LeftDockWidgetArea, _filtersDockWidget);
-
-	_blastSceneTree = new BlastSceneTree(mainWindow);
-	_blastSceneTree->setAllowedAreas(Qt::LeftDockWidgetArea);
-	_blastSceneTree->setFeatures(_blastSceneTree->features()&~QDockWidget::DockWidgetClosable);
-	_blastSceneTree->addObserver(_defaultDamagePanel);
-	_blastSceneTree->addObserver(_supportPanel);
-	_blastSceneTree->addObserver(_generalPanel);
-	mainWindow->addDockWidget(Qt::LeftDockWidgetArea, _blastSceneTree);
-	return true;
-}
-
-bool BlastPlugin::AppMainWindow_updateUI()
-{
-	if (_mainToolbar)
-		_mainToolbar->updateValues();
-
-	if (_filtersDockWidget)
-		_filtersDockWidget->updateValues();
-
-	if (_blastSceneTree)
-	{
-		_blastSceneTree->updateValues();
-		//SampleManager::ins()->m_bNeedRefreshTree = true;
-	}
-
-	if (_materialLibraryPanel)
-		_materialLibraryPanel->updateValues();
-
-	if (_materialAssignmentsPanel)
-		_materialAssignmentsPanel->updateValues();
-
-	if (_fileReferencesPanel)
-		_fileReferencesPanel->updateValues();
-
-	if (_generalPanel)
-		_generalPanel->updateValues();
-
-	if (_fractureGeneralPanel)
-		_fractureGeneralPanel->updateValues();
-
-	if (_fractureSliceSettingsPanel)
-		_fractureSliceSettingsPanel->updateValues();
-
-	if (_fractureVisualizersPanel)
-		_fractureVisualizersPanel->updateValues();
-
-	if (_fractureVoronoiSettingsPanel)
-		_fractureVoronoiSettingsPanel->updateValues();
-
-	if (_supportPanel)
-		_supportPanel->updateValues();
-
-	if (_defaultDamagePanel)
-		_defaultDamagePanel->updateValues();
-	return true; 
-}
-
-bool BlastPlugin::AppMainWindow_updatePluginUI()
-{
-	return true; 
-}
-
-bool BlastPlugin::AppMainWindow_processDragAndDrop(QString fname)
-{ 
-	return true; 
-}
-
-bool BlastPlugin::AppMainWindow_closeEvent(QCloseEvent *event)
-{
-	if (!menu_saveProject())
-	{
-		return false;
-	}
-
-	return true;
-}
-
-
-bool BlastPlugin::AppMainWindow_InitToolbar(QWidget *pQWidget, QVBoxLayout* pLayout)
-{ 
-	//_mainToolbar = new BlastToolbar(pQWidget);
-	//pLayout->insertWidget(0, _mainToolbar);
-//	connect(_mainToolbar->getUI().btnFileOpen, SIGNAL(clicked()), this, SLOT(menu_openProject()));
-
-	return true; 
-}
-
-bool BlastPlugin::AppMainWindow_shortcut_expert(bool mode)
-{ 
-	//if (_mainToolbar)
-	//	_mainToolbar->setVisible(mode);
-	if (_filtersDockWidget)
-		_filtersDockWidget->setVisible(mode);
-	if (_blastSceneTree)
-		_blastSceneTree->setVisible(mode);
-
-	// set FPS display
-	GlobalSettings::Inst().m_showFPS = mode;
-	return true; 
-}
-
-bool BlastPlugin::AppMainWindow_updateMainToolbar()
-{ 
-	if (_mainToolbar)
-		_mainToolbar->updateValues();
-
-	return true; 
-}
-
-bool BlastPlugin::AppMainWindow_menu_item_triggered(QAction* action)
-{
-	bool clickRecent = false;
-	for (int i = 0; i < _recentProjectActions.count(); ++i)
-	{
-		if (_recentProjectActions.at(i) == action)
-		{
-			clickRecent = true;
-			break;
-		}
-	}
-
-	if (clickRecent)
-	{
-		bool ret = _openProject(action->text());
-		_resetRecentProject(action->text());
-		return ret;
-	}
-	return false;
-}
-
-bool BlastPlugin::AppMainWindow_menu_about()
-{
-	return true;
-}
-
-bool BlastPlugin::AppMainWindow_menu_opendoc()
-{
-	QString appDir = QApplication::applicationDirPath();
-	QString docsFile = QFileInfo(appDir + "/../../docs/User_Guide/Nvidia Blast.chm").absoluteFilePath();
-
-	QUrl docsUrl = QUrl::fromLocalFile(docsFile);
-	QUrl url = QUrl::fromUserInput(QString("http://docs.nvidia.com/gameworks/content/artisttools/blast/index.html"));
-	QDesktopServices::openUrl(url);
-
-	return true;
-}
-
-#if USE_CURVE_EDITOR
-#include "CurveEditorMainWindow.h"
-
-bool BlastPlugin::AppMainWindow_UpdateCurveEditor()
-{
-	return true;
-}
-bool BlastPlugin::AppMainWindow_ShowCurveEditor(int paramId)
-{
-	return true;
-}
-bool BlastPlugin::AppMainWindow_onCurveAttributeChanged(nvidia::CurveEditor::CurveAttribute* attribute)
-{
-	return true;
-}
-bool BlastPlugin::AppMainWindow_onColorAttributeChanged(nvidia::CurveEditor::ColorAttribute* attribute)
-{
-	return true;
-}
-bool BlastPlugin::AppMainWindow_onReloadColorAttributeTexture(nvidia::CurveEditor::ColorAttribute* attribute, bool reloadColorTex, int selectedCtrlPntIndex)
-{
-	return true;
-}
-#endif
-
-bool BlastPlugin::menu_openProject()
-{
-	AppMainWindow& window = AppMainWindow::Inst();
-	QString lastDir = window._lastFilePath;
-	QString fileName = QFileDialog::getOpenFileName(&window, "Open Blast Project File", lastDir, "Blast Project File (*.blastProj)");
-
-	_addRecentProject(fileName);
-
-	return _openProject(fileName);
-}
-
-bool BlastPlugin::menu_saveProject()
-{
-	char message[1024];
-
-	std::string projectFilePath = GlobalSettings::Inst().getAbsoluteFilePath();
-	std::string projectFileName = GlobalSettings::Inst().m_projectFileName;
-	if (projectFileName != "")
-	{
-		QFileInfo fileInfo(projectFileName.c_str());
-		std::string ext = fileInfo.suffix().toUtf8().data();
-		if (ext.length() < 1)
-			projectFileName += ".blastProj";
-		if (SimpleScene::Inst()->SaveProject(
-			GlobalSettings::Inst().m_projectFileDir.c_str(),
-			projectFileName.c_str()
-			) == false)
-		{
-			QMessageBox messageBox;
-
-			sprintf(message, "Project file %s could not be saved!", (const char*)projectFilePath.c_str());
-			messageBox.critical(0, "Error", message);
-			messageBox.setFixedSize(500, 200);
-			char message[1024];
-			sprintf(message, "Failed to save project file(\"%s\")", (const char*)projectFilePath.c_str());
-			viewer_err(message);
-			return false;
-		}
-
-		sprintf(message, "Project file %s was saved.", (const char*)projectFilePath.c_str());
-
-		/*
-		QMessageBox messageBox;
-		messageBox.information(0, "Info", message);
-		messageBox.setFixedSize(500,200);
-		*/
-		viewer_msg(message);
-		return true;
-	}
-	else
-	{
-		return menu_saveProjectAs();
-	}
-	return false;
-}
-
-bool BlastPlugin::menu_saveProjectAs()
-{
-	AppMainWindow& window = AppMainWindow::Inst();
-
-	char message[1024];
-
-	QString lastDir = window._lastFilePath;
-	QString fileName = QFileDialog::getSaveFileName(&window, "Save Blast Project File", lastDir, "Blast Project File (*.blastProj)");
-	_addRecentProject(fileName);
-	if (!fileName.isEmpty())
-	{
-		QFileInfo fileInfo(fileName);
-		QByteArray dir = QDir::toNativeSeparators(fileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-		QByteArray file = fileInfo.fileName().toLocal8Bit();
-		std::string ext = fileInfo.suffix().toUtf8().data();
-
-		if (SimpleScene::Inst()->SaveProject(dir, file) == false)
-		{
-			QMessageBox messageBox;
-			sprintf(message, "Project file %s could not be saved!", (const char*)file);
-			messageBox.critical(0, "Error", message);
-			messageBox.setFixedSize(500, 200);
-			return false;
-		}
-
-		sprintf(message, "Project file %s was saved.", (const char*)fileName.toUtf8().data());
-
-		/*
-		QMessageBox messageBox;
-		messageBox.information(0, "Info", message);
-		messageBox.setFixedSize(500,200);
-		*/
-
-		viewer_msg(message);
-
-		// show project path in toolbar
-		BlastPlugin::Inst().GetMainToolbar()->updateValues();
-
-		window._lastFilePath = fileInfo.absoluteDir().absolutePath();
-		return true;
-	}
-	return false;
-}
-
-bool BlastPlugin::shortcut_damagetool()
-{
-	BlastPlugin::Inst().GetMainToolbar()->on_btnDamage_clicked();
-	return true;
-}
-
-bool BlastPlugin::shortcut_selecttool()
-{
-	BlastPlugin::Inst().GetMainToolbar()->on_btnSelectTool_clicked();
-	BlastPlugin::Inst().GetMainToolbar()->updateCheckIconsStates();
-	return true;
-}
-
-bool BlastPlugin::shortcut_Translate()
-{
-	BlastPlugin::Inst().GetMainToolbar()->on_Translate_clicked();
-	BlastPlugin::Inst().GetMainToolbar()->updateCheckIconsStates();
-	return true;
-}
-
-bool BlastPlugin::shortcut_Rotation()
-{
-	BlastPlugin::Inst().GetMainToolbar()->on_Rotation_clicked();
-	BlastPlugin::Inst().GetMainToolbar()->updateCheckIconsStates();
-	return true;
-}
-
-bool BlastPlugin::shortcut_Scale()
-{
-	BlastPlugin::Inst().GetMainToolbar()->on_Scale_clicked();
-	BlastPlugin::Inst().GetMainToolbar()->updateCheckIconsStates();
-	return true;
-}
-
-bool BlastPlugin::shortcut_edittool()
-{
-	SampleManager& sampleManager = SimpleScene::Inst()->GetSampleManager();
-	sampleManager.EnableSimulating(false);
-	return true;
-}
-
-bool BlastPlugin::shortcut_addFamily()
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	BlastAsset* pBlastAsset = pSampleManager->getCurBlastAsset();
-	if (pBlastAsset == nullptr)
-	{
-		viewer_warn("please select asset first to create family !");
-		return false;
-	}
-
-	SourceAssetOpenDlg dlg(2, &AppMainWindow::Inst());
-	if (dlg.exec() != QDialog::Accepted)
-		return false;
-
-	physx::PxTransform t(physx::PxIdentity);
-	{
-		QVector3D Position = dlg.getPosition();
-		t.p = physx::PxVec3(Position.x(), Position.y(), Position.z());
-
-		QVector3D RotationAxis = dlg.getRotationAxis();
-		physx::PxVec3 Axis = physx::PxVec3(RotationAxis.x(), RotationAxis.y(), RotationAxis.z());
-		Axis = Axis.getNormalized();
-		float RotationDegree = dlg.getRotationDegree();
-		float DEGREE_TO_RAD = acos(-1.0) / 180.0;
-		RotationDegree = RotationDegree * DEGREE_TO_RAD;
-		t.q = physx::PxQuat(RotationDegree, Axis);
-	}
-	bool res = pSampleManager->addBlastFamily(pBlastAsset, t);
-	if(res)
-		AppMainWindow::Inst().updateUI();
-	return res;
-}
-
-bool BlastPlugin::slot_Make_Support()
-{
-	BlastSceneTree::ins()->makeSupport();
-	return true;
-}
-
-bool BlastPlugin::slot_Make_Static_Support()
-{
-	BlastSceneTree::ins()->makeStaticSupport();
-	return true;
-}
-
-bool BlastPlugin::slot_Remove_Support()
-{
-	BlastSceneTree::ins()->removeSupport();
-	return true;
-}
-
-bool BlastPlugin::slot_Bond_Chunks()
-{
-	BlastSceneTree::ins()->bondChunks();
-	return true;
-}
-
-bool BlastPlugin::slot_Bond_Chunks_with_Joints()
-{
-	BlastSceneTree::ins()->bondChunksWithJoints();
-	return true;
-}
-
-bool BlastPlugin::slot_Remove_all_Bonds()
-{
-	BlastSceneTree::ins()->removeAllBonds();
-	return true;
-}
-
-bool BlastPlugin::_openProject(const QString project)
-{
-	AppMainWindow& window = AppMainWindow::Inst();
-	bool ret = window.openProject(project);
-	if (ret)
-	{
-		SampleManager* pSampleManager = SampleManager::ins();
-		SelectionToolController& selectionToolController = pSampleManager->getSelectionToolController();
-		GizmoToolController& gizmoToolController = pSampleManager->getGizmoToolController();
-		gizmoToolController.showAxisRenderables(false);
-		if (selectionToolController.IsEnabled() || gizmoToolController.IsEnabled())
-		{
-			// do nothing here
-		}
-		else
-		{
-			// turn on selection tool
-			selectionToolController.EnableController();
-			BlastPlugin::Inst().GetMainToolbar()->updateCheckIconsStates();
-		}
-	}
-	return ret;
-}
-
-void BlastPlugin::_addRecentProject(const QString project)
-{
-	if (project.isEmpty())
-		return;
-
-	if (_recentProjectRecordFile.getItems().count() > 0 && _recentProjectRecordFile.getItems().first() == project)
-		return;
-
-	if (_recentProjectActions.count() == 8)
-	{
-		QAction* act = _recentProjectActions.last();
-		_recentProjectMenu->removeAction(act);
-
-		_recentProjectRecordFile.getItems().pop_back();
-		_recentProjectActions.pop_back();
-	}
-
-	if (_recentProjectRecordFile.isItemExist(project))
-	{
-		_resetRecentProject(project);
-		return;
-	}
-
-	QAction* act = new QAction(project, _recentProjectMenu);
-	if (_recentProjectActions.count() > 0)
-		_recentProjectMenu->insertAction(_recentProjectActions.first(), act);
-	else
-		_recentProjectMenu->addAction(act);
-
-	_recentProjectActions.push_front(act);
-
-	_recentProjectRecordFile.getItems().push_front(project);
-
-	_saveRecentProject();
-}
-
-void BlastPlugin::_resetRecentProject(const QString project)
-{
-	if (project.isEmpty())
-		return;
-
-	if (_recentProjectRecordFile.getItems().count() > 0 && _recentProjectRecordFile.getItems().first() == project)
-		return;
-
-	if (!_recentProjectRecordFile.isItemExist(project))
-		return;
-
-	QList<QAction*> actions;
-	for (int i = 0; i < _recentProjectActions.count(); ++i)
-	{
-		QAction* act = _recentProjectActions.at(i);
-		if (act->text() == project)
-			actions.push_front(act);
-		else
-			actions.push_back(act);
-	}
-
-	_recentProjectMenu->addActions(actions);
-	_recentProjectActions = actions;
-
-	QList<QString> projectsTMP;
-	QList<QString>& projectsCurrent = _recentProjectRecordFile.getItems();
-	for (int i = 0; i < projectsCurrent.count(); ++i)
-	{
-		QString item = projectsCurrent.at(i);
-		if (item == project)
-			projectsTMP.push_front(item);
-		else
-			projectsTMP.push_back(item);
-	}
-	projectsCurrent.clear();
-	projectsCurrent = projectsTMP;
-
-	_saveRecentProject();
-}
-
-void BlastPlugin::_loadRecentProject()
-{
-	QString recentProjectRecordFile = QCoreApplication::applicationDirPath() + "/RecentBlastProjects.rbp";
-	_recentProjectRecordFile.load(recentProjectRecordFile);
-
-	QList<QString> recentProjects = _recentProjectRecordFile.getItems();
-	_recentProjectRecordFile.getItems().clear();
-
-	for (int i = recentProjects.count() - 1; i >= 0; --i)
-	{
-		_addRecentProject(recentProjects.at(i));
-	}
-}
-
-void BlastPlugin::_saveRecentProject()
-{
-	QString recentProjectRecordFile = QCoreApplication::applicationDirPath() + "/RecentBlastProjects.rbp";
-	_recentProjectRecordFile.save(recentProjectRecordFile);
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/BlastPlugin.h b/tools/ArtistTools/source/BlastPlugin/BlastPlugin.h
deleted file mode 100644
index 4bda771..0000000
--- a/tools/ArtistTools/source/BlastPlugin/BlastPlugin.h
+++ /dev/null
@@ -1,214 +0,0 @@
-#ifndef BLASTPLUGIN_H
-#define BLASTPLUGIN_H
-
-#include <QtCore/QObject>
-#include <QtCore/QtPlugin>
-#include "PluginInterface.h"
-#include "UIGlobal.h"
-#include "XMLHelper.h"
-
-class QMenu;
-class QAction;
-class QDoubleSpinBox;
-class QComboBox;
-class QCheckBox;
-class QVBoxLayout;
-class BlastToolbar;
-class ExpandablePanel;
-class FileReferencesPanel;
-class GeneralPanel;
-class DefaultDamagePanel;
-class MaterialLibraryPanel;
-class MaterialAssignmentsPanel;
-class FractureGeneralPanel;
-class FractureSliceSettingsPanel;
-class FractureVisualizersPanel;
-class FractureVoronoiSettingsPanel;
-class SupportPanel;
-class BlastSceneTree;
-class FiltersDockWidget;
-
-class Camera;
-class Light;
-namespace NvParameterized
-{
-	class Interface;
-	class Handle;
-}
-class D3D11RenderShader;
-
-#define BlastPluginName "BlastPlugin"
-
-class BlastPlugin : public QObject, public PluginInterface
-{
-	Q_OBJECT
-		Q_PLUGIN_METADATA(IID PluginInterface_iid FILE "blastplugin.json")
-		Q_INTERFACES(PluginInterface)
-
-public:
-	BlastPlugin();
-	~BlastPlugin();
-	virtual QString GetPluginName();
-
-	virtual bool CoreLib_RunApp();
-
-	virtual bool LoadRenderPlugin(std::string api);
-
-	virtual bool GetBoneNames(std::vector<std::string>& BoneNames);
-
-	virtual bool MainToolbar_updateValues();
-
-	virtual bool CurveEditor_updateValues(int _paramId, float* _values);
-	virtual bool CurveEditor_onUpdateValues(int _paramId, float* _values);
-
-	virtual bool DisplayMeshesPanel_updateValues();
-	virtual bool DisplayMeshesPanel_EmitToggleSignal(unsigned int id, bool visible);
-
-	virtual bool Camera_LoadParameters(void* ptr, Camera* pCamera);
-	virtual bool Camera_SaveParameters(void * ptr, Camera* pCamera);
-
-	virtual bool Gamepad_ToggleSimulation();
-	virtual bool Gamepad_LoadSamples(QString fn);
-	virtual bool Gamepad_ResetScene();
-	virtual bool Gamepad_PlaySample();
-	virtual bool GamepadHandler_ShowHair();
-	virtual bool GamepadHandler_SpinWindStrength(float windStrength);
-	virtual bool Gamepad_ResetAnimation();
-	virtual bool Gamepad_PlayPauseAnimation();
-	
-	virtual bool Light_loadParameters(NvParameterized::Handle& handle, Light* pLight);
-	virtual bool Light_saveParameters(NvParameterized::Handle& handle, Light* pLight);
-
-	virtual void SimpleScene_OpenFilesByDrop(const QStringList& fileNames);
-	virtual bool SimpleScene_SimpleScene();
-	virtual bool SimpleScene_Initialize(int backdoor);
-	virtual bool SimpleScene_Shutdown();
-	virtual bool SimpleScene_Clear();
-	virtual bool SimpleScene_Draw_DX12();
-	virtual bool SimpleScene_Draw_DX11();
-	virtual bool SimpleScene_FitCamera(atcore_float3& center, atcore_float3& extents);
-	virtual bool SimpleScene_ResetUpDir(bool zup);
-	virtual bool SimpleScene_UpdateCamera();
-	virtual bool SimpleScene_DrawGround();
-	virtual bool SimpleScene_DrawWind();
-	virtual bool SimpleScene_DrawAxis();
-	virtual bool SimpleScene_LoadSceneFromFbx(const char* dir, const char* fbxName);
-	virtual bool SimpleScene_LoadProject(const char* dir, const char* file);
-	virtual bool SimpleScene_SaveProject(const char* dir, const char* file);
-	virtual bool SimpleScene_LoadParameters(NvParameterized::Interface* iface);
-	virtual bool SimpleScene_SaveParameters(NvParameterized::Interface* iface);
-	virtual bool SimpleScene_LoadCameraBookmarks(NvParameterized::Interface* iface);
-	virtual bool SimpleScene_SaveCameraBookmarks(NvParameterized::Interface* iface);
-	
-	virtual bool D3DWidget_resizeEvent(QResizeEvent* e);
-	virtual bool D3DWidget_paintEvent(QPaintEvent* e);
-	virtual bool D3DWidget_mousePressEvent(QMouseEvent* e);
-	virtual bool D3DWidget_mouseReleaseEvent(QMouseEvent* e);
-	virtual bool D3DWidget_mouseMoveEvent(QMouseEvent* e);
-	virtual bool D3DWidget_wheelEvent(QWheelEvent * e);
-	virtual bool D3DWidget_keyPressEvent(QKeyEvent* e);
-	virtual bool D3DWidget_keyReleaseEvent(QKeyEvent* e);
-	virtual bool D3DWidget_dragEnterEvent(QDragEnterEvent *e);
-	virtual bool D3DWidget_dragMoveEvent(QDragMoveEvent *e);
-	virtual bool D3DWidget_dragLeaveEvent(QDragLeaveEvent *e);
-	virtual bool D3DWidget_dropEvent(QDropEvent *e);
-	virtual bool D3DWidget_contextMenuEvent(QContextMenuEvent *e);
-
-	virtual bool D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap);
-
-	virtual bool AppMainWindow_AppMainWindow();
-	virtual bool AppMainWindow_InitMenuItems(QMenuBar* pMenuBar);
-	virtual bool AppMainWindow_InitMainTab(QWidget *displayScrollAreaContents, QVBoxLayout *displayScrollAreaLayout, int idx);
-	virtual bool AppMainWindow_InitPluginTab(QTabWidget* pTabWidget);
-	virtual bool AppMainWindow_InitUI();
-	virtual bool AppMainWindow_updateUI();
-	virtual bool AppMainWindow_updatePluginUI();
-	virtual bool AppMainWindow_processDragAndDrop(QString fname);
-	virtual bool AppMainWindow_closeEvent(QCloseEvent *event);
-	virtual bool AppMainWindow_InitToolbar(QWidget *pQWidget, QVBoxLayout* pLayout);
-	virtual bool AppMainWindow_shortcut_expert(bool mode);
-	virtual bool AppMainWindow_updateMainToolbar();
-
-	virtual bool AppMainWindow_menu_item_triggered(QAction* action);
-	virtual bool AppMainWindow_menu_about();
-	virtual bool AppMainWindow_menu_opendoc();
-#if USE_CURVE_EDITOR
-	virtual bool AppMainWindow_UpdateCurveEditor();
-	virtual bool AppMainWindow_ShowCurveEditor(int paramId);
-	virtual bool AppMainWindow_onCurveAttributeChanged(nvidia::CurveEditor::CurveAttribute* attribute);
-	virtual bool AppMainWindow_onColorAttributeChanged(nvidia::CurveEditor::ColorAttribute* attribute);
-	virtual bool AppMainWindow_onReloadColorAttributeTexture(nvidia::CurveEditor::ColorAttribute* attribute, bool reloadColorTex, int selectedCtrlPntIndex);
-#endif
-	BlastToolbar* GetMainToolbar() { return _mainToolbar; }
-
-public:
-	static void DrawHUD();
-
-	static BlastPlugin& Inst();
-
-	/////////////////////////////////////////////////////////////////////
-	// profiler and timer
-	static void ResetFrameTimer();
-	static void OpenBpxa(const char* dir, const char* fn);
-
-	FileReferencesPanel* GetFileReferencesPanel() { return _fileReferencesPanel; }
-
-public slots:
-	void slot_Gamepad_PlaySample();
-
-	bool menu_openProject();
-	bool menu_saveProject();
-	bool menu_saveProjectAs();
-	bool shortcut_damagetool();
-	bool shortcut_selecttool();
-	bool shortcut_Translate();
-	bool shortcut_Rotation();
-	bool shortcut_Scale();
-	bool shortcut_edittool();
-	bool shortcut_addFamily();
-
-	bool slot_Make_Support();
-	bool slot_Make_Static_Support();
-	bool slot_Remove_Support();
-	bool slot_Bond_Chunks();
-	bool slot_Bond_Chunks_with_Joints();
-	bool slot_Remove_all_Bonds();
-
-private:
-	bool _openProject(const QString project);
-	void _addRecentProject(const QString project);
-	void _resetRecentProject(const QString project);
-	void _loadRecentProject();
-	void _saveRecentProject();
-
-private:
-	BlastToolbar*					_mainToolbar;
-	MaterialLibraryPanel*			_materialLibraryPanel;
-	MaterialAssignmentsPanel*		_materialAssignmentsPanel;
-	FileReferencesPanel*			_fileReferencesPanel;
-	GeneralPanel*					_generalPanel;
-	DefaultDamagePanel*				_defaultDamagePanel;
-	FractureGeneralPanel*			_fractureGeneralPanel;
-	FractureVoronoiSettingsPanel*	_fractureVoronoiSettingsPanel;
-	FractureSliceSettingsPanel*		_fractureSliceSettingsPanel;
-	FractureVisualizersPanel*		_fractureVisualizersPanel;
-	SupportPanel*					_supportPanel;
-	ExpandablePanel*				_fractureVoronoiSettingsExpandlePanel;
-	ExpandablePanel*				_fractureSliceSettingsExpandlePanel;
-	BlastSceneTree*					_blastSceneTree;
-	FiltersDockWidget*				_filtersDockWidget;
-
-	QMenu*							_recentProjectMenu;
-	QList<QAction*>					_recentProjectActions;
-	SingleItemKindFile				_recentProjectRecordFile;
-
-	QMenu*	 _contextMenu;
-	QAction* action_Make_Support;
-	QAction* action_Make_Static_Support;
-	QAction* action_Remove_Support;
-	QAction* action_Bond_Chunks;
-	QAction* action_Bond_Chunks_with_Joints;
-	QAction* action_Remove_all_Bonds;
-};
-
-#endif // HAIRWORKSPLUGIN_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Parameters/BlastProjectParams.pl b/tools/ArtistTools/source/BlastPlugin/Parameters/BlastProjectParams.pl
deleted file mode 100644
index ad959ec..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Parameters/BlastProjectParams.pl
+++ /dev/null
@@ -1,1509 +0,0 @@
-{
-	header =>
-	{
-		className => 'BlastProjectParameters',
-		implementStorage => 1,
-	
-		# Version history
-		# 0.0 Initial Version
-		classVersion => '0.0',
-
-		hints =>
-		{
-		},
-	},
-
-	structs =>
-	[
-		{
-			name => 'GraphicsMaterial',
-			parameters =>
-			[
-				{
-					name => 'ID',
-					type => 'I32',
-					defaultValue => '-1',
-					hints => { shortDescription => "ID of this material" },
-				},
-				{
-					name => 'name',
-					type => 'STRING',
-					hints => { shortDescription => 'Name of this material' },
-				},
-				{
-					name => 'useTextures',
-					type => 'BOOL',
-					hints => { shortDescription => 'Use textures'},
-				},
-				{
-					name => 'diffuseTextureFilePath',
-					type => 'STRING',
-					hints => { shortDescription => 'Diffuse texture file path' },
-				},
-				{
-					name => 'specularTextureFilePath',
-					type => 'STRING',
-					hints => { shortDescription => 'Specular texture file path' },
-				},
-				{
-					name => 'normalTextureFilePath',
-					type => 'STRING',
-					hints => { shortDescription => 'Normal texture file path' },
-				},
-				{
-					name => 'diffuseColor',
-					type => 'VEC4',
-					defaultValue => '0',
-					hints => { shortDescription => "Diffuse color" },
-				},
-				{
-					name => 'specularColor',
-					type => 'VEC4',
-					defaultValue => '0',
-					hints => { shortDescription => "Specular color" },
-				},
-				{
-					name => 'specularShininess',
-					type => 'F32',
-					defaultValue => '1.0f',
-					hints => { shortDescription => 'Specular shininess' },
-				},
-			]
-		},
-		{
-			name => 'MaterialAssignments',
-			parameters =>
-			[
-				{
-					name => 'libraryMaterialID',
-					type => 'I32',
-					defaultValue => '-1',
-					hints =>
-					{
-						shortDescription => "ID of the material in material library",
-					},
-				},
-				{
-					name => 'faceMaterialID',
-					type => 'I32',
-					defaultValue => '-1',
-					hints =>
-					{
-						shortDescription => "ID of the material for face, which are generated in graphics mesh range",
-					},
-				},
-			]
-		},
-		{
-			name => 'GraphicsMesh',
-			parameters =>
-			[
-				{
-					name => 'materialAssignments',
-					type => 'MaterialAssignments',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "MaterialAssignments",
-					},
-				},
-				{
-					name => 'positions',
-					type => 'VEC3',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Position data array",
-					},
-				},
-				{
-					name => 'normals',
-					type => 'VEC3',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Normal data array",
-					},
-				},
-				{
-					name => 'tangents',
-					type => 'VEC3',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Tangent data array",
-					},
-				},
-				{
-					name => 'texcoords',
-					type => 'VEC2',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Texcoord data array",
-					},
-				},
-				{
-					name => 'vertextCountInFace',
-					type => 'U32',
-					defaultValue => '3',
-					hints =>
-					{
-						shortDescription => "Count of vertextes of one face",
-					},
-				},
-				{
-					name => 'positionIndexes',
-					type => 'I32',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Indexes of the positions of each face",
-					},
-				},
-				{
-					name => 'normalIndexes',
-					type => 'I32',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Indexes of the normal of each face",
-					},
-				},
-				{
-					name => 'tangentIndexes',
-					type => 'I32',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Indexes of the tangents of each face",
-					},
-				},
-				{
-					name => 'texcoordIndexes',
-					type => 'I32',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Indexes of the texcoords of each face",
-					},
-				},
-				{
-					name => 'materialIDs',
-					type => 'I32',
-					isArray => 1,
-					arraySize => '-1',
-					hints => { shortDescription => "IDs of the material specified for each face " },
-				},
-			]
-		},
-		{
-			name => 'Light',
-			parameters =>
-			[
-				{
-					name => 'name',
-					type => 'STRING',
-					defaultValue => '',
-					hints => { shortDescription => 'name of light' },
-				},
-				{
-					name => 'enable',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "enable this light" },
-				},
-				{
-					name => 'useShadows',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "use shadows for this light" },
-				},
-				{
-					name => 'lockToRoot',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "lock this light to the root bone" },
-				},
-				{
-					name => 'visualize',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "visualize this light" },
-				},
-				{
-					name => 'type',
-					type => 'I32',
-					defaultValue => '0',
-					hints =>
-					{
-						shortDescription => "Type of this light",
-					},
-				},
-				{
-					name => 'shadowMapResolution',
-					type => 'I32',
-					defaultValue => '0',
-					hints =>
-					{
-						shortDescription => "shadow resolution",
-					},
-				},
-				{
-					name => 'color',
-					type => 'VEC3',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Light color for visualization" },
-				},
-				{
-					name => 'diffuseColor',
-					type => 'VEC3',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Light diffuse color" },
-				},
-				{
-					name => 'ambientColor',
-					type => 'VEC3',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Light ambient color" },
-				},
-				{
-					name => 'specularColor',
-					type => 'VEC3',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Light specular color" },
-				},
-				{
-					name => 'intensity',
-					type => 'F32',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Light intensity" },
-				},
-				{
-					name => 'distance',
-					type => 'F32',
-					defaultValue => '100.0f',
-					hints => { shortDescription => "Light distance (for position based lights)" },
-				},
-				{
-					name => 'spotFalloffStart',
-					type => 'F32',
-					defaultValue => '20.0f',
-					hints => { shortDescription => "Fall off start angle for spot light" },
-				},
-				{
-					name => 'spotFalloffEnd',
-					type => 'F32',
-					defaultValue => '30.0f',
-					hints => { shortDescription => "Fall off end angle for spot light" },
-				},
-				{
-					name => 'lightAxisX',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "X axis of light matrix",
-					},
-				},
-				{
-					name => 'lightAxisY',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "Y axis of light matrix",
-					},
-				},
-				{
-					name => 'lightAxisZ',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "Z axis of light matrix",
-					},
-				},
-				{
-					name => 'lightPos',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "light position",
-					},
-				},
-			]
-		},
-		{
-			name => 'Camera',
-			parameters =>
-			[
-				{
-					name => 'flags',
-					type => 'U16',
-					defaultValue => '0',
-					hints => { shortDescription => "Y Up(1) or Z Up(2)" },
-				},
-				{
-					name => 'fov',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "FOV" },
-				},
-				{
-					name => 'aspectRatio',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "FOV" },
-				},
-				{
-					name => 'znear',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Near Z" },
-				},
-				{
-					name => 'zfar',
-					type => 'F32',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Far Z" },
-				},
-				{
-					name => 'width',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Width for Ortho" },
-				},
-				{
-					name => 'height',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Height for Ortho" },
-				},
-				{
-					name => 'isPerspective',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "Camera Eye Position" },
-				},
-				{
-					name => 'eye',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Camera Eye Position" },
-				},
-				{
-					name => 'at',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Camera At Position" },
-				},
-				{
-					name => 'xAxis',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "X Axis" },
-				},
-				{
-					name => 'yAxis',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Y Axis" },
-				},
-				{
-					name => 'zAxis',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Z Axis" },
-				},
-				{
-					name => 'viewDirection',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "View Direction" },
-				},
-				{
-					name => 'lookDistance',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Look Distance" },
-				},
-				{
-					name => 'orientation',
-					type => 'VEC4',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Orientation Quaternion" },
-				},
-				{
-					name => 'viewMatrix',
-					type => 'MAT44',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "View Matrix" },
-				},
-				{
-					name => 'projectionMatrix',
-					type => 'MAT44',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "View Matrix" },
-				},
-			]
-		},
-		{
-			name => 'CameraBookmark',
-			parameters =>
-			[
-				{
-					name => 'name',
-					type => 'STRING',
-					hints => { shortDescription => "Name of the bookmark" },
-				},
-				{
-					name => 'camera',
-					type => 'Camera',
-					hints => { shortDescription => "Camera information" },
-				},
-			]
-		},
-		{
-			name => 'Scene',
-			parameters =>
-			[
-				{
-					name => 'repeatAnimation',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "Repeat animation" },
-				},
-				{
-					name => 'animationSpeed',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Animation speed" },
-				},
-				{
-					name => 'showGrid',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "Show grid" },
-				},
-				{
-					name => 'showAxis',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "Show axis" },
-				},
-				{
-					name => 'upAxis',
-					type => 'U32',
-					defaultValue => '0',
-					hints => { shortDescription => "Up axis" },
-				},
-				{
-					name => 'sceneUnitIndex',
-					type => 'U32',
-					defaultValue => '0',
-					hints => { shortDescription => "Scene Unit" },
-				},
-			]
-		},
-		{
-			name => 'Renderer',
-			parameters =>
-			[
-				{
-					name => 'renderFps',
-					type => 'F32',
-					defaultValue => '60.0f',
-					hints =>
-					{
-						shortDescription => "Render Play Rate FPS",
-					},
-				},
-				{
-					name => 'frameStartTime',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "Frame start time",
-					},
-				},
-				{
-					name => 'frameEndTime',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "Frame end time",
-					},
-				},
-				{
-					name => 'animationFps',
-					type => 'F32',
-					defaultValue => '24.0f',
-					hints =>
-					{
-						shortDescription => "Animation FPS",
-					},
-				},
-				{
-					name => 'animate',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Is animated",
-					},
-				},
-				{
-					name => 'simulate',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints =>
-					{
-						shortDescription => "Is simulated",
-					},
-				},
-				{
-					name => 'resetSimulationOnLoop',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints =>
-					{
-						shortDescription => "Reset simulation state on loop",
-					},
-				},
-				{
-					name => 'simulationFps',
-					type => 'F32',
-					defaultValue => '60.0f',
-					hints =>
-					{
-						shortDescription => "Simulation Rate FPS",
-					},
-				},
-				{
-					name => 'showGraphicsMesh',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints =>
-					{
-						shortDescription => "Show graphics mesh",
-					},
-				},
-				{
-					name => 'visualizeGrowthMesh',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Visualize growth mesh",
-					},
-				},
-				{
-					name => 'visualizeLight',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Visualize light",
-					},
-				},
-				{
-					name => 'visualizeWind',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Visualize wind",
-					},
-				},
-				{
-					name => 'showStatistics',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Show statistics",
-					},
-				},
-				{
-					name => 'renderStyle',
-					type => 'I32',
-					defaultValue => '2',
-					hints =>
-					{
-						shortDescription => "Render style",
-					},
-				},
-				{
-					name => 'colorizeOption',
-					type => 'I32',
-					defaultValue => '0',
-					hints =>
-					{
-						shortDescription => "Colorize option",
-					},
-				},
-				{
-					name => 'showWireframe',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Show wireframe",
-					},
-				},
-				{
-					name => 'lockRootBone',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Lock root bone",
-					},
-				},
-				{
-					name => 'controlTextureOption',
-					type => 'I32',
-					defaultValue => '0',
-					hints =>
-					{
-						shortDescription => "Control texture option",
-					},
-				},
-				{
-					name => 'useLighting',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints =>
-					{
-						shortDescription => "Use lighting",
-					},
-				},
-				{
-					name => 'showSkinnedMeshOnly',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Show skinned mesh only",
-					},
-				},
-				{
-					name => 'lightDir',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "Light direction",
-					},
-				},
-				{
-					name => 'ambientColor',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "Scene ambient color",
-					},
-				},
-				{
-					name => 'windDir',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "Wind direction",
-					},
-				},
-				{
-					name => 'windStrength',
-					type => 'F32',
-					defaultValue => '1.0f',
-					hints =>
-					{
-						shortDescription => "Wind strength",
-					},
-				},
-				{
-					name => 'lightIntensity',
-					type => 'F32',
-					defaultValue => '1.0f',
-					hints =>
-					{
-						shortDescription => "Light intensity",
-					},
-				},
-				{
-					name => 'gravityDir',
-					type => 'VEC3',
-					defaultValue => '0.0f',
-					hints =>
-					{
-						shortDescription => "Gravity direction",
-					},
-				},
-				{
-					name => 'gravityScale',
-					type => 'F32',
-					defaultValue => '1.0f',
-					hints =>
-					{
-						shortDescription => "Gravity scale",
-					},
-				},
-				{
-					name => 'textureFilePath',
-					type => 'STRING',
-					hints =>
-					{
-						shortDescription => "Texture file path",
-					},
-				},
-				{
-					name => 'lights',
-					type => 'Light',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Light data",
-					},
-				},
-			]
-		},
-		{
-			name => 'BlastFileReferences',
-			parameters =>
-			[
-				{
-					name => 'fbxSourceAsset',
-					type => 'STRING',
-					hints => { shortDescription => "FBX source asset path" },
-				},
-			]
-		},
-		{
-			name => 'StressSolver',
-			parameters =>
-			[
-				{
-					name => 'hardness',
-					type => 'F32',
-					defaultValue => '1000.0f',
-					hints => { shortDescription => "Hardness of bond's material" },
-				},
-				{
-					name => 'linearFactor',
-					type => 'F32',
-					defaultValue => '0.25f',
-					hints => { shortDescription => "Linear stress on bond multiplier" },
-				},
-				{
-					name => 'angularFactor',
-					type => 'F32',
-					defaultValue => '0.75f',
-					hints => { shortDescription => "Angular stress on bond multiplier" },
-				},
-				{
-					name => 'bondIterationsPerFrame',
-					type => 'U32',
-					defaultValue => '18000',
-					hints => { shortDescription => "Number of bond iterations to perform per frame" },
-				},
-				{
-					name => 'graphReductionLevel',
-					type => 'U32',
-					defaultValue => '3',
-					hints => { shortDescription => "Graph reduction level" },
-				},
-			]
-		},
-		{
-			name => 'SupportStructure',
-			parameters =>
-			[
-				{
-					name => 'healthMask',
-					type => 'STRING',
-					hints =>
-					{
-						shortDescription => "Name of active health mask",
-					},
-				},
-				{
-					name => 'bondStrength',
-					type => 'F32',
-					defaultValue => '1.0',
-					hints => { shortDescription => "Bond strength" },
-				},
-				{
-					name => 'enableJoint',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Whether have a joint or not" },
-				},
-			]
-		},
-		{
-			name => 'Bond',
-			parameters =>
-			[
-				{
-					name => 'name',
-					type => 'STRING',
-					hints =>
-					{
-						shortDescription => "Name of bond",
-					},
-				},
-				{
-					name => 'asset',
-					type => 'I32',
-					hints =>
-					{
-						shortDescription => "ID of the blast asset this bond belongs to",
-					},
-				},
-				{
-					name => 'visible',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "Is this bond visible" },
-				},
-				{
-					name => 'fromChunk',
-					type => 'I32',
-					defaultValue => '-1',
-					hints => { shortDescription => "ID of the chunk this bond is from" },
-				},
-				{
-					name => 'toChunk',
-					type => 'I32',
-					defaultValue => '-1',
-					hints => { shortDescription => "ID of the chunk this bond is to" },
-				},
-				{
-					name => 'support',
-					type => 'SupportStructure',
-				},
-			]
-		},
-		{
-			name => 'Chunk',
-			parameters =>
-			[
-				{
-					name => 'ID',
-					type => 'I32',
-					defaultValue => '-1',
-					hints => { shortDescription => "ID of this chunk" },
-				},
-				{
-					name => 'parentID',
-					type => 'I32',
-					defaultValue => '-1',
-					hints => { shortDescription => "ID of parent chunk" },
-				},
-				{
-					name => 'name',
-					type => 'STRING',
-					hints =>
-					{
-						shortDescription => "Name of chunk",
-					},
-				},
-				{
-					name => 'asset',
-					type => 'I32',
-					hints =>
-					{
-						shortDescription => "ID of the blast asset this chunk belongs to",
-					},
-				},
-				{
-					name => 'visible',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "Is this chunk visible" },
-				},
-				{
-					name => 'support',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "Is this chunk a support chunk" },
-				},
-				{
-					name => 'staticFlag',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Is this chunk static" },
-				},
-				{
-					name => 'graphicsMesh',
-					type => 'GraphicsMesh',
-					hints => { shortDescription => "Graphics mesh of this chunk" },
-				},
-			]
-		},
-		{
-			name => 'DamageStruct',
-			parameters =>
-			[
-				{
-					name => 'damageRadius',
-					type => 'F32',
-					defaultValue => '5.0f',
-					hints => { shortDescription => "Damage radius (Mouse WH)" },
-				},
-				{
-					name => 'continuously',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Damage continuously" },
-				},
-			]
-		},
-		{
-			name => 'DefaultDamage',
-			parameters =>
-			[
-				{
-					name => 'damageAmount',
-					type => 'F32',
-					defaultValue => '100.0f',
-					hints => { shortDescription => "Damage Amount" },
-				},
-				{
-					name => 'explosiveImpulse',
-					type => 'F32',
-					defaultValue => '100.0f',
-					hints => { shortDescription => "Explosive impulse" },
-				},
-				{
-					name => 'stressDamageForce',
-					type => 'F32',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Stress damage force" },
-				},
-				{
-					name => 'damageProfile',
-					type => 'U32',
-					defaultValue => '0',
-					hints => { shortDescription => "FallOff" },
-				},
-				{
-					name => 'damageStructs',
-					type => 'DamageStruct',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Damage Structs",
-					},
-				},
-			]
-		},
-		{
-			name => 'BlastAsset',
-			parameters =>
-			[
-				{
-					name => 'ID',
-					type => 'I32',
-					defaultValue => '-1',
-					hints => { shortDescription => "ID of this asset" },
-				},
-				{
-					name => 'name',
-					type => 'STRING',
-					hints =>
-					{
-						shortDescription => "Name of this blast asset",
-					},
-				},
-				{
-					name => 'visible',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "Is this blast asset visible" },
-				},
-				{
-					name => 'stressSolver',
-					type => 'StressSolver',
-				},
-				{
-					name => 'activeUserPreset',
-					type => 'STRING',
-					hints => { shortDescription => "Name of active user preset" },
-				},
-				{
-					name => 'fbx',
-					type => 'STRING',
-					hints => { shortDescription => "FBX export asset path" },
-				},
-				{
-					name => 'exportFBX',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Is this blast asset export FBX" },
-				},
-				{
-					name => 'embedFBXCollision',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Whether embed collisio in export FBX" },
-				},
-				{
-					name => 'obj',
-					type => 'STRING',
-					hints => { shortDescription => "OBJ export asset path" },
-				},
-				{
-					name => 'exportOBJ',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Is this blast asset export OBJ" },
-				},
-				{
-					name => 'llasset',
-					type => 'STRING',
-					hints => { shortDescription => "LLAsset export asset path" },
-				},
-				{
-					name => 'exportLLAsset',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Is this blast asset export LLAsset" },
-				},
-				{
-					name => 'tkasset',
-					type => 'STRING',
-					hints => { shortDescription => "TKAsset export asset path" },
-				},
-				{
-					name => 'exportTKAsset',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Is this blast asset export TKAsset" },
-				},
-				{
-					name => 'bpxa',
-					type => 'STRING',
-					hints => { shortDescription => "Blast export asset path" },
-				},
-				{
-					name => 'exportBPXA',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Is this blast asset export BPXA" },
-				},
-			]
-		},
-		{
-			name => 'Transform',
-			parameters =>
-			[
-				{
-					name => 'position',
-					type => 'VEC3',
-					defaultValue => '0',
-					hints => 
-					{ 
-						shortDescription => "Position" 
-					},
-				},
-				{
-					name => 'rotation',
-					type => 'VEC4',
-					defaultValue => '0',
-					hints => 
-					{ 
-						shortDescription => "Rotation" 
-					},
-				},
-			]
-		},
-		{
-			name => 'BlastAssetInstance',
-			parameters =>
-			[
-				{
-					name => 'name',
-					type => 'STRING',
-					hints =>
-					{
-						shortDescription => "Name of blast asset instance",
-					},
-				},
-				{
-					name => 'visible',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints => { shortDescription => "Is this bond visible" },
-				},
-				{
-					name => 'asset',
-					type => 'I32',
-					hints =>
-					{
-						shortDescription => "ID of the blast asset this instance created by",
-					},
-				},
-				{
-					name => 'transform',
-					type => 'Transform',
-					hints =>
-					{
-						shortDescription => "Transform of blast asset instance",
-					},
-				},
-				{
-					name => 'exMaterial',
-					type => 'STRING',
-					defaultValue => '',
-					hints => { shortDescription => "External material of blast asset instance" },
-				},
-				{
-					name => 'inMaterial',
-					type => 'STRING',
-					defaultValue => '',
-					hints => { shortDescription => "Internal material of blast asset instance" },
-				},
-			]
-		},
-		{
-			name => 'Blast',
-			parameters =>
-			[
-				{
-					name => 'fileReferences',
-					type => 'BlastFileReferences',
-				},
-				{
-					name => 'blastAssets',
-					type => 'BlastAsset',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Blast assets",
-					},
-				},
-				{
-					name => 'blastAssetInstances',
-					type => 'BlastAssetInstance',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Blast asset instances",
-					},
-				},
-				{
-					name => 'chunks',
-					type => 'Chunk',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Chunks",
-					},
-				},
-				{
-					name => 'bonds',
-					type => 'Bond',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Bonds",
-					},
-				},
-				{
-					name => 'healthMask',
-					type => 'STRING',
-					hints =>
-					{
-						shortDescription => "Health mask file path",
-					},
-				},
-			]
-		},
-		{
-			name => 'FractureGeneral',
-			parameters =>
-			[
-				{
-					name => 'fracturePreset',
-					type => 'STRING',
-					hints => { shortDescription => "Name of fracture preset" },
-				},
-				{
-					name => 'fractureType',
-					type => 'I32',
-					defaultValue => '-1',
-					hints => { shortDescription => "Index of fracture type" },
-				},
-				{
-					name => 'applyMaterial',
-					type => 'I32',
-					defaultValue => '-1',
-					hints => { shortDescription => "Apply material" },
-				},
-				{
-					name => 'autoSelectNewChunks',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints => { shortDescription => "Auto Select New Chunks" },
-				},
-				{
-					name => 'selectionDepthTest',
-					type => 'BOOL',
-					defaultValue => 'true',
-					hints =>
-					{
-						shortDescription => "Selection Depth Test",
-					},
-				},
-			]
-		},
-		{
-			name => 'FractureVisualization',
-			parameters =>
-			[
-				{
-					name => 'fracturePreview',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Show fracture preview",
-					},
-				},
-				{
-					name => 'displayFractureWidget',
-					type => 'BOOL',
-					defaultValue => 'false',
-					hints =>
-					{
-						shortDescription => "Display fracture widget",
-					},
-				},
-			]
-		},
-		{
-			name => 'Voronoi',
-			parameters =>
-			[
-				{
-					name => 'siteGeneration',
-					type => 'I32',
-					defaultValue => '-1',
-					hints => { shortDescription => "Index of site generation" },
-				},
-				{
-					name => 'numSites',
-					type => 'U32',
-					defaultValue => '5',
-					hints => { shortDescription => "Number of generated sites for uniform site generation method" },
-				},
-				{
-					name => 'numberOfClusters',
-					type => 'U32',
-					defaultValue => '1',
-					hints => { shortDescription => "Number of generated clusters" },
-				},
-				{
-					name => 'sitesPerCluster',
-					type => 'U32',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Number of sites in each cluster" },
-				},
-				{
-					name => 'clusterRadius',
-					type => 'F32',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Voronoi cells cluster radius" },
-				},
-			]
-		},
-		{
-			name => 'Slice',
-			parameters =>
-			[
-				{
-					name => 'numSlicesX',
-					type => 'U32',
-					defaultValue => '1',
-					hints => { shortDescription => "Number of slices along X axis" },
-				},
-				{
-					name => 'numSlicesY',
-					type => 'U32',
-					defaultValue => '1',
-					hints => { shortDescription => "Number of slices along Z axis" },
-				},
-				{
-					name => 'numSlicesZ',
-					type => 'U32',
-					defaultValue => '1',
-					hints => { shortDescription => "Number of slices along Z axis" },
-				},
-				{
-					name => 'offsetVariation',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Offset of variation" },
-				},
-				{
-					name => 'rotationVariation',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Rotation of variation" },
-				},
-				{
-					name => 'noiseAmplitude',
-					type => 'F32',
-					defaultValue => '0.0f',
-					hints => { shortDescription => "Noise of amplitude" },
-				},
-				{
-					name => 'noiseFrequency',
-					type => 'F32',
-					defaultValue => '1.0f',
-					hints => { shortDescription => "Noise of frequency" },
-				},
-				{
-					name => 'noiseOctaveNumber',
-					type => 'U32',
-					defaultValue => '1',
-					hints => { shortDescription => "Noise octave number, which declares how many octaves of noise will be summed to form final noise function" },
-				},
-				{
-					name => 'noiseSeed',
-					type => 'U32',
-					defaultValue => '1',
-					hints => { shortDescription => "Noise of seed" },
-				},
-				{
-					name => 'surfaceResolution',
-					type => 'I32',
-					defaultValue => '1',
-					hints => { shortDescription => "Cutting surface resolution" },
-				},
-			]
-		},
-		{
-			name => 'Fracture',
-			parameters =>
-			[
-				{
-					name => 'general',
-					type => 'FractureGeneral',
-				},
-				{
-					name => 'visualization',
-					type => 'FractureVisualization',
-				},
-				{
-					name => 'voronoi',
-					type => 'Voronoi',
-				},
-				{
-					name => 'slice',
-					type => 'Slice',
-				},
-			]
-		},
-		{
-			name => 'Filter',
-			parameters =>
-			[
-				{
-					name => 'activeFilter',
-					type => 'STRING',
-					hints => { shortDescription => "Name of active filter preset" },
-				},
-				{
-					name => 'filterRestrictions',
-					type => 'STRING',
-					isArray => 1,
-					arraySize => '-1',
-					hints =>
-					{
-						shortDescription => "Filter restrictions",
-					},
-				},
-			]
-		},
-	],
-
-	parameters =>
-	[
-		{
-			name => 'camera',
-			type => 'Camera',
-		},
-		{
-			name => 'cameraBookmarks',
-			type => 'CameraBookmark',
-			isArray => 1,
-			arraySize => '-1',
-			hints => { shortDescription => "All camera bookmarks" },
-		},
-		{
-			name => 'lightCamera',
-			type => 'Camera',
-		},
-		{
-			name => 'windCamera',
-			type => 'Camera',
-		},
-		{
-			name => 'graphicsMaterials',
-			type => 'GraphicsMaterial',
-			isArray => 1,
-			arraySize => '-1',
-			hints =>
-			{
-				shortDescription => "Graphics materials",
-			},
-		},
-		{
-			name => 'scene',
-			type => 'Scene',
-		},
-		{
-			name => 'renderer',
-			type => 'Renderer',
-		},
-		{
-			name => 'blast',
-			type => 'Blast',
-		},
-		{
-			name => 'fracture',
-			type => 'Fracture',
-		},
-		{
-			name => 'defaultDamage',
-			type => 'DefaultDamage',
-		},
-		{
-			name => 'filter',
-			type => 'Filter',
-		},
-	]
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Parameters/FoundationHolder.h b/tools/ArtistTools/source/BlastPlugin/Parameters/FoundationHolder.h
deleted file mode 100644
index 5ec7868..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Parameters/FoundationHolder.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "NvErrorCallback.h"
-#include "NsGlobals.h"
-#include "NsVersionNumber.h"
-
-class DefaultErrorCallback : public nvidia::NvErrorCallback
-{
-public:
-	DefaultErrorCallback(void)
-	{
-	}
-
-	virtual void reportError(nvidia::NvErrorCode::Enum code, const char* message, const char* file, int line)
-	{
-		NV_UNUSED(code);
-		printf("PhysX: %s : %s : %d\r\n", message, file, line);
-	}
-private:
-};
-
-class DefaultAllocator : public nvidia::NvAllocatorCallback
-{
-public:
-	DefaultAllocator(void)
-	{
-	}
-
-	~DefaultAllocator(void)
-	{
-	}
-
-	virtual void* allocate(size_t size, const char* typeName, const char* filename, int line)
-	{
-		NV_UNUSED(typeName);
-		NV_UNUSED(filename);
-		NV_UNUSED(line);
-		void *ret = ::_aligned_malloc(size, 16);
-		return ret;
-	}
-
-	virtual void deallocate(void* ptr)
-	{
-		::_aligned_free(ptr);
-	}
-private:
-};
-
-
-#if 0
-class FoundationHolder
-{
-	NvFoundation* mFoundation;
-	FoundationHolder()
-		:mFoundation(nullptr)
-	{
-	}
-
-	~FoundationHolder()
-	{
-		if (mFoundation)
-		{
-			// to-do
-			// we should release foundation. but Hair SDK could release it first.
-			//mFoundation->release();
-			mFoundation = nullptr;
-		}
-	}
-
-public:
-
-	static NvFoundation* GetFoundation()
-	{
-		static FoundationHolder fh;
-		if (fh.mFoundation == nullptr)
-		{
-			static DefaultAllocator sDefaultAllocator;
-			static DefaultErrorCallback sDefaultErrorCallback;
-			fh.mFoundation = NvCreateFoundation(NV_FOUNDATION_VERSION, sDefaultAllocator, sDefaultErrorCallback);
-			assert(fh.mFoundation != nullptr);
-		}
-		return fh.mFoundation;
-	}
-};
-
-#else
-
-class FoundationHolder
-{
-	bool m_isInitialized;
-	public:
-	static void GetFoundation()
-	{
-		static FoundationHolder s_holder;
-		if (!s_holder.m_isInitialized)
-		{
-			static DefaultAllocator sDefaultAllocator;
-			static DefaultErrorCallback sDefaultErrorCallback;
-			nvidia::shdfnd::initializeSharedFoundation(NV_FOUNDATION_VERSION, sDefaultAllocator, sDefaultErrorCallback);
-
-			s_holder.m_isInitialized = true;
-		}
-	}
-	~FoundationHolder()
-	{
-		//nvidia::terminateSharedFoundation();
-	}
-};
-
-#endif
diff --git a/tools/ArtistTools/source/BlastPlugin/Parameters/HackNvParamBug.cpp b/tools/ArtistTools/source/BlastPlugin/Parameters/HackNvParamBug.cpp
deleted file mode 100644
index 5cd0a32..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Parameters/HackNvParamBug.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <string.h>
-#include "BlastProjectParameters.h"
-
-int GetHackElementSize(const char* data)
-{
-	if (strstr(data, "graphicsMesh.materialAssignments") != nullptr)
-		return sizeof(nvidia::parameterized::BlastProjectParametersNS::MaterialAssignments_Type);
-	if (strstr(data, "graphicsMesh.positions") != nullptr)
-		return sizeof(nvidia::NvVec3);
-	if (strstr(data, "graphicsMesh.normals") != nullptr)
-		return sizeof(nvidia::NvVec3);
-	if (strstr(data, "graphicsMesh.tangents") != nullptr)
-		return sizeof(nvidia::NvVec3);
-	if (strstr(data, "graphicsMesh.texcoords") != nullptr)
-		return sizeof(nvidia::NvVec2);
-	if (strstr(data, "graphicsMesh.positionIndexes") != nullptr)
-		return sizeof(int32_t);
-	if (strstr(data, "graphicsMesh.normalIndexes") != nullptr)
-		return sizeof(int32_t);
-	if (strstr(data, "graphicsMesh.texcoordIndexes") != nullptr)
-		return sizeof(int32_t);
-	if (strstr(data, "graphicsMesh.materialIDs") != nullptr)
-		return sizeof(int32_t);
-	if (strstr(data, "filter.filters[0].depthFilters") != nullptr)
-		return sizeof(uint32_t);
-	return 0;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp b/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp
deleted file mode 100644
index 3f97631..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp
+++ /dev/null
@@ -1,3144 +0,0 @@
-// 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-2013 NVIDIA Corporation. All rights reserved.
-
-#include "NvParameterized.h"
-#include "XmlSerializer.h"
-#include "NsFileBuffer.h"
-#include "NvTraits.h"
-#include "NsMemoryBuffer.h"
-
-#include "BlastProjectParameters.h"
-#include "SimpleScene.h"
-#include "ProjectParams.h"
-
-#include "NvErrorCallback.h"
-#include "NsGlobals.h"
-#include "NsVersionNumber.h"
-#include <QtXml\QtXml>
-#include <QtWidgets/QMessageBox>
-#include "AppMainWindow.h"
-#include "FoundationHolder.h"
-#include <limits> 
-#include "BlastSceneTree.h"
-
-using namespace nvidia;
-using namespace nvidia::parameterized;
-using namespace nvidia::parameterized::BlastProjectParametersNS;
-
-struct ProjectParamsContext*	g_projectParamsContext = nullptr;
-const char* USER_PRESET = "UserPreset.userPreset";
-const char* FRACTURE_PRESET = "FracturePreset.fracturePreset";
-const char* FILTER_PRESET = "FilterPreset.filterPreset";
-
-struct ProjectParamsContext
-{
-	//NvFoundation* mFoundation;
-	NvParameterized::Traits* mTraits;
-	BlastProjectParametersFactory* mBlastProjectParametersFactory;
-};
-
-void freeString(NvParameterized::DummyStringStruct& str)
-{
-	delete[] str.buf;
-	str.buf = nullptr;
-}
-
-void freeBlast(BPPGraphicsMesh& data)
-{
-	delete[] data.materialAssignments.buf;
-	data.materialAssignments.buf = nullptr;
-	data.materialAssignments.arraySizes[0] = 0;
-
-	delete[] data.positions.buf;
-	data.positions.buf = nullptr;
-	data.positions.arraySizes[0] = 0;
-
-	delete[] data.normals.buf;
-	data.normals.buf = nullptr;
-	data.normals.arraySizes[0] = 0;
-
-	delete[] data.tangents.buf;
-	data.tangents.buf = nullptr;
-	data.tangents.arraySizes[0] = 0;
-
-	delete[] data.texcoords.buf;
-	data.texcoords.buf = nullptr;
-	data.texcoords.arraySizes[0] = 0;
-
-	delete data.positions.buf;
-	data.positions.buf = nullptr;
-	data.positions.arraySizes[0] = 0;
-
-	delete[] data.positionIndexes.buf;
-	data.positionIndexes.buf = nullptr;
-	data.positionIndexes.arraySizes[0] = 0;
-
-	delete[] data.normalIndexes.buf;
-	data.normalIndexes.buf = nullptr;
-	data.normalIndexes.arraySizes[0] = 0;
-
-	delete[] data.tangentIndexes.buf;
-	data.tangentIndexes.buf = nullptr;
-	data.tangentIndexes.arraySizes[0] = 0;
-
-	delete[] data.texcoordIndexes.buf;
-	data.texcoordIndexes.buf = nullptr;
-	data.texcoordIndexes.arraySizes[0] = 0;
-
-	delete[] data.materialIDs.buf;
-	data.materialIDs.buf = nullptr;
-	data.materialIDs.arraySizes[0] = 0;
-}
-
-void freeBlast(BPPChunk& data)
-{
-	freeString(data.name);
-	freeBlast(data.graphicsMesh);
-}
-
-void freeBlast(BPPBond& data)
-{
-	freeString(data.name);
-}
-
-void freeBlast(BPPAsset& data)
-{
-	freeString(data.name);
-	freeString(data.fbx);
-	freeString(data.obj);
-	freeString(data.llasset);
-	freeString(data.tkasset);
-	freeString(data.bpxa);
-}
-
-void freeBlast(BPPAssetInstance& data)
-{
-	freeString(data.name);
-	freeString(data.exMaterial);
-	freeString(data.inMaterial);
-}
-
-void freeBlast(BPPBlast& data)
-{
-	freeString(data.fileReferences.fbxSourceAsset);
-
-	freeBlast(data.blastAssets);
-	freeBlast(data.blastAssetInstances);
-	freeBlast(data.chunks);
-	freeBlast(data.bonds);
-}
-
-void freeBlast(BPPGraphicsMaterial& data)
-{
-	freeString(data.name);
-	freeString(data.diffuseTextureFilePath);
-	freeString(data.specularTextureFilePath);
-	freeString(data.normalTextureFilePath);
-}
-
-void freeBlast(BPPDefaultDamage& data)
-{
-	delete[] data.damageStructs.buf;
-	data.damageStructs.buf = nullptr;
-	data.damageStructs.arraySizes[0] = 0;
-}
-
-void freeBlast(BPPStringArray& data)
-{
-	for (int i = 0; i < data.arraySizes[0]; ++i)
-	{
-		freeString(data.buf[i]);
-	}
-
-	delete[] data.buf;
-	data.buf = nullptr;
-	data.arraySizes[0] = 0;
-}
-
-void freeBlast(BPPChunkArray& data)
-{
-	for (int i = 0; i < data.arraySizes[0]; ++i)
-	{
-		freeBlast(data.buf[i]);
-	}
-
-	delete[] data.buf;
-	data.buf = nullptr;
-	data.arraySizes[0] = 0;
-}
-
-void freeBlast(BPPBondArray& data)
-{
-	for (int i = 0; i < data.arraySizes[0]; ++i)
-	{
-		freeBlast(data.buf[i]);
-	}
-
-	delete[] data.buf;
-	data.buf = nullptr;
-	data.arraySizes[0] = 0;
-}
-
-void freeBlast(BPPAssetArray& data)
-{
-	for (int i = 0; i < data.arraySizes[0]; ++i)
-	{
-		freeBlast(data.buf[i]);
-	}
-
-	delete[] data.buf;
-	data.buf = nullptr;
-	data.arraySizes[0] = 0;
-}
-
-void freeBlast(BPPAssetInstanceArray& data)
-{
-	for (int i = 0; i < data.arraySizes[0]; ++i)
-	{
-		freeBlast(data.buf[i]);
-	}
-
-	delete[] data.buf;
-	data.buf = nullptr;
-	data.arraySizes[0] = 0;
-}
-
-void freeBlast(BPPGraphicsMaterialArray& data)
-{
-	for (int i = 0; i < data.arraySizes[0]; ++i)
-	{
-		freeBlast(data.buf[i]);
-	}
-
-	delete[] data.buf;
-	data.buf = nullptr;
-	data.arraySizes[0] = 0;
-}
-
-void copy(NvParameterized::DummyStringStruct& dest, const char* source)
-{
-	delete[] dest.buf;
-	dest.buf = nullptr;
-	//dest.isAllocated = false;
-
-	if (source != nullptr)
-	{
-		dest.buf = new char[strlen(source) + 1];
-		strcpy(const_cast<char*>(dest.buf), source);
-		//dest.isAllocated = true;
-	}
-}
-
-void copy(NvParameterized::DummyStringStruct& dest, NvParameterized::DummyStringStruct& source)
-{
-	copy(dest, source.buf);
-}
-
-bool isItemExist(BPPStringArray& dest, const char* item)
-{
-	if (nullptr == item || 0 == strlen(item))
-	{
-		return false;
-	}
-
-	for (int i = 0; i < dest.arraySizes[0]; ++i)
-	{
-		NvParameterized::DummyStringStruct& curItem = dest.buf[i];
-
-		if (nvidia::shdfnd::strcmp(curItem.buf, item) == 0)
-			return true;
-	}
-
-	return false;
-}
-
-void addItem(BPPStringArray& dest, const char* item)
-{
-	if (nullptr == item || 0 == strlen(item))
-	{
-		return;
-	}
-
-	NvParameterized::DummyStringStruct* oldBuf = dest.buf;
-	dest.buf = new NvParameterized::DummyStringStruct[dest.arraySizes[0] + 1];
-	int i = 0;
-	for (; i < dest.arraySizes[0]; ++i)
-	{
-		copy(dest.buf[i], oldBuf[i]);
-	}
-
-	NvParameterized::DummyStringStruct& newItem = dest.buf[i];
-	copy(newItem, item);
-	dest.arraySizes[0] += 1;
-
-	delete[] oldBuf;
-}
-
-void removeItem(BPPStringArray& dest, const char* item)
-{
-	if (!isItemExist(dest, item))
-	{
-		return;
-	}
-
-	NvParameterized::DummyStringStruct* oldBuf = dest.buf;
-	dest.buf = new NvParameterized::DummyStringStruct[dest.arraySizes[0] - 1];
-
-	int index = 0;
-	for (int i = 0; i < dest.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(oldBuf[i].buf, item) != 0)
-		{
-			NvParameterized::DummyStringStruct& newItem = dest.buf[index++];
-			NvParameterized::DummyStringStruct& oldItem = oldBuf[i];
-			copy(newItem, oldItem);
-		}
-	}
-	dest.arraySizes[0] -= 1;
-	delete[] oldBuf;
-}
-
-void copy(BPPStringArray& dest, BPPStringArray& source)
-{
-	{
-		for (int i = 0; i < dest.arraySizes[0]; ++i)
-		{
-			delete[] dest.buf[i].buf;
-		}
-		delete[] dest.buf;
-		dest.buf = nullptr;
-		dest.arraySizes[0] = 0;
-	}
-
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new NvParameterized::DummyStringStruct[source.arraySizes[0]];
-
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			NvParameterized::DummyStringStruct& destItem = dest.buf[i];
-			NvParameterized::DummyStringStruct& sourceItem = source.buf[i];
-
-			destItem.buf = nullptr;
-
-			copy(destItem, sourceItem);
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPGraphicsMaterialArray& dest, BPPGraphicsMaterialArray& source)
-{
-	delete[] dest.buf;
-	dest.buf = nullptr;
-	dest.arraySizes[0] = 0;
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new BPPGraphicsMaterial[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			BPPGraphicsMaterial& destItem = dest.buf[i];
-			BPPGraphicsMaterial& sourceItem = source.buf[i];
-
-			init(destItem);
-
-			copy(destItem, sourceItem);
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPMaterialAssignmentsArray& dest, BPPMaterialAssignmentsArray& source)
-{
-	delete[] dest.buf;
-	dest.buf = nullptr;
-	dest.arraySizes[0] = 0;
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new BPPMaterialAssignments[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			BPPMaterialAssignments& destItem = dest.buf[i];
-			BPPMaterialAssignments& sourceItem = source.buf[i];
-
-			copy(destItem, sourceItem);
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPBookmarkArray& dest, BPPBookmarkArray& source)
-{
-	{
-		int count = dest.arraySizes[0];
-		for (int i = 0; i < count; ++i)
-		{
-			delete[] dest.buf[i].name.buf;
-		}
-		delete[] dest.buf;
-		dest.buf = nullptr;
-		dest.arraySizes[0] = 0;
-	}
-
-	{
-		int count = source.arraySizes[0];
-		dest.arraySizes[0] = count;
-		if (count > 0)
-		{
-			dest.buf = new BPPCameraBookmark[count];
-			for (int i = 0; i < count; ++i)
-			{
-				BPPCameraBookmark& destItem = dest.buf[i];
-				BPPCameraBookmark& sourceItem = source.buf[i];
-
-				destItem.name.buf = nullptr;
-
-				copy(destItem.name, sourceItem.name);
-				destItem.camera = sourceItem.camera;
-			}
-		}
-	}
-}
-
-void copy(BPPLightArray& dest, BPPLightArray& source)
-{
-	delete[] dest.buf;
-	dest.buf = nullptr;
-	dest.arraySizes[0] = 0;
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new BPPLight[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			BPPLight& destItem = dest.buf[i];
-			BPPLight& sourceItem = source.buf[i];
-
-			destItem.name.buf = nullptr;
-
-			copy(destItem.name, sourceItem.name);
-			copy(destItem, sourceItem);
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPChunkArray& dest, BPPChunkArray& source)
-{
-	freeBlast(dest);
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new BPPChunk[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			BPPChunk& destItem = dest.buf[i];
-			BPPChunk& sourceItem = source.buf[i];
-
-			init(destItem);
-
-			copy(destItem, sourceItem);
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPBondArray& dest, BPPBondArray& source)
-{
-	freeBlast(dest);
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new BPPBond[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			BPPBond& destItem = dest.buf[i];
-			BPPBond& sourceItem = source.buf[i];
-
-			init(destItem);
-
-			copy(destItem, sourceItem);
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPAssetArray& dest, BPPAssetArray& source)
-{
-	delete[] dest.buf;
-	dest.buf = nullptr;
-	dest.arraySizes[0] = 0;
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new BPPAsset[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			BPPAsset& destItem = dest.buf[i];
-			BPPAsset& sourceItem = source.buf[i];
-
-			init(destItem);
-
-			copy(destItem, sourceItem);
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPAssetInstanceArray& dest, BPPAssetInstanceArray& source)
-{
-	delete[] dest.buf;
-	dest.buf = nullptr;
-	dest.arraySizes[0] = 0;
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new BPPAssetInstance[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			BPPAssetInstance& destItem = dest.buf[i];
-			BPPAssetInstance& sourceItem = source.buf[i];
-
-			init(destItem);
-
-			copy(destItem, sourceItem);
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPI32Array& dest, BPPI32Array& source)
-{
-	delete[] dest.buf;
-	dest.buf = nullptr;
-	dest.arraySizes[0] = 0;
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new int32_t[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			int32_t& destItem = dest.buf[i];
-			int32_t& sourceItem = source.buf[i];
-
-			destItem = sourceItem;
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPVEC3Array& dest, BPPVEC3Array& source)
-{
-	delete[] dest.buf;
-	dest.buf = nullptr;
-	dest.arraySizes[0] = 0;
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new nvidia::NvVec3[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			nvidia::NvVec3& destItem = dest.buf[i];
-			nvidia::NvVec3& sourceItem = source.buf[i];
-
-			destItem = sourceItem;
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPVEC2Array& dest, BPPVEC2Array& source)
-{
-	delete[] dest.buf;
-	dest.buf = nullptr;
-	dest.arraySizes[0] = 0;
-
-	if (source.arraySizes[0] > 0)
-	{
-		dest.buf = new nvidia::NvVec2[source.arraySizes[0]];
-		for (int i = 0; i < source.arraySizes[0]; ++i)
-		{
-			nvidia::NvVec2& destItem = dest.buf[i];
-			nvidia::NvVec2& sourceItem = source.buf[i];
-
-			destItem = sourceItem;
-		}
-		dest.arraySizes[0] = source.arraySizes[0];
-	}
-}
-
-void copy(BPPLight& dest, BPPLight& source)
-{
-	copy(dest.name, source.name);
-	dest.enable = source.enable;
-	dest.useShadows = source.useShadows;
-	dest.lockToRoot = source.lockToRoot;
-	dest.visualize = source.visualize;
-	dest.type = source.type;
-	dest.shadowMapResolution = source.shadowMapResolution;
-	dest.color = source.color;
-	dest.diffuseColor = source.diffuseColor;
-	dest.ambientColor = source.ambientColor;
-	dest.specularColor = source.specularColor;
-	dest.intensity = source.intensity;
-	dest.distance = source.distance;
-	dest.spotFalloffStart = source.spotFalloffStart;
-	dest.spotFalloffEnd = source.spotFalloffEnd;
-	dest.lightAxisX = source.lightAxisX;
-	dest.lightAxisY = source.lightAxisY;
-	dest.lightAxisZ = source.lightAxisZ;
-	dest.lightPos = source.lightPos;
-}
-
-void copy(BPPGraphicsMaterial& dest, BPPGraphicsMaterial& source)
-{
-	copy(dest.name, source.name);
-	dest.useTextures = source.useTextures;
-	copy(dest.diffuseTextureFilePath, source.diffuseTextureFilePath);
-	copy(dest.specularTextureFilePath, source.specularTextureFilePath);
-	copy(dest.normalTextureFilePath, source.normalTextureFilePath);
-	dest.diffuseColor = source.diffuseColor;
-	dest.specularColor = source.specularColor;
-	dest.specularShininess = source.specularShininess;
-}
-
-void copy(BPPGraphicsMesh& dest, BPPGraphicsMesh& source)
-{
-	copy(dest.materialAssignments, source.materialAssignments);
-	copy(dest.positions, source.positions);
-	copy(dest.normals, source.normals);
-	copy(dest.tangents, source.tangents);
-	copy(dest.texcoords, source.texcoords);
-	dest.vertextCountInFace = source.vertextCountInFace;
-	copy(dest.positionIndexes, source.positionIndexes);
-	copy(dest.normalIndexes, source.normalIndexes);
-	copy(dest.tangentIndexes, source.tangentIndexes);
-	copy(dest.texcoordIndexes, source.texcoordIndexes);
-	copy(dest.materialIDs, source.materialIDs);
-}
-
-void copy(BPPMaterialAssignments& dest, BPPMaterialAssignments& source)
-{
-	dest.libraryMaterialID = source.libraryMaterialID;
-	dest.faceMaterialID = source.faceMaterialID;
-}
-
-void copy(BPPSupportStructure& dest, BPPSupportStructure& source)
-{
-	copy(dest.healthMask, source.healthMask);
-	dest.bondStrength = source.bondStrength;
-	dest.enableJoint = source.enableJoint;
-}
-
-void copy(BPPChunk& dest, BPPChunk& source)
-{
-	dest.ID = source.ID;
-	dest.parentID = source.parentID;
-	copy(dest.name, source.name);
-	dest.asset = source.asset;
-	dest.visible = source.visible;
-	dest.support = source.support;
-	dest.staticFlag = source.staticFlag;
-	copy(dest.graphicsMesh, source.graphicsMesh);
-}
-
-void copy(BPPBond& dest, BPPBond& source)
-{
-	copy(dest.name, source.name);
-	dest.asset = source.asset;
-	dest.visible = source.visible;
-	dest.fromChunk = source.fromChunk;
-	dest.toChunk = source.toChunk;
-	copy(dest.support, source.support);
-}
-
-void copy(BPPRenderer& dest, BPPRenderer& source)
-{
-	dest.renderFps = source.renderFps;
-	dest.frameStartTime = source.frameStartTime;
-	dest.frameEndTime = source.frameEndTime;
-	dest.animationFps = source.animationFps;
-	dest.animate = source.animate;
-	dest.simulate = source.simulate;
-	dest.resetSimulationOnLoop = source.resetSimulationOnLoop;
-	dest.simulationFps = source.simulationFps;
-	dest.showGraphicsMesh = source.showGraphicsMesh;
-	dest.visualizeGrowthMesh = source.visualizeGrowthMesh;
-	dest.visualizeLight = source.visualizeLight;
-	dest.visualizeWind = source.visualizeWind;
-	dest.showStatistics = source.showStatistics;
-	dest.renderStyle = source.renderStyle;
-	dest.colorizeOption = source.colorizeOption;
-	dest.showWireframe = source.showWireframe;
-	dest.lockRootBone = source.lockRootBone;
-	dest.controlTextureOption = source.controlTextureOption;
-	dest.useLighting = source.useLighting;
-	dest.showSkinnedMeshOnly = source.showSkinnedMeshOnly;
-	dest.lightDir = source.lightDir;
-	dest.ambientColor = source.ambientColor;
-	dest.windDir = source.windDir;
-	dest.windStrength = source.windStrength;
-	dest.lightIntensity = source.lightIntensity;
-	dest.gravityDir = source.gravityDir;
-	dest.gravityScale = source.gravityScale;
-
-	copy(dest.textureFilePath, source.textureFilePath);
-	copy(dest.lights, source.lights);
-}
-
-void copy(BPPStressSolver& dest, BPPStressSolver& source)
-{
-	dest.hardness = source.hardness;
-	dest.linearFactor = source.linearFactor;
-	dest.angularFactor = source.angularFactor;
-	dest.bondIterationsPerFrame = source.bondIterationsPerFrame;
-	dest.graphReductionLevel = source.graphReductionLevel;
-}
-
-void copy(BPPAsset& dest, BPPAsset& source)
-{
-	dest.ID = source.ID;
-	copy(dest.name, source.name);
-	dest.visible = source.visible;
-	dest.stressSolver = source.stressSolver;
-	copy(dest.activeUserPreset, source.activeUserPreset);
-	copy(dest.fbx, source.fbx);
-	copy(dest.obj, source.obj);
-	copy(dest.llasset, source.llasset);
-	copy(dest.tkasset, source.tkasset);
-	copy(dest.bpxa, source.bpxa);
-	dest.exportFBX = source.exportFBX;
-	dest.embedFBXCollision = source.embedFBXCollision;
-	dest.exportOBJ = source.exportOBJ;
-	dest.exportLLAsset = source.exportLLAsset;
-	dest.exportTKAsset = source.exportTKAsset;
-	dest.exportBPXA = source.exportBPXA;
-}
-
-void copy(BPPAssetInstance& dest, BPPAssetInstance& source)
-{
-	copy(dest.name, source.name);
-	dest.visible = source.visible;
-	dest.asset = source.asset;
-	dest.transform = source.transform;
-	copy(dest.exMaterial, source.exMaterial);
-	copy(dest.inMaterial, source.inMaterial);
-}
-
-void copy(BPPBlast& dest, BPPBlast& source)
-{
-	copy(dest.fileReferences.fbxSourceAsset, source.fileReferences.fbxSourceAsset);
-
-	copy(dest.blastAssets, source.blastAssets);
-	copy(dest.blastAssetInstances, source.blastAssetInstances);
-	copy(dest.chunks, source.chunks);
-	copy(dest.bonds, source.bonds);
-	copy(dest.healthMask, source.healthMask);
-}
-
-void copy(BPPFractureGeneral& dest, BPPFractureGeneral& source)
-{
-	copy(dest.fracturePreset, source.fracturePreset);
-	dest.fractureType = source.fractureType;
-	dest.applyMaterial = source.applyMaterial;
-	dest.autoSelectNewChunks = source.autoSelectNewChunks;
-	dest.selectionDepthTest = source.selectionDepthTest;
-}
-
-void copy(BPPVoronoi& dest, BPPVoronoi& source)
-{
-	dest.siteGeneration = source.siteGeneration;
-	dest.numSites = source.numSites;
-	dest.numberOfClusters = source.numberOfClusters;
-	dest.sitesPerCluster = source.sitesPerCluster;
-	dest.clusterRadius = source.clusterRadius;
-}
-
-void copy(BPPFracture& dest, BPPFracture& source)
-{
-	copy(dest.general, source.general);
-	dest.visualization = source.visualization;
-	copy(dest.voronoi, source.voronoi);
-	dest.slice = source.slice;
-}
-
-void copy(BPPDefaultDamage& dest, BPPDefaultDamage& source)
-{
-	dest.damageAmount = source.damageAmount;
-	dest.explosiveImpulse = source.explosiveImpulse;
-	dest.stressDamageForce = source.stressDamageForce;
-	dest.damageProfile = source.damageProfile;
-
-	int count = source.damageStructs.arraySizes[0];
-
-	if(dest.damageStructs.buf != nullptr && dest.damageStructs.arraySizes[0] != count)
-	{
-		delete[] dest.damageStructs.buf;
-		dest.damageStructs.buf = nullptr;
-		dest.damageStructs.arraySizes[0] = 0;
-	}
-
-	if (count == 0)
-		return;
-
-	if (dest.damageStructs.buf == nullptr)
-	{
-		dest.damageStructs.buf = new BPPDamageStruct[count];
-		dest.damageStructs.arraySizes[0] = count;
-	}
-
-	for (int i = 0; i < count; ++i)
-	{
-		BPPDamageStruct& destItem = dest.damageStructs.buf[i];
-		BPPDamageStruct& sourceItem = source.damageStructs.buf[i];
-
-		destItem.damageRadius = sourceItem.damageRadius;
-		destItem.continuously = sourceItem.continuously;
-	}
-}
-
-void copy(BPPFilter& dest, BPPFilter& source)
-{
-	copy(dest.activeFilter, source.activeFilter);
-	copy(dest.filterRestrictions, source.filterRestrictions);
-}
-
-void copy(BPParams& dest, BPParams& source)
-{
-	dest.camera = source.camera;
-	copy(dest.cameraBookmarks, source.cameraBookmarks);
-	dest.lightCamera = source.camera;
-	dest.windCamera = source.camera;
-	copy(dest.graphicsMaterials, source.graphicsMaterials);
-	dest.scene = source.scene;
-	copy(dest.renderer, source.renderer);
-	copy(dest.blast, source.blast);
-	copy(dest.fracture, source.fracture);
-	copy(dest.defaultDamage, source.defaultDamage);
-	copy(dest.filter, source.filter);
-}
-
-void merge(BPPAssetArray& dest, BPPAssetArray& source)
-{
-	if (source.arraySizes[0] > 0)
-	{
-		BPPAsset* oriDestArray = dest.buf;
-		int oriCount = dest.arraySizes[0];
-		int srcCount = source.arraySizes[0];
-		dest.buf = new BPPAsset[oriCount + srcCount];
-		int i = 0;
-//		std::map<BPPAsset*, BPPAsset*> changeMap;
-		for (; i < oriCount; ++i)
-		{
-			BPPAsset& destItem = dest.buf[i];
-			BPPAsset& oriItem = oriDestArray[i];
-
-			init(destItem);
-			copy(destItem, oriItem);
-//			changeMap[&oriItem] = &destItem;
-		}
-//		BlastTreeData::ins().refreshProjectDataToNodeMap(changeMap);
-		for (int j = 0; j < srcCount; ++j, ++i)
-		{
-			BPPAsset& destItem = dest.buf[i];
-			BPPAsset& sourceItem = source.buf[j];
-
-			init(destItem);
-			copy(destItem, sourceItem);
-		}
-		for (int m = 0; m < oriCount; ++m)
-		{
-			freeBlast(oriDestArray[m]);
-		}
-		delete[] oriDestArray;
-		dest.arraySizes[0] = oriCount + srcCount;
-	}
-}
-
-void merge(BPPAssetInstanceArray& dest, BPPAssetInstanceArray& source)
-{
-	if (source.arraySizes[0] > 0)
-	{
-		BPPAssetInstance* oriDestArray = dest.buf;
-		int oriCount = dest.arraySizes[0];
-		int srcCount = source.arraySizes[0];
-		dest.buf = new BPPAssetInstance[oriCount + srcCount];
-		int i = 0;
-//		std::map<BPPAssetInstance*, BPPAssetInstance*> changeMap;
-		for (; i < oriCount; ++i)
-		{
-			BPPAssetInstance& destItem = dest.buf[i];
-			BPPAssetInstance& oriItem = oriDestArray[i];
-
-			init(destItem);
-			copy(destItem, oriItem);
-//			changeMap[&oriItem] = &destItem;
-		}
-//		BlastTreeData::ins().refreshProjectDataToNodeMap(changeMap);
-		for (int j = 0; j < srcCount; ++j, ++i)
-		{
-			BPPAssetInstance& destItem = dest.buf[i];
-			BPPAssetInstance& sourceItem = source.buf[j];
-
-			init(destItem);
-			copy(destItem, sourceItem);
-		}
-		for (int m = 0; m < oriCount; ++m)
-		{
-			freeBlast(oriDestArray[m]);
-		}
-		delete[] oriDestArray;
-		dest.arraySizes[0] = oriCount + srcCount;
-	}
-}
-
-void merge(BPPChunkArray& dest, BPPChunkArray& source)
-{
-	if (source.arraySizes[0] > 0)
-	{
-		BPPChunk* oriDestArray = dest.buf;
-		int oriCount = dest.arraySizes[0];
-		int srcCount = source.arraySizes[0];
-		dest.buf = new BPPChunk[oriCount + srcCount];
-		int i = 0;
-		for (; i < oriCount; ++i)
-		{
-			BPPChunk& destItem = dest.buf[i];
-			BPPChunk& oriItem = oriDestArray[i];
-
-			init(destItem);
-			copy(destItem, oriItem);
-		}
-		for (int j = 0; j < srcCount; ++j, ++i)
-		{
-			BPPChunk& destItem = dest.buf[i];
-			BPPChunk& sourceItem = source.buf[j];
-
-			init(destItem);
-			copy(destItem, sourceItem);
-		}
-		for (int m = 0; m < oriCount; ++m)
-		{
-			freeBlast(oriDestArray[m]);
-		}
-		delete[] oriDestArray;
-		dest.arraySizes[0] = oriCount + srcCount;
-	}
-}
-
-void merge(BPPBondArray& dest, BPPBondArray& source)
-{
-	if (source.arraySizes[0] > 0)
-	{
-		BPPBond* oriDestArray = dest.buf;
-		int oriCount = dest.arraySizes[0];
-		int srcCount = source.arraySizes[0];
-		dest.buf = new BPPBond[oriCount + srcCount];
-		int i = 0;
-		for (; i < oriCount; ++i)
-		{
-			BPPBond& destItem = dest.buf[i];
-			BPPBond& oriItem = oriDestArray[i];
-
-			init(destItem);
-			copy(destItem, oriItem);
-		}
-		for (int j = 0; j < srcCount; ++j, ++i)
-		{
-			BPPBond& destItem = dest.buf[i];
-			BPPBond& sourceItem = source.buf[j];
-
-			init(destItem);
-			copy(destItem, sourceItem);
-		}
-		for (int m = 0; m < oriCount; ++m)
-		{
-			freeBlast(oriDestArray[m]);
-		}
-		delete[] oriDestArray;
-		dest.arraySizes[0] = oriCount + srcCount;
-	}
-}
-
-/*
-void apart(BPPAssetArray& dest, BPPAssetArray& source)
-{
-	if (source.arraySizes[0] == 0)
-		return;
-
-	int destCount = dest.arraySizes[0];
-	int srcCount = source.arraySizes[0];
-	std::vector<int> indexes;
-	for (int i = 0; i < destCount; ++i)
-	{
-		bool find = false;
-		for (int j = 0; j < srcCount; ++j)
-		{
-			if (dest.buf[i].ID == source.buf[j].ID)
-			{
-				find = true;
-				break;
-			}
-		}
-
-		if (!find)
-		{
-			indexes.push_back(i);
-		}
-	}
-
-	int newSize = indexes.size();
-	BPPAsset* newArray = nullptr;
-	if (newSize > 0)
-	{
-		newArray = new BPPAsset[newSize];
-		std::map<BPPAsset*, BPPAsset*> changeMap;
-		for (int n = 0; n < newSize; ++n)
-		{
-			BPPAsset& newItem = newArray[n];
-			BPPAsset& oriItem = dest.buf[indexes[n]];
-			init(newItem);
-			copy(newItem, oriItem);
-			changeMap[&oriItem] = &newItem;
-		}
-		BlastTreeData::ins().refreshProjectDataToNodeMap(changeMap);
-	}
-
-	freeBlast(dest);
-	dest.buf = newArray;
-	dest.arraySizes[0] = newSize;
-}
-
-void apart(BPPAssetInstanceArray& dest, BPPAssetInstanceArray& source)
-{
-	if (source.arraySizes[0] == 0)
-		return;
-
-	int destCount = dest.arraySizes[0];
-	int srcCount = source.arraySizes[0];
-	std::vector<int> indexes;
-	for (int i = 0; i < destCount; ++i)
-	{
-		bool find = false;
-		for (int j = 0; j < srcCount; ++j)
-		{
-			if (::strcmp(dest.buf[i].name.buf, source.buf[j].name.buf) == 0
-				&& dest.buf[i].asset == source.buf[j].asset)
-			{
-				find = true;
-				break;
-			}
-		}
-
-		if (!find)
-		{
-			indexes.push_back(i);
-		}
-	}
-
-	int newSize = indexes.size();
-	BPPAssetInstance* newArray = nullptr;
-	if (newSize > 0)
-	{
-		newArray = new BPPAssetInstance[newSize];
-		std::map<BPPAssetInstance*, BPPAssetInstance*> changeMap;
-		for (int n = 0; n < newSize; ++n)
-		{
-			BPPAssetInstance& newItem = newArray[n];
-			BPPAssetInstance& oriItem = dest.buf[indexes[n]];
-			init(newItem);
-			copy(newItem, oriItem);
-			changeMap[&oriItem] = &newItem;
-		}
-		BlastTreeData::ins().refreshProjectDataToNodeMap(changeMap);
-	}
-
-	freeBlast(dest);
-	dest.buf = newArray;
-	dest.arraySizes[0] = newSize;
-}
-
-void apart(BPPChunkArray& dest, BPPChunkArray& source)
-{
-	if (source.arraySizes[0] == 0)
-		return;
-
-	int destCount = dest.arraySizes[0];
-	int srcCount = source.arraySizes[0];
-	std::vector<int> indexes;
-	for (int i = 0; i < destCount; ++i)
-	{
-		bool find = false;
-		for (int j = 0; j < srcCount; ++j)
-		{
-			if (::strcmp(dest.buf[i].name.buf, source.buf[j].name.buf) == 0
-				&& dest.buf[i].asset == source.buf[j].asset)
-			{
-				find = true;
-				break;
-			}
-		}
-
-		if (!find)
-		{
-			indexes.push_back(i);
-		}
-	}
-
-	int newSize = indexes.size();
-	BPPChunk* newArray = nullptr;
-	if (newSize > 0)
-	{
-		newArray = new BPPChunk[newSize];
-
-		for (int n = 0; n < newSize; ++n)
-		{
-			BPPChunk& newItem = newArray[n];
-			init(newItem);
-			copy(newItem, dest.buf[indexes[n]]);
-		}
-	}
-
-	freeBlast(dest);
-	dest.buf = newArray;
-	dest.arraySizes[0] = newSize;
-}
-
-void apart(BPPBondArray& dest, BPPBondArray& source)
-{
-	if (source.arraySizes[0] == 0)
-		return;
-
-	int destCount = dest.arraySizes[0];
-	int srcCount = source.arraySizes[0];
-	std::vector<int> indexes;
-	for (int i = 0; i < destCount; ++i)
-	{
-		bool find = false;
-		for (int j = 0; j < srcCount; ++j)
-		{
-			if (::strcmp(dest.buf[i].name.buf, source.buf[j].name.buf) == 0
-				&& dest.buf[i].asset == source.buf[j].asset)
-			{
-				find = true;
-				break;
-			}
-		}
-
-		if (!find)
-		{
-			indexes.push_back(i);
-		}
-	}
-
-	int newSize = indexes.size();
-	BPPBond* newArray = nullptr;
-	if (newSize > 0)
-	{
-		newArray = new BPPBond[newSize];
-
-		for (int n = 0; n < newSize; ++n)
-		{
-			BPPBond& newItem = newArray[n];
-			init(newItem);
-			copy(newItem, dest.buf[indexes[n]]);
-		}
-	}
-
-	freeBlast(dest);
-	dest.buf = newArray;
-	dest.arraySizes[0] = newSize;
-}
-
-*/
-void apart(BPPAssetArray& dest, int32_t assetId)
-{
-	if (assetId < 0)
-	{
-		return;
-	}
-
-	int destCount = dest.arraySizes[0];
-	std::vector<int> indexes;
-	for (int i = 0; i < destCount; ++i)
-	{
-		if (dest.buf[i].ID == assetId)
-		{
-			continue;
-		}
-
-		indexes.push_back(i);
-	}
-
-	int newSize = indexes.size();
-	BPPAsset* newArray = nullptr;
-	if (newSize > 0)
-	{
-		newArray = new BPPAsset[newSize];
-//		std::map<BPPAsset*, BPPAsset*> changeMap;
-		for (int n = 0; n < newSize; ++n)
-		{
-			BPPAsset& newItem = newArray[n];
-			BPPAsset& oriItem = dest.buf[indexes[n]];
-			init(newItem);
-			copy(newItem, oriItem);
-//			changeMap[&oriItem] = &newItem;
-		}
-//		BlastTreeData::ins().refreshProjectDataToNodeMap(changeMap);
-	}
-
-	freeBlast(dest);
-	dest.buf = newArray;
-	dest.arraySizes[0] = newSize;
-}
-
-void apart(BPPAssetInstanceArray& dest, int32_t assetId)
-{
-	if (assetId < 0)
-	{
-		return;
-	}
-
-	int destCount = dest.arraySizes[0];
-	std::vector<int> indexes;
-	for (int i = 0; i < destCount; ++i)
-	{
-		if (dest.buf[i].asset == assetId)
-		{
-			continue;
-		}
-
-		indexes.push_back(i);
-	}
-
-	int newSize = indexes.size();
-	BPPAssetInstance* newArray = nullptr;
-	if (newSize > 0)
-	{
-		newArray = new BPPAssetInstance[newSize];
-//		std::map<BPPAssetInstance*, BPPAssetInstance*> changeMap;
-		for (int n = 0; n < newSize; ++n)
-		{
-			BPPAssetInstance& newItem = newArray[n];
-			BPPAssetInstance& oriItem = dest.buf[indexes[n]];
-			init(newItem);
-			copy(newItem, oriItem);
-//			changeMap[&oriItem] = &newItem;
-		}
-//		BlastTreeData::ins().refreshProjectDataToNodeMap(changeMap);
-	}
-
-	freeBlast(dest);
-	dest.buf = newArray;
-	dest.arraySizes[0] = newSize;
-}
-
-void apart(BPPAssetInstanceArray& dest, int32_t assetId, const char* instanceName)
-{
-	if (assetId < 0 || instanceName == nullptr)
-	{
-		return;
-	}
-
-	int destCount = dest.arraySizes[0];
-	std::vector<int> indexes;
-	for (int i = 0; i < destCount; ++i)
-	{
-		if (dest.buf[i].asset == assetId &&
-			::strcmp(dest.buf[i].name.buf, instanceName) == 0)
-		{
-			continue;
-		}
-
-		indexes.push_back(i);
-	}
-
-	int newSize = indexes.size();
-	BPPAssetInstance* newArray = nullptr;
-	if (newSize > 0)
-	{
-		newArray = new BPPAssetInstance[newSize];
-//		std::map<BPPAssetInstance*, BPPAssetInstance*> changeMap;
-		for (int n = 0; n < newSize; ++n)
-		{
-			BPPAssetInstance& newItem = newArray[n];
-			BPPAssetInstance& oriItem = dest.buf[indexes[n]];
-			init(newItem);
-			copy(newItem, oriItem);
-//			changeMap[&oriItem] = &newItem;
-		}
-//		BlastTreeData::ins().refreshProjectDataToNodeMap(changeMap);
-	}
-
-	freeBlast(dest);
-	dest.buf = newArray;
-	dest.arraySizes[0] = newSize;
-}
-
-void apart(BPPChunkArray& dest, int32_t assetId)
-{
-	if (assetId < 0)
-	{
-		return;
-	}
-
-	int destCount = dest.arraySizes[0];
-	std::vector<int> indexes;
-	for (int i = 0; i < destCount; ++i)
-	{
-		if (dest.buf[i].asset == assetId)
-		{
-			continue;
-		}
-
-		indexes.push_back(i);
-	}
-
-	int newSize = indexes.size();
-	BPPChunk* newArray = nullptr;
-	if (newSize > 0)
-	{
-		newArray = new BPPChunk[newSize];
-//		std::map<BPPChunk*, BPPChunk*> changeMap;
-		for (int n = 0; n < newSize; ++n)
-		{
-			BPPChunk& newItem = newArray[n];
-			BPPChunk& oriItem = dest.buf[indexes[n]];
-			init(newItem);
-			copy(newItem, oriItem);
-//			changeMap[&oriItem] = &newItem;
-		}
-//		BlastTreeData::ins().refreshProjectDataToNodeMap(changeMap);
-	}
-
-	freeBlast(dest);
-	dest.buf = newArray;
-	dest.arraySizes[0] = newSize;
-}
-
-void apart(BPPBondArray& dest, int32_t assetId)
-{
-	if (assetId < 0)
-	{
-		return;
-	}
-
-	int destCount = dest.arraySizes[0];
-	std::vector<int> indexes;
-	for (int i = 0; i < destCount; ++i)
-	{
-		if (dest.buf[i].asset == assetId)
-		{
-			continue;
-		}
-
-		indexes.push_back(i);
-	}
-
-	int newSize = indexes.size();
-	BPPBond* newArray = nullptr;
-	if (newSize > 0)
-	{
-		newArray = new BPPBond[newSize];
-//		std::map<BPPBond*, BPPBond*> changeMap;
-		for (int n = 0; n < newSize; ++n)
-		{
-			BPPBond& newItem = newArray[n];
-			BPPBond& oriItem = dest.buf[indexes[n]];
-			init(newItem);
-			copy(newItem, oriItem);
-//			changeMap[&oriItem] = &newItem;
-		}
-//		BlastTreeData::ins().refreshProjectDataToNodeMap(changeMap);
-	}
-
-	freeBlast(dest);
-	dest.buf = newArray;
-	dest.arraySizes[0] = newSize;
-}
-
-void init(BPPStressSolver& param)
-{
-	param.hardness = 1000.0f;
-	param.linearFactor = 0.25f;
-	param.angularFactor = 0.75f;
-	param.bondIterationsPerFrame = 18000;
-	param.graphReductionLevel = 3;
-}
-
-void init(BPPGraphicsMaterial& param)
-{
-	param.ID = -1;
-	param.name.buf = nullptr;
-	param.useTextures = false;
-	param.diffuseTextureFilePath.buf = nullptr;
-	param.specularTextureFilePath.buf = nullptr;
-	param.normalTextureFilePath.buf = nullptr;
-	param.specularShininess = 20.0;
-}
-
-void init(BPPGraphicsMesh& param)
-{
-	param.materialAssignments.buf = 0;
-	param.materialAssignments.arraySizes[0];
-
-	param.positions.buf = nullptr;
-	param.positions.arraySizes[0] = 0;
-
-	param.normals.buf = nullptr;
-	param.normals.arraySizes[0] = 0;
-
-	param.tangents.buf = nullptr;
-	param.tangents.arraySizes[0] = 0;
-
-	param.texcoords.buf = nullptr;
-	param.texcoords.arraySizes[0] = 0;
-
-	init<I32_DynamicArray1D_Type>(param.positionIndexes);
-	init<I32_DynamicArray1D_Type>(param.normalIndexes);
-	init<I32_DynamicArray1D_Type>(param.tangentIndexes);
-	init<I32_DynamicArray1D_Type>(param.texcoordIndexes);
-	init<I32_DynamicArray1D_Type>(param.materialIDs);
-}
-
-void init(BPPBond& param)
-{
-	param.name.buf = nullptr;
-	param.asset = -1;
-	param.visible = true;
-	param.support.healthMask.buf = nullptr;
-	param.support.bondStrength = 1.0;
-	param.support.enableJoint = false;
-}
-
-void init(BPPChunk& param)
-{
-	param.name.buf = nullptr;
-	param.asset = -1;
-	param.visible = true;
-
-	init(param.graphicsMesh);
-}
-
-void init(BPPDefaultDamage& param)
-{
-	/*
-	param.compressiveDamage = 1.0f;
-	param.explosiveImpulse = 100.0f;
-	param.damageRadius = 5.0f;
-	param.stressDamageForce = 1.0f;
-	param.damageProfile = 0;
-	*/
-	param.damageStructs.buf = nullptr;
-	param.damageStructs.arraySizes[0] = 0;
-	param.damageProfile = -1;
-}
-
-void init(BPPAsset& param)
-{
-	param.ID = -1;
-	param.name.buf = nullptr;
-	param.activeUserPreset.buf = nullptr;
-	init(param.stressSolver);
-	param.obj.buf = nullptr;
-	param.fbx.buf = nullptr;
-	param.llasset.buf = nullptr;
-	param.tkasset.buf = nullptr;
-	param.bpxa.buf = nullptr;
-	param.exportFBX = false;
-	param.embedFBXCollision = true;
-	param.exportOBJ = false;
-	param.exportLLAsset = false;
-	param.exportTKAsset = false;
-	param.exportBPXA = false;
-}
-
-void init(BPPAssetInstance& param)
-{
-	param.name.buf = nullptr;
-	param.asset = -1;
-	param.visible = true;
-	param.exMaterial.buf = nullptr;
-	param.inMaterial.buf = nullptr;
-}
-
-void init(BPPVoronoi& param)
-{
-	param.siteGeneration = 0;
-	param.numSites = 5;
-	param.numberOfClusters = 1;
-	param.sitesPerCluster = 1.0f;
-	param.clusterRadius = 1.0f;
-}
-
-void init(BPPSlice& param)
-{
-	param.numSlicesX = 1;
-	param.numSlicesY = 1;
-	param.numSlicesZ = 1;
-	param.offsetVariation = 0.0f;
-	param.rotationVariation = 0.0f;
-	param.noiseAmplitude = 0.0f;
-	param.noiseFrequency = 1.0f;
-	param.noiseOctaveNumber = 1;
-	param.noiseSeed = 1;
-	param.surfaceResolution = 1;
-}
-
-void init(BPPFractureVisualization& param)
-{
-	param.displayFractureWidget = false;
-	param.fracturePreview = false;
-}
-
-void init(BPParams& params)
-{
-	//memset(&params, sizeof(BPParams), 0);
-
-	//params.cameraBookmarks.buf = nullptr;
-	//for (int i = 0; i < 4; ++i)
-	//	params.renderer.lights.buf[i].name.buf = 
-}
-
-const char* convertFilterRestrictionToString(EFilterRestriction& restriction)
-{
-	switch (restriction)
-	{
-	case eFilterRestriction_AllDescendants:
-		return "AllDescendants";
-	case eFilterRestriction_AllParents:
-		return "AllParents";
-	case eFilterRestriction_DepthAll:
-		return "DepthAll";
-	case eFilterRestriction_Depth0:
-		return "Depth0";
-	case eFilterRestriction_Depth1:
-		return "Depth1";
-	case eFilterRestriction_Depth2:
-		return "Depth2";
-	case eFilterRestriction_Depth3:
-		return "Depth3";
-	case eFilterRestriction_Depth4:
-		return "Depth4";
-	case eFilterRestriction_Depth5:
-		return "Depth5";
-	case eFilterRestriction_ItemTypeAll:
-		return "ItemTypeAll";
-	case eFilterRestriction_Chunk:
-		return "Chunk";
-	case eFilterRestriction_SupportChunk:
-		return "SupportChunk";
-	case eFilterRestriction_StaticSupportChunk:
-		return "StaticSupportChunk";
-	case eFilterRestriction_Bond:
-		return "Bond";
-	case eFilterRestriction_WorldBond:
-		return "WorldBond";
-	case eFilterRestriction_EqualTo:
-		return "EqualTo";
-	case eFilterRestriction_NotEquaTo:
-		return "NotEqualTo";
-	}
-
-	return "";
-}
-
-EFilterRestriction convertStringToFilterRestriction(const char* restriction)
-{
-	static std::map<std::string, EFilterRestriction> stringRestrictionMap;
-	if (0 == stringRestrictionMap.size())
-	{
-		stringRestrictionMap["AllDescendants"]	= eFilterRestriction_AllDescendants;
-		stringRestrictionMap["AllParents"]		= eFilterRestriction_AllParents;
-		stringRestrictionMap["DepthAll"]		= eFilterRestriction_DepthAll;
-		stringRestrictionMap["Depth0"]			= eFilterRestriction_Depth0;
-		stringRestrictionMap["Depth1"]			= eFilterRestriction_Depth1;
-		stringRestrictionMap["Depth2"]			= eFilterRestriction_Depth2;
-		stringRestrictionMap["Depth3"]			= eFilterRestriction_Depth3;
-		stringRestrictionMap["Depth4"]			= eFilterRestriction_Depth4;
-		stringRestrictionMap["Depth5"]			= eFilterRestriction_Depth5;
-		stringRestrictionMap["ItemTypeAll"]		= eFilterRestriction_ItemTypeAll;
-		stringRestrictionMap["Chunk"]			= eFilterRestriction_Chunk;
-		stringRestrictionMap["SupportChunk"]	= eFilterRestriction_SupportChunk;
-		stringRestrictionMap["StaticSupportChunk"] = eFilterRestriction_StaticSupportChunk;
-		stringRestrictionMap["Bond"]			= eFilterRestriction_Bond;
-		stringRestrictionMap["WorldBond"]		= eFilterRestriction_WorldBond;
-		stringRestrictionMap["EqualTo"]			= eFilterRestriction_EqualTo;
-		stringRestrictionMap["NotEqualTo"]		= eFilterRestriction_NotEquaTo;
-	}
-
-	if (nullptr == restriction || 0 == strlen(restriction))
-		return eFilterRestriction_Invalid;
-
-	for (std::map<std::string, EFilterRestriction>::iterator itr = stringRestrictionMap.begin(); itr != stringRestrictionMap.end(); ++itr)
-	{
-		if (0 == nvidia::shdfnd::stricmp(itr->first.c_str(), restriction))
-			return itr->second;
-	}
-
-	return eFilterRestriction_Invalid;
-}
-
-FilterPreset::FilterPreset(const char* inName)
-{
-	name = inName;
-}
-
-StressSolverUserPreset::StressSolverUserPreset(const char* inName)
-	: name(inName)
-{
-	name = name;
-	init(stressSolver);
-}
-
-FracturePreset::FracturePreset(const char* inName, FractureType inType)
-	: name(inName)
-	, type(inType)
-{
-	init();
-}
-
-void FracturePreset::setType(FractureType inType)
-{
-	type = inType;
-
-	if (eFractureType_Voronoi == type)
-	{
-		BPPVoronoi& voronoi = fracture.voronoi;
-		::init(voronoi);
-	}
-	else if (eFractureType_Slice == type)
-	{
-		BPPSlice& slice = fracture.slice;
-		::init(slice);
-	}
-}
-
-void FracturePreset::init()
-{
-	if (eFractureType_Voronoi == type)
-	{
-		BPPVoronoi& voronoi = fracture.voronoi;
-		::init(voronoi);
-	}
-	else if (eFractureType_Slice == type)
-	{
-		BPPSlice& slice = fracture.slice;
-		::init(slice);
-	}
-
-	::init(visualization);
-}
-
-BlastProject& BlastProject::ins()
-{
-	static BlastProject _ins;
-	return _ins;
-}
-
-BlastProject::~BlastProject()
-{
-	delete[] _projectParams.cameraBookmarks.buf;
-}
-
-void BlastProject::clear()
-{
-	freeBlast(_projectParams.blast);
-	freeBlast(_projectParams.graphicsMaterials);
-	_projectParams.fracture.general.applyMaterial = -1;
-	_projectParams.fracture.general.autoSelectNewChunks = false;
-	_projectParams.fracture.general.selectionDepthTest = true;
-}
-
-std::string BlastProject::getAseetNameByID(int assetID)
-{
-	BPPAssetArray& assetArray = _projectParams.blast.blastAssets;
-	for (int i = 0; i < assetArray.arraySizes[0]; ++i)
-	{
-		if (assetArray.buf[i].ID == assetID)
-			return assetArray.buf[i].name.buf;
-	}
-	return "";
-}
-
-int BlastProject::getAssetIDByName(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return -1;
-
-	BPPAssetArray& assetArray = _projectParams.blast.blastAssets;
-	for (int i = 0; i < assetArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(assetArray.buf[i].name, name) == 0)
-			return assetArray.buf[i].ID;
-	}
-	return -1;
-}
-
-BPPAsset* BlastProject::getAsset(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return nullptr;
-
-	BPPAssetArray& assetArray = _projectParams.blast.blastAssets;
-	for (int i = 0; i < assetArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(assetArray.buf[i].name, name) == 0)
-			return assetArray.buf + i;
-	}
-	return nullptr;
-}
-
-int BlastProject::generateNewAssetID()
-{
-	int id = 0;
-	for (; id < (std::numeric_limits<int>::max)(); ++id)
-	{
-		BPPAssetArray& assetArray = _projectParams.blast.blastAssets;
-		bool find = false;
-
-		if (assetArray.arraySizes[0] == 0)
-			find = false;
-
-		for (int i = 0; i < assetArray.arraySizes[0]; ++i)
-		{
-			if (assetArray.buf[i].ID == id)
-			{
-				find = true;
-				break;
-			}
-		}
-
-		if (!find)
-		{
-			break;
-		}
-	}
-
-	return id;
-}
-
-bool BlastProject::isGraphicsMaterialNameExist(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return false;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		BPPGraphicsMaterial& item = theArray.buf[i];
-		if (nvidia::shdfnd::strcmp(item.name.buf, name) == 0)
-			return true;
-	}
-	return false;
-}
-
-BPPGraphicsMaterial* BlastProject::addGraphicsMaterial(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return nullptr;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-	BPPGraphicsMaterial* oldBuf = theArray.buf;
-	theArray.buf = new BPPGraphicsMaterial[theArray.arraySizes[0] + 1];
-
-	int i = 0;
-	for (; i < theArray.arraySizes[0]; ++i)
-	{
-		BPPGraphicsMaterial& newItem = theArray.buf[i];
-		BPPGraphicsMaterial& oldItem = oldBuf[i];
-		init(newItem);
-		copy(newItem, oldItem);
-	}
-
-	BPPGraphicsMaterial& newItem = theArray.buf[i];
-	init(newItem);
-	copy(newItem.name, name);
-	theArray.arraySizes[0] += 1;
-
-	delete[] oldBuf;
-
-	return &newItem;
-}
-
-void BlastProject::removeGraphicsMaterial(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0 || !isGraphicsMaterialNameExist(name))
-		return;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-	BPPGraphicsMaterial* oldBuf = theArray.buf;
-
-	theArray.buf = new BPPGraphicsMaterial[theArray.arraySizes[0] - 1];
-	int index = 0;
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(oldBuf[i].name.buf, name) != 0)
-		{
-			BPPGraphicsMaterial& newItem = theArray.buf[index++];
-			BPPGraphicsMaterial& oldItem = oldBuf[i];
-			init(newItem);
-			copy(newItem, oldItem);
-		}
-	}
-	theArray.arraySizes[0] -= 1;
-	delete[] oldBuf;
-}
-
-void BlastProject::renameGraphicsMaterial(const char* oldName, const char* newName)
-{
-	if (oldName == nullptr || newName == nullptr)
-		return;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(theArray.buf[i].name.buf, oldName) == 0)
-		{
-			copy(theArray.buf[i].name, newName);
-			return;
-		}
-	}
-}
-
-void BlastProject::reloadDiffuseColor(const char* name, float r, float g, float b, float a)
-{
-	if (name == nullptr)
-		return;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(theArray.buf[i].name.buf, name) == 0)
-		{
-			theArray.buf[i].diffuseColor[0] = r;
-			theArray.buf[i].diffuseColor[1] = g;
-			theArray.buf[i].diffuseColor[2] = b;
-			theArray.buf[i].diffuseColor[3] = a;
-			return;
-		}
-	}
-}
-
-void BlastProject::reloadSpecularColor(const char* name, float r, float g, float b, float a)
-{
-	if (name == nullptr)
-		return;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(theArray.buf[i].name.buf, name) == 0)
-		{
-			theArray.buf[i].specularColor[0] = r;
-			theArray.buf[i].specularColor[1] = g;
-			theArray.buf[i].specularColor[2] = b;
-			theArray.buf[i].specularColor[3] = a;
-			return;
-		}
-	}
-}
-
-void BlastProject::reloadSpecularShininess(const char* name, float specularShininess)
-{
-	if (name == nullptr)
-		return;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(theArray.buf[i].name.buf, name) == 0)
-		{
-			theArray.buf[i].specularShininess = specularShininess;
-			return;
-		}
-	}
-}
-
-void BlastProject::reloadDiffuseTexture(const char* name, const char* diffuseTexture)
-{
-	if (name == nullptr)
-		return;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(theArray.buf[i].name.buf, name) == 0)
-		{
-			copy(theArray.buf[i].diffuseTextureFilePath, diffuseTexture);
-			return;
-		}
-	}
-}
-
-void BlastProject::reloadSpecularTexture(const char* name, const char* specularTexture)
-{
-	if (name == nullptr)
-		return;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(theArray.buf[i].name.buf, name) == 0)
-		{
-			copy(theArray.buf[i].specularTextureFilePath, specularTexture);
-			return;
-		}
-	}
-}
-
-void BlastProject::reloadNormalTexture(const char* name, const char* normalTexture)
-{
-	if (name == nullptr)
-		return;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(theArray.buf[i].name.buf, name) == 0)
-		{
-			copy(theArray.buf[i].normalTextureFilePath, normalTexture);
-			return;
-		}
-	}
-}
-
-void BlastProject::reloadEnvTexture(const char* name, const char* envTexture)
-{
-	// to do
-}
-
-BPPGraphicsMaterial* BlastProject::getGraphicsMaterial(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return nullptr;
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(theArray.buf[i].name.buf, name) == 0)
-		{
-			return &theArray.buf[i];
-		}
-	}
-
-	return nullptr;
-}
-
-std::string BlastProject::generateNewMaterialName(const char* name)
-{
-	std::string nName = "";
-	if (name != nullptr)
-		nName = name;
-
-	char materialName[MAX_PATH];
-
-	BPPGraphicsMaterialArray& theArray = _projectParams.graphicsMaterials;
-	for (int m = 0; ;m++)
-	{
-		sprintf(materialName, "%s_%d", nName.c_str(), m);
-
-		bool exist = false;
-		for (int i = 0; i < theArray.arraySizes[0]; ++i)
-		{
-			BPPGraphicsMaterial& item = theArray.buf[i];
-			if (nvidia::shdfnd::strcmp(item.name.buf, materialName) == 0)
-			{
-				exist = true;
-				break;
-			}
-		}
-		if (!exist)
-		{
-			break;
-		}
-	}
-
-	return materialName;
-}
-
-bool BlastProject::isAssetInstanceNameExist(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return false;
-
-	BPPAssetInstanceArray& theArray = _projectParams.blast.blastAssetInstances;
-
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		BPPAssetInstance& item = theArray.buf[i];
-		if (nvidia::shdfnd::strcmp(item.name.buf, name) == 0)
-			return true;
-	}
-	return false;
-}
-
-int BlastProject::getAssetInstanceCount(int assetID)
-{
-	std::vector<BPPAssetInstance*> instances;
-	getAssetInstances(assetID, instances);
-	return instances.size();
-}
-
-void BlastProject::getAssetInstances(int assetID, std::vector<BPPAssetInstance*>& instances)
-{
-	instances.clear();
-
-	if (assetID < 0)
-	{
-		return;
-	}
-
-	/*
-	assetID may not less than assetArray.arraySizes[0]
-	for example : there is only one asset and its id is two
-
-	BPPAssetArray& assetArray = _projectParams.blast.blastAssets;
-	if (assetID >= assetArray.arraySizes[0])
-	{
-		return;
-	}
-	*/
-
-	BPPAssetInstanceArray& instanceArray = _projectParams.blast.blastAssetInstances;
-	for (int i = 0; i < instanceArray.arraySizes[0]; i++)
-	{
-		BPPAssetInstance& instance = instanceArray.buf[i];
-		if (assetID == instance.asset)
-			instances.push_back(&instance);
-	}
-}
-
-BPPAssetInstance* BlastProject::getAssetInstance(int assetID, int instanceIndex)
-{
-	std::vector<BPPAssetInstance*> instances;
-	getAssetInstances(assetID, instances);
-
-	int instanceSize = instances.size();
-	if (instanceSize == 0 || instanceSize <= instanceIndex)
-	{
-		return nullptr;
-	}
-
-	return instances[instanceIndex];
-}
-
-BPPAssetInstance* BlastProject::getAssetInstance(int assetID, const char* instanceName)
-{
-	std::vector<BPPAssetInstance*> instances;
-	getAssetInstances(assetID, instances);
-
-	int instanceSize = instances.size();
-	if (instanceSize == 0)
-	{
-		return nullptr;
-	}
-
-	BPPAssetInstance* instance = nullptr;
-	for (int is = 0; is < instanceSize; is++)
-	{
-		if (::strcmp(instanceName, instances[is]->name.buf) == 0)
-		{
-			instance = instances[is];
-			break;
-		}
-	}
-	return instance;
-}
-
-BPPAssetInstance* BlastProject::addAssetInstance(int blastAssetIndex, const char* instanceName)
-{
-	if (instanceName == nullptr)
-		return nullptr;
-
-	BPPAssetArray& assetArray = _projectParams.blast.blastAssets;
-	if (blastAssetIndex < 0 && blastAssetIndex > assetArray.arraySizes[0])
-		return nullptr;
-
-	BPPAssetInstanceArray& theArray = _projectParams.blast.blastAssetInstances;
-
-	BPPAssetInstance* oldBuf = theArray.buf;
-	theArray.buf = new BPPAssetInstance[theArray.arraySizes[0] + 1];
-
-	int i = 0;
-	for (; i < theArray.arraySizes[0]; ++i)
-	{
-		BPPAssetInstance& newItem = theArray.buf[i];
-		BPPAssetInstance& oldItem = oldBuf[i];
-
-		init(newItem);
-		copy(newItem, oldItem);
-	}
-
-	BPPAssetInstance& newItem = theArray.buf[i];
-	init(newItem);
-	copy(newItem.name, instanceName);
-	newItem.asset = -1;
-	newItem.visible = true;
-
-	delete[] oldBuf;
-
-	return &newItem;
-}
-
-void BlastProject::removeAssetInstance(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0 || !isAssetInstanceNameExist(name))
-		return;
-
-	BPPAssetInstanceArray& theArray = _projectParams.blast.blastAssetInstances;
-	BPPAssetInstance* oldBuf = theArray.buf;
-
-	theArray.buf = new BPPAssetInstance[theArray.arraySizes[0] - 1];
-	int index = 0;
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(oldBuf[i].name.buf, name) != 0)
-		{
-			BPPAssetInstance& newItem = theArray.buf[index++];
-			BPPAssetInstance& oldItem = oldBuf[i];
-			init(newItem);
-			copy(newItem, oldItem);
-		}
-	}
-	theArray.arraySizes[0] -= 1;
-	delete[] oldBuf;
-}
-
-BPPChunk* BlastProject::getChunk(BPPAsset& asset, int chunkID)
-{
-	BPPChunkArray& chunkArray = _projectParams.blast.chunks;
-
-	int count = chunkArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		BPPChunk& chunk = chunkArray.buf[i];
-		if (chunk.ID == chunkID && chunk.asset == asset.ID)
-			return &chunk;
-	}
-
-	return nullptr;
-}
-
-std::vector<BPPChunk*> BlastProject::getChildrenChunks(BPPAsset& asset, int parentID)
-{
-	std::vector<BPPChunk*> chunks;
-
-	BPPChunkArray& chunkArray = _projectParams.blast.chunks;
-
-	int count = chunkArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		BPPChunk& chunk = chunkArray.buf[i];
-		if (chunk.parentID == parentID && chunk.asset == asset.ID)
-			chunks.push_back(&chunk);
-	}
-
-	return chunks;
-}
-
-std::vector<BPPChunk*> BlastProject::getChildrenChunks(BPPAsset& asset)
-{
-	return getChildrenChunks(asset.ID);
-}
-
-std::vector<BPPChunk*> BlastProject::getChildrenChunks(int assetID)
-{
-	std::vector<BPPChunk*> chunks;
-
-	BPPChunkArray& chunkArray = _projectParams.blast.chunks;
-
-	int count = chunkArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		BPPChunk& chunk = chunkArray.buf[i];
-		if (chunk.asset == assetID)
-			chunks.push_back(&chunk);
-	}
-
-	return chunks;
-}
-
-std::vector<BPPBond*> BlastProject::getBondsByChunk(BPPAsset& asset, int chunkID)
-{
-	std::vector<BPPBond*> bonds;
-	BPPBondArray& bondArray = _projectParams.blast.bonds;
-	int count = bondArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		BPPBond&  bond = bondArray.buf[i];
-		if (bond.asset == asset.ID)
-		{
-			if (bond.fromChunk == chunkID)
-				bonds.push_back(&bond);
-			else if (bond.toChunk == chunkID)
-				bonds.push_back(&bond);
-		}
-	}
-
-	return bonds;
-}
-
-std::vector<BPPBond*> BlastProject::getChildrenBonds(BPPAsset& asset)
-{
-	std::vector<BPPBond*> bonds;
-
-	BPPBondArray& bondArray = _projectParams.blast.bonds;
-
-	int count = bondArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		BPPBond& bond = bondArray.buf[i];
-		if (bond.asset == asset.ID)
-			bonds.push_back(&bond);
-	}
-
-	return bonds;
-}
-
-bool BlastProject::isUserPresetNameExist(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return false;
-
-	for (size_t i = 0; i < _userPresets.size(); ++i)
-	{
-		StressSolverUserPreset& item = _userPresets[i];
-		if (item.name == name)
-			return true;
-	}
-
-	return false;
-}
-
-std::vector<StressSolverUserPreset>& BlastProject::getUserPresets()
-{
-	return _userPresets;
-}
-
-void BlastProject::addUserPreset(const char* name)
-{
-	_userPresets.push_back(StressSolverUserPreset(name));
-}
-
-void BlastProject::saveUserPreset()
-{
-	QString presetFolder = QCoreApplication::applicationDirPath() + "/Preset/";
-	QDir presetDir(presetFolder);
-	QString presetFilePath = presetFolder + USER_PRESET;
-	if (!presetDir.exists())
-	{
-		if (!presetDir.mkdir(presetFolder))
-			return;
-	}
-	QFile file(presetFilePath);
-	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate))
-	{
-		return;
-	}
-	QTextStream out(&file);
-
-	QDomDocument    xmlDoc;
-	QDomElement rootElm = xmlDoc.createElement(QObject::tr("UserPreset"));
-	xmlDoc.appendChild(rootElm);
-
-	for (size_t i = 0; i < _userPresets.size(); ++i)
-	{
-		_saveStressSolverPreset(rootElm, _userPresets[i]);
-	}
-
-	// 4 is count of indent
-	xmlDoc.save(out, 4);
-}
-
-void BlastProject::loadUserPreset()
-{
-	QString presetFilePath = QCoreApplication::applicationDirPath() + "/Preset/" + USER_PRESET;
-
-	QFile file(presetFilePath);
-
-	if (!file.open(QIODevice::ReadOnly))
-	{
-		return;
-	}
-
-	QDomDocument	xmlDoc;
-	if (!xmlDoc.setContent(&file))
-	{
-		file.close();
-		return;
-	}
-	file.close();
-
-	if (xmlDoc.isNull() || xmlDoc.documentElement().tagName() != QObject::tr("UserPreset"))
-	{
-		QMessageBox::warning(&AppMainWindow::Inst(), QObject::tr("Warning"), QObject::tr("The file you selected is empty or not a blast user preset file."));
-		return;
-	}
-
-	QDomNodeList elms = xmlDoc.documentElement().elementsByTagName(QObject::tr("StressSolverPreset"));
-	for (int i = 0; i < elms.count(); ++i)
-	{
-		StressSolverUserPreset preset("");
-		_userPresets.push_back(preset);
-		_loadStressSolverPreset(elms.at(i).toElement(), _userPresets[i]);
-	}
-}
-
-bool BlastProject::isFracturePresetNameExist(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return false;
-
-	for (size_t i = 0; i < _fracturePresets.size(); ++i)
-	{
-		FracturePreset& item = _fracturePresets[i];
-		if (item.name == name)
-			return true;
-	}
-
-	return false;
-}
-
-std::vector<FracturePreset>& BlastProject::getFracturePresets()
-{
-	return _fracturePresets;
-}
-
-void BlastProject::addFracturePreset(const char* name, FractureType type)
-{
-	_fracturePresets.push_back(FracturePreset(name, type));
-}
-
-void BlastProject::saveFracturePreset()
-{
-	QString presetFolder = QCoreApplication::applicationDirPath() + "/Preset/";
-	QDir presetDir(presetFolder);
-	QString presetFilePath = presetFolder + FRACTURE_PRESET;
-	if (!presetDir.exists())
-	{
-		if (!presetDir.mkdir(presetFolder))
-			return;
-	}
-	QFile file(presetFilePath);
-	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate))
-	{
-		return;
-	}
-	QTextStream out(&file);
-
-	QDomDocument    xmlDoc;
-	QDomElement rootElm = xmlDoc.createElement(QObject::tr("FracturePresets"));
-	xmlDoc.appendChild(rootElm);
-
-	for (size_t i = 0; i < _fracturePresets.size(); ++i)
-	{
-		_saveFracturePreset(rootElm, _fracturePresets[i]);
-	}
-
-	// 4 is count of indent
-	xmlDoc.save(out, 4);
-}
-
-void BlastProject::loadFracturePreset()
-{
-	QString presetFilePath = QCoreApplication::applicationDirPath() + "/Preset/" + FRACTURE_PRESET;
-	QFile file(presetFilePath);
-
-	if (!file.open(QIODevice::ReadOnly))
-	{
-		return;
-	}
-
-	QDomDocument	xmlDoc;
-	if (!xmlDoc.setContent(&file))
-	{
-		file.close();
-		return;
-	}
-	file.close();
-
-	if (xmlDoc.isNull() || xmlDoc.documentElement().tagName() != QObject::tr("FracturePresets"))
-	{
-		QMessageBox::warning(&AppMainWindow::Inst(), QObject::tr("Warning"), QObject::tr("The file you selected is empty or not a blast user preset file."));
-		return;
-	}
-
-	QDomNodeList elms = xmlDoc.documentElement().elementsByTagName(QObject::tr("FracturePreset"));
-	for (int i = 0; i < elms.count(); ++i)
-	{
-		FracturePreset preset("", eFractureType_Voronoi);
-		_fracturePresets.push_back(preset);
-		_loadFracturePreset(elms.at(i).toElement(), _fracturePresets[i]);
-	}
-}
-
-bool BlastProject::isFilterPresetNameExist(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return false;
-
-	for (FilterPreset preset : _filterPresets)
-	{
-		if (preset.name == name)
-			return true;
-	}
-
-	return false;
-}
-
-std::vector<FilterPreset>& BlastProject::getFilterPresets()
-{
-	return _filterPresets;
-}
-
-void BlastProject::addFilterPreset(const char* name)
-{
-	if (name == nullptr)
-		return;
-
-	_filterPresets.push_back(FilterPreset(name));
-}
-
-void BlastProject::removeFilterPreset(const char* name)
-{
-	if (name == nullptr || strlen(name) == 0 || !isFilterPresetNameExist(name))
-		return;
-
-	for (std::vector<FilterPreset>::iterator itr = _filterPresets.begin(); itr != _filterPresets.end(); ++itr)
-	{
-		if (itr->name == name)
-		{
-			_filterPresets.erase(itr);
-			return;
-		}
-	}
-}
-
-FilterPreset* BlastProject::getFilterPreset(const char* name)
-{
-	if (name == nullptr)
-		return nullptr;
-
-	for (std::vector<FilterPreset>::iterator itr = _filterPresets.begin(); itr != _filterPresets.end(); ++itr)
-	{
-		if (itr->name == name)
-		{
-			return &(*itr);
-		}
-	}
-
-	return nullptr;
-}
-
-void BlastProject::renameFilterPreset(const char* oldName, const char* newName)
-{
-	if (oldName == nullptr || newName == nullptr)
-		return;
-
-	for (std::vector<FilterPreset>::iterator itr = _filterPresets.begin(); itr != _filterPresets.end(); ++itr)
-	{
-		if (itr->name == oldName)
-		{
-			(*itr).name = newName;
-			return;
-		}
-	}
-}
-
-void BlastProject::addFilterRestriction(const char* filterName, EFilterRestriction restriction)
-{
-	if (filterName == nullptr || strlen(filterName) == 0 || !isFilterPresetNameExist(filterName))
-		return;
-
-	for (std::vector<FilterPreset>::iterator itr = _filterPresets.begin(); itr != _filterPresets.end(); ++itr)
-	{
-		if (itr->name == filterName)
-		{
-			(*itr).filters.push_back(restriction);
-			return;
-		}
-	}
-}
-
-void BlastProject::removeFilterRestriction(const char* filterName, EFilterRestriction restriction)
-{
-	if (filterName == nullptr || strlen(filterName) == 0 || !isFilterPresetNameExist(filterName))
-		return;
-
-	for (std::vector<FilterPreset>::iterator itr = _filterPresets.begin(); itr != _filterPresets.end(); ++itr)
-	{
-		if (itr->name == filterName)
-		{
-			std::vector<EFilterRestriction>& filters = (*itr).filters;
-			filters.erase(std::find(filters.begin(), filters.end(), restriction));
-			return;
-		}
-	}
-}
-
-void BlastProject::saveFilterPreset()
-{
-	QString presetFolder = QCoreApplication::applicationDirPath() + "/Preset/";
-	QDir presetDir(presetFolder);
-	QString presetFilePath = presetFolder + FILTER_PRESET;
-	if (!presetDir.exists())
-	{
-		if (!presetDir.mkdir(presetFolder))
-			return;
-	}
-	QFile file(presetFilePath);
-	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate))
-	{
-		return;
-	}
-	QTextStream out(&file);
-
-	QDomDocument    xmlDoc;
-	QDomElement rootElm = xmlDoc.createElement(QObject::tr("FilterPresets"));
-	xmlDoc.appendChild(rootElm);
-
-	for (size_t i = 0; i < _filterPresets.size(); ++i)
-	{
-		_saveFilterPreset(rootElm, _filterPresets[i]);
-	}
-
-	// 4 is count of indent
-	xmlDoc.save(out, 4);
-}
-
-void BlastProject::loadFilterPreset()
-{
-	QString presetFilePath = QCoreApplication::applicationDirPath() + "/Preset/" + FILTER_PRESET;
-	QFile file(presetFilePath);
-
-	if (!file.open(QIODevice::ReadOnly))
-	{
-		return;
-	}
-
-	QDomDocument	xmlDoc;
-	if (!xmlDoc.setContent(&file))
-	{
-		file.close();
-		return;
-	}
-	file.close();
-
-	if (xmlDoc.isNull() || xmlDoc.documentElement().tagName() != QObject::tr("FilterPresets"))
-	{
-		QMessageBox::warning(&AppMainWindow::Inst(), QObject::tr("Warning"), QObject::tr("The file you selected is empty or not a blast user preset file."));
-		return;
-	}
-
-	QDomNodeList elms = xmlDoc.documentElement().elementsByTagName(QObject::tr("FilterPreset"));
-	for (int i = 0; i < elms.count(); ++i)
-	{
-		FilterPreset preset("");
-		_filterPresets.push_back(preset);
-		_loadFilterPreset(elms.at(i).toElement(), _filterPresets[i]);
-	}
-}
-
-BlastProject::BlastProject()
-{
-	_projectParams.renderer.textureFilePath.buf = nullptr;
-
-	_projectParams.renderer.lights.buf = new BPPLight[4];
-	_projectParams.renderer.lights.arraySizes[0] = 4;
-
-	for (int i = 0; i < 4; ++i)
-	{
-		_projectParams.renderer.lights.buf[i].name.buf = nullptr;
-	}
-
-	_projectParams.blast.fileReferences.fbxSourceAsset.buf = nullptr;
-
-	_projectParams.blast.healthMask.buf = nullptr;
-
-	_projectParams.fracture.general.fracturePreset.buf = nullptr;
-
-	init(_projectParams.fracture.slice);
-	init(_projectParams.fracture.voronoi);
-
-	init(_projectParams.defaultDamage);
-
-	_projectParams.fracture.general.autoSelectNewChunks = false;
-	_projectParams.fracture.general.selectionDepthTest = true;
-}
-
-void BlastProject::_saveStressSolverPreset(QDomElement& parentElm, StressSolverUserPreset& stressSolverUserPreset)
-{
-	QDomElement newElm = parentElm.ownerDocument().createElement(QObject::tr("StressSolverPreset"));
-	parentElm.appendChild(newElm);
-	newElm.setAttribute(QObject::tr("Name"), stressSolverUserPreset.name.c_str());
-	_saveStressSolver(newElm, stressSolverUserPreset.stressSolver);
-}
-
-void BlastProject::_saveStressSolver(QDomElement& parentElm, BPPStressSolver& stressSolver)
-{
-	QDomElement newElm = parentElm.ownerDocument().createElement(QObject::tr("StressSolver"));
-	parentElm.appendChild(newElm);
-	newElm.setAttribute(QObject::tr("Hardness"), stressSolver.hardness);
-	newElm.setAttribute(QObject::tr("LinearFactor"), stressSolver.linearFactor);
-	newElm.setAttribute(QObject::tr("AngularFactor"), stressSolver.angularFactor);
-	newElm.setAttribute(QObject::tr("BondIterationsPerFrame"), stressSolver.bondIterationsPerFrame);
-	newElm.setAttribute(QObject::tr("GraphReductionLevel"), stressSolver.graphReductionLevel);
-}
-
-void BlastProject::_loadStressSolverPreset(QDomElement& parentElm, StressSolverUserPreset& stressSolverUserPreset)
-{
-	stressSolverUserPreset.name = parentElm.attribute(QObject::tr("Name")).toUtf8().data();
-
-	QDomElement stressSolverElm = parentElm.firstChildElement(QObject::tr("StressSolver"));
-	_loadStressSolver(stressSolverElm, stressSolverUserPreset.stressSolver);
-}
-
-void BlastProject::_loadStressSolver(QDomElement& parentElm, BPPStressSolver& stressSolver)
-{
-	stressSolver.hardness = parentElm.attribute(QObject::tr("Hardness")).toFloat();
-	stressSolver.linearFactor = parentElm.attribute(QObject::tr("LinearFactor")).toFloat();
-	stressSolver.angularFactor = parentElm.attribute(QObject::tr("AngularFactor")).toFloat();
-	stressSolver.bondIterationsPerFrame = parentElm.attribute(QObject::tr("BondIterationsPerFrame")).toUInt();
-	stressSolver.graphReductionLevel = parentElm.attribute(QObject::tr("GraphReductionLevel")).toUInt();
-}
-
-void BlastProject::_saveFracturePreset(QDomElement& parentElm, FracturePreset& fracturePreset)
-{
-	QDomElement newElm = parentElm.ownerDocument().createElement(QObject::tr("FracturePreset"));
-	parentElm.appendChild(newElm);
-	newElm.setAttribute(QObject::tr("Name"), fracturePreset.name.c_str());
-
-	if (eFractureType_Voronoi == fracturePreset.type)
-	{
-		_saveFracture(newElm, fracturePreset.fracture.voronoi);
-	}
-	else if (eFractureType_Slice == fracturePreset.type)
-	{
-		_saveFracture(newElm, fracturePreset.fracture.slice);
-	}
-
-	QDomElement visualizationElm = parentElm.ownerDocument().createElement(QObject::tr("Visualization"));
-	newElm.appendChild(visualizationElm);
-	visualizationElm.setAttribute(QObject::tr("FracturePreview"), fracturePreset.visualization.fracturePreview);
-	visualizationElm.setAttribute(QObject::tr("DisplayFractureWidget"), fracturePreset.visualization.displayFractureWidget);
-}
-
-void BlastProject::_saveFracture(QDomElement& parentElm, BPPVoronoi& voronoi)
-{
-	QDomElement newElm = parentElm.ownerDocument().createElement(QObject::tr("Voronoi"));
-	parentElm.appendChild(newElm);
-	newElm.setAttribute(QObject::tr("SiteGeneration"), voronoi.siteGeneration);
-	newElm.setAttribute(QObject::tr("NumSites"), voronoi.numSites);
-	newElm.setAttribute(QObject::tr("NumberOfClusters"), voronoi.numberOfClusters);
-	newElm.setAttribute(QObject::tr("SitesPerCluster"), voronoi.sitesPerCluster);
-	newElm.setAttribute(QObject::tr("ClusterRadius"), voronoi.clusterRadius);
-}
-
-void BlastProject::_saveFracture(QDomElement& parentElm, BPPSlice& slice)
-{
-	QDomElement newElm = parentElm.ownerDocument().createElement(QObject::tr("Slice"));
-	parentElm.appendChild(newElm);
-	newElm.setAttribute(QObject::tr("NumSlicesX"), slice.numSlicesX);
-	newElm.setAttribute(QObject::tr("NumSlicesY"), slice.numSlicesY);
-	newElm.setAttribute(QObject::tr("NumSlicesZ"), slice.numSlicesZ);
-	newElm.setAttribute(QObject::tr("OffsetVariation"), slice.offsetVariation);
-	newElm.setAttribute(QObject::tr("RotationVariation"), slice.rotationVariation);
-	newElm.setAttribute(QObject::tr("NoiseAmplitude"), slice.noiseAmplitude);
-	newElm.setAttribute(QObject::tr("NoiseFrequency"), slice.noiseFrequency);
-	newElm.setAttribute(QObject::tr("NoiseOctaveNumber"), slice.noiseOctaveNumber);
-	newElm.setAttribute(QObject::tr("NoiseSeed"), slice.noiseSeed);
-	newElm.setAttribute(QObject::tr("SurfaceResolution"), slice.surfaceResolution);
-}
-
-void BlastProject::_loadFracturePreset(QDomElement& parentElm, FracturePreset& fracturePreset)
-{
-	fracturePreset.name = parentElm.attribute(QObject::tr("Name")).toUtf8().data();
-
-	QDomElement elm = parentElm.firstChildElement(QObject::tr("Voronoi"));
-	if (!elm.isNull())
-	{
-		fracturePreset.type = eFractureType_Voronoi;
-		_loadFracture(elm, fracturePreset.fracture.voronoi);
-	}
-	elm = parentElm.firstChildElement(QObject::tr("Slice"));
-	if (!elm.isNull())
-	{
-		fracturePreset.type = eFractureType_Slice;
-		_loadFracture(elm, fracturePreset.fracture.slice);
-	}
-
-	elm = parentElm.firstChildElement(QObject::tr("Visualization"));
-	if (!elm.isNull())
-	{
-		/*
-		std::string str0 = parentElm.attribute(QObject::tr("FracturePreview")).toStdString();
-		std::string str1 = parentElm.attribute(QObject::tr("DisplayFractureWidget")).toStdString();
-		uint val0 = parentElm.attribute(QObject::tr("FracturePreview")).toUInt();
-		uint val1 = parentElm.attribute(QObject::tr("DisplayFractureWidget")).toUInt();
-		*/
-		fracturePreset.visualization.fracturePreview = elm.attribute(QObject::tr("FracturePreview")).toUInt();
-		fracturePreset.visualization.displayFractureWidget = elm.attribute(QObject::tr("DisplayFractureWidget")).toUInt();
-	}
-}
-
-void BlastProject::_loadFracture(QDomElement& parentElm, BPPVoronoi& voronoi)
-{
-	voronoi.siteGeneration = parentElm.attribute(QObject::tr("SiteGeneration")).toInt();
-	voronoi.numSites = parentElm.attribute(QObject::tr("NumSites")).toUInt();
-	voronoi.numberOfClusters = parentElm.attribute(QObject::tr("NumberOfClusters")).toUInt();
-	voronoi.sitesPerCluster = parentElm.attribute(QObject::tr("SitesPerCluster")).toFloat();
-	voronoi.clusterRadius = parentElm.attribute(QObject::tr("ClusterRadius")).toFloat();
-}
-
-void BlastProject::_loadFracture(QDomElement& parentElm, BPPSlice& slice)
-{
-	slice.numSlicesX = parentElm.attribute(QObject::tr("NumSlicesX")).toUInt();
-	slice.numSlicesY = parentElm.attribute(QObject::tr("NumSlicesY")).toUInt();
-	slice.numSlicesZ = parentElm.attribute(QObject::tr("NumSlicesZ")).toUInt();
-	slice.offsetVariation = parentElm.attribute(QObject::tr("OffsetVariation")).toFloat();
-	slice.rotationVariation = parentElm.attribute(QObject::tr("RotationVariation")).toFloat();
-	slice.noiseAmplitude = parentElm.attribute(QObject::tr("NoiseAmplitude")).toFloat();
-	slice.noiseFrequency = parentElm.attribute(QObject::tr("NoiseFrequency")).toFloat();
-	slice.noiseOctaveNumber = parentElm.attribute(QObject::tr("NoiseOctaveNumber")).toUInt();
-	slice.noiseSeed = parentElm.attribute(QObject::tr("NoiseSeed")).toUInt();
-	slice.surfaceResolution = parentElm.attribute(QObject::tr("SurfaceResolution")).toUInt();
-}
-
-void BlastProject::_saveFilterPreset(QDomElement& parentElm, FilterPreset& filterPreset)
-{
-	QDomElement newElm = parentElm.ownerDocument().createElement(QObject::tr("FilterPreset"));
-	parentElm.appendChild(newElm);
-	newElm.setAttribute(QObject::tr("Name"), filterPreset.name.c_str());
-
-	for (EFilterRestriction restriction : filterPreset.filters)
-		_saveRestriction(newElm, restriction);
-}
-
-void BlastProject::_saveRestriction(QDomElement& parentElm, EFilterRestriction& restriction)
-{
-	QDomElement newElm = parentElm.ownerDocument().createElement(QObject::tr("Restriction"));
-	parentElm.appendChild(newElm);
-	newElm.setAttribute(QObject::tr("Value"), convertFilterRestrictionToString(restriction));
-}
-
-void BlastProject::_loadFilterPreset(QDomElement& parentElm, FilterPreset& filterPreset)
-{
-	filterPreset.name = parentElm.attribute(QObject::tr("Name")).toUtf8().data();
-
-	QDomNodeList nodeList = parentElm.childNodes();
-	for (int i = 0; i < nodeList.count(); ++i)
-	{
-		QDomNode& node = nodeList.at(i);
-		QDomElement elm = node.toElement();
-		if (elm.isNull() || elm.nodeName() != "Restriction")
-			continue;
-
-		EFilterRestriction restriction;
-		_loadRestriction(elm, restriction);
-		filterPreset.filters.push_back(restriction);
-	}
-}
-
-void BlastProject::_loadRestriction(QDomElement& parentElm, EFilterRestriction& restriction)
-{
-	restriction = (EFilterRestriction)(convertStringToFilterRestriction(parentElm.attribute(QObject::tr("Value")).toUtf8().data()));
-}
-
-void BlastProject::_addStringItem(BPPStringArray& theArray, const char* name)
-{
-	if (name == nullptr)
-		return;
-
-	NvParameterized::DummyStringStruct* oldBuf = theArray.buf;
-	theArray.buf = new NvParameterized::DummyStringStruct[theArray.arraySizes[0] + 1];
-
-	int i = 0;
-	for (; i < theArray.arraySizes[0]; ++i)
-	{
-		NvParameterized::DummyStringStruct& newItem = theArray.buf[i];
-		NvParameterized::DummyStringStruct& oldItem = oldBuf[i];
-		newItem.buf = nullptr;
-		copy(newItem, oldItem);
-	}
-
-	NvParameterized::DummyStringStruct& newItem = theArray.buf[i];
-	newItem.buf = nullptr;
-	copy(newItem, name);
-	theArray.arraySizes[0] += 1;
-
-	delete[] oldBuf;
-}
-
-void BlastProject::_removeStringItem(BPPStringArray& theArray, const char* name)
-{
-	if (name == nullptr || strlen(name) == 0)
-		return;
-
-	bool nameExist = false;
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		NvParameterized::DummyStringStruct& item = theArray.buf[i];
-		if (nvidia::shdfnd::strcmp(item.buf, name) == 0)
-		{
-			nameExist = true;
-			break;
-		}
-	}
-
-	if (!nameExist)
-		return;
-
-	NvParameterized::DummyStringStruct* oldBuf = theArray.buf;
-
-	theArray.buf = new NvParameterized::DummyStringStruct[theArray.arraySizes[0] - 1];
-	int index = 0;
-	for (int i = 0; i < theArray.arraySizes[0]; ++i)
-	{
-		if (nvidia::shdfnd::strcmp(oldBuf[i].buf, name) != 0)
-		{
-			NvParameterized::DummyStringStruct& newItem = theArray.buf[index++];
-			NvParameterized::DummyStringStruct& oldItem = oldBuf[i];
-			newItem.buf = nullptr;
-			copy(newItem, oldItem);
-		}
-	}
-	theArray.arraySizes[0] -= 1;
-	delete[] oldBuf;
-}
-
-static bool LoadParamVec2Array(NvParameterized::Interface* iface,
-                               const char* paramName,
-                               nvidia::NvVec2** outValue)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		int arraySize;
-		handle.getArraySize(arraySize);
-		*outValue = new nvidia::NvVec2[arraySize];
-		handle.getParamVec2Array((nvidia::NvVec2*)*outValue, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool LoadParamVec3Array(NvParameterized::Interface* iface,
-                               const char* paramName,
-                               nvidia::NvVec3** outValue)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		int arraySize;
-		handle.getArraySize(arraySize);
-		*outValue = new nvidia::NvVec3[arraySize];
-		handle.getParamVec3Array((nvidia::NvVec3*)*outValue, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool LoadParamVec4Array(NvParameterized::Interface* iface,
-                               const char* paramName,
-                               nvidia::NvVec4** outValue)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		int arraySize;
-		handle.getArraySize(arraySize);
-		*outValue = new nvidia::NvVec4[arraySize];
-		handle.getParamVec4Array((nvidia::NvVec4*)*outValue, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool LoadParamU8Array(NvParameterized::Interface* iface,
-                             const char* paramName,
-                             NvUInt8** outValue)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		int arraySize;
-		handle.getArraySize(arraySize);
-		*outValue = new NvUInt8[arraySize];
-		handle.getParamU8Array((NvUInt8*)*outValue, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool LoadParamU32Array(NvParameterized::Interface* iface,
-                              const char* paramName,
-                              NvUInt32** outValue)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		int arraySize;
-		handle.getArraySize(arraySize);
-		*outValue = new NvUInt32[arraySize];
-		handle.getParamU32Array((NvUInt32*)*outValue, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool LoadParamString(NvParameterized::Interface* iface,
-                            const char* paramName,
-                            char* outString)
-{
-	if (outString == NV_NULL)
-	{
-		return false;
-	}
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		const char* var;
-		handle.getParamString(var);
-		if (var)
-		{
-			strcpy(outString, var);
-		}
-		else
-		{
-			outString[0] = '\0';
-		}
-		return true;
-	}
-	return false;
-}
-
-static bool SaveParamVec2Array(NvParameterized::Interface* iface,
-                               const char* paramName,
-                               const nvidia::NvVec2* value,
-                               int arraySize)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		handle.resizeArray(arraySize);
-		handle.setParamVec2Array((nvidia::NvVec2*)value, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool SaveParamVec3Array(NvParameterized::Interface* iface,
-                               const char* paramName,
-                               const nvidia::NvVec3* value,
-                               int arraySize)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		handle.resizeArray(arraySize);
-		handle.setParamVec3Array((nvidia::NvVec3*)value, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool SaveParamVec4Array(NvParameterized::Interface* iface,
-                               const char* paramName,
-                               const nvidia::NvVec4* value,
-                               int arraySize)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		handle.resizeArray(arraySize);
-		handle.setParamVec4Array((nvidia::NvVec4*)value, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool SaveParamU8Array(NvParameterized::Interface* iface,
-                             const char* paramName,
-                             const NvUInt8* value,
-                             int arraySize)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		handle.resizeArray(arraySize);
-		handle.setParamU8Array((NvUInt8*)value, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool SaveParamU32Array(NvParameterized::Interface* iface,
-                              const char* paramName,
-                              const NvUInt32* value,
-                              int arraySize)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		handle.resizeArray(arraySize);
-		handle.setParamU32Array((NvUInt32*)value, arraySize);
-		return true;
-	}
-	return false;
-}
-
-static bool SaveParamString(NvParameterized::Interface* iface,
-                            const char* paramName,
-                            const char* inString)
-{
-	NvParameterized::Handle handle(iface);
-	if (iface->getParameterHandle(paramName, handle) == NvParameterized::ERROR_NONE)
-	{
-		handle.setParamString(inString);
-		return true;
-	}
-	return false;
-}
-
-bool CreateProjectParamsContext()
-{
-	FoundationHolder::GetFoundation();
-
-	ProjectParamsContext* context = new ProjectParamsContext;
-	g_projectParamsContext = context;
-	if (context == nullptr)
-		return false;
-
-	//context->mFoundation = FoundationHolder::GetFoundation();
-	//assert(context->mFoundation != NV_NULL);
-	context->mTraits = NvParameterized::createTraits();
-	context->mBlastProjectParametersFactory = new BlastProjectParametersFactory;
-	context->mTraits->registerFactory(*context->mBlastProjectParametersFactory);
-	return true;
-}
-
-void ReleaseProjectParamsContext()
-{
-	g_projectParamsContext->mTraits->release();
-	delete g_projectParamsContext->mBlastProjectParametersFactory;
-	delete g_projectParamsContext;
-}
-
-bool ProjectParamsLoad(const char* filePath,
-                       SimpleScene* scene)
-{
-	if (g_projectParamsContext == NV_NULL) return false;
-	NvFileBuf* stream = new NvFileBufferBase(filePath, NvFileBuf::OPEN_READ_ONLY);
-	if (!stream || !stream->isOpen())
-	{
-		// file open error
-		if (stream) stream->release();
-		return false;
-	}
-	NvParameterized::Serializer::DeserializedData data;
-	NvParameterized::Serializer::ErrorType serError = NvParameterized::Serializer::ERROR_NONE;
-	NvParameterized::XmlSerializer serializer(g_projectParamsContext->mTraits);
-	bool isUpdated;
-	serError = serializer.deserialize(*stream, data, isUpdated);
-	if (data.size() < 1)
-	{
-		if (stream) stream->release();
-		return false;
-	}
-
-//	scene->Clear();
-
-	for (int idx = 0; idx < (int)data.size(); ++idx) {
-		NvParameterized::Interface* iface = data[idx];
-		if (::strcmp(iface->className(), BlastProjectParameters::staticClassName()) == 0)
-		{
-			scene->LoadParameters(iface);
-		}
-	}
-	stream->release();
-	return true;
-}
-
-bool ProjectParamsSave(const char* filePath,
-                       SimpleScene* scene)
-{
-	if (g_projectParamsContext == NV_NULL) return false;
-	NvParameterized::XmlSerializer serializer(g_projectParamsContext->mTraits);
-	NvFileBuf* stream = new NvFileBufferBase(filePath, NvFileBuf::OPEN_WRITE_ONLY);
-	if (!stream || !stream->isOpen())
-	{
-		// file open error
-		if (stream) stream->release();
-		return false;
-	}
-	NvParameterized::Traits* traits = g_projectParamsContext->mTraits;
-	int numObjects = 0;
-	const int kMaxObjects = 1;
-	NvParameterized::Interface* objects[kMaxObjects];
-	
-	if (1)
-	{
-		BlastProjectParameters* params = new BlastProjectParameters(traits);
-		objects[numObjects++] = params;
-		NvParameterized::Interface* iface = static_cast<NvParameterized::Interface*>(params);
-		scene->SaveParameters(iface);
-	}
-
-	NV_ASSERT(numObjects <= kMaxObjects);
-	NvParameterized::Serializer::ErrorType serError = NvParameterized::Serializer::ERROR_NONE;
-	bool isUpdate = false;
-	serError = serializer.serialize(*stream, (const NvParameterized::Interface**)&objects[0], numObjects, isUpdate);
-	//for (int idx = 0; idx < numObjects; ++idx)
-	//{
-	//	delete objects[idx];
-	//}
-	stream->release();
-	return true;
-}
-
-// Utility function to get the child parameter handle from the parent handle.
-bool ParamGetChild(NvParameterized::Handle& parentHandle, NvParameterized::Handle& outChildHandle, const char* childName)
-{
-	if (parentHandle.getChildHandle(parentHandle.getInterface(), childName, outChildHandle) == NvParameterized::ERROR_NONE)
-	{
-		return true;
-	}
-	return false;
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.h b/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.h
deleted file mode 100644
index cfc0b7f..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.h
+++ /dev/null
@@ -1,305 +0,0 @@
-#pragma once
-
-#include "BlastProjectParameters.h"
-#include <QtCore/QVector>
-#include <set>
-class QDomElement;
-
-typedef nvidia::parameterized::BlastProjectParametersNS::ParametersStruct BPParams;
-typedef nvidia::parameterized::BlastProjectParametersNS::GraphicsMaterial_Type BPPGraphicsMaterial;
-typedef nvidia::parameterized::BlastProjectParametersNS::MaterialAssignments_Type BPPMaterialAssignments;
-typedef nvidia::parameterized::BlastProjectParametersNS::GraphicsMesh_Type BPPGraphicsMesh;
-typedef nvidia::parameterized::BlastProjectParametersNS::Light_Type BPPLight;
-typedef nvidia::parameterized::BlastProjectParametersNS::Camera_Type BPPCamera;
-typedef nvidia::parameterized::BlastProjectParametersNS::CameraBookmark_Type BPPCameraBookmark;
-typedef nvidia::parameterized::BlastProjectParametersNS::Scene_Type BPPScene;
-typedef nvidia::parameterized::BlastProjectParametersNS::Renderer_Type BPPRenderer;
-typedef nvidia::parameterized::BlastProjectParametersNS::BlastFileReferences_Type BPPFileReferences;
-typedef nvidia::parameterized::BlastProjectParametersNS::StressSolver_Type BPPStressSolver;
-typedef nvidia::parameterized::BlastProjectParametersNS::SupportStructure_Type BPPSupportStructure;
-typedef nvidia::parameterized::BlastProjectParametersNS::Bond_Type BPPBond;
-typedef nvidia::parameterized::BlastProjectParametersNS::Chunk_Type BPPChunk;
-typedef nvidia::parameterized::BlastProjectParametersNS::DamageStruct_Type BPPDamageStruct;
-typedef nvidia::parameterized::BlastProjectParametersNS::DefaultDamage_Type BPPDefaultDamage;
-typedef nvidia::parameterized::BlastProjectParametersNS::BlastAsset_Type BPPAsset;
-typedef nvidia::parameterized::BlastProjectParametersNS::BlastAssetInstance_Type BPPAssetInstance;
-typedef nvidia::parameterized::BlastProjectParametersNS::Blast_Type BPPBlast;
-typedef nvidia::parameterized::BlastProjectParametersNS::FractureGeneral_Type BPPFractureGeneral;
-typedef nvidia::parameterized::BlastProjectParametersNS::FractureVisualization_Type BPPFractureVisualization;
-typedef nvidia::parameterized::BlastProjectParametersNS::Voronoi_Type BPPVoronoi;
-typedef nvidia::parameterized::BlastProjectParametersNS::Slice_Type BPPSlice;
-typedef nvidia::parameterized::BlastProjectParametersNS::Fracture_Type BPPFracture;
-typedef nvidia::parameterized::BlastProjectParametersNS::Filter_Type BPPFilter;
-
-typedef nvidia::parameterized::BlastProjectParametersNS::CameraBookmark_DynamicArray1D_Type BPPBookmarkArray;
-typedef nvidia::parameterized::BlastProjectParametersNS::STRING_DynamicArray1D_Type BPPStringArray;
-typedef nvidia::parameterized::BlastProjectParametersNS::GraphicsMaterial_DynamicArray1D_Type BPPGraphicsMaterialArray;
-typedef nvidia::parameterized::BlastProjectParametersNS::MaterialAssignments_DynamicArray1D_Type BPPMaterialAssignmentsArray;
-typedef nvidia::parameterized::BlastProjectParametersNS::Light_DynamicArray1D_Type BPPLightArray;
-typedef nvidia::parameterized::BlastProjectParametersNS::Chunk_DynamicArray1D_Type BPPChunkArray;
-typedef nvidia::parameterized::BlastProjectParametersNS::Bond_DynamicArray1D_Type BPPBondArray;
-typedef nvidia::parameterized::BlastProjectParametersNS::BlastAsset_DynamicArray1D_Type BPPAssetArray;
-typedef nvidia::parameterized::BlastProjectParametersNS::BlastAssetInstance_DynamicArray1D_Type BPPAssetInstanceArray;
-typedef nvidia::parameterized::BlastProjectParametersNS::I32_DynamicArray1D_Type BPPI32Array;
-typedef nvidia::parameterized::BlastProjectParametersNS::VEC3_DynamicArray1D_Type BPPVEC3Array;
-typedef nvidia::parameterized::BlastProjectParametersNS::VEC2_DynamicArray1D_Type BPPVEC2Array;
-
-void freeString(NvParameterized::DummyStringStruct& str);
-void freeBlast(BPPGraphicsMesh& data);
-void freeBlast(BPPChunk& data);
-void freeBlast(BPPBond& data);
-void freeBlast(BPPAsset& data);
-void freeBlast(BPPAssetInstance& data);
-void freeBlast(BPPBlast& data);
-void freeBlast(BPPGraphicsMaterial& data);
-void freeBlast(BPPDefaultDamage& data);
-
-void freeBlast(BPPStringArray& data);
-void freeBlast(BPPChunkArray& data);
-void freeBlast(BPPBondArray& data);
-void freeBlast(BPPAssetArray& data);
-void freeBlast(BPPAssetInstanceArray& data);
-void freeBlast(BPPGraphicsMaterialArray& data);
-
-void copy(NvParameterized::DummyStringStruct& dest, const char* source);
-void copy(NvParameterized::DummyStringStruct& dest, NvParameterized::DummyStringStruct& source);
-bool isItemExist(BPPStringArray& dest, const char* item);
-void addItem(BPPStringArray& dest, const char* item);
-void removeItem(BPPStringArray& dest, const char* item);
-void copy(BPPStringArray& dest, BPPStringArray& source);
-void copy(BPPGraphicsMaterialArray& dest, BPPGraphicsMaterialArray& source);
-void copy(BPPMaterialAssignmentsArray& dest, BPPMaterialAssignmentsArray& source);
-void copy(BPPBookmarkArray& dest, BPPBookmarkArray& source);
-void copy(BPPLightArray& dest, BPPLightArray& source);
-void copy(BPPChunkArray& dest, BPPChunkArray& source);
-void copy(BPPBondArray& dest, BPPBondArray& source);
-void copy(BPPAssetArray& dest, BPPAssetArray& source);
-void copy(BPPAssetInstanceArray& dest, BPPAssetInstanceArray& source);
-void copy(BPPI32Array& dest, BPPI32Array& source);
-void copy(BPPVEC3Array& dest, BPPVEC3Array& source);
-void copy(BPPVEC2Array& dest, BPPVEC2Array& source);
-
-void copy(BPPLight& dest, BPPLight& source);
-void copy(BPPRenderer& dest, BPPRenderer& source);
-void copy(BPPGraphicsMaterial& dest, BPPGraphicsMaterial& source);
-void copy(BPPGraphicsMesh& dest, BPPGraphicsMesh& source);
-void copy(BPPMaterialAssignments& dest, BPPMaterialAssignments& source);
-void copy(BPPChunk& dest, BPPChunk& source);
-void copy(BPPBond& dest, BPPBond& source);
-void copy(BPPSupportStructure& dest, BPPSupportStructure& source);
-void copy(BPPStressSolver& dest, BPPStressSolver& source);
-void copy(BPPAsset& dest, BPPAsset& source);
-void copy(BPPAssetInstance& dest, BPPAssetInstance& source);
-void copy(BPPBlast& dest, BPPBlast& source);
-void copy(BPPFractureGeneral& dest, BPPFractureGeneral& source);
-void copy(BPPVoronoi& dest, BPPVoronoi& source);
-void copy(BPPFracture& dest, BPPFracture& source);
-void copy(BPPDefaultDamage& dest, BPPDefaultDamage& source);
-void copy(BPPFilter& dest, BPPFilter& source);
-void copy(BPParams& dest, BPParams& source);
-
-void merge(BPPAssetArray& dest, BPPAssetArray& source);
-void merge(BPPAssetInstanceArray& dest, BPPAssetInstanceArray& source);
-void merge(BPPChunkArray& dest, BPPChunkArray& source);
-void merge(BPPBondArray& dest, BPPBondArray& source);
-
-/*
-void apart(BPPAssetArray& dest, BPPAssetArray& source);
-void apart(BPPAssetInstanceArray& dest, BPPAssetInstanceArray& source);
-void apart(BPPChunkArray& dest, BPPChunkArray& source);
-void apart(BPPBondArray& dest, BPPBondArray& source);
-*/
-void apart(BPPAssetArray& dest, int32_t assetId);
-void apart(BPPAssetInstanceArray& dest, int32_t assetId);
-void apart(BPPAssetInstanceArray& dest, int32_t assetId, const char* instanceName);
-void apart(BPPChunkArray& dest, int32_t assetId);
-void apart(BPPBondArray& dest, int32_t assetId);
-
-template <class T>
-void init(T& param)
-{
-	param.buf = nullptr;
-	param.arraySizes[0] = 0;
-}
-void init(BPPStressSolver& param);
-void init(BPPGraphicsMaterial& param);
-void init(BPPGraphicsMesh& param);
-void init(BPPBond& param);
-void init(BPPChunk& param);
-void init(BPPDefaultDamage& param);
-void init(BPPAsset& param);
-void init(BPPAssetInstance& param);
-void init(BPPVoronoi& param); 
-void init(BPPSlice& param);
-void init(BPPFractureVisualization& param);
-void init(BPParams& params);
-
-enum EFilterRestriction
-{
-	eFilterRestriction_Invalid = 0x0000,
-	eFilterRestriction_AllDescendants = 0x0001 << 0,
-	eFilterRestriction_AllParents = 0x0001 << 1,
-	eFilterRestriction_DepthAll = 0x0001 << 2,
-	eFilterRestriction_Depth0 = 0x0001 << 3,
-	eFilterRestriction_Depth1 = 0x0001 << 4,
-	eFilterRestriction_Depth2 = 0x0001 << 5,
-	eFilterRestriction_Depth3 = 0x0001 << 6,
-	eFilterRestriction_Depth4 = 0x0001 << 7,
-	eFilterRestriction_Depth5 = 0x0001 << 8,
-	eFilterRestriction_ItemTypeAll = 0x0001 << 9,
-	eFilterRestriction_Chunk = 0x0001 << 10,
-	eFilterRestriction_SupportChunk = 0x0001 << 11,
-	eFilterRestriction_StaticSupportChunk = 0x0001 << 12,
-	eFilterRestriction_Bond = 0x0001 << 13,
-	eFilterRestriction_WorldBond = 0x0001 << 14,
-	eFilterRestriction_EqualTo = 0x0001 << 15,
-	eFilterRestriction_NotEquaTo = 0x0001 << 16,
-	
-};
-
-const char* convertFilterRestrictionToString(EFilterRestriction& restriction);
-EFilterRestriction convertStringToFilterRestriction(const char* restriction);
-
-struct FilterPreset
-{
-	FilterPreset(const char* inName);
-	std::string name;
-	std::vector<EFilterRestriction> filters;
-};
-
-struct StressSolverUserPreset
-{
-	StressSolverUserPreset(const char* inName);
-	std::string name;
-	BPPStressSolver stressSolver;
-};
-
-enum FractureType
-{
-	eFractureType_Voronoi,
-	eFractureType_Slice,
-};
-struct FracturePreset
-{
-	FracturePreset(const char* inName, FractureType inType);
-
-	void setType(FractureType inType);
-
-	FractureType type;
-	std::string name;
-	
-	void init();
-	union
-	{
-		BPPVoronoi voronoi;
-		BPPSlice slice;
-	} fracture;
-
-	BPPFractureVisualization visualization;
-};
-
-class BlastProject
-{
-public:
-
-	static BlastProject& ins();
-	~BlastProject();
-
-	BPParams& getParams() { return _projectParams; }
-
-	void clear();
-
-	std::string getAseetNameByID(int assetID);
-	int getAssetIDByName(const char* name);
-	BPPAsset* getAsset(const char* name);
-	int generateNewAssetID();
-
-	bool isGraphicsMaterialNameExist(const char* name);
-	BPPGraphicsMaterial* addGraphicsMaterial(const char* name);
-	void removeGraphicsMaterial(const char* name);
-	void renameGraphicsMaterial(const char* oldName, const char* newName);
-	void reloadDiffuseColor(const char* name, float r, float g, float b, float a = 1.0);
-	void reloadSpecularColor(const char* name, float r, float g, float b, float a = 1.0);
-	void reloadSpecularShininess(const char* name, float specularShininess);
-	void reloadDiffuseTexture(const char* name, const char* diffuseTexture);
-	void reloadSpecularTexture(const char* name, const char* specularTexture);
-	void reloadNormalTexture(const char* name, const char* normalTexture);
-	void reloadEnvTexture(const char* name, const char* envTexture);
-	BPPGraphicsMaterial* getGraphicsMaterial(const char* name);
-	std::string generateNewMaterialName(const char* name);
-
-	bool isAssetInstanceNameExist(const char* name);
-	int getAssetInstanceCount(int assetID);
-	void getAssetInstances(int assetID, std::vector<BPPAssetInstance*>& instances);
-	BPPAssetInstance* getAssetInstance(int assetID, int instanceIndex);
-	BPPAssetInstance* getAssetInstance(int assetID, const char* instanceName);
-	BPPAssetInstance* addAssetInstance(int blastAssetIndex, const char* instanceName);
-	void removeAssetInstance(const char* name);
-
-	BPPChunk* getChunk(BPPAsset& asset, int chunkID);
-	std::vector<BPPChunk*> getChildrenChunks(BPPAsset& asset, int parentID);
-	std::vector<BPPChunk*> getChildrenChunks(BPPAsset& asset);
-	std::vector<BPPChunk*> getChildrenChunks(int assetID);
-	std::vector<BPPBond*> getBondsByChunk(BPPAsset& asset, int chunkID);
-	std::vector<BPPBond*> getChildrenBonds(BPPAsset& asset);
-
-	bool isUserPresetNameExist(const char* name);
-	std::vector<StressSolverUserPreset>& getUserPresets();
-	void addUserPreset(const char* name);
-	void saveUserPreset();
-	void loadUserPreset();
-
-	bool isFracturePresetNameExist(const char* name);
-	std::vector<FracturePreset>& getFracturePresets();
-	void addFracturePreset(const char* name, FractureType type);
-	void saveFracturePreset();
-	void loadFracturePreset();
-
-	bool isFilterPresetNameExist(const char* name);
-	std::vector<FilterPreset>& getFilterPresets();
-	void addFilterPreset(const char* name);
-	void removeFilterPreset(const char* name);
-	FilterPreset* getFilterPreset(const char* name);
-	void renameFilterPreset(const char* oldName, const char* newName);
-	void addFilterRestriction(const char* filterName, EFilterRestriction restriction);
-	void removeFilterRestriction(const char* filterName, EFilterRestriction restriction);
-	void saveFilterPreset();
-	void loadFilterPreset();
-
-private:
-	BlastProject();
-	void _saveStressSolverPreset(QDomElement& parentElm, StressSolverUserPreset& stressSolverUserPreset);
-	void _saveStressSolver(QDomElement& parentElm, BPPStressSolver& stressSolver);
-	void _loadStressSolverPreset(QDomElement& parentElm, StressSolverUserPreset& stressSolverUserPreset);
-	void _loadStressSolver(QDomElement& parentElm, BPPStressSolver& stressSolver);
-
-	void _saveFracturePreset(QDomElement& parentElm, FracturePreset& fracturePreset);
-	void _saveFracture(QDomElement& parentElm, BPPVoronoi& voronoi);
-	void _saveFracture(QDomElement& parentElm, BPPSlice& slice);
-	void _loadFracturePreset(QDomElement& parentElm, FracturePreset& fracturePreset);
-	void _loadFracture(QDomElement& parentElm, BPPVoronoi& voronoi);
-	void _loadFracture(QDomElement& parentElm, BPPSlice& slice);
-
-	void _saveFilterPreset(QDomElement& parentElm, FilterPreset& filterPreset);
-	void _saveRestriction(QDomElement& parentElm, EFilterRestriction& restriction);
-	void _loadFilterPreset(QDomElement& parentElm, FilterPreset& filterPreset);
-	void _loadRestriction(QDomElement& parentElm, EFilterRestriction& restriction);
-
-	void _addStringItem(BPPStringArray& theArray, const char* name);
-	void _removeStringItem(BPPStringArray& theArray, const char* name);
-
-private:
-	BPParams	_projectParams;
-	std::vector<StressSolverUserPreset> _userPresets;
-	std::vector<FracturePreset> _fracturePresets;
-	std::vector<FilterPreset> _filterPresets;
-};
-
-bool CreateProjectParamsContext();
-void ReleaseProjectParamsContext();
-bool ProjectParamsLoad(const char* filePath,
-                       class SimpleScene* scene);
-bool ProjectParamsSave(const char* filePath,
-                       class SimpleScene* scene);
-
-bool ParamGetChild(NvParameterized::Handle& parentHandle, NvParameterized::Handle& outChildHandle, const char* childName);
diff --git a/tools/ArtistTools/source/BlastPlugin/Parameters/go.bat b/tools/ArtistTools/source/BlastPlugin/Parameters/go.bat
deleted file mode 100644
index 4a5b6c9..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Parameters/go.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@if "%PERL%"=="" set PERL=..\..\..\..\..\..\..\external\perl\5.8.8_822\bin\perl.exe
-@%PERL% ..\..\..\..\..\..\..\external\NvParameterized\1.1\trunk\build\scripts\GenParameterized.pl -force BlastProjectParams.pl . .
-
diff --git a/tools/ArtistTools/source/BlastPlugin/Render/D3D11/PluginBlastDx11.cpp b/tools/ArtistTools/source/BlastPlugin/Render/D3D11/PluginBlastDx11.cpp
deleted file mode 100644
index 1c37502..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Render/D3D11/PluginBlastDx11.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "PluginBlastDx11.h"
-#include "D3D11RenderShader.h"
-#include "D3D11RenderInterface.h"
-#include "LightShaderParam.h"
-
-PluginBlast* CreateRenderBlast(void)
-{
-	return new PluginBlastDx11;
-}
-
-PluginBlastDx11::PluginBlastDx11()
-{
-}
-
-PluginBlastDx11::~PluginBlastDx11()
-{
-}
-
-// D3D11Shaders
-bool PluginBlastDx11::D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap)
-{
-	return true;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Render/D3D11/PluginBlastDx11.h b/tools/ArtistTools/source/BlastPlugin/Render/D3D11/PluginBlastDx11.h
deleted file mode 100644
index ed9dbe1..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Render/D3D11/PluginBlastDx11.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "PluginBlast.h"
-
-extern "C" PLUGINBTRENDER_EXPORT PluginBlast* CreateRenderBlast(void);
-
-class PluginBlastDx11 : public PluginBlast
-{
-public:
-	PluginBlastDx11();
-	~PluginBlastDx11();
-
-	// D3D11Shaders
-	virtual bool D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap);
-};
-
diff --git a/tools/ArtistTools/source/BlastPlugin/Render/D3D12/PluginBlastDx12.cpp b/tools/ArtistTools/source/BlastPlugin/Render/D3D12/PluginBlastDx12.cpp
deleted file mode 100644
index 670f17b..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Render/D3D12/PluginBlastDx12.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "PluginBlastDx12.h"
-
-PluginBlast* CreateRenderBlast(void)
-{
-	return new PluginBlastDx12;
-}
-
-PluginBlastDx12::PluginBlastDx12()
-{
-}
-
-PluginBlastDx12::~PluginBlastDx12()
-{
-}
-
-// D3D11Shaders
-bool PluginBlastDx12::D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap)
-{
-	return true;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Render/D3D12/PluginBlastDx12.h b/tools/ArtistTools/source/BlastPlugin/Render/D3D12/PluginBlastDx12.h
deleted file mode 100644
index fab6b4e..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Render/D3D12/PluginBlastDx12.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "PluginBlast.h"
-
-extern "C" PLUGINBTRENDER_EXPORT PluginBlast* CreateRenderBlast(void);
-
-class PluginBlastDx12 : public PluginBlast
-{
-public:
-	PluginBlastDx12();
-	~PluginBlastDx12();
-
-	// D3D11Shaders
-	virtual bool D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap);
-};
-
diff --git a/tools/ArtistTools/source/BlastPlugin/Render/Interface/PluginBlast.cpp b/tools/ArtistTools/source/BlastPlugin/Render/Interface/PluginBlast.cpp
deleted file mode 100644
index 3a9c9c9..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Render/Interface/PluginBlast.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "PluginBlast.h"
-
-PluginBlast* g_Plugin = nullptr;
-
-PluginBlast::PluginBlast()
-{
-}
-
-PluginBlast::~PluginBlast()
-{
-}
-
-typedef PluginBlast*(*Func)(void);
-
-bool PluginBlast::Create(std::string strApi)
-{
-	if ("" == strApi)
-		return false;
-
-	std::string pluginDll = "";
-	HMODULE module = NULL;
-	Func CreateFunc = NULL;
-
-#ifdef NV_ARTISTTOOLS
-	pluginDll = "RenderBlast";
-#else
-	pluginDll = "FurRender";
-#endif
-
-	pluginDll.append(strApi);
-
-#ifdef _WIN64
-	pluginDll.append(".win64");
-#else						  
-	pluginDll.append(".win32");
-#endif
-
-#ifdef _DEBUG
-	pluginDll.append(".d");
-#else						  
-#endif
-
-	pluginDll.append(".dll");
-
-	module = LoadLibraryA(pluginDll.c_str());
-	if (NULL == module)
-		return false;
-
-	CreateFunc = (Func)GetProcAddress(module, "CreateRenderBlast");
-	if (NULL == CreateFunc)
-		return false;
-
-	g_Plugin = CreateFunc();
-	return (NULL != g_Plugin);
-}
-
-PluginBlast* PluginBlast::Instance()
-{
-	return g_Plugin;
-}
-
-void PluginBlast::Destroy()
-{
-	if (nullptr == g_Plugin)
-		return;
-
-	delete g_Plugin;
-	g_Plugin = nullptr;
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Render/Interface/PluginBlast.h b/tools/ArtistTools/source/BlastPlugin/Render/Interface/PluginBlast.h
deleted file mode 100644
index a67fd89..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Render/Interface/PluginBlast.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "RenderPlugin.h"
-#include "blastplugin_global.h"
-
-class PLUGINBT_EXPORT PluginBlast
-{
-public:
-	static bool Create(std::string api);
-	static PluginBlast* Instance();
-	static void Destroy();
-
-	~PluginBlast();
-
-	// D3D11Shaders
-	virtual bool D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap) = 0;
-	
-protected:
-	PluginBlast();
-};
-
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/Sample.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/Sample.h
deleted file mode 100644
index 2499deb..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/Sample.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SAMPLE_H
-#define SAMPLE_H
-
-#include "PxTransform.h"
-#include <string>
-#include <vector>
-
-
-struct AssetList
-{
-	struct BoxAsset
-	{
-		BoxAsset() : staticHeight(-std::numeric_limits<float>().infinity()), 
-			jointAllBonds(false), extents(20, 20, 20), bondFlags(7)
-		{}
-
-		struct Level
-		{
-			Level() :x(0), y(0), z(0), isSupport(0) {};
-
-			int				x, y, z;
-			bool			isSupport;
-		};
-
-		std::string			id;
-		std::string			name;
-		physx::PxVec3		extents;
-		float				staticHeight;
-		bool				jointAllBonds;
-		std::vector<Level>	levels;
-		uint32_t			bondFlags;
-	};
-
-	struct ModelAsset
-	{
-		ModelAsset() : isSkinned(false), transform(physx::PxIdentity) 
-		{}
-
-		std::string			id;
-		std::string			file;
-		std::string			name;
-		std::string			fullpath;
-		physx::PxTransform	transform;
-		bool				isSkinned;
-	};
-
-	struct CompositeAsset
-	{
-		CompositeAsset() : transform(physx::PxIdentity)
-		{}
-
-		struct AssetRef
-		{
-			std::string			id;
-			physx::PxTransform	transform;
-		};
-
-		struct Joint
-		{
-			int32_t				assetIndices[2];
-			uint32_t			chunkIndices[2];
-			physx::PxVec3		attachPositions[2];
-		};
-
-		std::string				id;
-		std::string				name;
-		physx::PxTransform		transform;
-		std::vector<AssetRef>	assetRefs;
-		std::vector<Joint>		joints;
-	};
-
-	std::vector<ModelAsset>		models;
-	std::vector<CompositeAsset>	composites;
-	std::vector<BoxAsset>		boxes;
-};
-
-struct SampleConfig
-{
-	std::wstring			sampleName;
-	std::string				assetsFile;
-	std::vector<std::string> additionalResourcesDir;
-	AssetList				additionalAssetList;
-};
-
-int runSample(const SampleConfig& config);
-
-#endif //SAMPLE_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAsset.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAsset.cpp
deleted file mode 100644
index 7bb4f95..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAsset.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastAsset.h"
-#include "NvBlastExtPxAsset.h"
-#include "NvBlastTkAsset.h"
-#include <map>
-#include <algorithm>
-// Add By Lixu Begin
-#include "BlastSceneTree.h"
-#include "SampleManager.h"
-// Add By Lixu End
-
-std::set<int> ExistingAssetIds;
-BlastAsset::BlastAsset(Renderer& renderer)
-	: m_renderer(renderer), m_bondHealthMax(1.0f), m_supportChunkHealthMax(1.0f)
-{
-	for (int id = 0; ; id++)
-	{
-		if (ExistingAssetIds.find(id) == ExistingAssetIds.end())
-		{
-			ExistingAssetIds.emplace(id);
-			mUniqueId = id;
-			break;
-		}
-	}
-}
-
-BlastAsset::~BlastAsset()
-{
-	ExistingAssetIds.erase(mUniqueId);
-}
-
-void BlastAsset::initialize()
-{
-// Add By Lixu Begin
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-	BPPChunkArray& chunks = blast.chunks;
-	BPPBondArray& bonds = blast.bonds;
-
-	std::vector<float> BondHealths;
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itASM = AssetDescMap.find(this);
-	AssetList::ModelAsset m;
-	if (itASM != AssetDescMap.end())
-	{
-		m = itASM->second;
-	}
-
-	int assetID = BlastProject::ins().getAssetIDByName(m.name.c_str());
-	for (int bc = 0; bc < bonds.arraySizes[0]; bc++)
-	{
-		BPPBond& bond = bonds.buf[bc];
-		if (bond.asset == assetID)
-		{
-			BondHealths.push_back(bond.support.bondStrength);
-		}
-	}
-
-	const TkAsset& tkAsset = m_pxAsset->getTkAsset();
-	uint32_t bondCount = tkAsset.getBondCount();
-
-	const float* pBondHealths = nullptr;
-	if (bondCount == BondHealths.size())
-	{
-		pBondHealths = BondHealths.data();
-	}
-
-	const NvBlastActorDesc& defaultActorDesc = m_pxAsset->getDefaultActorDesc();
-	NvBlastActorDesc newActorDesc = defaultActorDesc;
-	newActorDesc.initialBondHealths = pBondHealths;
-// Add By Lixu End
-
-	// calc max healths
-	const NvBlastActorDesc& actorDesc = newActorDesc;
-	if (actorDesc.initialBondHealths)
-	{
-		m_bondHealthMax = FLT_MIN;
-		const uint32_t bondCount = m_pxAsset->getTkAsset().getBondCount();
-		for (uint32_t i = 0; i < bondCount; ++i)
-		{
-			m_bondHealthMax = std::max<float>(m_bondHealthMax, actorDesc.initialBondHealths[i]);
-		}
-	}
-	else
-	{
-		m_bondHealthMax = actorDesc.uniformInitialBondHealth;
-	}
-
-	if(actorDesc.initialSupportChunkHealths)
-	{
-		m_supportChunkHealthMax = FLT_MIN;
-		const uint32_t nodeCount = m_pxAsset->getTkAsset().getGraph().nodeCount;
-		for (uint32_t i = 0; i < nodeCount; ++i)
-		{
-			m_supportChunkHealthMax = std::max<float>(m_supportChunkHealthMax, actorDesc.initialSupportChunkHealths[i]);
-		}
-	}
-	else
-	{
-		m_supportChunkHealthMax = actorDesc.uniformInitialLowerSupportChunkHealth;
-	}
-}
-
-size_t BlastAsset::getBlastAssetSize() const
-{
-	return m_pxAsset->getTkAsset().getDataSize();
-}
-
-std::vector<uint32_t> BlastAsset::getChunkIndexesByDepth(uint32_t depth) const
-{
-	const TkAsset& tkAsset = m_pxAsset->getTkAsset();
-	const NvBlastChunk* pNvBlastChunk = tkAsset.getChunks();
-	uint32_t chunkCount = tkAsset.getChunkCount();
-
-	std::map<uint32_t, uint32_t> indexDepthMap;
-	indexDepthMap.insert(std::make_pair(0, 0));
-	for (size_t i = 1; i < chunkCount; ++i)
-	{
-		int depth = 0;
-		const NvBlastChunk* curChunk = pNvBlastChunk + i;
-		while (-1 != curChunk->parentChunkIndex)
-		{
-			++depth;
-			curChunk = pNvBlastChunk + curChunk->parentChunkIndex;
-		}
-		indexDepthMap.insert(std::make_pair(i, depth));
-	}
-
-	std::vector<uint32_t> indexes;
-	for (std::map<uint32_t, uint32_t>::iterator itr = indexDepthMap.begin(); itr != indexDepthMap.end(); ++itr)
-	{
-		if (itr->second == depth)
-		{
-			indexes.push_back(itr->first);
-		}
-	}
-
-	return indexes;
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAsset.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAsset.h
deleted file mode 100644
index feec9e3..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAsset.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_ASSET_H
-#define BLAST_ASSET_H
-
-#include <memory>
-#include <vector>
-#include "PxTransform.h"
-#include "NvBlastTypes.h"
-
-
-using namespace physx;
-
-class Renderer;
-class BlastFamily;
-class PhysXController;
-
-namespace Nv
-{
-namespace Blast
-{
-class ExtPxFamily;
-class ExtPxAsset;
-class ExtPxManager;
-class TkGroup;
-}
-}
-
-using namespace Nv::Blast;
-
-// Add By Lixu Begin
-typedef BlastFamily* BlastFamilyPtr;
-// Add By Lixu End
-
-
-class BlastAsset
-{
-public:
-	//////// ctor ////////
-
-	BlastAsset(Renderer& renderer);
-	virtual ~BlastAsset();
-	int mUniqueId;
-
-
-	//////// desc ////////
-
-	/**
-	Descriptor with actor initial settings.
-	*/
-	struct ActorDesc
-	{
-		NvBlastID			id;
-		PxTransform			transform;
-		TkGroup*			group;
-	};
-
-
-	//////// abstract ////////
-
-	virtual BlastFamilyPtr createFamily(PhysXController& physXConroller, ExtPxManager& pxManager, const ActorDesc& desc) = 0;
-
-
-	//////// data getters  ////////
-
-	const ExtPxAsset* getPxAsset() const
-	{ 
-		return m_pxAsset;
-	}
-
-	size_t getBlastAssetSize() const;
-
-	std::vector<uint32_t> getChunkIndexesByDepth(uint32_t depth) const;
-	
-	float getBondHealthMax() const
-	{
-		return m_bondHealthMax;
-	}
-
-	float getSupportChunkHealthMax() const
-	{
-		return m_bondHealthMax;
-	}
-
-	void initialize();
-
-protected:
-	//////// internal operations ////////
-
-
-
-	//////// input data ////////
-
-	Renderer&			m_renderer;
-
-
-	//////// internal data ////////
-
-	ExtPxAsset*			m_pxAsset;
-	float				m_bondHealthMax;
-	float				m_supportChunkHealthMax;
-};
-
-
-
-#endif //BLAST_ASSET_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetBoxes.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetBoxes.cpp
deleted file mode 100644
index 4bd9766..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetBoxes.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastAssetBoxes.h"
-#include "BlastFamilyBoxes.h"
-#include "NvBlastExtPxAsset.h"
-#include "PxPhysics.h"
-#include "cooking/PxCooking.h"
-
-
-BlastAssetBoxes::BlastAssetBoxes(TkFramework& framework, PxPhysics& physics, PxCooking& cooking, Renderer& renderer, const Desc& desc)
-	: BlastAsset(renderer)
-{
-	// generate boxes slices procedurally
-	CubeAssetGenerator::generate(m_generatorAsset, desc.generatorSettings);
-
-	// asset desc / tk asset
-	ExtPxAssetDesc assetDesc;
-	assetDesc.chunkDescs = m_generatorAsset.solverChunks.data();
-	assetDesc.chunkCount = (uint32_t)m_generatorAsset.solverChunks.size();
-	assetDesc.bondDescs = m_generatorAsset.solverBonds.data();
-	assetDesc.bondCount = (uint32_t)m_generatorAsset.solverBonds.size();
-	std::vector<uint8_t> bondFlags(assetDesc.bondCount);
-	std::fill(bondFlags.begin(), bondFlags.end(), desc.jointAllBonds ? 1 : 0);
-	assetDesc.bondFlags = bondFlags.data();
-
-	// box convex
-	PxVec3 vertices[8] = { { -1, -1, -1 }, { -1, -1, 1 }, { -1, 1, -1 }, { -1, 1, 1 }, { 1, -1, -1 }, { 1, -1, 1 }, { 1, 1, -1 }, { 1, 1, 1 } };
-	PxConvexMeshDesc convexMeshDesc;
-	convexMeshDesc.points.count = 8;
-	convexMeshDesc.points.data = vertices;
-	convexMeshDesc.points.stride = sizeof(PxVec3);
-	convexMeshDesc.flags = PxConvexFlag::eCOMPUTE_CONVEX;
-	m_boxMesh = cooking.createConvexMesh(convexMeshDesc, physics.getPhysicsInsertionCallback());
-
-	// prepare chunks
-	const uint32_t chunkCount = (uint32_t)m_generatorAsset.solverChunks.size();
-	std::vector<ExtPxAssetDesc::ChunkDesc> pxChunks(chunkCount);
-	std::vector<ExtPxAssetDesc::SubchunkDesc> pxSubchunks;
-	pxSubchunks.reserve(chunkCount);
-	for (uint32_t i = 0; i < m_generatorAsset.solverChunks.size(); i++)
-	{
-		uint32_t chunkID = m_generatorAsset.solverChunks[i].userData;
-		GeneratorAsset::BlastChunkCube& cube = m_generatorAsset.chunks[chunkID];
-		PxVec3 position = *reinterpret_cast<PxVec3*>(&cube.position);
-		PxVec3 extents = *reinterpret_cast<PxVec3*>(&cube.extents);
-		ExtPxAssetDesc::ChunkDesc& chunk = pxChunks[chunkID];
-		ExtPxAssetDesc::SubchunkDesc subchunk =
-		{
-			PxTransform(position),
-			PxConvexMeshGeometry(m_boxMesh, PxMeshScale(extents / 2))
-		};
-		pxSubchunks.push_back(subchunk);
-		chunk.subchunks = &pxSubchunks.back();
-		chunk.subchunkCount = 1;
-		chunk.isStatic = (position.y - (extents.y - desc.generatorSettings.extents.y) / 2) <= desc.staticHeight;
-	}
-
-	// create asset
-	assetDesc.pxChunks = pxChunks.data();
-	m_pxAsset = ExtPxAsset::create(assetDesc, framework);
-
-	initialize();
-}
-
-
-BlastAssetBoxes::~BlastAssetBoxes()
-{
-	m_boxMesh->release();
-	m_pxAsset->release();
-}
-
-
-BlastFamilyPtr BlastAssetBoxes::createFamily(PhysXController& physXConroller, ExtPxManager& pxManager, const ActorDesc& desc)
-{
-	return BlastFamilyPtr(new BlastFamilyBoxes(physXConroller, pxManager, m_renderer, *this, desc));
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetBoxes.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetBoxes.h
deleted file mode 100644
index d4f8dd2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetBoxes.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_ASSET_BOXES_H
-#define BLAST_ASSET_BOXES_H
-
-#include "BlastAsset.h"
-#include "AssetGenerator.h"
-#include "PxConvexMesh.h"
-
-
-namespace physx
-{
-class PxPhysics;
-class PxCooking;
-}
-
-namespace Nv
-{
-namespace Blast
-{
-class TkFramework;
-}
-}
-
-
-class BlastAssetBoxes : public BlastAsset
-{
-public:
-	struct Desc
-	{
-		CubeAssetGenerator::Settings generatorSettings;
-		float staticHeight;
-		bool jointAllBonds;
-	};
-
-	BlastAssetBoxes(TkFramework& framework, PxPhysics& physics, PxCooking& cooking, Renderer& renderer, const Desc& desc);
-	virtual ~BlastAssetBoxes();
-
-	BlastFamilyPtr createFamily(PhysXController& physXConroller, ExtPxManager& pxManager, const ActorDesc& desc);
-
-private:
-	PxConvexMesh*	m_boxMesh;
-	GeneratorAsset	m_generatorAsset;
-};
-
-
-
-#endif //BLAST_ASSET_BOXES_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModel.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModel.cpp
deleted file mode 100644
index 857cb9b..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModel.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "GlobalSettings.h"
-#include <QtCore/QFile>
-#include "BlastAssetModel.h"
-#include "Renderer.h"
-#include "BlastController.h"
-#include "Utils.h"
-#include "ResourceManager.h"
-#include "NvBlastExtPxAsset.h"
-#include <sstream>
-#include <fstream>
-#include "NvBlastExtExporter.h"
-#include "PxPhysics.h"
-#include <NvBlastGlobals.h>
-#include "NvBlastExtAssetUtils.h"
-#include "NvBlastExtPxAsset.h"
-#include "NvBlastTkAsset.h"
-#include "NvBlastExtSerialization.h"
-#include "NvBlastExtLlSerialization.h"
-#include "NvBlastExtTkSerialization.h"
-#include "NvBlastExtPxSerialization.h"
-#include "NvBlastExtAuthoring.h"
-#include "NvBlastExtAuthoringCollisionBuilder.h"
-
-BlastAssetModel::BlastAssetModel(TkFramework& framework, PxPhysics& physics, PxCooking& cooking, ExtSerialization& serialization, Renderer& renderer, const char* modelName, const char* modelPath)
-	: BlastAsset(renderer)
-{
-	if (modelPath == NULL)
-	{
-		GlobalSettings& globalSettings = GlobalSettings::Inst();
-		modelPath = globalSettings.m_projectFileDir.c_str();
-		assert(globalSettings.m_projectFileDir.length() > 0);
-	}
-
-	const float unitConversion = 1.f;
-
-	const NvcVec3 inputScale = { unitConversion, unitConversion, unitConversion };
-
-	std::string path;
-
-	// load obj file
-	std::ostringstream objFileName;
-	objFileName << modelName << ".obj";
-		
-	path = GlobalSettings::MakeFileName(modelPath, objFileName.str().c_str());
-	if (QFile::exists(path.c_str()))
-	{
-		m_model = BlastModel::loadFromFileTinyLoader(path.c_str());
-		if (!m_model)
-		{
-			ASSERT_PRINT(false, "obj load failed");
-		}		
-	}
-	else // Obj is not found, try FBX
-	{
-		objFileName.clear();
-		objFileName.str("");
-		objFileName << modelName << ".fbx";
-		path = GlobalSettings::MakeFileName(modelPath, objFileName.str().c_str());
-		if (QFile::exists(path.c_str()))
-		{
-			m_model = BlastModel::loadFromFbxFile(path.c_str());
-			if (!m_model)
-			{
-				ASSERT_PRINT(false, "fbx load failed");
-			}
-
-		}
-		else
-		{
-			ASSERT_PRINT(false, "mesh file not found");
-		}
-	}
-
-	for (auto& chunk : m_model->chunks)
-	{
-		for (auto& mesh : chunk.meshes)
-		{
-			SimpleMesh& smesh = const_cast<SimpleMesh&>(mesh.mesh);
-			smesh.center *= unitConversion;
-			smesh.extents *= unitConversion;
-			for (auto& vertex : smesh.vertices)
-			{
-				vertex.position *= unitConversion;
-			}
-		}
-	}
-
-	// Physics Asset
-
-	// Read file into buffer
-	std::ostringstream blastFileName;
-	blastFileName << modelName << ".blast";
-	path = GlobalSettings::MakeFileName(modelPath, blastFileName.str().c_str());
-	if (QFile::exists(path.c_str()))
-	{
-		std::ifstream stream(path.c_str(), std::ios::binary);
-		std::streampos size = stream.tellg();
-		stream.seekg(0, std::ios::end);
-		size = stream.tellg() - size;
-		stream.seekg(0, std::ios::beg);
-		std::vector<char> buffer(size);
-		stream.read(buffer.data(), buffer.size());
-		stream.close();
-		uint32_t objectTypeID;
-		void* asset = serialization.deserializeFromBuffer(buffer.data(), buffer.size(), &objectTypeID);
-		if (asset == nullptr)
-		{
-			ASSERT_PRINT(asset != nullptr, "can't load .blast file.");
-		}
-		else
-		if (objectTypeID == Nv::Blast::ExtPxObjectTypeID::Asset)
-		{
-			m_pxAsset = reinterpret_cast<ExtPxAsset*>(asset);
-			const TkAsset& tkAsset = m_pxAsset->getTkAsset();
-			NvBlastAsset* llasset = const_cast<NvBlastAsset*>(tkAsset.getAssetLL());
-			NvBlastExtAssetTransformInPlace(llasset, &inputScale, nullptr, nullptr);
-			ExtPxSubchunk* subchunks = const_cast<ExtPxSubchunk*>(m_pxAsset->getSubchunks());
-			for (uint32_t i = 0; i < m_pxAsset->getSubchunkCount(); ++i)
-			{
-				subchunks[i].geometry.scale.scale = PxVec3(unitConversion);
-			}
-		}
-		else
-		{
-			TkAsset* tkAsset = nullptr;
-			if (objectTypeID == Nv::Blast::TkObjectTypeID::Asset)
-			{
-				tkAsset = reinterpret_cast<TkAsset*>(asset);
-				NvBlastAsset* llasset = const_cast<NvBlastAsset*>(tkAsset->getAssetLL());
-				NvBlastExtAssetTransformInPlace(llasset, &inputScale, nullptr, nullptr);
-			}
-			else
-			if (objectTypeID == Nv::Blast::LlObjectTypeID::Asset)
-			{
-				NvBlastAsset* llasset = reinterpret_cast<NvBlastAsset*>(asset);
-				NvBlastExtAssetTransformInPlace(llasset, &inputScale, nullptr, nullptr);
-				tkAsset = framework.createAsset(llasset, nullptr, 0, true);
-			}
-			else
-			{
-				ASSERT_PRINT(false, ".blast file contains unknown object.");
-			}
-
-			if (tkAsset != nullptr)
-			{
-				std::vector<ExtPxAssetDesc::ChunkDesc> physicsChunks;
-				std::vector<std::vector<ExtPxAssetDesc::SubchunkDesc> > physicsSubchunks;
-				/**
-				Try find FBX and check whether it contains collision geometry.
-				*/
-				objFileName.str("");
-				objFileName << modelName << ".fbx";
-				path = GlobalSettings::MakeFileName(modelPath, objFileName.str().c_str());
-				if (QFile::exists(path.c_str()))
-				{
-					std::shared_ptr<IFbxFileReader> rdr(NvBlastExtExporterCreateFbxFileReader(), [](IFbxFileReader* p) {p->release(); });
-					rdr->loadFromFile(path.c_str());
-					if (rdr->isCollisionLoaded() == 0)
-					{
-						ASSERT_PRINT(false, "fbx doesn't contain collision geometry");
-					}
-					uint32_t* hullsOffsets = nullptr;
-					CollisionHull** hulls = nullptr;
-					uint32_t meshCount = rdr->getCollision(hullsOffsets, hulls);
-
-					/**
-					Create physics meshes;
-					*/
-					std::shared_ptr<Nv::Blast::ConvexMeshBuilder> collisionBuilder(
-						NvBlastExtAuthoringCreateConvexMeshBuilder(&cooking, &physics.getPhysicsInsertionCallback()),
-						[](Nv::Blast::ConvexMeshBuilder* cmb) {cmb->release(); });
-
-					physicsChunks.resize(meshCount);
-					physicsSubchunks.resize(meshCount);
-
-					for (uint32_t i = 0; i < meshCount; ++i)
-					{
-						for (uint32_t sbHulls = hullsOffsets[i]; sbHulls < hullsOffsets[i+1]; ++sbHulls)
-						{
-							PxConvexMeshGeometry temp = physx::PxConvexMeshGeometry(collisionBuilder.get()->buildConvexMesh(*hulls[sbHulls]));
-							if (temp.isValid())
-							{
-								physicsSubchunks[i].push_back(ExtPxAssetDesc::SubchunkDesc());
-								physicsSubchunks[i].back().geometry = temp;
-								physicsSubchunks[i].back().transform = physx::PxTransform(physx::PxIdentity);
-							}
-						}
-					}
-					for (uint32_t i = 0; i < meshCount; ++i)
-					{
-						physicsChunks[i].isStatic = false;
-						physicsChunks[i].subchunkCount = (uint32_t)physicsSubchunks[i].size();
-						physicsChunks[i].subchunks = physicsSubchunks[i].data();
-					}
-					if (hullsOffsets)
-					{
-						NVBLAST_FREE(hullsOffsets);
-					}
-					if (hulls)
-					{
-						NVBLAST_FREE(hulls);
-					}
-				}
-				m_pxAsset = ExtPxAsset::create(tkAsset, physicsChunks.data(), (uint32_t)physicsChunks.size());
-				ASSERT_PRINT(m_pxAsset != nullptr, "can't create asset");
-			}
-		}
-	}
-}
-
-BlastAssetModel::BlastAssetModel(ExtPxAsset* pExtPxAsset, BlastModel* pBlastModel, Renderer& renderer)
-	: BlastAsset(renderer)
-{
-	m_pxAsset = pExtPxAsset;
-	ASSERT_PRINT(m_pxAsset != nullptr, "m_pxAsset is nullptr");
-
-	m_model = pBlastModel;
-	ASSERT_PRINT(m_model != nullptr, "m_model is nullptr");
-}
-
-BlastAssetModel::~BlastAssetModel()
-{
-	m_pxAsset->release();
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModel.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModel.h
deleted file mode 100644
index 9e13674..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModel.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_ASSET_MODEL_H
-#define BLAST_ASSET_MODEL_H
-
-#include "BlastAsset.h"
-#include "BlastModel.h"
-
-
-namespace physx
-{
-class PxPhysics;
-class PxCooking;
-}
-
-namespace Nv
-{
-namespace Blast
-{
-class TkFramework;
-class ExtSerialization;
-}
-}
-
-
-class BlastAssetModel : public BlastAsset
-{
-public:
-	//////// ctor ////////
-
-	BlastAssetModel(TkFramework& framework, PxPhysics& physics, PxCooking& cooking, ExtSerialization& serialization, Renderer& renderer, const char* modelName, const char* modelPath = NULL);
-	BlastAssetModel(ExtPxAsset* pExtPxAsset, BlastModel* pBlastModel, Renderer& renderer);
-	virtual ~BlastAssetModel();
-
-
-	//////// data getters  ////////
-
-	const BlastModel& getModel() const
-	{
-// Add By Lixu Begin
-		return *m_model;
-// Add By Lixu End
-	}
-
-private:
-	//////// private internal data ////////
-
-	BlastModelPtr	m_model;
-};
-
-#endif //BLAST_ASSET_MODEL_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSimple.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSimple.cpp
deleted file mode 100644
index c3db31d..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSimple.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastAssetModelSimple.h"
-#include "BlastFamilyModelSimple.h"
-#include "CustomRenderMesh.h"
-#include "Renderer.h"
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												BlastAssetModelSimple
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-BlastAssetModelSimple::BlastAssetModelSimple(TkFramework& framework, PxPhysics& physics, PxCooking& cooking, ExtSerialization& serialization, Renderer& renderer, const char* modelName)
-	: BlastAssetModel(framework, physics, cooking, serialization, renderer, modelName)
-{
-	_init(renderer);
-}
-
-BlastAssetModelSimple::BlastAssetModelSimple(ExtPxAsset* pExtPxAsset, BlastModel* pBlastModel, Renderer& renderer)
-	: BlastAssetModel(pExtPxAsset, pBlastModel, renderer)
-{
-	_init(renderer);
-}
-
-BlastAssetModelSimple::~BlastAssetModelSimple()
-{
-	m_renderMaterialNames.clear();
-}
-
-void BlastAssetModelSimple::_init(Renderer& renderer)
-{
-	for (const BlastModel::Material& material : getModel().materials)
-	{
-		std::string name = material.name;
-		if (name != "" && !BlastProject::ins().isGraphicsMaterialNameExist(name.c_str()))
-		{
-			BlastProject::ins().addGraphicsMaterial(name.c_str());
-			BlastProject::ins().reloadDiffuseTexture(name.c_str(), material.diffuseTexture.c_str());
-			BlastProject::ins().reloadDiffuseColor(name.c_str(), material.r, material.g, material.b, material.a);
-		}
-		m_renderMaterialNames.push_back(name);
-	}
-}
-
-BlastFamilyPtr BlastAssetModelSimple::createFamily(PhysXController& physXConroller, ExtPxManager& pxManager, const ActorDesc& desc)
-{
-	return BlastFamilyPtr(new BlastFamilyModelSimple(physXConroller, pxManager, m_renderer, *this, desc));
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSimple.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSimple.h
deleted file mode 100644
index ca3d995..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSimple.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_ASSET_MODEL_SIMPLE_H
-#define BLAST_ASSET_MODEL_SIMPLE_H
-
-#include "BlastAssetModel.h"
-
-
-
-class BlastAssetModelSimple : public BlastAssetModel
-{
-public:
-	//////// ctor ////////
-
-	BlastAssetModelSimple(TkFramework& framework, PxPhysics& physics, PxCooking& cooking, ExtSerialization& serialization, Renderer& renderer, const char* modelName);
-	BlastAssetModelSimple(ExtPxAsset* pExtPxAsset, BlastModel* pBlastModel, Renderer& renderer);
-	virtual ~BlastAssetModelSimple();
-
-
-	//////// interface implementation ////////
-
-	virtual BlastFamilyPtr createFamily(PhysXController& physXConroller, ExtPxManager& pxManager, const ActorDesc& desc);
-
-
-	//////// data getters  ////////
-
-	const std::vector<std::string>& getRenderMaterials() const
-	{
-		return m_renderMaterialNames;
-	}
-
-
-private:
-	//////// private internal data ////////
-	void _init(Renderer& renderer);
-
-	std::vector<std::string>	m_renderMaterialNames;
-};
-
-#endif //BLAST_ASSET_MODEL_SIMPLE_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSkinned.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSkinned.cpp
deleted file mode 100644
index 747c2f4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSkinned.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastAssetModelSkinned.h"
-#include "BlastFamilyModelSkinned.h"
-#include "RenderMaterial.h"
-#include "Renderer.h"
-
-
-BlastAssetModelSkinned::BlastAssetModelSkinned(TkFramework& framework, PxPhysics& physics, PxCooking& cooking, ExtSerialization& serialization, Renderer& renderer, const char* modelName)
-	: BlastAssetModel(framework, physics, cooking, serialization, renderer, modelName)
-{
-// Add By Lixu Begin
-	int index = 0;
-	char materialName[50];
-	for (const BlastModel::Material& material : getModel().materials)
-	{
-		sprintf(materialName, "%s_Material%d", modelName, index++);
-
-		if (material.diffuseTexture.empty())
-			m_renderMaterials.push_back(new RenderMaterial(modelName, renderer.getResourceManager(), "model_skinned"));
-		else 
-			m_renderMaterials.push_back(new RenderMaterial(modelName, renderer.getResourceManager(), "model_skinned_textured", material.diffuseTexture.c_str()));
-	}
-// Add By Lixu End
-	initialize();
-}
-
-BlastAssetModelSkinned::~BlastAssetModelSkinned()
-{
-	for (RenderMaterial* r : m_renderMaterials)
-	{
-		SAFE_DELETE(r);
-	}
-}
-
-BlastFamilyPtr BlastAssetModelSkinned::createFamily(PhysXController& physXConroller, ExtPxManager& pxManager, const ActorDesc& desc)
-{
-	return BlastFamilyPtr(new BlastFamilyModelSkinned(physXConroller, pxManager, m_renderer, *this, desc));
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSkinned.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSkinned.h
deleted file mode 100644
index e9c6784..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastAssetModelSkinned.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_ASSET_MODEL_SKINNED_H
-#define BLAST_ASSET_MODEL_SKINNED_H
-
-#include "BlastAssetModel.h"
-
-class RenderMaterial;
-
-class BlastAssetModelSkinned : public BlastAssetModel
-{
-public:
-	//////// ctor ////////
-
-	BlastAssetModelSkinned(TkFramework& framework, PxPhysics& physics, PxCooking& cooking, ExtSerialization& serialization, Renderer& renderer, const char* modelName);
-	virtual ~BlastAssetModelSkinned();
-
-
-	//////// interface implementation ////////
-
-	BlastFamilyPtr createFamily(PhysXController& physXConroller, ExtPxManager& pxManager, const ActorDesc& desc);
-
-
-	//////// public getter ////////
-
-	const std::vector<RenderMaterial*>& getRenderMaterials() const
-	{
-		return m_renderMaterials;
-	}
-
-
-private:
-	//////// internal data ////////
-
-	std::vector<RenderMaterial*>	m_renderMaterials;
-};
-
-#endif //BLAST_ASSET_MODEL_SKINNED_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastController.cpp
deleted file mode 100644
index 950b217..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastController.cpp
+++ /dev/null
@@ -1,611 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastController.h"
-#include "BlastFamily.h"
-#include "BlastAsset.h"
-#include "BlastReplay.h"
-#include "PhysXController.h"
-#include "SampleTime.h"
-#include "SampleProfiler.h"
-#include "Utils.h"
-#include "Renderer.h"
-
-#include "NvBlastExtPxTask.h"
-
-#include "NvBlast.h"
-#include "NvBlastPxCallbacks.h"
-#include "NvBlastExtPxManager.h"
-#include "NvBlastExtPxFamily.h"
-#include "NvBlastExtPxActor.h"
-#include "NvBlastExtSerialization.h"
-#include "NvBlastExtTkSerialization.h"
-#include "NvBlastExtPxSerialization.h"
-
-#include "NvBlastTkFramework.h"
-
-#include "PsString.h"
-#include "PxTaskManager.h"
-#include "PxDefaultCpuDispatcher.h"
-#include "PxRigidBody.h"
-#include "PxScene.h"
-#include "PxRigidDynamic.h"
-#include "PxDistanceJoint.h"
-
-#include <sstream>
-#include <numeric>
-#include <cstdlib>
-
-#include "imgui.h"
-
-// Add By Lixu Begin
-#include "BlastSceneTree.h"
-// Add By Lixu End
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												Joint creation
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-static physx::PxJoint* createPxJointCallback(ExtPxActor* actor0, const physx::PxTransform& localFrame0, ExtPxActor* actor1, const physx::PxTransform& localFrame1, physx::PxPhysics& physics, TkJoint& joint)
-{
-	PxDistanceJoint* pxJoint = PxDistanceJointCreate(physics, actor0 ? &actor0->getPhysXActor() : nullptr, localFrame0, actor1 ? &actor1->getPhysXActor() : nullptr, localFrame1);
-	pxJoint->setMaxDistance(1.0f);
-	return pxJoint;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												Controller
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-BlastController::BlastController() 
-: m_eventCallback(nullptr), debugRenderMode(BlastFamily::DEBUG_RENDER_DISABLED), m_impactDamageEnabled(true), 
-m_impactDamageToStressEnabled(false), m_rigidBodyLimitEnabled(true), m_rigidBodyLimit(40000), m_blastAssetsSize(0), debugRenderScale(0.01f),
-m_taskManager(nullptr), m_extGroupTaskManager(nullptr)
-{
-	m_impactDamageToStressFactor = 0.01f;
-	m_draggingToStressFactor = 100.0f;
-}
-
-
-BlastController::~BlastController()
-{
-}
-
-void BlastController::reinitialize()
-{
-	onSampleStop();
-	onSampleStart();
-}
-
-void BlastController::onSampleStart()
-{
-	m_tkFramework = NvBlastTkFrameworkCreate();
-
-	m_replay = new BlastReplay();
-
-	m_taskManager = PxTaskManager::createTaskManager(NvBlastGetPxErrorCallback(), getPhysXController().getCPUDispatcher(), 0);
-
-	TkGroupDesc gdesc;
-	gdesc.workerCount = m_taskManager->getCpuDispatcher()->getWorkerCount();
-	m_tkGroup = m_tkFramework->createGroup(gdesc);
-
-	m_extPxManager = ExtPxManager::create(getPhysXController().getPhysics(), *m_tkFramework, createPxJointCallback);
-	m_extPxManager->setActorCountLimit(m_rigidBodyLimitEnabled ? m_rigidBodyLimit : 0);
-	m_extImpactDamageManager = ExtImpactDamageManager::create(m_extPxManager, m_extImpactDamageManagerSettings);
-	m_eventCallback = new EventCallback(m_extImpactDamageManager);
-
-	m_extGroupTaskManager = ExtGroupTaskManager::create(*m_taskManager);
-	m_extGroupTaskManager->setGroup(m_tkGroup);
-
-	setImpactDamageEnabled(m_impactDamageEnabled, true);
-
-	m_extSerialization = NvBlastExtSerializationCreate();
-	if (m_extSerialization != nullptr)
-	{
-		NvBlastExtTkSerializerLoadSet(*m_tkFramework, *m_extSerialization);
-		NvBlastExtPxSerializerLoadSet(*m_tkFramework, getPhysXController().getPhysics(), getPhysXController().getCooking(), *m_extSerialization);
-	}
-}
-
-
-void BlastController::onSampleStop()
-{
-	getPhysXController().simualtionSyncEnd();
-
-	removeAllFamilies();
-
-	m_extImpactDamageManager->release();
-	m_extPxManager->release();
-	SAFE_DELETE(m_eventCallback);
-
-	m_tkGroup->release();
-
-	delete m_replay;
-
-	m_tkFramework->release();
-
-	if (m_extGroupTaskManager != nullptr)
-	{
-		m_extGroupTaskManager->release();
-		m_extGroupTaskManager = nullptr;
-	}
-
-	if (m_taskManager != nullptr)
-	{
-		m_taskManager->release();
-	}
-}
-
-
-void BlastController::notifyPhysXControllerRelease()
-{
-	if (m_extGroupTaskManager != nullptr)
-	{
-		m_extGroupTaskManager->release();
-		m_extGroupTaskManager = nullptr;
-	}
-
-	if (m_taskManager != nullptr)
-	{
-		m_taskManager->release();
-		m_taskManager = nullptr;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												Impact damage
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void BlastController::updateImpactDamage()
-{
-	if (m_impactDamageUpdatePending)
-	{
-		getPhysXController().getPhysXScene().setSimulationEventCallback(m_impactDamageEnabled ? m_eventCallback : nullptr);
-		refreshImpactDamageSettings();
-		m_impactDamageUpdatePending = false;
-	}
-}
-
-void BlastController::setImpactDamageEnabled(bool enabled, bool forceUpdate)
-{
-	if (m_impactDamageEnabled != enabled || forceUpdate)
-	{
-		m_impactDamageEnabled = enabled;
-		m_impactDamageUpdatePending = true;
-	}
-}
-
-bool BlastController::customImpactDamageFunction(void* data, ExtPxActor* actor, physx::PxShape* shape, physx::PxVec3 position, physx::PxVec3 force)
-{
-	return reinterpret_cast<BlastController*>(data)->stressDamage(actor, position, force);
-}
-
-bool BlastController::stressDamage(ExtPxActor *actor, physx::PxVec3 position, physx::PxVec3 force)
-{
-	if (actor->getTkActor().getGraphNodeCount() > 1)
-	{
-		void* userData = actor->getFamily().userData;
-		if (userData)
-		{
-			ExtPxStressSolver* solver = reinterpret_cast<ExtPxStressSolver*>(userData);
-			solver->getSolver().addForce(*actor->getTkActor().getActorLL(), position, force * m_impactDamageToStressFactor);
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void BlastController::refreshImpactDamageSettings()
-{
-	m_extImpactDamageManagerSettings.damageFunction = m_impactDamageToStressEnabled ? customImpactDamageFunction : nullptr;
-	m_extImpactDamageManagerSettings.damageFunctionData = this;
-	m_extImpactDamageManager->setSettings(m_extImpactDamageManagerSettings);
-}
-
-// Add By Lixu Begin
-BlastFamily* BlastController::getFamilyByPxActor(const PxActor& actor)
-{
-	for (BlastFamilyPtr family : m_families)
-	{
-		if (family->find(actor))
-		{
-			return family;
-		}
-	}
-	return nullptr;
-}
-
-BlastFamily* BlastController::getFamilyById(int familyId)
-{
-	BlastFamily* pBlastFamily = nullptr;
-	for (BlastFamilyPtr p : m_families)
-	{
-		if (p->mUniqueId == familyId)
-		{
-			pBlastFamily = p;
-			break;
-		}
-	}
-	return pBlastFamily;
-}
-
-std::vector<PxActor*> BlastController::getActor(BlastAsset* asset, int chunkId)
-{
-	std::vector<PxActor*> actors;
-	for (BlastFamilyPtr family : m_families)
-	{
-		if (&(family->getBlastAsset()) == asset)
-		{
-			PxActor* actor = nullptr;
-			family->getPxActorByChunkIndex(chunkId, &actor);
-			if (actor)
-				actors.push_back(actor);
-		}
-	}
-	return actors;
-}
-
-void BlastController::updateActorRenderableTransform(const PxActor& actor, physx::PxTransform& pos, bool local)
-{
-	BlastFamily* family = getFamilyByPxActor(actor);
-	if (family == nullptr)
-		return;
-
-	family->updateActorRenderableTransform(actor, pos, local);
-}
-
-bool BlastController::isActorVisible(const PxActor& actor)
-{
-	BlastFamily* family = getFamilyByPxActor(actor);
-	if (family == nullptr)
-		return false;
-
-	return family->isActorVisible(actor);
-}
-
-bool BlastController::isAssetFractrued(const PxActor& actor)
-{
-	BlastFamily* family = getFamilyByPxActor(actor);
-	if (family == nullptr)
-		return false;
-
-	const BlastAsset& asset = family->getBlastAsset();
-	if (asset.getChunkIndexesByDepth(1).size() > 0)
-	{
-		return true;
-	}
-
-	return false;
-}
-
-void BlastController::updateModelMeshToProjectParam(const PxActor& actor)
-{
-	BlastFamily* family = getFamilyByPxActor(actor);
-	if (family == nullptr)
-		return;
-
-	const BlastAsset& asset = family->getBlastAsset();
-	SampleManager::ins()->updateModelMeshToProjectParam(const_cast<BlastAsset*>(&asset));
-}
-// Add By Lixu End
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Stress
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void BlastController::updateDraggingStress()
-{
-	auto physxController = getPhysXController();
-	auto actor = physxController.getDraggingActor();
-	if (actor)
-	{
-		ExtPxActor* pxActor = m_extPxManager->getActorFromPhysXActor(*actor);
-		if (pxActor && pxActor->getTkActor().getGraphNodeCount() > 1 && pxActor->getPhysXActor().getRigidBodyFlags() & PxRigidBodyFlag::eKINEMATIC)
-		{
-			void* userData = pxActor->getFamily().userData;
-			if (userData)
-			{
-				ExtPxStressSolver* solver = reinterpret_cast<ExtPxStressSolver*>(userData);
-				PxTransform t(pxActor->getPhysXActor().getGlobalPose().getInverse());
-				PxVec3 dragVector = t.rotate(physxController.getDragVector());
-				const float factor = dragVector.magnitudeSquared() * m_draggingToStressFactor;
-				solver->getSolver().addForce(*pxActor->getTkActor().getActorLL(), physxController.getDragActorHookLocalPoint(), dragVector.getNormalized() * factor);
-			}
-		}
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Stats
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-uint32_t BlastController::getActorCount() const
-{
-	return std::accumulate(m_families.begin(), m_families.end(), (uint32_t)0, [](uint32_t sum, const BlastFamilyPtr& a)
-	{
-		return sum += a->getActorCount();
-	});
-}
-
-uint32_t BlastController::getTotalVisibleChunkCount() const
-{
-	return std::accumulate(m_families.begin(), m_families.end(), (uint32_t)0, [](uint32_t sum, const BlastFamilyPtr& a)
-	{
-		return sum += a->getTotalVisibleChunkCount();
-	});
-}
-
-size_t BlastController::getFamilySize() const
-{
-	return std::accumulate(m_families.begin(), m_families.end(), (size_t)0, [](size_t sum, const BlastFamilyPtr& a)
-	{
-		return sum += a->getFamilySize();
-	});
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Time
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const double Time::s_secondsPerTick = Time::getTickDuration();
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												Controller events
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void BlastController::Animate(double dt)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	PROFILER_BEGIN("Apply Impact Damage");
-	m_extImpactDamageManager->applyDamage();
-	PROFILER_END();
-
-	updateDraggingStress();
-
-	fillDebugRender();
-
-	getPhysXController().simualtionSyncEnd();
-
-	updateImpactDamage();
-
-	Time blastTime;
-	for (uint32_t i = 0; i < m_families.size(); ++i)
-	{
-		if (m_families[i])
-		{
-			m_families[i]->updatePreSplit(dt);
-		}
-	}
-
-	m_replay->update();
-
-	PROFILER_BEGIN("Tk Group Process/Sync");
-
-#if 1
-
-	m_extGroupTaskManager->process();
-	m_extGroupTaskManager->wait();
-
-#else // process group on main thread
-
-	m_tkGroup->process();
-
-#endif
-
-	PROFILER_END();
-
-	getPhysXController().simulationBegin(dt);
-
-	TkGroupStats gstats;
-	m_tkGroup->getStats(gstats);
-
-	this->m_lastBlastTimers.blastDamageMaterial = NvBlastTicksToSeconds(gstats.timers.material);
-	this->m_lastBlastTimers.blastDamageFracture = NvBlastTicksToSeconds(gstats.timers.fracture);
-	this->m_lastBlastTimers.blastSplitIsland = NvBlastTicksToSeconds(gstats.timers.island);
-	this->m_lastBlastTimers.blastSplitPartition = NvBlastTicksToSeconds(gstats.timers.partition);
-	this->m_lastBlastTimers.blastSplitVisibility = NvBlastTicksToSeconds(gstats.timers.visibility);
-
-	for (uint32_t i = 0; i < m_families.size(); ++i)
-	{
-		if (m_families[i])
-		{
-			m_families[i]->updateAfterSplit(dt);
-		}
-	}
-
-// Add By Lixu Begin
-	BlastSceneTree* pBlastSceneTree = BlastSceneTree::ins();
-	bool needUpdateUI = false;
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = getManager()->getAssetFamiliesMap();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itAsset;
-	std::vector<BlastFamily*>::iterator itFamily;
-	uint32_t assetIndex = 0;
-	for (itAsset = AssetFamiliesMap.begin(); itAsset != AssetFamiliesMap.end(); itAsset++)
-	{
-		std::vector<BlastFamily*>& BlastFamilies = itAsset->second;
-		for (itFamily = BlastFamilies.begin(); itFamily != BlastFamilies.end(); itFamily++)
-		{
-			BlastFamily* pFamily = *itFamily;
-
-			std::map<uint32_t, bool>& VisibleChangedChunks = pFamily->getVisibleChangedChunks();
-			std::map<uint32_t, bool>::iterator itChunk;
-			for (itChunk = VisibleChangedChunks.begin(); itChunk != VisibleChangedChunks.end(); itChunk++)
-			{
-				pBlastSceneTree->updateVisible(assetIndex, itChunk->first, itChunk->second);
-				needUpdateUI = true;
-			}
-			pFamily->clearVisibleChangedChunks();
-		}
-
-		assetIndex++;
-	}
-
-	if (needUpdateUI)
-	{
-		//pBlastSceneTree->updateValues(false);
-		SampleManager::ins()->m_bNeedRefreshTree = true;
-	}
-// Add By Lixu End
-}
-
-
-void BlastController::drawUI()
-{
-	// impact damage
-	bool impactEnabled = getImpactDamageEnabled();
-	if (ImGui::Checkbox("Impact Damage", &impactEnabled))
-	{
-		setImpactDamageEnabled(impactEnabled);
-	}
-	{
-		bool refresh = false;
-		refresh |= ImGui::Checkbox("Use Shear Damage", &m_extImpactDamageManagerSettings.shearDamage);
-		refresh |= ImGui::DragFloat("Impulse Threshold (Min)", &m_extImpactDamageManagerSettings.impulseMinThreshold);
-		refresh |= ImGui::DragFloat("Impulse Threshold (Max)", &m_extImpactDamageManagerSettings.impulseMaxThreshold);
-		refresh |= ImGui::DragFloat("Damage (Max)", &m_extImpactDamageManagerSettings.damageMax);
-		refresh |= ImGui::DragFloat("Damage Radius (Max)", &m_extImpactDamageManagerSettings.damageRadiusMax);
-		refresh |= ImGui::DragFloat("Damage Attenuation", &m_extImpactDamageManagerSettings.damageAttenuation, 1.0f, 0.0f, 1.0f);
-		refresh |= ImGui::Checkbox("Impact Damage To Stress Solver", &m_impactDamageToStressEnabled);
-
-		if (refresh)
-		{
-			refreshImpactDamageSettings();
-		}
-	}
-
-	ImGui::DragFloat("Impact Damage To Stress Factor", &m_impactDamageToStressFactor, 0.001f, 0.0f, 1000.0f, "%.4f");
-	ImGui::DragFloat("Dragging To Stress Factor", &m_draggingToStressFactor, 0.1f, 0.0f, 1000.0f, "%.3f");
-
-	ImGui::Checkbox("Limit Rigid Body Count", &m_rigidBodyLimitEnabled);
-	if (m_rigidBodyLimitEnabled)
-	{
-		ImGui::DragInt("Rigid Body Limit", (int*)&m_rigidBodyLimit, 100, 1000, 100000);
-	}
-	m_extPxManager->setActorCountLimit(m_rigidBodyLimitEnabled ? m_rigidBodyLimit : 0);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													actor management
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-BlastFamilyPtr BlastController::spawnFamily(BlastAsset* blastAsset, const BlastAsset::ActorDesc& desc)
-{	
-	BlastFamilyPtr actor = blastAsset->createFamily(getPhysXController(), *m_extPxManager, desc);
-	m_families.push_back(actor);
-	recalculateAssetsSize();
-	m_replay->addFamily(&actor->getFamily()->getTkFamily());
-	return actor;
-}
-
-void BlastController::removeFamily(BlastFamilyPtr actor)
-{
-	m_replay->removeFamily(&actor->getFamily()->getTkFamily());
-	m_families.erase(std::remove(m_families.begin(), m_families.end(), actor), m_families.end());
-	recalculateAssetsSize();
-	getPhysXController().resetDragging();
-// Add By Lixu Begin
-	delete actor;
-// Add By Lixu End
-}
-
-void BlastController::removeAllFamilies()
-{
-	while (!m_families.empty())
-	{
-		removeFamily(m_families.back());
-	}
-	m_replay->reset();
-}
-
-void BlastController::recalculateAssetsSize()
-{
-	std::set<const BlastAsset*> uniquedAssets;
-	m_blastAssetsSize = 0;
-	for (uint32_t i = 0; i < m_families.size(); ++i)
-	{
-		if (uniquedAssets.find(&m_families[i]->getBlastAsset()) == uniquedAssets.end())
-		{
-			m_blastAssetsSize += m_families[i]->getBlastAsset().getBlastAssetSize();
-			uniquedAssets.insert(&m_families[i]->getBlastAsset());
-		}
-	}
-}
-
-bool BlastController::overlap(const PxGeometry& geometry, const PxTransform& pose, std::function<void(ExtPxActor*)> hitCall)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	bool anyHit = false;
-	for (uint32_t i = 0; i < m_families.size(); ++i)
-	{
-		if (m_families[i])
-		{
-			anyHit |= m_families[i]->overlap(geometry, pose, hitCall);
-		}
-	}
-	return anyHit;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													debug render
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void BlastController::fillDebugRender()
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	m_debugRenderBuffer.clear();
-
-	if (debugRenderMode != BlastFamily::DEBUG_RENDER_DISABLED)
-	{
-		getPhysXController().getPhysXScene().setVisualizationParameter(PxVisualizationParameter::eSCALE, 1);
-		for (uint32_t i = 0; i < m_families.size(); ++i)
-		{
-			m_families[i]->fillDebugRender(m_debugRenderBuffer, debugRenderMode, debugRenderScale);
-		}
-	}
-	else
-	{
-		getPhysXController().getPhysXScene().setVisualizationParameter(PxVisualizationParameter::eSCALE, 0);
-	}
-
-	getRenderer().queueRenderBuffer(&m_debugRenderBuffer);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastController.h
deleted file mode 100644
index 7a6bcf0..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastController.h
+++ /dev/null
@@ -1,287 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_CONTROLLER_H
-#define BLAST_CONTROLLER_H
-
-#include "SampleManager.h"
-#include "BlastFamily.h"
-#include "DebugRenderBuffer.h"
-#include "PxSimulationEventCallback.h"
-#include "NvBlastExtImpactDamageManager.h"
-
-using namespace physx;
-
-class BlastAsset;
-class BlastReplay;
-
-namespace physx
-{
-class PxTaskManager;
-}
-namespace Nv
-{
-namespace Blast
-{
-class TkFramework;
-class ExtGroupTaskManager;
-class ExtSerialization;
-}
-}
-
-
-struct BlastTimers
-{
-	double blastDamageMaterial;
-	double blastDamageFracture;
-	double blastSplitIsland;
-	double blastSplitPartition;
-	double blastSplitVisibility;
-};
-
-/**
-Blast Controller. Entry point for all blast related code, keeps blast actors and controls them.
-*/
-class BlastController : public ISampleController
-{
-public:
-	//////// ctor ////////
-
-	BlastController();
-	virtual ~BlastController();
-
-	void reinitialize();
-
-	//////// controller callbacks ////////
-
-	virtual void onSampleStart();
-	virtual void onSampleStop();
-
-	virtual void Animate(double dt);
-	void drawUI();
-
-
-	//////// public API ////////
-
-	bool overlap(const PxGeometry& geometry, const PxTransform& pose, std::function<void(ExtPxActor*)> hitCall);
-
-	bool stressDamage(ExtPxActor *actor, PxVec3 position, PxVec3 force);
-
-	BlastFamilyPtr spawnFamily(BlastAsset* blastAsset, const BlastAsset::ActorDesc& desc);
-	void removeFamily(BlastFamilyPtr actor);
-	void removeAllFamilies();
-
-
-	//////// public getters/setters ////////
-
-	TkFramework& getTkFramework() const
-	{
-		return *m_tkFramework;
-	}
-
-	TkGroup* getTkGroup() const
-	{
-		return m_tkGroup;
-	}
-
-	ExtPxManager& getExtPxManager() const
-	{
-		return *m_extPxManager;
-	}
-
-	ExtImpactDamageManager*	getExtImpactDamageManager() const
-	{
-		return m_extImpactDamageManager;
-	}
-
-	BlastReplay* getReplay() const
-	{
-		return m_replay;
-	}
-
-	uint32_t getActorCount() const;
-
-	uint32_t getTotalVisibleChunkCount() const;
-
-	size_t getFamilySize() const;
-
-	size_t getBlastAssetsSize() const
-	{
-		return m_blastAssetsSize;
-	}
-
-	const BlastTimers& getLastBlastTimers() const
-	{
-		return m_lastBlastTimers;
-	}
-
-	bool getImpactDamageEnabled() const
-	{
-		return m_impactDamageEnabled;
-	}
-
-	void setImpactDamageEnabled(bool enabled, bool forceUpdate = false);
-
-	ExtStressSolverSettings& getStressSolverSettings()
-	{
-		return m_extStressSolverSettings;
-	}
-
-// Add By Lixu Begin
-	std::vector<BlastFamilyPtr>& getFamilies()
-	{
-		return m_families;
-	}
-
-	BlastFamily* getFamilyByPxActor(const PxActor& actor);
-	std::vector<PxActor*> getActor(BlastAsset* asset, int chunkId);
-
-	void updateActorRenderableTransform(const PxActor& actor, physx::PxTransform& pos, bool local = false);
-
-	bool isActorVisible(const PxActor& actor);
-
-	bool isAssetFractrued(const PxActor& actor);
-
-	// only update unfractured mode mesh
-	void updateModelMeshToProjectParam(const PxActor& actor);
-
-	BlastFamily* getFamilyById(int familyId);
-// Add By Lixu End
-
-	float getLastStressDelta() const;
-
-	void notifyPhysXControllerRelease();
-
-	ExtSerialization*	getExtSerialization() const
-	{
-		return m_extSerialization;
-	}
-
-	//////// public variables for UI ////////
-
-	BlastFamily::DebugRenderMode debugRenderMode;
-	float debugRenderScale;
-
-
-	//////// Filter shader enum ////////
-
-	enum FilterDataAttributes
-	{
-		SUPPRESS_CONTACT_NOTIFY = 1,
-	};
-
-private:
-	//////// impact damage event callback ////////
-
-	class EventCallback : public PxSimulationEventCallback
-	{
-	public:
-		EventCallback(ExtImpactDamageManager* manager) : m_manager(manager) {}
-
-		// implemented
-		virtual void onContact(const PxContactPairHeader& pairHeader, const PxContactPair* pairs, uint32_t nbPairs)
-		{
-			m_manager->onContact(pairHeader, pairs, nbPairs);
-		}
-
-	private:
-		// unused
-		void onConstraintBreak(PxConstraintInfo*, PxU32) {}
-		void onWake(PxActor**, PxU32) {}
-		void onSleep(PxActor**, PxU32) {}
-		void onTrigger(PxTriggerPair*, PxU32) {}
-		void onAdvance(const PxRigidBody*const*, const PxTransform*, const PxU32) {}
-
-		// data
-		ExtImpactDamageManager*		m_manager;
-	};
-
-
-	//////// private methods ////////
-
-	void updateDraggingStress();
-
-	void updateImpactDamage();
-
-	void refreshImpactDamageSettings();
-
-	void fillDebugRender();
-
-	void recalculateAssetsSize();
-
-	static bool customImpactDamageFunction(void* data, ExtPxActor* actor, PxShape* shape, PxVec3 position, PxVec3 force);
-
-
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-
-	//////// internal data ////////
-
-	PxTaskManager*					   m_taskManager;
-	TkFramework*					   m_tkFramework;
-	TkGroup*						   m_tkGroup;
-	ExtPxManager*					   m_extPxManager;
-	ExtImpactDamageManager*	           m_extImpactDamageManager;
-	ExtImpactSettings				   m_extImpactDamageManagerSettings;
-	EventCallback*					   m_eventCallback;
-	ExtStressSolverSettings			   m_extStressSolverSettings;
-	ExtGroupTaskManager*			   m_extGroupTaskManager;
-	ExtSerialization*				   m_extSerialization;
-
-	std::vector<BlastFamilyPtr>		   m_families;
-	DebugRenderBuffer                  m_debugRenderBuffer;
-
-	bool                               m_impactDamageEnabled;
-	bool                               m_impactDamageUpdatePending;
-	bool							   m_impactDamageToStressEnabled;
-
-	float							   m_impactDamageToStressFactor;
-	float							   m_draggingToStressFactor;
-
-	bool							   m_rigidBodyLimitEnabled;
-	uint32_t						   m_rigidBodyLimit;
-
-	BlastReplay*					   m_replay;
-
-	BlastTimers				           m_lastBlastTimers;
-
-	size_t					           m_blastAssetsSize;
-};
-
-
-#endif
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamily.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamily.cpp
deleted file mode 100644
index dff2d20..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamily.cpp
+++ /dev/null
@@ -1,617 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastFamily.h"
-#include "SampleProfiler.h"
-#include "PhysXController.h"
-#include "RenderUtils.h"
-#include "SampleTime.h"
-#include "UIHelpers.h"
-
-#include "NvBlast.h"
-#include "NvBlastTkFamily.h"
-#include "NvBlastTkActor.h"
-#include "NvBlastTkAsset.h"
-#include "NvBlastTkJoint.h"
-#include "NvBlastExtPxAsset.h"
-#include "NvBlastExtPxActor.h"
-#include "NvBlastExtPxFamily.h"
-#include "NvBlastExtPxManager.h"
-
-#include "PxRigidDynamic.h"
-#include "PxScene.h"
-#include "PxJoint.h"
-// Add By Lixu Begin
-#include "BlastSceneTree.h"
-// Add By Lixu End
-
-
-const float RIGIDBODY_DENSITY = 2000.0f;
-
-std::set<int> ExistingFamilyIds;
-BlastFamily::BlastFamily(PhysXController& physXController, ExtPxManager& pxManager, const BlastAsset& blastAsset) 
-	: m_physXController(physXController)
-	, m_pxManager(pxManager)
-	, m_blastAsset(blastAsset)
-	, m_listener(this)
-	, m_totalVisibleChunkCount(0)
-	, m_stressSolver(nullptr)
-	, m_spawned(false)
-{
-	m_settings.stressSolverEnabled = false;
-	m_settings.stressDamageEnabled = false;
-
-	for (int id = 0; ; id++)
-	{
-		if (ExistingFamilyIds.find(id) == ExistingFamilyIds.end())
-		{
-			ExistingFamilyIds.emplace(id);
-			mUniqueId = id;
-			break;
-		}
-	}
-}
-
-BlastFamily::~BlastFamily()
-{
-	if (m_stressSolver)
-	{
-		m_stressSolver->release();
-	}
-
-	m_pxFamily->unsubscribe(m_listener);
-
-	m_pxFamily->release();
-
-	ExistingFamilyIds.erase(mUniqueId);
-}
-
-void BlastFamily::initialize(const BlastAsset::ActorDesc& desc)
-{
-// Add By Lixu Begin
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-	BPPBondArray& bonds = blast.bonds;
-	BlastTreeData& blastTreeData = BlastTreeData::ins();
-
-	std::vector<float> BondHealths;
-	BlastAsset* pThis = (BlastAsset*)&m_blastAsset;
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-	AssetList::ModelAsset m = AssetDescMap[pThis];
-	int assetID = BlastProject::ins().getAssetIDByName(m.name.c_str());
-
-	for (int bc = 0; bc < bonds.arraySizes[0]; bc++)
-	{
-		BPPBond& bond = bonds.buf[bc];	
-		if (bond.asset == assetID)
-		{
-			BondHealths.push_back(bond.support.bondStrength);		
-		}
-	}
-
-	const ExtPxAsset* pExtPxAsset = m_blastAsset.getPxAsset();
-	const TkAsset& tkAsset = pExtPxAsset->getTkAsset();
-	uint32_t bondCount = tkAsset.getBondCount();
-
-	const float* pBondHealths = nullptr;
-	if (bondCount == BondHealths.size())
-	{
-		pBondHealths = BondHealths.data();
-	}
-
-	const NvBlastActorDesc& defaultActorDesc = m_blastAsset.getPxAsset()->getDefaultActorDesc();
-	NvBlastActorDesc newActorDesc = defaultActorDesc;
-	newActorDesc.initialBondHealths = pBondHealths;
-// Add By Lixu End
-
-	ExtPxFamilyDesc familyDesc;
-	familyDesc.actorDesc = (const NvBlastActorDesc*)&newActorDesc; // if you use it one day, consider changing code which needs getBondHealthMax() from BlastAsset.
-	familyDesc.group = desc.group;
-	familyDesc.pxAsset = m_blastAsset.getPxAsset();
-	m_pxFamily = m_pxManager.createFamily(familyDesc);
-
-	m_tkFamily = &m_pxFamily->getTkFamily();
-	m_tkFamily->setID(desc.id);
-	m_tkFamily->setMaterial(&m_settings.material);
-	
-	m_familySize = NvBlastFamilyGetSize(m_tkFamily->getFamilyLL(), nullptr);
-
-	m_pxFamily->subscribe(m_listener);
-
-	m_initialTransform = desc.transform;
-
-	updatePreSplit(0);
-	m_VisibleChangedChunks.clear();
-}
-
-void BlastFamily::updatePreSplit(float dt)
-{
-	if (!m_spawned)
-	{
-		ExtPxSpawnSettings spawnSettings = {
-			&m_physXController.getPhysXScene(),
-			m_physXController.getDefaultMaterial(),
-			RIGIDBODY_DENSITY
-		};
-
-		m_pxFamily->spawn(m_initialTransform, PxVec3(1.0f), spawnSettings);
-		reloadStressSolver();
-
-		m_spawned = true;
-	}
-
-	// collect potential actors to health update
-	m_actorsToUpdateHealth.clear();
-	for (const ExtPxActor* actor : m_actors)
-	{
-		if (actor->getTkActor().isPending())
-		{
-			m_actorsToUpdateHealth.emplace(actor);
-		}
-	}
-}
-
-void BlastFamily::updateAfterSplit(float dt)
-{
-	PROFILER_BEGIN("Actor Health Update");
-	for (const ExtPxActor* actor : m_actors)
-	{
-		onActorUpdate(*actor);
-
-		// update health if neccessary
-		if (m_actorsToUpdateHealth.find(actor) != m_actorsToUpdateHealth.end())
-		{
-			onActorHealthUpdate(*actor);
-		}
-	}
-	PROFILER_END();
-
-	PROFILER_BEGIN("Stress Solver");
-	// update stress
-	m_stressSolveTime = 0;
-	if (m_stressSolver)
-	{
-		Time t;
-		m_stressSolver->update(m_settings.stressDamageEnabled);
-		m_stressSolveTime += t.getElapsedSeconds();
-	}
-	PROFILER_END();
-
-	PROFILER_BEGIN("Actor Misc Update");
-	onUpdate();
-	PROFILER_END();
-
-	m_pxFamily->postSplitUpdate();
-}
-
-void BlastFamily::processActorCreated(ExtPxFamily&, ExtPxActor& actor)
-{
-	m_totalVisibleChunkCount += actor.getChunkCount();
-	m_actors.emplace(&actor);
-
-	onActorCreated(actor);
-	onActorHealthUpdate(actor);
-}
-
-void BlastFamily::processActorDestroyed(ExtPxFamily&, ExtPxActor& actor)
-{
-	m_totalVisibleChunkCount -= actor.getChunkCount();
-	m_physXController.notifyRigidDynamicDestroyed(&actor.getPhysXActor());
-
-	onActorDestroyed(actor);
-
-	m_actors.erase(m_actors.find(&actor));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Data Helpers
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-uint32_t BlastFamily::getActorCount() const
-{
-	return (uint32_t)m_tkFamily->getActorCount();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													  UI
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void BlastFamily::drawUI()
-{
-	// Blast Material
-	ImGui::Spacing();
-	ImGui::Text("Blast Material:");
-	ImGui::DragFloat("Health", &m_settings.material.health);
-	ImGui::DragFloat("Min Damage Threshold", &m_settings.material.minDamageThreshold, 0.01f, 0.f, m_settings.material.maxDamageThreshold);
-	ImGui::DragFloat("Max Damage Threshold", &m_settings.material.maxDamageThreshold, 0.01f, m_settings.material.minDamageThreshold, 1.f);
-
-	ImGui::Spacing();
-
-	// Stress Solver Settings
-	if (ImGui::Checkbox("Stress Solver Enabled", &m_settings.stressSolverEnabled))
-	{
-		reloadStressSolver();
-	}
-
-	if (m_settings.stressSolverEnabled)
-	{
-		// Settings
-		bool changed = false;
-		
-		changed |= ImGui::DragInt("Bond Iterations Per Frame", (int*)&m_settings.stressSolverSettings.bondIterationsPerFrame, 100, 0, 500000);
-		changed |= ImGui::DragFloat("Material Hardness", &m_settings.stressSolverSettings.hardness, 10.0f, 0.01f, 100000.0f, "%.2f");
-		changed |= ImGui::DragFloat("Stress Linear Factor", &m_settings.stressSolverSettings.stressLinearFactor, 0.01f, 0.0f, 100.0f, "%.2f");
-		changed |= ImGui::DragFloat("Stress Angular Factor", &m_settings.stressSolverSettings.stressAngularFactor, 0.01f, 0.0f, 100.0f, "%.2f");
-		changed |= ImGui::SliderInt("Graph Reduction Level", (int*)&m_settings.stressSolverSettings.graphReductionLevel, 0, 32);
-		if (changed)
-		{
-			refreshStressSolverSettings();
-		}
-
-		ImGui::Checkbox("Stress Damage Enabled", &m_settings.stressDamageEnabled);
-
-		if (ImGui::Button("Recalculate Stress"))
-		{
-			resetStress();
-		}
-	}
-}
-
-void BlastFamily::drawStatsUI()
-{
-	ImGui::PushStyleColor(ImGuiCol_Text, ImColor(10, 255, 10, 255));
-	if (m_stressSolver)
-	{
-		const ExtStressSolver& stressSolver = m_stressSolver->getSolver();
-		const float errorLinear = stressSolver.getStressErrorLinear();
-		const float errorAngular = stressSolver.getStressErrorAngular();
-
-		ImGui::Text("Stress Bond Count:               %d", stressSolver.getBondCount());
-		ImGui::Text("Stress Frame Iter:               %d", stressSolver.getIterationsPerFrame());
-		ImGui::Text("Stress Frames:                   %d", stressSolver.getFrameCount());
-		ImGui::Text("Stress Error Lin / Ang:          %.4f / %.4f", errorLinear, errorAngular);
-		ImGui::Text("Stress Solve Time:               %.3f ms", m_stressSolveTime * 1000);
-
-		// plot errors
-		{
-			static float scale = 1.0f;
-			scale = stressSolver.getFrameCount() <= 1 ? 1.0f : scale;
-			scale = std::max<float>(scale, errorLinear);
-			scale = std::max<float>(scale, errorAngular);
-
-			static PlotLinesInstance<> linearErrorPlot;
-			linearErrorPlot.plot("Stress Linear Error", errorLinear, "error/frame", 0.0f, 1.0f * scale);
-			static PlotLinesInstance<> angularErrorPlot;
-			angularErrorPlot.plot("Stress Angular Error", errorAngular, "error/frame", 0.0f, 1.0f * scale);
-		}
-	}
-	else
-	{
-		ImGui::Text("No Stress Solver");
-	}
-	ImGui::PopStyleColor();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												  Stress Solver
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void BlastFamily::setSettings(const Settings& settings)
-{
-	bool reloadStressSolverNeeded = (m_settings.stressSolverEnabled != settings.stressSolverEnabled);
-
-	m_settings = settings;
-	refreshStressSolverSettings();
-
-	if (reloadStressSolverNeeded)
-	{
-		reloadStressSolver();
-	}
-
-	m_tkFamily->setMaterial(&m_settings.material);
-	initTransform(m_settings.transform);
-	m_initialTransform = m_settings.transform;
-}
-
-void BlastFamily::refreshStressSolverSettings()
-{
-	if (m_stressSolver)
-	{
-		m_stressSolver->getSolver().setSettings(m_settings.stressSolverSettings);
-	}
-}
-
-void BlastFamily::resetStress()
-{
-	if (m_stressSolver)
-	{
-		m_stressSolver->getSolver().reset();
-	}
-}
-
-void BlastFamily::reloadStressSolver()
-{
-	if (m_stressSolver)
-	{
-		m_stressSolver->release();
-		m_stressSolver = nullptr;
-	}
-
-	if (m_settings.stressSolverEnabled)
-	{
-		m_stressSolver = ExtPxStressSolver::create(*m_pxFamily, m_settings.stressSolverSettings);
-		m_pxFamily->userData = m_stressSolver;
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												  debug render
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const DirectX::XMFLOAT4 BOND_NORMAL_COLOR(0.0f, 0.8f, 1.0f, 1.0f);
-const DirectX::XMFLOAT4 BOND_INVISIBLE_COLOR(0.65f, 0.16f, 0.16f, 1.0f);
-const DirectX::XMFLOAT4 BOND_IMPULSE_LINEAR_COLOR(0.0f, 1.0f, 0.0f, 1.0f);
-const DirectX::XMFLOAT4 BOND_IMPULSE_ANGULAR_COLOR(1.0f, 0.0f, 0.0f, 1.0f);
-const DirectX::XMFLOAT4 JOINT_COLOR(0.5f, 0.6f, 7.0f, 1.0f);
-
-
-inline void pushCentroid(std::vector<PxDebugLine>& lines, PxVec3 pos, PxU32 color, const float& area, const PxVec3& normal)
-{
-	// draw square of area 'area' rotated by normal
-	{
-		// build world rotation
-		PxVec3 n0(0, 0, 1);
-		PxVec3 n1 = normal;
-		PxVec3 axis = n0.cross(n1);
-		float d = n0.dot(n1);
-		PxQuat q(axis.x, axis.y, axis.z, 1.f + d);
-		q.normalize();
-		float e = PxSqrt(1.0f / 2.0f);
-		float r = PxSqrt(area);
-
-		// transform all 4 square points
-		PxTransform t(pos, q);
-		PxVec3 p0 = t.transform(PxVec3(-e,  e, 0) * r);
-		PxVec3 p1 = t.transform(PxVec3( e,  e, 0) * r);
-		PxVec3 p2 = t.transform(PxVec3( e, -e, 0) * r);
-		PxVec3 p3 = t.transform(PxVec3(-e, -e, 0) * r);
-
-		// push square edges
-		lines.push_back(PxDebugLine(p0, p1, color));
-		lines.push_back(PxDebugLine(p3, p2, color));
-		lines.push_back(PxDebugLine(p1, p2, color));
-		lines.push_back(PxDebugLine(p0, p3, color));
-	}
-
-	// draw normal
-	lines.push_back(PxDebugLine(pos, pos + normal * 0.5f, XMFLOAT4ToU32Color(BOND_NORMAL_COLOR)));
-}
-
-inline DirectX::XMFLOAT4 bondHealthColor(float healthFraction)
-{
-	const DirectX::XMFLOAT4 BOND_HEALTHY_COLOR(0.0f, 1.0f, 0.0f, 1.0f);
-	const DirectX::XMFLOAT4 BOND_MID_COLOR(1.0f, 1.0f, 0.0f, 1.0f);
-	const DirectX::XMFLOAT4 BOND_BROKEN_COLOR(1.0f, 0.0f, 0.0f, 1.0f);
-
-	return healthFraction < 0.5 ? XMFLOAT4Lerp(BOND_BROKEN_COLOR, BOND_MID_COLOR, 2.0f * healthFraction) : XMFLOAT4Lerp(BOND_MID_COLOR, BOND_HEALTHY_COLOR, 2.0f * healthFraction - 1.0f);
-}
-
-void BlastFamily::fillDebugRender(DebugRenderBuffer& debugRenderBuffer, DebugRenderMode mode, float renderScale)
-{
-	const NvBlastChunk* chunks = m_tkFamily->getAsset()->getChunks();
-	const NvBlastBond* bonds = m_tkFamily->getAsset()->getBonds();
-	const NvBlastSupportGraph graph = m_tkFamily->getAsset()->getGraph();
-	const float bondHealthMax = m_blastAsset.getBondHealthMax();
-	const uint32_t chunkCount = m_tkFamily->getAsset()->getChunkCount();
-
-	for (const ExtPxActor* pxActor : m_actors)
-	{
-		TkActor& actor = pxActor->getTkActor();
-		uint32_t lineStartIndex = (uint32_t)debugRenderBuffer.m_lines.size();
-
-		uint32_t nodeCount = actor.getGraphNodeCount();
-		if (nodeCount == 0) // subsupport chunks don't have graph nodes
-			continue;
-
-		std::vector<uint32_t> nodes(nodeCount);
-		actor.getGraphNodeIndices(nodes.data(), static_cast<uint32_t>(nodes.size()));
-
-		if (DEBUG_RENDER_HEALTH_GRAPH <= mode && mode <= DEBUG_RENDER_HEALTH_GRAPH_CENTROIDS)
-		{
-			const float* bondHealths = actor.getBondHealths();
-
-			const ExtPxChunk* pxChunks = m_blastAsset.getPxAsset()->getChunks();
-
-			for (uint32_t node0 : nodes)
-			{
-				const uint32_t chunkIndex0 = graph.chunkIndices[node0];
-				const NvBlastChunk& blastChunk0 = chunks[chunkIndex0];
-				const ExtPxChunk& assetChunk0 = pxChunks[chunkIndex0];
-
-				for (uint32_t adjacencyIndex = graph.adjacencyPartition[node0]; adjacencyIndex < graph.adjacencyPartition[node0 + 1]; adjacencyIndex++)
-				{
-					uint32_t node1 = graph.adjacentNodeIndices[adjacencyIndex];
-					const uint32_t chunkIndex1 = graph.chunkIndices[node1];
-					const NvBlastChunk& blastChunk1 = chunks[chunkIndex1];
-					const ExtPxChunk& assetChunk1 = pxChunks[chunkIndex1];
-					if (node0 > node1)
-						continue;
-
-					bool invisibleBond = chunkIndex0 >= chunkCount || chunkIndex1 >= chunkCount || assetChunk0.subchunkCount == 0 || assetChunk1.subchunkCount == 0;
-
-					// health
-					uint32_t bondIndex = graph.adjacentBondIndices[adjacencyIndex];
-					float healthVal = PxClamp(bondHealths[bondIndex] / bondHealthMax, 0.0f, 1.0f);
-
-					DirectX::XMFLOAT4 color = bondHealthColor(healthVal);
-
-					const NvBlastBond& solverBond = bonds[bondIndex];
-					const PxVec3& centroid = reinterpret_cast<const PxVec3&>(solverBond.centroid);
-
-					// centroid
-					if (mode == DEBUG_RENDER_HEALTH_GRAPH_CENTROIDS || mode == DEBUG_RENDER_CENTROIDS)
-					{
-						const PxVec3& normal = reinterpret_cast<const PxVec3&>(solverBond.normal);
-						pushCentroid(debugRenderBuffer.m_lines, centroid, XMFLOAT4ToU32Color(invisibleBond ? BOND_INVISIBLE_COLOR : color), solverBond.area, normal.getNormalized());
-					}
-
-					// chunk connection (bond)
-					if ((mode == DEBUG_RENDER_HEALTH_GRAPH || mode == DEBUG_RENDER_HEALTH_GRAPH_CENTROIDS) && !invisibleBond)
-					{
-						const PxVec3& c0 = reinterpret_cast<const PxVec3&>(blastChunk0.centroid);
-						const PxVec3& c1 = reinterpret_cast<const PxVec3&>(blastChunk1.centroid);
-						debugRenderBuffer.m_lines.push_back(PxDebugLine(c0, c1, XMFLOAT4ToU32Color(color)));
-					}
-				}
-			}
-		}
-
-		// stress
-		if (DEBUG_RENDER_STRESS_GRAPH <= mode && mode <= DEBUG_RENDER_STRESS_GRAPH_BONDS_IMPULSES)
-		{
-			if (m_stressSolver)
-			{
-				const auto buffer = m_stressSolver->getSolver().fillDebugRender(nodes.data(), (uint32_t)nodes.size(), (ExtStressSolver::DebugRenderMode)(mode - DEBUG_RENDER_STRESS_GRAPH), renderScale);
-				if (buffer.lineCount)
-				{
-					const auto lines = reinterpret_cast<const PxDebugLine*>(buffer.lines);
-					debugRenderBuffer.m_lines.insert(debugRenderBuffer.m_lines.end(), lines, lines + buffer.lineCount);
-				}
-			}
-		}
-
-		// transform all added lines from local to global
-		PxTransform localToGlobal = pxActor->getPhysXActor().getGlobalPose();
-		for (uint32_t i = lineStartIndex; i < debugRenderBuffer.m_lines.size(); i++)
-		{
-			PxDebugLine& line = debugRenderBuffer.m_lines[i];
-			line.pos0 = localToGlobal.transform(line.pos0);
-			line.pos1 = localToGlobal.transform(line.pos1);
-		}
-	}
-
-	// joints debug render
-	if (mode == DEBUG_RENDER_JOINTS)
-	{
-		for (const ExtPxActor* pxActor : m_actors)
-		{
-			TkActor& actor = pxActor->getTkActor();
-			const uint32_t jointCount = actor.getJointCount();
-			if (jointCount > 0)
-			{
-				std::vector<TkJoint*> joints(jointCount);
-				actor.getJoints(joints.data(), jointCount);
-				for (auto joint : joints)
-				{
-					PxJoint* pxJoint = reinterpret_cast<PxJoint*>(joint->userData);
-					if (pxJoint)
-					{
-						PxRigidActor *actor0, *actor1;
-						pxJoint->getActors(actor0, actor1);
-						auto lp0 = pxJoint->getLocalPose(PxJointActorIndex::eACTOR0);
-						auto lp1 = pxJoint->getLocalPose(PxJointActorIndex::eACTOR1);
-						PxVec3 p0 = actor0 ? actor0->getGlobalPose().transform(lp0).p : lp0.p;
-						PxVec3 p1 = actor1 ? actor1->getGlobalPose().transform(lp1).p : lp1.p;
-						debugRenderBuffer.m_lines.push_back(PxDebugLine(p0, p1, XMFLOAT4ToU32Color(JOINT_COLOR)));
-					}
-				}
-			}
-		}
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//														action!!!
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class BlastOverlapCallback : public PxOverlapCallback
-{
-public:
-	BlastOverlapCallback(ExtPxManager& pxManager, std::set<ExtPxActor*>& actorBuffer)
-		: m_pxManager(pxManager), m_actorBuffer(actorBuffer), PxOverlapCallback(m_hitBuffer, sizeof(m_hitBuffer) / sizeof(m_hitBuffer[0])) {}
-
-	PxAgain processTouches(const PxOverlapHit* buffer, PxU32 nbHits)
-	{
-		for (PxU32 i = 0; i < nbHits; ++i)
-		{
-			PxRigidDynamic* rigidDynamic = buffer[i].actor->is<PxRigidDynamic>();
-			if (rigidDynamic)
-			{
-				ExtPxActor* actor = m_pxManager.getActorFromPhysXActor(*rigidDynamic);
-				if (actor != nullptr)
-				{
-					m_actorBuffer.insert(actor);
-				}
-			}
-		}
-		return true;
-	}
-
-private:
-	ExtPxManager&						m_pxManager;
-	std::set<ExtPxActor*>&				m_actorBuffer;
-	PxOverlapHit						m_hitBuffer[1000];
-};
-
-bool BlastFamily::overlap(const PxGeometry& geometry, const PxTransform& pose, std::function<void(ExtPxActor*)> hitCall)
-{
-// Add By Lixu Begin
-	/*
-	const ExtPxAsset* pExtPxAsset = m_blastAsset.getPxAsset();
-	const TkAsset& tkAsset = pExtPxAsset->getTkAsset();
-	uint32_t bondCount = tkAsset.getBondCount();
-	if (bondCount == 0)
-	{
-		return false;
-	}
-	*/
-// Add By Lixu End
-
-	std::set<ExtPxActor*> actorsToDamage;
-#if 1
-	BlastOverlapCallback overlapCallback(m_pxManager, actorsToDamage);
-	m_physXController.getPhysXScene().overlap(geometry, pose, overlapCallback);
-#else
-	for (std::map<NvBlastActor*, PhysXController::Actor*>::iterator it = m_actorsMap.begin(); it != m_actorsMap.end(); it++)
-	{
-		actorsToDamage.insert(it->first);
-	}
-#endif
-
-	for (auto actor : actorsToDamage)
-	{
-		hitCall(actor);
-	}
-
-	return !actorsToDamage.empty();
-}
-
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamily.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamily.h
deleted file mode 100644
index 9978f20..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamily.h
+++ /dev/null
@@ -1,262 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_FAMILY_H
-#define BLAST_FAMILY_H
-
-#include "BlastAsset.h"
-#include "NvBlastExtPxListener.h"
-#include "NvBlastExtPxStressSolver.h"
-#include "NvBlastExtDamageShaders.h"
-#include <functional>
-#include <set>
-#include <map>
-
-
-class DebugRenderBuffer;
-// Add By Lixu Begin
-class RenderMaterial;
-namespace physx
-{
-	class PxActor;
-}
-using namespace physx;
-// Add By Lixu End
-
-namespace Nv
-{
-namespace Blast
-{
-class TkFamily;
-class ExtPxManager;
-}
-}
-
-namespace physx
-{
-class PxGeometry;
-class PxTransform;
-}
-
-
-
-/**
-BlastFamily class represents 1 spawned BlastAsset, contains and manipulates all physx/blast actors spawned by fracturing it.
-Abstract class, internal actor management functions are implementation dependent and so pure virtual.
-*/
-class BlastFamily
-{
-public:
-
-	//////// public API ////////
-
-	bool overlap(const PxGeometry& geometry, const PxTransform& pose, std::function<void(ExtPxActor*)> hitCall);
-
-	void updatePreSplit(float dt);
-	void updateAfterSplit(float dt);
-
-	void drawUI();
-	void drawStatsUI();
-
-// Add By Lixu Begin
-	virtual bool find(const PxActor& actor) { return false; }
-	virtual void updateActorRenderableTransform(const PxActor& actor, PxTransform& pos, bool local) {}
-	virtual uint32_t getChunkIndexByPxActor(const PxActor& actor) { return -1; }
-	virtual bool getPxActorByChunkIndex(uint32_t chunkIndex, PxActor** ppActor) { return false; }
-	virtual void setActorSelected(const PxActor& actor, bool selected) {}
-	virtual bool isActorSelected(const PxActor& actor) { return false; }
-	virtual void setActorVisible(const PxActor& actor, bool visible) {}
-	virtual bool isActorVisible(const PxActor& actor) { return false; }
-	virtual std::vector<uint32_t> getSelectedChunks()	{ return std::vector<uint32_t>(); }
-	virtual void clearChunksSelected() {}
-	virtual void setChunkSelected(uint32_t chunk, bool selected) {}
-	virtual void setChunkSelected(std::vector<uint32_t> depths, bool selected) {}
-	virtual bool isChunkSelected(uint32_t chunk) { return false; }
-	virtual void setActorScale(const PxActor& actor, PxMat44& scale, bool replace) {}
-	virtual bool isChunkVisible(uint32_t chunkIndex) { return false; }
-	virtual void setChunkVisible(uint32_t chunkIndex, bool bVisible) {}
-	virtual void setChunkVisible(std::vector<uint32_t> depths, bool bVisible) {}
-	virtual void initTransform(physx::PxTransform t) { m_settings.transform = t; }
-	std::map<uint32_t, bool>& getVisibleChangedChunks() { return m_VisibleChangedChunks; }
-	void clearVisibleChangedChunks() { m_VisibleChangedChunks.clear(); }
-	virtual void getMaterial(RenderMaterial** ppRenderMaterial, bool externalSurface) {}
-	virtual void setMaterial(RenderMaterial* pRenderMaterial, bool externalSurface) {}
-	virtual void highlightChunks() {}
-// Add By Lixu End
-
-	enum DebugRenderMode
-	{
-		DEBUG_RENDER_DISABLED,
-		DEBUG_RENDER_HEALTH_GRAPH,
-		DEBUG_RENDER_CENTROIDS,
-		DEBUG_RENDER_HEALTH_GRAPH_CENTROIDS,
-		DEBUG_RENDER_JOINTS,
-		DEBUG_RENDER_STRESS_GRAPH,
-		DEBUG_RENDER_STRESS_GRAPH_NODES_IMPULSES,
-		DEBUG_RENDER_STRESS_GRAPH_BONDS_IMPULSES,
-
-		// count
-		DEBUG_RENDER_MODES_COUNT
-	};
-
-	void fillDebugRender(DebugRenderBuffer& debugRenderBuffer, DebugRenderMode mode, float renderScale);
-
-
-	//////// public getters ////////
-
-	const ExtPxFamily* getFamily() const
-	{
-		return m_pxFamily;
-	}
-
-	uint32_t getActorCount() const;
-
-	uint32_t getTotalVisibleChunkCount() const
-	{
-		return m_totalVisibleChunkCount;
-	}
-
-	size_t getFamilySize() const
-	{
-		return m_familySize;
-	}
-
-	const BlastAsset& getBlastAsset()
-	{
-		return m_blastAsset;
-	}
-
-	void resetStress();
-
-	void refreshStressSolverSettings();
-
-	void reloadStressSolver();
-
-
-	//////// settings ////////
-
-	struct Settings
-	{
-		bool						stressSolverEnabled;
-		ExtStressSolverSettings		stressSolverSettings;
-		bool						stressDamageEnabled;
-		NvBlastExtMaterial			material;
-		physx::PxTransform			transform;
-	};
-
-	void setSettings(const Settings& settings);
-
-	const Settings& getSettings() const
-	{
-		return m_settings;
-	}
-
-
-	//////// dtor ////////
-
-	virtual ~BlastFamily();
-	int mUniqueId;
-
-protected:
-
-	//////// ctor ////////
-
-	BlastFamily(PhysXController& physXController, ExtPxManager& pxManager, const BlastAsset& blastAsset);
-
-	void initialize(const BlastAsset::ActorDesc& desc);
-
-
-	//////// internal virtual callbacks  ////////
-
-	virtual void onActorCreated(const ExtPxActor& actor) = 0;
-	virtual void onActorUpdate(const ExtPxActor& actor) = 0;
-	virtual void onActorDestroyed(const ExtPxActor& actor) = 0;
-	virtual void onActorHealthUpdate(const ExtPxActor& pxActor) {};
-	
-	virtual void onUpdate() {}
-
-
-	//////// protected data ////////
-
-	PhysXController&	m_physXController;
-	ExtPxManager&		m_pxManager;
-	const BlastAsset&	m_blastAsset;
-	std::map<uint32_t, bool> m_VisibleChangedChunks;
-
-private:
-
-	//////// physics listener ////////
-
-	class PxManagerListener : public ExtPxListener
-	{
-	public:
-		PxManagerListener(BlastFamily* family) : m_family(family) {}
-
-		virtual void onActorCreated(ExtPxFamily& family, ExtPxActor& actor)
-		{
-			m_family->processActorCreated(family, actor);
-
-		}
-
-		virtual void onActorDestroyed(ExtPxFamily& family, ExtPxActor& actor)
-		{
-			m_family->processActorDestroyed(family, actor);
-		}
-	private:
-		BlastFamily* m_family;
-	};
-
-	friend class PxManagerListener;
-
-	//////// private methods ////////
-
-	void processActorCreated(ExtPxFamily&, ExtPxActor& actor);
-	void processActorDestroyed(ExtPxFamily&, ExtPxActor& actor);
-
-
-	//////// private data ////////
-
-	TkFamily*												 m_tkFamily;
-	ExtPxFamily*										     m_pxFamily;
-	PxManagerListener					                     m_listener;
-	Settings												 m_settings;
-	PxTransform												 m_initialTransform;
-	bool													 m_spawned;
-	size_t									                 m_familySize;
-	uint32_t                                                 m_totalVisibleChunkCount;
-	ExtPxStressSolver*										 m_stressSolver;
-	double													 m_stressSolveTime;
-	std::set<const ExtPxActor*>						         m_actorsToUpdateHealth;
-	// Add By Lixu Begin
-protected:
-	std::set<ExtPxActor*>								     m_actors;
-	// Add By Lixu End
-};
-
-
-#endif //BLAST_FAMILY_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyBoxes.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyBoxes.cpp
deleted file mode 100644
index 7011612..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyBoxes.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastFamilyBoxes.h"
-#include "NvBlastExtPxAsset.h"
-#include "NvBlastExtPxActor.h"
-#include "BlastAssetBoxes.h"
-#include "Renderer.h"
-#include "PhysXController.h"
-#include "RenderUtils.h"
-#include "PxRigidDynamic.h"
-
-using namespace physx;
-
-
-BlastFamilyBoxes::BlastFamilyBoxes(PhysXController& physXController, ExtPxManager& pxManager, Renderer& renderer, const BlastAssetBoxes& blastAsset, const BlastAsset::ActorDesc& desc)
-	: BlastFamily(physXController, pxManager, blastAsset), m_renderer(renderer)
-{
-	// prepare renderables
-	IRenderMesh* boxRenderMesh = renderer.getPrimitiveRenderMesh(PrimitiveRenderMeshType::Box);
-	RenderMaterial* primitiveRenderMaterial = physXController.getPrimitiveRenderMaterial();
-
-	const ExtPxAsset* pxAsset = m_blastAsset.getPxAsset();
-	const uint32_t chunkCount = pxAsset->getChunkCount();
-	const ExtPxChunk* chunks = pxAsset->getChunks();
-	const ExtPxSubchunk* subChunks = pxAsset->getSubchunks();
-	m_chunkRenderables.resize(chunkCount);
-	for (uint32_t i = 0; i < chunkCount; i++)
-	{
-		Renderable* renderable = renderer.createRenderable(*boxRenderMesh, *primitiveRenderMaterial);
-		renderable->setHidden(true);
-		renderable->setScale(subChunks[chunks[i].firstSubchunkIndex].geometry.scale.scale);
-		m_chunkRenderables[i] = renderable;
-	}
-
-	// initialize in position
-	initialize(desc);
-}
-
-BlastFamilyBoxes::~BlastFamilyBoxes()
-{
-	for (uint32_t i = 0; i < m_chunkRenderables.size(); i++)
-	{
-		m_renderer.removeRenderable(m_chunkRenderables[i]);
-	}
-}
-
-void BlastFamilyBoxes::onActorCreated(const ExtPxActor& actor)
-{
-	DirectX::XMFLOAT4 color = getRandomPastelColor();
-
-	const uint32_t* chunkIndices = actor.getChunkIndices();
-	uint32_t chunkCount = actor.getChunkCount();
-	for (uint32_t i = 0; i < chunkCount; i++)
-	{
-		const uint32_t chunkIndex = chunkIndices[i];
-		m_chunkRenderables[chunkIndex]->setHidden(false);
-		m_chunkRenderables[chunkIndex]->setColor(color);
-	}
-}
-
-void BlastFamilyBoxes::onActorUpdate(const ExtPxActor& actor)
-{
-	const ExtPxChunk* chunks = m_blastAsset.getPxAsset()->getChunks();
-	const ExtPxSubchunk* subChunks = m_blastAsset.getPxAsset()->getSubchunks();
-	const uint32_t* chunkIndices = actor.getChunkIndices();
-	uint32_t chunkCount = actor.getChunkCount();
-	for (uint32_t i = 0; i < chunkCount; i++)
-	{
-		const uint32_t chunkIndex = chunkIndices[i];
-		m_chunkRenderables[chunkIndex]->setTransform(actor.getPhysXActor().getGlobalPose() * subChunks[chunks[chunkIndex].firstSubchunkIndex].transform);
-	}
-}
-
-void BlastFamilyBoxes::onActorDestroyed(const ExtPxActor& actor)
-{
-	const uint32_t* chunkIndices = actor.getChunkIndices();
-	uint32_t chunkCount = actor.getChunkCount();
-	for (uint32_t i = 0; i < chunkCount; i++)
-	{
-		m_chunkRenderables[chunkIndices[i]]->setHidden(true);
-	}
-
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyBoxes.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyBoxes.h
deleted file mode 100644
index b67ec31..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyBoxes.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_FAMILY_BOXES
-#define BLAST_FAMILY_BOXES
-
-#include "BlastFamily.h"
-
-class BlastAssetBoxes;
-class Renderable;
-
-
-class BlastFamilyBoxes : public BlastFamily
-{
-public:
-	BlastFamilyBoxes(PhysXController& physXController, ExtPxManager& pxManager, Renderer& renderer, const BlastAssetBoxes& blastAsset, const BlastAsset::ActorDesc& desc);
-	virtual ~BlastFamilyBoxes();
-
-protected:
-	virtual void onActorCreated(const ExtPxActor& actor);
-	virtual void onActorUpdate(const ExtPxActor& actor);
-	virtual void onActorDestroyed(const ExtPxActor& actor);
-
-private:
-	Renderer&				 m_renderer;
-	std::vector<Renderable*> m_chunkRenderables;
-};
-
-
-#endif //BLAST_FAMILY_BOXES
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSimple.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSimple.cpp
deleted file mode 100644
index 4ca8b87..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSimple.cpp
+++ /dev/null
@@ -1,1071 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastFamilyModelSimple.h"
-#include "RenderUtils.h"
-#include "DeviceManager.h"
-#include "Renderer.h"
-#include "NvBlastExtPxAsset.h"
-#include "NvBlastExtPxActor.h"
-#include "NvBlastTkActor.h"
-#include "NvBlastTkAsset.h"
-#include "PxRigidDynamic.h"
-#include "MaterialLibraryPanel.h"
-
-// Add By Lixu Begin
-#include "NvBlastExtPxManager.h"
-#include "SceneController.h"
-#include "PhysXController.h"
-#include "SampleManager.h"
-#include "BlastModel.h"
-#include "PxPhysics.h"
-#include "PxScene.h"
-#include "GizmoToolController.h"
-// Add By Lixu End
-
-using namespace physx;
-
-#include "ViewerOutput.h"
-// print out all shapes for debug purpose. check actor/shape releasing.
-void PrintActors(PhysXController& physXController)
-{
-	PxPhysics& physx = physXController.getPhysics();
-	static int convexNum = 0, shapeNum = 0;
-	int convexNumNew = physx.getNbConvexMeshes();
-	int shapeNumNew = physx.getNbShapes();
-	if (shapeNum != shapeNumNew && shapeNumNew > 0)
-	{
-		// print shapes
-		std::vector<PxShape*> shapes(shapeNumNew);
-		physx.getShapes(shapes.data(), shapeNumNew);
-		shapeNum = shapeNumNew;
-		for (PxU32 u = 0; u < shapeNumNew; ++u)
-		{
-			PxShape& shape = *shapes[u];
-			PxRigidActor* pActor = shape.getActor();
-			const char* pName = pActor ? pActor->getName() : nullptr;
-			char buf[256];
-			if (pName)
-			{
-				sprintf(buf, "Actor %x shape %x %s", pActor, &shape, pName);
-			}
-			else
-			{
-				sprintf(buf, "Actor %x shape %x", pActor, &shape);
-			}
-			viewer_msg(buf);
-		}
-	}
-}
-
-// only modify unfractured mode mesh
-void modifyModelByLocalWay(BlastModel& model, PxTransform& gp_old, PxTransform& gp_new)
-{
-	BlastModel::Chunk& chunk = model.chunks[0];//unfracture model only has one chunk
-
-	std::vector<BlastModel::Chunk::Mesh>& meshes = chunk.meshes;
-	int meshSize = meshes.size();
-
-	if (meshSize == 0)
-	{
-		return;
-	}
-
-	PxTransform gp_newInv = gp_new.getInverse();
-	for (int ms = 0; ms < meshSize; ms++)
-	{
-		BlastModel::Chunk::Mesh& mesh = meshes[ms];
-		SimpleMesh& simpleMesh = mesh.mesh;
-		std::vector<SimpleMesh::Vertex>& vertices = simpleMesh.vertices;
-
-		int NumVertices = vertices.size();
-		for (uint32_t i = 0; i < NumVertices; ++i)
-		{
-			PxTransform v_old(vertices[i].position);
-			PxTransform v_new = gp_newInv * gp_old * v_old;
-			physx::PxVec3 pos = v_new.p;
-
-			SimpleMesh::Vertex& vertex = vertices[i];
-			vertex.position.x = pos.x;
-			vertex.position.y = pos.y;
-			vertex.position.z = pos.z;
-		}
-	}
-}
-
-
-void scaleModel(BlastModel& model, PxMat44& scale)
-{
-	BlastModel::Chunk& chunk = model.chunks[0];//unfracture model only has one chunk
-
-	std::vector<BlastModel::Chunk::Mesh>& meshes = chunk.meshes;
-	int meshSize = meshes.size();
-
-	if (meshSize == 0)
-	{
-		return;
-	}
-
-	for (int ms = 0; ms < meshSize; ms++)
-	{
-		BlastModel::Chunk::Mesh& mesh = meshes[ms];
-		SimpleMesh& simpleMesh = mesh.mesh;
-		std::vector<SimpleMesh::Vertex>& vertices = simpleMesh.vertices;
-
-		int NumVertices = vertices.size();
-		for (uint32_t i = 0; i < NumVertices; ++i)
-		{
-			SimpleMesh::Vertex& vertex = vertices[i];
-			physx::PxVec3 pos = scale.transform(vertices[i].position);
-
-			vertex.position.x = pos.x;
-			vertex.position.y = pos.y;
-			vertex.position.z = pos.z;
-		}
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												SimpleRenderMesh
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class SimpleRenderMesh : public IRenderMesh
-{
-public:
-	SimpleRenderMesh(const SimpleMesh* mesh, int renderableId) : m_mesh(mesh)
-	{
-		mUniqueId = renderableId;
-
-		m_device = GetDeviceManager()->GetDevice();
-
-		m_inputDesc.push_back({ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-		m_inputDesc.push_back({ "VERTEX_NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-		m_inputDesc.push_back({ "FACE_NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-		m_inputDesc.push_back({ "TANGENT", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 36, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-		m_inputDesc.push_back({ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 48, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-		m_inputDesc.push_back({ "TEXCOORD", 1, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-
-		m_numVertices = static_cast<uint32_t>(mesh->vertices.size());
-		m_numFaces = static_cast<uint32_t>(mesh->indices.size());
-
-		// VB
-		{
-			D3D11_SUBRESOURCE_DATA vertexBufferData;
-			ZeroMemory(&vertexBufferData, sizeof(vertexBufferData));
-			vertexBufferData.pSysMem = mesh->vertices.data();
-
-			D3D11_BUFFER_DESC bufferDesc;
-			memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-			bufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-			bufferDesc.ByteWidth = sizeof(SimpleMesh::Vertex) * m_numVertices;
-			bufferDesc.CPUAccessFlags = 0;
-			bufferDesc.MiscFlags = 0;
-			bufferDesc.Usage = D3D11_USAGE_IMMUTABLE;
-
-			V(m_device->CreateBuffer(&bufferDesc, &vertexBufferData, &m_vertexBuffer));
-		}
-
-		// Health Buffer
-		{
-			// fill with 1.0f initially
-			std::vector<float> healths(mesh->vertices.size());
-			std::fill(healths.begin(), healths.end(), 1.0f);
-
-			D3D11_SUBRESOURCE_DATA vertexBufferData;
-			ZeroMemory(&vertexBufferData, sizeof(vertexBufferData));
-			vertexBufferData.pSysMem = healths.data();
-
-			D3D11_BUFFER_DESC bufferDesc;
-			memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-			bufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-			bufferDesc.ByteWidth = (uint32_t)(sizeof(float) * m_numVertices);
-			bufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-			bufferDesc.MiscFlags = 0;
-			bufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-
-			V(m_device->CreateBuffer(&bufferDesc, &vertexBufferData, &m_healthBuffer));
-		}
-
-		// IB
-		if (m_numFaces)
-		{
-			D3D11_SUBRESOURCE_DATA indexBufferData;
-
-			ZeroMemory(&indexBufferData, sizeof(indexBufferData));
-			indexBufferData.pSysMem = mesh->indices.data();
-
-			D3D11_BUFFER_DESC bufferDesc;
-
-			memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-			bufferDesc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-			bufferDesc.ByteWidth = sizeof(uint16_t) * m_numFaces;
-			bufferDesc.CPUAccessFlags = 0;
-			bufferDesc.MiscFlags = 0;
-			bufferDesc.Usage = D3D11_USAGE_IMMUTABLE;
-
-			V(m_device->CreateBuffer(&bufferDesc, &indexBufferData, &m_indexBuffer));
-		}
-	}
-
-	~SimpleRenderMesh()
-	{
-		SAFE_RELEASE(m_healthBuffer);
-		SAFE_RELEASE(m_vertexBuffer);
-		SAFE_RELEASE(m_indexBuffer);
-	}
-
-
-	void render(ID3D11DeviceContext& context) const
-	{
-		context.IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-
-		UINT strides[2] = { sizeof(SimpleMesh::Vertex), sizeof(float) };
-		UINT offsets[2] = { 0 };
-		ID3D11Buffer* buffers[2] = { m_vertexBuffer, m_healthBuffer };
-		context.IASetVertexBuffers(0, 2, buffers, strides, offsets);
-
-
-		context.IASetIndexBuffer(m_indexBuffer, DXGI_FORMAT_R16_UINT, 0);
-
-		if (m_indexBuffer)
-			context.DrawIndexed(m_numFaces, 0, 0);
-		else
-			context.Draw(m_numVertices, 0);
-	}
-
-	const std::vector<D3D11_INPUT_ELEMENT_DESC>& getInputElementDesc() const { return m_inputDesc; }
-	
-	const SimpleMesh* getMesh() { return m_mesh; }
-
-	void updateHealths(const std::vector<float>& healths)
-	{
-		ID3D11DeviceContext* context;
-		m_device->GetImmediateContext(&context);
-
-		// update buffer
-		{
-			D3D11_MAPPED_SUBRESOURCE mappedRead;
-			V(context->Map(m_healthBuffer, 0, D3D11_MAP_WRITE_DISCARD, NULL, &mappedRead));
-			memcpy(mappedRead.pData, healths.data(), sizeof(float) * healths.size());
-			context->Unmap(m_healthBuffer, 0);
-		}
-
-	}
-
-// Add By Lixu Begin
-	void setScale(PxMat44 scale, bool replace)
-	{
-		std::vector<SimpleMesh::Vertex> newVertex(m_numVertices);
-		for (int v = 0; v < m_numVertices; v++)
-		{
-			newVertex[v] = m_mesh->vertices[v];
-			newVertex[v].position = scale.transform(newVertex[v].position);
-		}
-
-		D3D11_SUBRESOURCE_DATA vertexBufferData;
-		ZeroMemory(&vertexBufferData, sizeof(vertexBufferData));
-		vertexBufferData.pSysMem = newVertex.data();
-
-		D3D11_BUFFER_DESC bufferDesc;
-		memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-		bufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-		bufferDesc.ByteWidth = sizeof(SimpleMesh::Vertex) * m_numVertices;
-		bufferDesc.CPUAccessFlags = 0;
-		bufferDesc.MiscFlags = 0;
-		bufferDesc.Usage = D3D11_USAGE_IMMUTABLE;
-
-		ID3D11Buffer* pBuffer = m_vertexBuffer;
-		V(m_device->CreateBuffer(&bufferDesc, &vertexBufferData, &m_vertexBuffer));
-		if (NULL != pBuffer)
-		{
-			pBuffer->Release();
-			pBuffer = NULL;
-		}
-
-		if (replace)
-		{
-			memcpy((void*)m_mesh->vertices.data(), newVertex.data(), bufferDesc.ByteWidth);
-		}
-	}
-// Add By Lixu End
-
-private:
-
-	ID3D11Device* m_device;
-
-	ID3D11Buffer* m_vertexBuffer;
-	ID3D11Buffer* m_healthBuffer;
-	ID3D11Buffer* m_indexBuffer;
-	uint32_t      m_numFaces;
-	uint32_t      m_numVertices;
-
-	std::vector<D3D11_INPUT_ELEMENT_DESC> m_inputDesc;
-
-	const SimpleMesh* m_mesh;
-};
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//											BlastFamilyModelSimple
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-BlastFamilyModelSimple::BlastFamilyModelSimple(PhysXController& physXController, ExtPxManager& pxManager, Renderer& renderer, const BlastAssetModelSimple& blastAsset, const BlastAsset::ActorDesc& desc)
-	: BlastFamily(physXController, pxManager, blastAsset), m_renderer(renderer)
-{
-	// Add By Lixu Begin
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = pSampleManager->getAssetFamiliesMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-
-	BlastAsset* pBlastAsset = (BlastAsset*)&getBlastAsset();
-	AssetFamiliesMap[pBlastAsset].push_back(this);
-
-	AssetList::ModelAsset& m = AssetDescMap[pBlastAsset];
-	// Add By Lixu End
-
-	// materials
-	auto materials = blastAsset.getRenderMaterials();
-
-	// model
-	const BlastModel& model = blastAsset.getModel();
-
-	// create render mesh for every BlastModel::Chunk::Mesh and renderable with it
-	const std::vector<BlastModel::Chunk>& modelChunks = model.chunks;
-	m_chunks.resize(modelChunks.size());
-	for (uint32_t chunkIndex = 0; chunkIndex < modelChunks.size(); chunkIndex++)
-	{
-		const std::vector<BlastModel::Chunk::Mesh>& meshes = modelChunks[chunkIndex].meshes;
-		std::vector<SimpleRenderMesh*>& renderMeshes = m_chunks[chunkIndex].renderMeshes;
-		std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-// Add By Lixu Begin
-		std::vector<Renderable*>& ex_Renderables = m_chunks[chunkIndex].ex_Renderables;
-		ex_Renderables.clear();
-		std::vector<Renderable*>& in_Renderables = m_chunks[chunkIndex].in_Renderables;
-		in_Renderables.clear();
-
-		PxActor* actor = pSampleManager->getPhysXController().createEditPhysXActor(meshes, desc.transform);
-		m_editActorChunkMap.insert(std::make_pair(actor, chunkIndex));
-		m_chunkEditActorMap.insert(std::make_pair(chunkIndex, actor));
-// Add By Lixu End
-		renderMeshes.resize(meshes.size());
-		renderables.resize(meshes.size());
-
-		int renderableId = Renderable::getRenderableId(mUniqueId, chunkIndex);
-
-		for (uint32_t i = 0; i < meshes.size(); i++)
-		{
-			renderMeshes[i] = new SimpleRenderMesh(&meshes[i].mesh, renderableId);
-
-			uint32_t materialIndex = model.chunks[chunkIndex].meshes[i].materialIndex;
-
-			RenderMaterial* pRenderMaterial = pSampleManager->getRenderMaterial(materials[materialIndex]);
-
-			Renderable* renderable = renderer.createRenderable(*renderMeshes[i], *pRenderMaterial);
-			renderable->setHidden(!_getBPPChunkVisible(chunkIndex));
-			renderables[i] = renderable;
-// Add By Lixu Begin
-			if (materialIndex == 0)
-			{
-				ex_Renderables.push_back(renderable);
-			}
-			else if (materialIndex == 1)
-			{
-				in_Renderables.push_back(renderable);
-			}
-// Add By Lixu End
-		}
-	}
-
-// Add By Lixu Begin
-	initTransform(desc.transform);
-// Add By Lixu End
-
-	// initialize in position
-	initialize(desc);
-}
-
-BlastFamilyModelSimple::~BlastFamilyModelSimple()
-{
-// Add By Lixu Begin
-	// remove from AssetFamiliesMap
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = pSampleManager->getAssetFamiliesMap();
-	BlastAsset* pBlastAsset = (BlastAsset*)&getBlastAsset();
-	std::vector<BlastFamily*>& families = AssetFamiliesMap[pBlastAsset];
-	std::vector<BlastFamily*>::iterator itBF;
-	for (itBF = families.begin(); itBF != families.end(); itBF++)
-	{
-		if ((*itBF) == this)
-		{
-			families.erase(itBF);
-			break;
-		}
-	}
-	if (families.size() == 0)
-	{
-		AssetFamiliesMap.erase(AssetFamiliesMap.find(pBlastAsset));
-	}
-
-	// disconnect the material and relative renderable
-	const BlastAssetModelSimple& blastAsset = *(BlastAssetModelSimple*)&m_blastAsset;
-	const std::vector<std::string>& materials = blastAsset.getRenderMaterials();
-	int materialSize = materials.size();
-	for (int ms = 0; ms < materialSize; ms++)
-	{
-		RenderMaterial* pRenderMaterial = pSampleManager->getRenderMaterial(materials[ms]);
-		pRenderMaterial->clearRelatedRenderables();
-	}
-
-	// remove physx actor for edit mode
-	PxScene& editScene = pSampleManager->getPhysXController().getEditPhysXScene();
-
-	for (std::map<PxActor*, uint32_t>::iterator itr = m_editActorChunkMap.begin(); itr != m_editActorChunkMap.end(); ++itr)
-	{
-		editScene.removeActor(*(itr->first));
-		PxRigidDynamic* rigidDynamic = (itr->first)->is<PxRigidDynamic>();
-		if (rigidDynamic == nullptr)
-		{
-			itr->first->release();
-			continue;
-		}
-		
-		PxU32 shapeCount = rigidDynamic->getNbShapes();
-		std::vector<PxShape*> shapes;
-		shapes.resize(shapeCount);
-		rigidDynamic->getShapes(shapes.data(), shapeCount);
-		for (PxU32 u = 0; u < shapeCount; ++u)
-		{
-			PxShape& shape = *shapes[u];
-			rigidDynamic->detachShape(shape);
-			PxConvexMeshGeometry geometry;
-			shape.getConvexMeshGeometry(geometry);
-			geometry.convexMesh->release();
-			shape.release();
-		}
-
-		rigidDynamic->release();
-	}
-// Add By Lixu End
-
-	// release all chunks
-	for (uint32_t chunkIndex = 0; chunkIndex < m_chunks.size(); chunkIndex++)
-	{
-		std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-		for (uint32_t i = 0; i < m_chunks[chunkIndex].renderables.size(); i++)
-		{
-			m_renderer.removeRenderable(m_chunks[chunkIndex].renderables[i]);
-			SAFE_DELETE(m_chunks[chunkIndex].renderMeshes[i]);
-		}
-	}
-	// Add By Lixu Begin
-	//PrintActors(SampleManager::ins()->getPhysXController());
-	// Add By Lixu End
-}
-
-void BlastFamilyModelSimple::onActorCreated(const ExtPxActor& actor)
-{
-	// separate color for every material
-	std::vector<DirectX::XMFLOAT4> colors;
-
-	const uint32_t* chunkIndices = actor.getChunkIndices();
-	uint32_t chunkCount = actor.getChunkCount();
-	for (uint32_t i = 0; i < chunkCount; i++)
-	{
-		uint32_t chunkIndex = chunkIndices[i];
-		std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-		for (uint32_t r = 0; r < renderables.size(); r++)
-		{
-			if (colors.size() <= r)
-				colors.push_back(getRandomPastelColor());
-			if (SampleManager::ins()->IsSimulating())
-			{
-				renderables[r]->setHidden(false);
-			}
-			else
-			{
-				renderables[r]->setHidden(!_getBPPChunkVisible(chunkIndex));
-			}
-//			renderables[r]->setColor(colors[r]);
-
-			m_VisibleChangedChunks[chunkIndex] = true;
-		}
-	}
-}
-
-void BlastFamilyModelSimple::onActorUpdate(const ExtPxActor& actor)
-{
-// Add By Lixu Begin
-	if (!SampleManager::ins()->IsSimulating())
-		return;
-
-	uint32_t shapesCount = actor.getPhysXActor().getNbShapes();
-	PxTransform lp;
-	if (shapesCount > 0)
-	{
-		std::vector<PxShape*> shapes(shapesCount);
-		actor.getPhysXActor().getShapes(&shapes[0], shapesCount);
-		PxShape* shape = shapes[0];
-		lp = shape->getLocalPose();
-	}
-// Add By Lixu End
-
-	const ExtPxChunk* chunks = m_blastAsset.getPxAsset()->getChunks();
-	const ExtPxSubchunk* subChunks = m_blastAsset.getPxAsset()->getSubchunks();
-	const uint32_t* chunkIndices = actor.getChunkIndices();
-	uint32_t chunkCount = actor.getChunkCount();
-	for (uint32_t i = 0; i < chunkCount; i++)
-	{
-		uint32_t chunkIndex = chunkIndices[i];
-		std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-		for (Renderable* r : renderables)
-		{
-// Add By Lixu Begin
-			r->setTransform(actor.getPhysXActor().getGlobalPose() * lp * subChunks[chunks[chunkIndex].firstSubchunkIndex].transform);
-// Add By Lixu End
-		}
-
-		// Add By Lixu Begin
-		PxActor* editActor = m_chunkEditActorMap[chunkIndex];
-		PxRigidDynamic* rigidDynamic = editActor->is<PxRigidDynamic>();
-		rigidDynamic->setGlobalPose(actor.getPhysXActor().getGlobalPose() * lp * subChunks[chunks[chunkIndex].firstSubchunkIndex].transform);
-		// Add By Lixu End
-	}
-}
-
-void BlastFamilyModelSimple::onActorDestroyed(const ExtPxActor& actor)
-{
-	const uint32_t* chunkIndices = actor.getChunkIndices();
-	uint32_t chunkCount = actor.getChunkCount();
-	for (uint32_t i = 0; i < chunkCount; i++)
-	{
-		uint32_t chunkIndex = chunkIndices[i];
-		std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-		for (Renderable* r : renderables)
-		{
-			r->setHidden(true);
-
-			m_VisibleChangedChunks[chunkIndex] = false;
-		}
-	}
-}
-
-void BlastFamilyModelSimple::onActorHealthUpdate(const ExtPxActor& actor)
-{
-	TkActor& tkActor = actor.getTkActor();
-	const TkAsset* tkAsset = tkActor.getAsset();
-
-	const float* bondHealths = tkActor.getBondHealths();
-	uint32_t nodeCount = tkActor.getGraphNodeCount();
-	if (nodeCount == 0) // subsupport chunks don't have graph nodes
-		return;
-
-	std::vector<uint32_t> nodes(tkActor.getGraphNodeCount());
-	tkActor.getGraphNodeIndices(nodes.data(), static_cast<uint32_t>(nodes.size()));
-
-	const NvBlastChunk* chunks = tkAsset->getChunks();
-	const NvBlastBond* bonds = tkAsset->getBonds();
-
-	const NvBlastSupportGraph graph = tkAsset->getGraph();
-	const float bondHealthMax = m_blastAsset.getBondHealthMax();
-
-	std::vector<float> healthBuffer;
-
-	for (uint32_t node0 : nodes)
-	{
-		uint32_t chunkIndex = graph.chunkIndices[node0];
-
-		if (chunkIndex >= m_chunks.size())
-			continue;
-
-		std::vector<SimpleRenderMesh*>& meshes = m_chunks[chunkIndex].renderMeshes;
-		const auto& renderables = m_chunks[chunkIndex].renderables;
-		for (uint32_t i = 0; i < meshes.size(); ++i)
-		{
-			if(renderables[i]->isHidden())
-				continue;
-
-			SimpleRenderMesh* renderMesh = meshes[i];
-
-			const SimpleMesh* mesh = renderMesh->getMesh();
-			healthBuffer.resize(mesh->vertices.size());
-			
-			for (uint32_t vertexIndex = 0; vertexIndex < mesh->vertices.size(); vertexIndex++)
-			{
-				PxVec3 position = mesh->vertices[vertexIndex].position;
-				float health = 0.0f;
-				float healthDenom = 0.0f;
-
-				for (uint32_t adjacencyIndex = graph.adjacencyPartition[node0]; adjacencyIndex < graph.adjacencyPartition[node0 + 1]; adjacencyIndex++)
-				{
-					uint32_t node1 = graph.adjacentNodeIndices[adjacencyIndex];
-					uint32_t bondIndex = graph.adjacentBondIndices[adjacencyIndex];
-					float bondHealth = PxClamp(bondHealths[bondIndex] / bondHealthMax, 0.0f, 1.0f);
-					const NvBlastBond& solverBond = bonds[bondIndex];
-					const PxVec3& centroid = reinterpret_cast<const PxVec3&>(solverBond.centroid);
-					
-					float factor = 1.0f / (centroid - position).magnitudeSquared();
-
-					health += bondHealth * factor;
-					healthDenom += factor;
-				}
-
-				healthBuffer[vertexIndex] = healthDenom > 0.0f ? health / healthDenom : 1.0f;
-			}
-
-			renderMesh->updateHealths(healthBuffer);
-		}
-	}
-}
-
-// Add By Lixu Begin
-bool BlastFamilyModelSimple::find(const PxActor& actor)
-{
-	return -1 != getChunkIndexByPxActor(actor);
-}
-
-void BlastFamilyModelSimple::updateActorRenderableTransform(const PxActor& actor, PxTransform& pos, bool local)
-{
-	uint32_t chunkIndex = getChunkIndexByPxActor(actor);
-	if (-1 == chunkIndex)
-		return;
-
-	std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-	for (Renderable* r : renderables)
-	{
-		if (!local)
-		{
-			r->setTransform(pos);
-
-			// in edit mode, if change root chunk's orientation in edit physx scene, also change root physx actor in blast physx scene
-			if (0 == chunkIndex && !SampleManager::ins()->IsSimulating())
-			{
-				(*m_actors.begin())->getPhysXActor().setGlobalPose(pos);
-			}
-		}
-		else
-		{
-			if (0 == chunkIndex)
-			{
-				PxActor& blastActor = (*m_actors.begin())->getPhysXActor();
-				PxRigidDynamic* rigidDynamic = blastActor.is<PxRigidDynamic>();
-				if (NULL != rigidDynamic)
-				{
-					PxTransform gp_new = pos;
-					PxTransform gp_old = rigidDynamic->getGlobalPose();
-					rigidDynamic->setGlobalPose(pos);
-					PxScene& pxScene = SampleManager::ins()->getPhysXController().getPhysXScene();
-					modifyPxActorByLocalWay(pxScene, *rigidDynamic, gp_old, gp_new);
-					const BlastModel& model = dynamic_cast<BlastAssetModelSimple*>(const_cast<BlastAsset*>(&m_blastAsset))->getModel();
-					// update model mesh
-					modifyModelByLocalWay(*(const_cast<BlastModel*>(&model)), gp_old, gp_new);
-					// update blast asset instance's transform
-					BPPAssetInstance* assetInstance = SampleManager::ins()->getInstanceByFamily(this);
-					assetInstance->transform.position = nvidia::NvVec3(gp_new.p.x, gp_new.p.y, gp_new.p.z);
-					assetInstance->transform.rotation = nvidia::NvVec4(gp_new.q.x, gp_new.q.y, gp_new.q.z, gp_new.q.w);
-				}
-			}
-		}
-	}
-}
-
-uint32_t BlastFamilyModelSimple::getChunkIndexByPxActor(const PxActor& actor)
-{
-	std::map<PxActor*, uint32_t>::iterator itr = m_editActorChunkMap.find(const_cast<PxActor*>(&actor));
-
-	if (itr != m_editActorChunkMap.end())
-	{
-		return itr->second;
-	}
-	else
-	{
-		for (ExtPxActor* extPxActor : m_actors)
-		{
-			if (&(extPxActor->getPhysXActor()) == (&actor)->is<physx::PxRigidDynamic>())
-			{
-				return extPxActor->getChunkIndices()[0];
-			}
-		}
-	}
-	return -1;
-}
-
-bool BlastFamilyModelSimple::getPxActorByChunkIndex(uint32_t chunkIndex, PxActor** ppActor)
-{
-	*ppActor = nullptr;
-	std::map<uint32_t, PxActor*>::iterator it =	m_chunkEditActorMap.find(chunkIndex);
-	if (it == m_chunkEditActorMap.end())
-	{
-		return false;
-	}
-
-	*ppActor = it->second;
-	return true;
-}
-
-void BlastFamilyModelSimple::setActorSelected(const PxActor& actor, bool selected)
-{
-	uint32_t chunkIndex = getChunkIndexByPxActor(actor);
-	if (-1 == chunkIndex)
-		return;
-
-	bool selectionDepthTest = BlastProject::ins().getParams().fracture.general.selectionDepthTest;
-
-	std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-	for (Renderable* r : renderables)
-	{
-		r->setSelected(selected);
-
-		if (!selectionDepthTest && selected)
-		{
-			r->setDepthTest(false);
-		}
-		else
-		{
-			r->setDepthTest(true);
-		}
-	}
-}
-
-bool BlastFamilyModelSimple::isActorSelected(const PxActor& actor)
-{
-	uint32_t chunkIndex = getChunkIndexByPxActor(actor);
-	if (-1 == chunkIndex)
-		return false;
-
-	std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-	return renderables[0]->isSelected();
-}
-
-void BlastFamilyModelSimple::setActorVisible(const PxActor& actor, bool visible)
-{
-	uint32_t chunkIndex = getChunkIndexByPxActor(actor);
-	if (-1 == chunkIndex)
-		return;
-
-	std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-	for (Renderable* r : renderables)
-	{
-		r->setHidden(!visible);
-	}
-}
-
-bool BlastFamilyModelSimple::isActorVisible(const PxActor& actor)
-{
-	uint32_t chunkIndex = getChunkIndexByPxActor(actor);
-	if (-1 == chunkIndex)
-		return false;
-
-	std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-	return !renderables[0]->isHidden();
-}
-
-void BlastFamilyModelSimple::setChunkSelected(uint32_t chunk, bool selected)
-{
-	if (chunk > m_chunks.size())
-		return;
-
-	bool selectionDepthTest = BlastProject::ins().getParams().fracture.general.selectionDepthTest;
-
-	std::vector<Renderable*>& renderables = m_chunks[chunk].renderables;
-	for (Renderable* r : renderables)
-	{
-		r->setSelected(selected);
-
-		if (!selectionDepthTest && selected)
-		{
-			r->setDepthTest(false);
-		}
-		else
-		{
-			r->setDepthTest(true);
-		}
-	}
-}
-
-void BlastFamilyModelSimple::setChunkSelected(std::vector<uint32_t> depths, bool selected)
-{
-	for (size_t i = 0; i < depths.size(); ++i)
-	{
-		const std::vector<uint32_t> indexes = m_blastAsset.getChunkIndexesByDepth(depths[i]);
-		for (size_t j = 0; j < indexes.size(); ++j)
-		{
-			setChunkSelected(indexes[j], selected);
-		}
-	}
-}
-
-void BlastFamilyModelSimple::clearChunksSelected()
-{
-	size_t count = m_chunks.size();
-	for (size_t chunkIndex = 0; chunkIndex < count; ++chunkIndex)
-	{
-		std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-		for (Renderable* r : renderables)
-		{
-			r->setSelected(false);
-			r->setDepthTest(true);
-			r->setHighlight(false);
-		}
-	}
-}
-
-bool BlastFamilyModelSimple::isChunkSelected(uint32_t chunk)
-{
-	if (chunk > m_chunks.size())
-		return false;
-
-	std::vector<Renderable*>& renderables = m_chunks[chunk].renderables;
-	for (Renderable* r : renderables)
-	{
-		for (Renderable* r : renderables)
-		{
-			if (r->isSelected())
-			{
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
-std::vector<uint32_t> BlastFamilyModelSimple::getSelectedChunks()
-{
-	std::vector<uint32_t> selectedChunks;
-	size_t count = m_chunks.size();
-	for (size_t chunkIndex = 0; chunkIndex < count; ++chunkIndex)
-	{
-		std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-		for (Renderable* r : renderables)
-		{
-			if (r->isSelected())
-			{
-				selectedChunks.push_back(chunkIndex);
-				break;
-			}
-		}
-	}
-	return selectedChunks;
-}
-
-void BlastFamilyModelSimple::setActorScale(const PxActor& actor, PxMat44& scale, bool replace)
-{
-	uint32_t chunkIndex = getChunkIndexByPxActor(actor);
-	if (-1 == chunkIndex)
-		return;
-	std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-	for (Renderable* r : renderables)
-	{
-		r->setMeshScale(scale, replace);
-	}
-
-	if (0 == chunkIndex)
-	{
-		PxActor& blastActor = (*m_actors.begin())->getPhysXActor();
-		PxRigidDynamic* rigidDynamic = blastActor.is<PxRigidDynamic>();
-		if (NULL != rigidDynamic)
-		{
-			PxScene& pxScene = SampleManager::ins()->getPhysXController().getPhysXScene();
-			scalePxActor(pxScene, *rigidDynamic, scale);
-
-			if (replace)
-			{
-				const BlastModel& model = dynamic_cast<BlastAssetModelSimple*>(const_cast<BlastAsset*>(&m_blastAsset))->getModel();
-				scaleModel(*(const_cast<BlastModel*>(&model)), scale);
-			}
-		}
-	}
-}
-
-bool BlastFamilyModelSimple::isChunkVisible(uint32_t chunkIndex)
-{
-	if (chunkIndex < 0 || chunkIndex >= m_chunks.size())
-	{
-		return false;
-	}
-
-	bool bVisible = false;
-	std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-	if (renderables.size() > 0)
-	{
-		bVisible = !renderables[0]->isHidden();
-	}
-	return bVisible;
-}
-
-void BlastFamilyModelSimple::setChunkVisible(uint32_t chunkIndex, bool bVisible)
-{
-	if (chunkIndex < 0 || chunkIndex >= m_chunks.size())
-	{
-		return;
-	}
-
-	std::vector<Renderable*>& renderables = m_chunks[chunkIndex].renderables;
-	for (Renderable* r : renderables)
-	{
-		r->setHidden(!bVisible);
-	}
-}
-
-void BlastFamilyModelSimple::setChunkVisible(std::vector<uint32_t> depths, bool bVisible)
-{
-	for (size_t i = 0; i < depths.size(); ++i)
-	{
-		const std::vector<uint32_t> indexes = m_blastAsset.getChunkIndexesByDepth(depths[i]);
-		for (size_t j = 0; j < indexes.size(); ++j)
-		{
-			setChunkVisible(indexes[j], bVisible);
-		}
-	}
-}
-
-void BlastFamilyModelSimple::initTransform(physx::PxTransform t)
-{
-	BlastFamily::initTransform(t);
-	int chunkSize = m_chunks.size();
-	for (int i = 0; i < chunkSize; i++)
-	{
-		std::vector<Renderable*>& renderables = m_chunks[i].renderables;
-		for (Renderable* r : renderables)
-		{
-			r->setTransform(t);
-		}
-	}
-
-	for (std::map<PxActor*, uint32_t>::iterator itr = m_editActorChunkMap.begin(); itr != m_editActorChunkMap.end(); ++itr)
-	{
-		PxRigidDynamic* rigidDynamic = itr->first->is<PxRigidDynamic>();
-		rigidDynamic->setGlobalPose(t);
-	}
-}
-
-void BlastFamilyModelSimple::getMaterial(RenderMaterial** ppRenderMaterial, bool externalSurface)
-{
-	*ppRenderMaterial = nullptr;
-
-	int chunkSize = m_chunks.size();
-	if (chunkSize == 0)
-	{
-		return;
-	}
-
-	if (externalSurface)
-	{
-		for (int i = 0; i < chunkSize; i++)
-		{
-			std::vector<Renderable*>& renderables = m_chunks[i].ex_Renderables;
-			if (renderables.size() > 0)
-			{
-				RenderMaterial& m = renderables[0]->getMaterial();
-				*ppRenderMaterial = &m;
-				return;
-			}
-		}
-	}
-	else
-	{
-		for (int i = 0; i < chunkSize; i++)
-		{
-			std::vector<Renderable*>& renderables = m_chunks[i].in_Renderables;
-			if (renderables.size() > 0)
-			{
-				RenderMaterial& m = renderables[0]->getMaterial();
-				*ppRenderMaterial = &m;
-				return;
-			}
-		}
-	}
-}
-
-void BlastFamilyModelSimple::setMaterial(RenderMaterial* pRenderMaterial, bool externalSurface)
-{
-	RenderMaterial* p = pRenderMaterial;
-	if (p == nullptr)
-	{
-		p = RenderMaterial::getDefaultRenderMaterial();
-	}
-
-	int chunkSize = m_chunks.size();
-	if (externalSurface)
-	{
-		for (int i = 0; i < chunkSize; i++)
-		{
-			std::vector<Renderable*>& renderables = m_chunks[i].ex_Renderables;
-			for (Renderable* r : renderables)
-			{
-				r->setMaterial(*p);
-			}
-		}
-	}
-	else
-	{
-		for (int i = 0; i < chunkSize; i++)
-		{
-			std::vector<Renderable*>& renderables = m_chunks[i].in_Renderables;
-			for (Renderable* r : renderables)
-			{
-				r->setMaterial(*p);
-			}
-		}
-	}
-}
-
-void BlastFamilyModelSimple::highlightChunks()
-{
-	bool selectionDepthTest = BlastProject::ins().getParams().fracture.general.selectionDepthTest;
-
-	for (Chunk chunk : m_chunks)
-	{
-		std::vector<Renderable*>& renderables = chunk.renderables;
-		for (Renderable* r : renderables)
-		{
-			r->setHighlight(true);
-			r->setDepthTest(selectionDepthTest);
-		}
-	}
-}
-
-bool BlastFamilyModelSimple::_getBPPChunkVisible(uint32_t chunkIndex)
-{
-	std::map<BlastAsset*, AssetList::ModelAsset>& assetDescMap = SampleManager::ins()->getAssetDescMap();
-	BlastAsset* blastAsset = (BlastAsset*)&getBlastAsset();
-	AssetList::ModelAsset& m = assetDescMap[blastAsset];
-
-	BlastProject& project = BlastProject::ins();
-	BPPAsset& bppAsset = *(project.getAsset(m.name.c_str()));
-
-	BPPChunk* bppChunk = project.getChunk(bppAsset, chunkIndex);
-	if (bppChunk)
-	{
-		return bppChunk->visible;
-	}
-	else
-	{
-		return true;
-	}
-}
-// Add By Lixu End
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSimple.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSimple.h
deleted file mode 100644
index c86242a..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSimple.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_FAMILY_MODEL_SIMPLE_H
-#define BLAST_FAMILY_MODEL_SIMPLE_H
-
-#include "BlastFamily.h"
-#include "BlastAssetModelSimple.h"
-
-class SimpleRenderMesh;
-class Renderable;
-class Renderer;
-// Add By Lixu Begin
-namespace physx
-{
-	class PxActor;
-}
-using namespace physx;
-// Add By Lixu End
-
-class BlastFamilyModelSimple : public BlastFamily
-{
-public:
-	//////// ctor ////////
-
-	BlastFamilyModelSimple(PhysXController& physXController, ExtPxManager& pxManager, Renderer& renderer, const BlastAssetModelSimple& blastAsset, const BlastAsset::ActorDesc& desc);
-	virtual ~BlastFamilyModelSimple();
-
-// Add By Lixu Begin
-	virtual bool find(const PxActor& actor);
-	virtual void updateActorRenderableTransform(const PxActor& actor, PxTransform& pos, bool local);
-	virtual uint32_t getChunkIndexByPxActor(const PxActor& actor);
-	virtual bool getPxActorByChunkIndex(uint32_t chunkIndex, PxActor** ppActor);
-	virtual void setActorSelected(const PxActor& actor, bool selected);
-	virtual bool isActorSelected(const PxActor& actor);
-	virtual void setActorVisible(const PxActor& actor, bool visible);
-	virtual bool isActorVisible(const PxActor& actor);
-	virtual void clearChunksSelected();
-	virtual void setChunkSelected(uint32_t chunk, bool selected);
-	virtual void setChunkSelected(std::vector<uint32_t> depths, bool selected);
-	virtual bool isChunkSelected(uint32_t chunk);
-	virtual std::vector<uint32_t> getSelectedChunks();
-	virtual void setActorScale(const PxActor& actor, PxMat44& scale, bool replace);
-	virtual bool isChunkVisible(uint32_t chunkIndex);
-	virtual void setChunkVisible(uint32_t chunkIndex, bool bVisible);
-	virtual void setChunkVisible(std::vector<uint32_t> depths, bool bVisible);
-	virtual void initTransform(physx::PxTransform t);
-	virtual void getMaterial(RenderMaterial** ppRenderMaterial, bool externalSurface);
-	virtual void setMaterial(RenderMaterial* pRenderMaterial, bool externalSurface);
-	virtual void highlightChunks();
-// Add By Lixu End
-
-protected:
-	//////// abstract implementation ////////
-
-	virtual void onActorCreated(const ExtPxActor& actor);
-	virtual void onActorUpdate(const ExtPxActor& actor);
-	virtual void onActorDestroyed(const ExtPxActor& actor);
-	virtual void onActorHealthUpdate(const ExtPxActor& pxActor);
-
-private:
-	// Add By Lixu Begin
-	bool _getBPPChunkVisible(uint32_t chunkIndex);
-	// Add By Lixu End
-
-	//////// internal data ////////
-
-	Renderer& m_renderer;
-
-	struct Chunk
-	{
-		std::vector<SimpleRenderMesh*> renderMeshes;
-		std::vector<Renderable*> renderables;
-// Add By Lixu Begin
-		std::vector<Renderable*> ex_Renderables;
-		std::vector<Renderable*> in_Renderables;
-// Add By Lixu End
-	};
-
-	std::vector<Chunk> m_chunks;
-	std::map<PxActor*, uint32_t> m_editActorChunkMap;// only for edit mode
-	std::map<uint32_t, PxActor*> m_chunkEditActorMap;// only for edit mode
-};
-
-
-#endif //BLAST_FAMILY_MODEL_SIMPLE_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSkinned.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSkinned.cpp
deleted file mode 100644
index a0319ff..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSkinned.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastFamilyModelSkinned.h"
-#include "RenderUtils.h"
-#include "Renderer.h"
-#include "SkinnedRenderMesh.h"
-#include "NvBlastExtPxAsset.h"
-#include "NvBlastExtPxActor.h"
-#include "NvBlastTkActor.h"
-#include "PxRigidDynamic.h"
-
-using namespace physx;
-
-BlastFamilyModelSkinned::BlastFamilyModelSkinned(PhysXController& physXController, ExtPxManager& pxManager, Renderer& renderer, const BlastAssetModelSkinned& blastAsset, const BlastAsset::ActorDesc& desc)
-	: BlastFamily(physXController, pxManager, blastAsset), m_renderer(renderer), m_visibleActorsDirty(true)
-{
-	// materials
-	auto materials = blastAsset.getRenderMaterials();
-
-	const BlastModel& model = blastAsset.getModel();
-
-	// finalize (create) sub model
-	auto finalizeSubModelFunction = [&](SubModel* subModel, std::vector<const SimpleMesh*>& subModelMeshes, RenderMaterial& renderMaterial)
-	{
-		subModel->skinnedRenderMesh = new SkinnedRenderMesh(subModelMeshes);
-		subModel->renderable = renderer.createRenderable(*subModel->skinnedRenderMesh, renderMaterial);
-		subModel->renderable->setColor(getRandomPastelColor());
-	};
-
-	// create at least one submodel per every material (if mesh count is too high, more then one sub model per material to be created)
-	SubModel* subModel = nullptr;
-	std::vector<const SimpleMesh*> subModelMeshes;
-	subModelMeshes.reserve(model.chunks.size());
-	for (uint32_t materialIndex = 0; materialIndex < model.materials.size(); materialIndex++)
-	{
-		for (uint32_t chunkIndex = 0; chunkIndex < model.chunks.size(); chunkIndex++)
-		{
-			const BlastModel::Chunk& chunk = model.chunks[chunkIndex];
-			for (const BlastModel::Chunk::Mesh& mesh : chunk.meshes)
-			{
-				if (mesh.materialIndex == materialIndex)
-				{
-					// init new submodel?
-					if (subModel == nullptr)
-					{
-						m_subModels.push_back(SubModel());
-						subModel = &m_subModels.back();
-						subModel->chunkIdToBoneMap.resize(model.chunks.size());
-						std::fill(subModel->chunkIdToBoneMap.begin(), subModel->chunkIdToBoneMap.end(), SubModel::INVALID_BONE_ID);
-						subModelMeshes.clear();
-					}
-
-					// add mesh to map and list
-					subModel->chunkIdToBoneMap[chunkIndex] = (uint32_t)subModelMeshes.size();
-					subModelMeshes.push_back(&(mesh.mesh));
-
-					// mesh reached limit?
-					if (subModelMeshes.size() == SkinnedRenderMesh::MeshesCountMax)
-					{
-						finalizeSubModelFunction(subModel, subModelMeshes, *materials[materialIndex]);
-						subModel = nullptr;
-					}
-				}
-			}
-		}
-
-		// finalize subModel for this material
-		if (subModel && subModelMeshes.size() > 0)
-		{
-			finalizeSubModelFunction(subModel, subModelMeshes, *materials[materialIndex]);
-			subModel = nullptr;
-		}
-	}
-
-	// reserve for scratch
-	m_visibleBones.reserve(model.chunks.size());
-	m_visibleBoneTransforms.reserve(model.chunks.size());
-
-	// initialize in position
-	initialize(desc);
-}
-
-BlastFamilyModelSkinned::~BlastFamilyModelSkinned()
-{
-	for (uint32_t subModelIndex = 0; subModelIndex < m_subModels.size(); subModelIndex++)
-	{
-		m_renderer.removeRenderable(m_subModels[subModelIndex].renderable);
-		SAFE_DELETE(m_subModels[subModelIndex].skinnedRenderMesh);
-	}
-}
-
-void BlastFamilyModelSkinned::onActorCreated(const ExtPxActor& actor)
-{
-	m_visibleActors.insert(&actor);
-	m_visibleActorsDirty = true;
-}
-
-void BlastFamilyModelSkinned::onActorUpdate(const ExtPxActor& actor)
-{
-}
-
-void BlastFamilyModelSkinned::onActorDestroyed(const ExtPxActor& actor)
-{
-	m_visibleActors.erase(&actor);
-	m_visibleActorsDirty = true;
-}
-
-void BlastFamilyModelSkinned::onUpdate()
-{
-	// visible actors changed this frame?
-	if (m_visibleActorsDirty)
-	{
-		for (const SubModel& model : m_subModels)
-		{
-			// pass visible chunks list to render mesh
-			m_visibleBones.clear();
-			for (const ExtPxActor* actor : m_visibleActors)
-			{
-				const uint32_t* chunkIndices = actor->getChunkIndices();
-				uint32_t chunkCount = actor->getChunkCount();
-				for (uint32_t i = 0; i < chunkCount; ++i)
-				{
-					uint32_t chunkIndex = chunkIndices[i];
-					uint32_t boneIndex = model.chunkIdToBoneMap[chunkIndex];
-					if (boneIndex != SubModel::INVALID_BONE_ID)
-					{
-						m_visibleBones.push_back(boneIndex);
-					}
-				}
-			}
-			model.skinnedRenderMesh->updateVisibleMeshes(m_visibleBones);
-		}
-
-		m_visibleActorsDirty = false;
-	}
-
-	// update and pass chunk transforms
-	const ExtPxChunk* chunks = m_blastAsset.getPxAsset()->getChunks();
-	const ExtPxSubchunk* subChunks = m_blastAsset.getPxAsset()->getSubchunks();
-	for (const SubModel& model : m_subModels)
-	{
-		m_visibleBoneTransforms.clear();
-		for (const ExtPxActor* actor : m_visibleActors)
-		{
-			const uint32_t* chunkIndices = actor->getChunkIndices();
-			uint32_t chunkCount = actor->getChunkCount();
-			for (uint32_t i = 0; i < chunkCount; ++i)
-			{
-				uint32_t chunkIndex = chunkIndices[i];
-				uint32_t boneIndex = model.chunkIdToBoneMap[chunkIndex];
-				if (boneIndex != SubModel::INVALID_BONE_ID)
-				{
-					m_visibleBoneTransforms.push_back(PxMat44(actor->getPhysXActor().getGlobalPose() * subChunks[chunks[chunkIndex].firstSubchunkIndex].transform));
-				}
-			}
-		}
-		model.skinnedRenderMesh->updateVisibleMeshTransforms(m_visibleBoneTransforms);
-	}
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSkinned.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSkinned.h
deleted file mode 100644
index d76b18e..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFamilyModelSkinned.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_FAMILY_MODEL_SKINNED_H
-#define BLAST_FAMILY_MODEL_SKINNED_H
-
-#include "BlastFamily.h"
-#include "BlastAssetModelSkinned.h"
-
-class SkinnedRenderMesh;
-class Renderable;
-
-class BlastFamilyModelSkinned : public BlastFamily
-{
-public:
-	//////// ctor ////////
-
-	BlastFamilyModelSkinned(PhysXController& physXController, ExtPxManager& pxManager, Renderer& renderer, const BlastAssetModelSkinned& blastAsset, const BlastAsset::ActorDesc& desc);
-	virtual ~BlastFamilyModelSkinned();
-
-protected:
-	//////// abstract implementation ////////
-
-	virtual void onActorCreated(const ExtPxActor& actor);
-	virtual void onActorUpdate(const ExtPxActor& actor);
-	virtual void onActorDestroyed(const ExtPxActor& actor);
-
-	virtual void onUpdate();
-
-private:
-	//////// internal data ////////
-
-	Renderer& m_renderer;
-
-	struct SubModel
-	{
-		static const uint32_t INVALID_BONE_ID = ~(uint32_t)0;
-
-		Renderable*	renderable = nullptr;
-		SkinnedRenderMesh* skinnedRenderMesh = nullptr;
-		std::vector<uint32_t> chunkIdToBoneMap;
-	};
-	std::vector<SubModel> m_subModels;
-
-	std::set<const ExtPxActor*> m_visibleActors;
-	bool m_visibleActorsDirty;
-
-	//////// scratch buffers ////////
-
-	std::vector<uint32_t> m_visibleBones;
-	std::vector<PxMat44>  m_visibleBoneTransforms;
-
-};
-
-
-#endif //BLAST_FAMILY_MODEL_SKINNED_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFractureTool.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFractureTool.cpp
deleted file mode 100644
index cbd299b..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFractureTool.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastFractureTool.h"
-#include <BlastAssetModel.h>
-#include <BlastAsset.h>
-#include <NvBlastExtPxAsset.h>
-#include <NvBlastTkAsset.h>
-#include "NvBlastExtAuthoring.h"
-#include "NvBlastExtAuthoringMeshImpl.h"
-void BlastFractureTool::free()
-{
-	std::vector<Nv::Blast::Mesh*>::iterator it;
-	for (it = chunkMeshes.begin(); it != chunkMeshes.end(); it++)
-	{
-		delete (*it);
-		(*it) = nullptr;
-	}
-	chunkMeshes.clear();
-}
-
-void BlastFractureTool::setSourceAsset(const BlastAsset* pBlastAsset)
-{
-	free();
-
-	BlastAssetModel* pBlastAssetModel = (BlastAssetModel*)pBlastAsset;
-	const BlastModel& blastModel = pBlastAssetModel->getModel();
-	const std::vector<BlastModel::Chunk>& chunks = blastModel.chunks;
-	int chunkSize = chunks.size();
-	if (chunkSize == 0)
-	{
-		return;
-	}
-
-	chunkMeshes.resize(chunkSize, nullptr);
-	for (int cs = 0; cs < chunkSize; cs++)
-	{
-		const BlastModel::Chunk& chunk = chunks[cs];
-		const std::vector<BlastModel::Chunk::Mesh>& meshes = chunk.meshes;
-		int meshSize = meshes.size();
-
-		if (meshSize == 0)
-		{
-			continue;
-		}
-
-		std::vector<physx::PxVec3> positions;
-		std::vector<physx::PxVec3> normals;
-		std::vector<physx::PxVec2> uv;
-		std::vector<uint32_t>  ind;
-		std::vector<int>  faceBreakPoint;
-		std::vector<uint32_t>  materialIndexes;
-		uint16_t curIndex = 0;
-		for (int ms = 0; ms < meshSize; ms++)
-		{
-			const BlastModel::Chunk::Mesh& mesh = meshes[ms];
-			materialIndexes.push_back(mesh.materialIndex);
-			const SimpleMesh& simpleMesh = mesh.mesh;
-			const std::vector<SimpleMesh::Vertex>& vertices = simpleMesh.vertices;
-			const std::vector<uint16_t>& indices = simpleMesh.indices;
-
-			int NumVertices = vertices.size();
-			for (uint32_t i = 0; i < NumVertices; ++i)
-			{
-				positions.push_back(physx::PxVec3(vertices[i].position.x, vertices[i].position.y, vertices[i].position.z));
-				normals.push_back(physx::PxVec3(vertices[i].normal.x, vertices[i].normal.y, vertices[i].normal.z));
-				uv.push_back(physx::PxVec2(vertices[i].uv.x, vertices[i].uv.y));
-			}
-			int NumIndices = indices.size();
-			for (uint32_t i = 0; i < NumIndices; ++i)
-			{
-				ind.push_back(indices[i] + curIndex);
-			}
-			curIndex += NumIndices;
-			faceBreakPoint.push_back(NumIndices / 3);
-		}
-
-		PxVec3* nr = (!normals.empty()) ? normals.data() : 0;
-		PxVec2* uvp = (!uv.empty()) ? uv.data() : 0;
-		Nv::Blast::Mesh* pMesh = NvBlastExtAuthoringCreateMesh(
-			positions.data(), nr, uvp, static_cast<uint32_t>(positions.size()),
-			ind.data(), static_cast<uint32_t>(ind.size()));
-
-		int curFaceIndex = 0;
-		int curFaceBreakPoint = faceBreakPoint[curFaceIndex];
-		uint32_t curMaterialIndex = materialIndexes[curFaceIndex];
-		for (int fc = 0; fc < pMesh->getFacetCount(); fc++)
-		{
-			if (fc >= curFaceBreakPoint)
-			{
-				curFaceIndex++;
-				curFaceBreakPoint += faceBreakPoint[curFaceIndex];
-				curMaterialIndex = materialIndexes[curFaceIndex];
-			}
-
-			Facet* pFacet = const_cast<Facet*>(pMesh->getFacet(fc));
-			pFacet->materialId = curMaterialIndex;
-		}
-
-		chunkMeshes[cs] = pMesh;
-	}
-
-	const ExtPxAsset* pExtPxAsset = pBlastAsset->getPxAsset();
-	const TkAsset& tkAsset = pExtPxAsset->getTkAsset();
-
-	std::vector<int32_t> parentIds;
-	parentIds.resize(chunkSize);
-	parentIds.assign(chunkSize, -1);
-	{
-		const NvBlastChunk* pNvBlastChunk = tkAsset.getChunks();
-		for (uint32_t i = 0; i < chunkSize; ++i)
-		{
-			parentIds[i] = pNvBlastChunk[i].parentChunkIndex;
-		}
-	}
-	std::vector<bool> isLeafs;
-	isLeafs.resize(chunkSize);
-	isLeafs.assign(chunkSize, false);
-	{
-		const NvBlastSupportGraph supportGraph = tkAsset.getGraph();
-		for (uint32_t i = 0; i < supportGraph.nodeCount; ++i)
-		{
-			const uint32_t chunkIndex = supportGraph.chunkIndices[i];
-			if (chunkIndex < chunkSize)
-			{
-				isLeafs[chunkIndex] = true;
-			}
-		}
-	}
-
-	setSourceMesh(chunkMeshes[0]);
-
-	mChunkData.resize(chunkSize);
-	mChunkData[0].parent = parentIds[0];
-	mChunkData[0].isLeaf = isLeafs[0];
-	mChunkData[0].chunkId = 0;
-	Nv::Blast::Mesh* mesh = nullptr;
-	for (int cs = 1; cs < chunkSize; cs++)
-	{
-		if (chunkMeshes[cs] == nullptr)
-			continue;
-		mChunkData[cs].meshData = new MeshImpl(*reinterpret_cast<const MeshImpl*>(chunkMeshes[cs]));
-		mChunkData[cs].parent = parentIds[cs];
-		mChunkData[cs].chunkId = mChunkIdCounter++;
-		mChunkData[cs].isLeaf = isLeafs[cs];
-
-		mesh = mChunkData[cs].meshData;
-		Nv::Blast::Vertex* verticesBuffer = const_cast<Nv::Blast::Vertex*>(mesh->getVertices());
-		for (uint32_t i = 0; i < mesh->getVerticesCount(); ++i)
-		{
-			verticesBuffer[i].p = (verticesBuffer[i].p - mOffset) * (1.0f / mScaleFactor);
-		}
-		PxBounds3& bb = const_cast<PxBounds3&>(mesh->getBoundingBox());
-		bb.minimum = (bb.minimum - mOffset) * (1.0f / mScaleFactor);
-		bb.maximum = (bb.maximum - mOffset) * (1.0f / mScaleFactor);
-		for (uint32_t i = 0; i < mesh->getFacetCount(); ++i)
-		{
-			Facet* pFacet = const_cast<Facet*>(mesh->getFacet(i));
-			pFacet->materialId = chunkMeshes[cs]->getFacet(i)->materialId;
-		}
-	}
-}
-
-void BlastFractureTool::setSourceMeshes(std::vector<Nv::Blast::Mesh*>& meshes, std::vector<int32_t>& parentIds)
-{
-	free();
-
-	int chunkSize = meshes.size();
-	if (chunkSize == 0)
-	{
-		return;
-	}
-
-	chunkMeshes.resize(chunkSize, nullptr);
-	for (int cs = 0; cs < chunkSize; cs++)
-	{
-		Nv::Blast::Mesh* pMesh = new MeshImpl(*reinterpret_cast<const MeshImpl*>(meshes[cs]));
-		chunkMeshes[cs] = pMesh;
-	}
-
-	std::vector<bool> isLeafs;
-	isLeafs.resize(chunkSize, true);
-	for (int cs = 0; cs < chunkSize; cs++)
-	{
-		int32_t parentId = parentIds[cs];
-		if (parentId == -1)
-		{
-			continue;
-		}
-
-		isLeafs[parentId] = false;
-	}
-
-	setSourceMesh(chunkMeshes[0]);
-
-	mChunkData.resize(chunkSize);
-	mChunkData[0].parent = parentIds[0];
-	mChunkData[0].isLeaf = isLeafs[0];
-	mChunkData[0].chunkId = 0;
-	Nv::Blast::Mesh* mesh = nullptr;
-	for (int cs = 1; cs < chunkSize; cs++)
-	{
-		if (chunkMeshes[cs] == nullptr)
-			continue;
-		mChunkData[cs].meshData = new MeshImpl(*reinterpret_cast<const MeshImpl*>(chunkMeshes[cs]));
-		mChunkData[cs].parent = parentIds[cs];
-		mChunkData[cs].chunkId = mChunkIdCounter++;
-		mChunkData[cs].isLeaf = isLeafs[cs];
-
-		mesh = mChunkData[cs].meshData;
-		Nv::Blast::Vertex* verticesBuffer = const_cast<Nv::Blast::Vertex*>(mesh->getVertices());
-		for (uint32_t i = 0; i < mesh->getVerticesCount(); ++i)
-		{
-			verticesBuffer[i].p = (verticesBuffer[i].p - mOffset) * (1.0f / mScaleFactor);
-		}
-		PxBounds3& bb = const_cast<PxBounds3&>(mesh->getBoundingBox());
-		bb.minimum = (bb.minimum - mOffset) * (1.0f / mScaleFactor);
-		bb.maximum = (bb.maximum - mOffset) * (1.0f / mScaleFactor);
-		for (uint32_t i = 0; i < mesh->getFacetCount(); ++i)
-		{
-			Facet* pFacet = const_cast<Facet*>(mesh->getFacet(i));
-			pFacet->materialId = chunkMeshes[cs]->getFacet(i)->materialId;
-		}
-	}
-}
-
-Nv::Blast::Mesh* BlastFractureTool::getSourceMesh(int32_t chunkId)
-{
-	if (chunkId < 0 || chunkId >= chunkMeshes.size())
-	{
-		return nullptr;
-	}
-	return chunkMeshes[chunkId];
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFractureTool.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFractureTool.h
deleted file mode 100644
index 3436551..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastFractureTool.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_FRACTURETOOL_H
-#define BLAST_FRACTURETOOL_H
-
-#include "NvBlastExtAuthoringFractureToolImpl.h"
-
-class BlastAsset;
-namespace Nv
-{
-	namespace Blast
-	{
-		class Mesh;
-	}
-}
-
-class BlastFractureTool : public Nv::Blast::FractureToolImpl
-{
-public:
-	BlastFractureTool() {}
-	~BlastFractureTool() { free(); }
-
-	void setSourceAsset(const BlastAsset* pBlastAsset);
-
-	void setSourceMeshes(std::vector<Nv::Blast::Mesh*>& meshes, std::vector<int32_t>& parentIds);
-
-	Nv::Blast::Mesh* getSourceMesh(int32_t chunkId);
-
-private:
-	void free();
-
-	std::vector<Nv::Blast::Mesh*> chunkMeshes;
-};
-
-#endif //BLAST_FRACTURETOOL_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastModel.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastModel.cpp
deleted file mode 100644
index 2f00207..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastModel.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastModel.h"
-
-// Add By Lixu Begin
-//#define TINYOBJLOADER_IMPLEMENTATION
-// Add By Lixu End
-#include "tiny_obj_loader.h"
-#include "MathUtil.h"
-#include "NvBlastExtExporter.h"
-#include "NvBlastGlobals.h"
-
-using namespace physx;
-
-void computeFacenormalByPosition(
-	physx::PxVec3 p0, physx::PxVec3 p1, physx::PxVec3 p2,
-	physx::PxVec3& facenormal)
-{
-	physx::PxVec3 p01 = p1 - p0;
-	physx::PxVec3 p02 = p2 - p0;
-
-	facenormal.x = p01.y * p02.z - p01.z * p02.y;
-	facenormal.y = p01.z * p02.x - p01.x * p02.z;
-	facenormal.z = p01.x * p02.y - p01.y * p02.x;
-
-	facenormal = -facenormal.getNormalized();
-}
-
-void computeTangentByPositionAndTexcoord(
-	physx::PxVec3 p0, physx::PxVec3 p1, physx::PxVec3 p2,
-	physx::PxVec2 r0, physx::PxVec2 r1, physx::PxVec2 r2,
-	physx::PxVec3& tangent)
-{
-	float x1 = p1.x - p0.x;
-	float x2 = p2.x - p0.x;
-	float y1 = p1.y - p0.y;
-	float y2 = p2.y - p0.y;
-	float z1 = p1.z - p0.z;
-	float z2 = p2.z - p0.z;
-
-	float s1 = r1.x - r0.x;
-	float s2 = r2.x - r0.x;
-	float t1 = r1.y - r0.y;
-	float t2 = r2.y - r0.y;
-
-	float r = 1.0f / (s1 * t2 - s2 * t1);
-
-	tangent = PxVec3((t2 * x1 - t1 * x2) * r, (t2 * y1 - t1 * y2) * r, (t2 * z1 - t1 * z2) * r);
-}
-
-BlastModelPtr BlastModel::loadFromFbxFile(const char* path)
-{
-// Add By Lixu Begin
-	BlastModel* model = new BlastModel();
-	model->bbMin = PxVec3(FLT_MAX, FLT_MAX, FLT_MAX);
-	model->bbMax = PxVec3(FLT_MIN, FLT_MIN, FLT_MIN);
-// Add By Lixu End
-
-
-	std::shared_ptr<Nv::Blast::IFbxFileReader> rdr(NvBlastExtExporterCreateFbxFileReader(), [](Nv::Blast::IFbxFileReader* p) {p->release(); });
-	rdr->loadFromFile(path);
-	if (rdr->getBoneCount() == 0)
-	{
-		return nullptr;
-	}
-
-	model->chunks.resize(rdr->getBoneCount());
-
-	model->materials.push_back(BlastModel::Material());
-	
-
-	/**
-		Produce buffers of appropriate for AssetViewer format
-	*/
-	uint32_t* infl;
-	rdr->getBoneInfluences(infl);
-	for (uint32_t i = 0; i < rdr->getBoneCount(); ++i)
-	{
-		std::vector<int32_t> indRemap(rdr->getVerticesCount(), -1);
-		std::vector<uint32_t> indices;
-		SimpleMesh cmesh;
-		for (uint32_t j = 0; j < rdr->getVerticesCount(); ++j)
-		{
-			if (i == infl[j])
-			{
-				indRemap[j] = (int32_t)cmesh.vertices.size();
-				cmesh.vertices.push_back(SimpleMesh::Vertex());
-				cmesh.vertices.back().normal = rdr->getNormalsArray()[j];
-				cmesh.vertices.back().position = rdr->getPositionArray()[j];
-				cmesh.vertices.back().uv = rdr->getUvArray()[j];	
-			}
-		}
-		for (uint32_t j = 0; j < rdr->getIdicesCount(); j += 3)
-		{
-			if (i == infl[rdr->getIndexArray()[j]])
-			{
-				int32_t lind = rdr->getIndexArray()[j + 2];
-				cmesh.indices.push_back(indRemap[lind]);
-				lind = rdr->getIndexArray()[j + 1];
-				cmesh.indices.push_back(indRemap[lind]);
-				lind = rdr->getIndexArray()[j];
-				cmesh.indices.push_back(indRemap[lind]);
-			}
-		}
-
-		model->chunks[i].meshes.push_back(Chunk::Mesh());
-		model->chunks[i].meshes.back().materialIndex = 0;
-		model->chunks[i].meshes.back().mesh = cmesh;
-
-		NVBLAST_FREE(infl);
-	}
-	return model;
-}
-
-
-BlastModelPtr BlastModel::loadFromFileTinyLoader(const char* path)
-{
-// Add By Lixu Begin
-	BlastModel* model = new BlastModel();
-	model->bbMin = PxVec3(FLT_MAX, FLT_MAX, FLT_MAX);
-	model->bbMax = PxVec3(FLT_MIN, FLT_MIN, FLT_MIN);
-// Add By Lixu End
-
-	std::vector<tinyobj::shape_t> shapes;
-	std::vector<tinyobj::material_t> mats;
-	std::string err;
-	std::string mtlPath;
-	for (size_t i = strnlen(path, 255) - 1; i >= 0; --i)
-	{
-		if (path[i] == '\\' || path[i] == '/')
-		{
-			mtlPath.resize(i + 2, 0);
-			strncpy(&mtlPath[0], path, i + 1);
-			break;
-		}
-	}
-
-
-	bool ret = tinyobj::LoadObj(shapes, mats, err, path, mtlPath.data());
-
-	// can't load?
-	if (!ret)
-		return false;
-
-	// one submodel per material
-	uint32_t materialsCount = (uint32_t)mats.size();
-	model->materials.resize(materialsCount);
-
-	// fill submodel materials
-	for (uint32_t i = 0; i < materialsCount; i++)
-	{
-		tinyobj::material_t *pMaterial = &mats[i];
-
-		// Add By Lixu Begin
-		if (strcmp(pMaterial->name.c_str(), "neverMat123XABCnever") == 0)
-		{
-			model->materials[i].name.clear();
-		}
-		else
-		{
-			model->materials[i].name = pMaterial->name;
-		}
-		// Add By Lixu End
-
-		model->materials[i].r = pMaterial->diffuse[0];
-		model->materials[i].g = pMaterial->diffuse[1];
-		model->materials[i].b = pMaterial->diffuse[2];
-		model->materials[i].a = 1.0;
-
-		if (!pMaterial->diffuse_texname.empty())
-		{
-			model->materials[i].diffuseTexture = pMaterial->diffuse_texname;
-		}
-	}
-
-	// estimate
-	model->chunks.reserve(shapes.size() / materialsCount + 1);
-
-	if (shapes.size() > 0)
-	{
-		uint32_t meshIndex = 0;
-		for (uint32_t m = 0; m < shapes.size(); m++)
-		{
-			tinyobj::shape_t& pMesh = shapes[m];
-			uint32_t materialIndex;
-			uint32_t chunkIndex;
-			sscanf(pMesh.name.data(), "%d_%d", &chunkIndex, &materialIndex);
-			if (model->chunks.size() <= chunkIndex)
-			{
-				model->chunks.resize(chunkIndex + 1);
-			}
-			model->chunks[chunkIndex].meshes.push_back(Chunk::Mesh());
-			Chunk::Mesh& mesh = model->chunks[chunkIndex].meshes.back();
-
-			mesh.materialIndex = materialIndex;
-			SimpleMesh& chunkMesh = mesh.mesh;
-
-			PxVec3 emin(FLT_MAX, FLT_MAX, FLT_MAX);
-			PxVec3 emax(FLT_MIN, FLT_MIN, FLT_MIN);
-
-
-
-			// create an index buffer
-			chunkMesh.indices.resize(pMesh.mesh.indices.size());
-
-			// Check if all faces are triangles
-			bool allTriangles = true;
-			for (uint32_t i = 0; i < pMesh.mesh.num_vertices.size(); ++i)
-			{
-				if (pMesh.mesh.num_vertices[i] != 3)
-				{
-					allTriangles = false;
-					break;
-				}
-			}
-
-			if (pMesh.mesh.indices.size() > 0 && allTriangles)
-			{
-				for (uint32_t i = 0; i < pMesh.mesh.indices.size(); i += 3)
-				{
-					chunkMesh.indices[i] = (uint16_t)pMesh.mesh.indices[i + 2];
-					chunkMesh.indices[i + 1] = (uint16_t)pMesh.mesh.indices[i + 1];
-					chunkMesh.indices[i + 2] = (uint16_t)pMesh.mesh.indices[i];
-				}
-			}
-			// create vertex buffer
-			chunkMesh.vertices.resize(pMesh.mesh.positions.size() / 3);
-			// copy positions
-			uint32_t indexer = 0;
-			for (uint32_t i = 0; i < pMesh.mesh.positions.size() / 3; i++)
-			{
-				chunkMesh.vertices[i].position.x = pMesh.mesh.positions[indexer];
-				chunkMesh.vertices[i].position.y = pMesh.mesh.positions[indexer + 1];
-				chunkMesh.vertices[i].position.z = pMesh.mesh.positions[indexer + 2];
-				indexer += 3;
-				// calc min/max
-				emin = emin.minimum(chunkMesh.vertices[i].position);
-				emax = emax.maximum(chunkMesh.vertices[i].position);
-			}
-
-			// copy normals
-			if (pMesh.mesh.normals.size() > 0)
-			{
-				indexer = 0;
-				for (uint32_t i = 0; i < pMesh.mesh.normals.size() / 3; i++)
-				{
-					chunkMesh.vertices[i].normal.x = pMesh.mesh.normals[indexer];
-					chunkMesh.vertices[i].normal.y = pMesh.mesh.normals[indexer + 1];
-					chunkMesh.vertices[i].normal.z = pMesh.mesh.normals[indexer + 2];
-
-					indexer += 3;
-				}
-			}
-
-			// copy uv
-			if (pMesh.mesh.texcoords.size() > 0)
-			{
-				indexer = 0;
-				for (uint32_t i = 0; i < pMesh.mesh.texcoords.size() / 2; i++)
-				{
-					chunkMesh.vertices[i].uv.x = pMesh.mesh.texcoords[indexer];
-					chunkMesh.vertices[i].uv.y = pMesh.mesh.texcoords[indexer + 1];
-					indexer += 2;
-				}
-			}
-
-			// compute facenormal and tangent
-			if (pMesh.mesh.indices.size() > 0 && allTriangles)
-			{
-				for (uint32_t i = 0; i < pMesh.mesh.indices.size(); i += 3)
-				{
-					SimpleMesh::Vertex& v0 = chunkMesh.vertices[chunkMesh.indices[i + 0]];
-					SimpleMesh::Vertex& v1 = chunkMesh.vertices[chunkMesh.indices[i + 1]];
-					SimpleMesh::Vertex& v2 = chunkMesh.vertices[chunkMesh.indices[i + 2]];
-
-					physx::PxVec3 facenormal;
-					computeFacenormalByPosition(
-						v0.position, v1.position, v2.position, facenormal);
-
-					v0.facenormal = facenormal;
-					v1.facenormal = facenormal;
-					v2.facenormal = facenormal;
-
-					physx::PxVec3 tangent;
-					computeTangentByPositionAndTexcoord(
-						v0.position, v1.position, v2.position, v0.uv, v1.uv, v2.uv, tangent);
-
-					v0.tangent += tangent;
-					v1.tangent += tangent;
-					v2.tangent += tangent;
-				}
-				for (uint32_t i = 0; i < chunkMesh.vertices.size(); i++)
-				{
-					chunkMesh.vertices[i].tangent = chunkMesh.vertices[i].tangent.getNormalized();
-				}
-			}
-
-			// assign extents
-			chunkMesh.extents = (emax - emin) * 0.5f;
-
-			// get the center
-			chunkMesh.center = emin + chunkMesh.extents;
-
-			atcore_float3 min = gfsdk_min(*(atcore_float3*)&emin, *(atcore_float3*)&(model->bbMin));
-			model->bbMin = *(physx::PxVec3*)&min;
-			atcore_float3 max = gfsdk_max(*(atcore_float3*)&emax, *(atcore_float3*)&(model->bbMax));
-			model->bbMax = *(physx::PxVec3*)&max;
-		}
-	}
-
-	return model;
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastModel.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastModel.h
deleted file mode 100644
index 82d2af8..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastModel.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_MODEL_H
-#define BLAST_MODEL_H
-
-#include "Mesh.h"
-#include <vector>
-#include <memory>
-
-
-class BlastModel;
-// Add By Lixu Begin
-typedef BlastModel* BlastModelPtr;
-// Add By Lixu End
-
-/**
-BlastModel struct represents graphic model.
-Now only loading from .obj file is supported.
-Can have >=0 materials
-Every chunk can have multiple meshes (1 for every material)
-*/
-class BlastModel
-{
-public:
-	struct Material
-	{
-		std::string name;
-		std::string diffuseTexture;
-		float r, g, b, a;
-	};
-
-	struct Chunk
-	{
-		struct Mesh
-		{
-			uint32_t materialIndex;
-			SimpleMesh mesh;
-		};
-
-		std::vector<Mesh> meshes;
-	};
-
-	std::vector<Material> materials;
-	std::vector<Chunk> chunks;
-	physx::PxVec3 bbMin;
-	physx::PxVec3 bbMax;
-
-	static BlastModelPtr loadFromFileTinyLoader(const char* path);
-	static BlastModelPtr loadFromFbxFile(const char* path);
-private:
-	BlastModel() {}
-};
-
-#endif // ifndef BLAST_MODEL_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastReplay.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastReplay.cpp
deleted file mode 100644
index 678cec2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastReplay.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "BlastReplay.h"
-#include "NvBlastTk.h"
-#include "NvBlastExtPxManager.h"
-#include "NvBlastExtPxFamily.h"
-#include "SampleProfiler.h"
-
-
-using namespace std::chrono;
-
-BlastReplay::BlastReplay() : m_sync(nullptr)
-{
-	m_sync = ExtSync::create();
-	reset();
-}
-
-BlastReplay::~BlastReplay()
-{
-	m_sync->release();
-	clearBuffer();
-}
-
-void BlastReplay::addFamily(TkFamily* family)
-{
-	family->addListener(*m_sync);
-}
-
-void BlastReplay::removeFamily(TkFamily* family)
-{
-	family->removeListener(*m_sync);
-}
-
-void BlastReplay::startRecording(ExtPxManager& manager, bool syncFamily, bool syncPhysics)
-{
-	if (isRecording())
-		return;
-
-	m_sync->releaseSyncBuffer();
-
-	if (syncFamily || syncPhysics)
-	{
-		std::vector<ExtPxFamily*> families(manager.getFamilyCount());
-		manager.getFamilies(families.data(), (uint32_t)families.size());
-		for (ExtPxFamily* family : families)
-		{
-			if (syncPhysics)
-			{
-				m_sync->syncFamily(*family);
-			}
-			else if (syncFamily)
-			{
-				m_sync->syncFamily(family->getTkFamily());
-			}
-		}
-	}
-
-	m_isRecording = true;
-}
-
-void BlastReplay::stopRecording()
-{
-	if (!isRecording())
-		return;
-
-	const ExtSyncEvent*const* buffer;
-	uint32_t size;
-	m_sync->acquireSyncBuffer(buffer, size);
-
-	clearBuffer();
-	m_buffer.resize(size);
-	for (uint32_t i = 0; i < size; ++i)
-	{
-		m_buffer[i] = buffer[i]->clone();
-	}
-
-	// TODO: sort by ts ? make sure?
-	//m_buffer.sort
-
-	m_sync->releaseSyncBuffer();
-
-	m_isRecording = false;
-}
-
-void BlastReplay::startPlayback(ExtPxManager& manager, TkGroup* group)
-{
-	if (isPlaying() || !hasRecord())
-		return;
-
-	m_isPlaying = true;
-	m_startTime = steady_clock::now();
-	m_nextEventIndex = 0;
-	m_firstEventTs = m_buffer[0]->timestamp;
-	m_pxManager = &manager;
-	m_group = group;
-}
-
-void BlastReplay::stopPlayback()
-{
-	if (!isPlaying())
-		return;
-
-	m_isPlaying = false;
-	m_pxManager = nullptr;
-	m_group = nullptr;
-}
-
-void BlastReplay::update()
-{
-	if (isPlaying())
-	{
-		PROFILER_SCOPED_FUNCTION();
-
-		auto now = steady_clock::now();
-		auto mil = duration_cast<milliseconds>((now - m_startTime));
-		bool stop = true;
-		while (m_nextEventIndex < m_buffer.size())
-		{
-			const ExtSyncEvent* e = m_buffer[m_nextEventIndex];
-			auto t = e->timestamp - m_firstEventTs;
-			if (t < (uint64_t)mil.count())
-			{
-				m_sync->applySyncBuffer(m_pxManager->getFramework(), &e, 1, m_group, m_pxManager);
-				m_nextEventIndex++;
-			}
-			else
-			{
-				stop = false;
-				break;
-			}
-		}
-
-		if (stop)
-			stopPlayback();
-	}
-}
-
-void BlastReplay::reset()
-{
-	m_isPlaying = false;
-	m_isRecording = false;
-	m_sync->releaseSyncBuffer();
-}
-
-void BlastReplay::clearBuffer()
-{
-	for (auto e : m_buffer)
-	{
-		e->release();
-	}
-	m_buffer.clear();
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastReplay.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastReplay.h
deleted file mode 100644
index 2c247a5..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/blast/BlastReplay.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef BLAST_REPLAY_H
-#define BLAST_REPLAY_H
-
-#include "NvBlastExtSync.h"
-#include <chrono>
-
-using namespace Nv::Blast;
-
-class BlastReplay
-{
-public:
-	BlastReplay();
-	~BlastReplay();
-
-	bool isRecording() const
-	{
-		return m_isRecording;
-	}
-
-	bool isPlaying() const
-	{
-		return m_isPlaying;
-	}
-
-	bool hasRecord() const
-	{
-		return m_buffer.size() > 0;
-	}
-
-	size_t getEventCount() const
-	{
-		return isRecording() ? m_sync->getSyncBufferSize() : m_buffer.size();
-	}
-
-	uint32_t getCurrentEventIndex() const
-	{
-		return m_nextEventIndex;
-	}
-
-	void addFamily(TkFamily* family);
-	void removeFamily(TkFamily* family);
-
-	void startRecording(ExtPxManager& manager, bool syncFamily, bool syncPhysics);
-	void stopRecording();
-	void startPlayback(ExtPxManager& manager, TkGroup* group);
-	void stopPlayback();
-	void update();
-	void reset();
-
-private:
-	void clearBuffer();
-
-	ExtPxManager*										m_pxManager;
-	TkGroup*											m_group;
-	std::chrono::steady_clock::time_point				m_startTime;
-	uint64_t											m_firstEventTs;
-	uint32_t											m_nextEventIndex;
-	bool												m_isRecording;
-	bool												m_isPlaying;
-	ExtSync*									        m_sync;
-	std::vector<ExtSyncEvent*>				            m_buffer;
-};
-
-
-#endif // ifndef BLAST_REPLAY_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/Application.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/core/Application.cpp
deleted file mode 100644
index 81754e4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/Application.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "Application.h"
-#include <DirectXMath.h>
-#include "XInput.h"
-#include "DXUTMisc.h"
-
-
-Application::Application(DeviceManager* pDeviceManager)
-{
-	m_deviceManager = pDeviceManager;
-}
-
-void Application::addControllerToFront(IApplicationController* controller)
-{
-	m_controllers.push_back(controller);
-	m_deviceManager->AddControllerToFront(controller);
-}
-
-int Application::init()
-{
-	// FirstPersonCamera uses this timer, without it it will be FPS-dependent
-	DXUTGetGlobalTimer()->Start();
-
-	m_deviceManager->DeviceCreated();
-	m_deviceManager->BackBufferResized();
-
-	for (auto it = m_controllers.begin(); it != m_controllers.end(); it++)
-		(*it)->onInitialize();
-
-	for (auto it = m_controllers.begin(); it != m_controllers.end(); it++)
-		(*it)->onSampleStart();
-
-	m_deviceManager->SetVsyncEnabled(false);
-
-	return 0;
-}
-
-int Application::run()
-{
-	m_deviceManager->MessageLoop();
-
-	return 0;
-}
-
-int Application::free()
-{
-	for (auto it = m_controllers.rbegin(); it != m_controllers.rend(); it++)
-		(*it)->onSampleStop();
-
-	for (auto it = m_controllers.rbegin(); it != m_controllers.rend(); it++)
-		(*it)->onTerminate();
-
-	//m_deviceManager->Shutdown();   // destructor will call this function
-	delete m_deviceManager;
-
-	return 0;
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/Application.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/core/Application.h
deleted file mode 100644
index 3681eb3..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/Application.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef APPLICATION_H
-#define APPLICATION_H
-
-#include <DeviceManager.h>
-#include <vector>
-#include <string>
-
-/**
-ISampleController adds more onstart and onstop callbacks to IVisualController
-*/
-class IApplicationController : public IVisualController
-{
-  public:
-	virtual void onInitialize() {}
-	virtual void onSampleStart() {}
-	virtual void onSampleStop() {}
-	virtual void onTerminate() {}
-};
-
-
-/**
-Main manager which runs sample.
-You have to add controllers to it which will receive all the start, animate, render etc. callbacks.
-*/
-class Application
-{
-public:
-	Application(DeviceManager* pDeviceManager);
-	void addControllerToFront(IApplicationController* controller);
-
-	const std::vector<IApplicationController*>& getControllers() const 
-	{ 
-		return m_controllers; 
-	}
-
-	int init();
-	int run();
-	int free();
-
-private:
-	DeviceManager* m_deviceManager;
-	std::vector<IApplicationController*> m_controllers;
-//	std::wstring m_sampleName;
-};
-
-
-#endif //APPLICATION_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/DeviceManager.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/core/DeviceManager.cpp
deleted file mode 100644
index 78eefe8..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/DeviceManager.cpp
+++ /dev/null
@@ -1,796 +0,0 @@
-// TAGRELEASE: PUBLIC
-
-#include "DeviceManager.h"
-#include <WinUser.h>
-#include <Windows.h>
-#include <assert.h>
-#include <sstream>
-#include <algorithm>
-#include <vector>
-#include "GlobalSettings.h"
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p)      { if (p) { (p)->Release(); (p)=NULL; } }
-#endif
-
-#undef min
-#undef max
-
-namespace
-{
-	bool IsNvDeviceID(UINT id)
-	{
-		return id == 0x10DE;
-	}
-
-	// Find an adapter whose name contains the given string.
-	IDXGIAdapter* FindAdapter(const WCHAR* targetName, bool& isNv)
-	{
-		IDXGIAdapter* targetAdapter = NULL;
-		IDXGIFactory* IDXGIFactory_0001 = NULL;
-		HRESULT hres = CreateDXGIFactory(__uuidof(IDXGIFactory), (void**)&IDXGIFactory_0001);
-		if (hres != S_OK) 
-		{
-			printf("ERROR in CreateDXGIFactory, %s@%d.\nFor more info, get log from debug D3D runtime: (1) Install DX SDK, and enable Debug D3D from DX Control Panel Utility. (2) Install and start DbgView. (3) Try running the program again.\n",__FILE__,__LINE__); 
-			return targetAdapter;
-		}
-
-		// changed by Junma Lixu
-		std::vector<IDXGIAdapter*> adapters;
-		// check current adapter first. EnumAdapters could fail on some device 
-		IDXGIAdapter* pAdapter = nullptr;
-		ID3D11Device* pD3dDevice = nullptr;
-		ID3D11DeviceContext* pD3dDeviceContext = nullptr;
-		DWORD createDeviceFlags = D3D11_CREATE_DEVICE_DEBUG;
-		D3D_FEATURE_LEVEL fl;
-		// This following code is the robust way to get all possible feature levels while handling DirectX 11.0 systems:
-		// please read https://blogs.msdn.microsoft.com/chuckw/2014/02/05/anatomy-of-direct3d-11-create-device/
-		D3D_FEATURE_LEVEL lvl[] = { D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_11_0,
-			D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0,
-			D3D_FEATURE_LEVEL_9_3, D3D_FEATURE_LEVEL_9_2, D3D_FEATURE_LEVEL_9_1 };
-		HRESULT hr = D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr,
-			createDeviceFlags, lvl, _countof(lvl),
-			D3D11_SDK_VERSION, &pD3dDevice, &fl, &pD3dDeviceContext);
-		if (pD3dDevice)
-		{
-			IDXGIDevice* dxgiDevice = nullptr;
-			hr = pD3dDevice->QueryInterface(__uuidof(IDXGIDevice), reinterpret_cast<void**>(&dxgiDevice));
-			if (SUCCEEDED(hr))
-			{
-				hr = dxgiDevice->GetAdapter(&pAdapter);
-				if (pAdapter)
-				{
-					adapters.push_back(pAdapter);
-				}
-				SAFE_RELEASE(dxgiDevice);
-			}
-			SAFE_RELEASE(pD3dDeviceContext);
-			SAFE_RELEASE(pD3dDevice);
-		}
-
-		// Enum Adapters
-		unsigned int adapterNo = 0;
-		while (SUCCEEDED(hres = IDXGIFactory_0001->EnumAdapters(adapterNo, (IDXGIAdapter**)&pAdapter)))
-		{
-			adapters.push_back(pAdapter);
-			adapterNo++;
-		}
-		if (wcslen(targetName) != 0)
-		{
-			// find the adapter with specified name
-			for (int i = 0; i < adapters.size(); ++i)
-			{
-				IDXGIAdapter* pAdapter = adapters[i];
-				DXGI_ADAPTER_DESC aDesc;
-				pAdapter->GetDesc(&aDesc);
-				std::wstring aName = aDesc.Description;
-				if (aName.find(targetName) != std::string::npos)
-				{
-					targetAdapter = pAdapter;
-					isNv = IsNvDeviceID(aDesc.VendorId);
-				}
-			}
-		}
-		else
-		{
-			// no name specified, find one NV adapter
-			for (int i = 0; i < adapters.size(); ++i)
-			{
-				IDXGIAdapter* pAdapter = adapters[i];
-				DXGI_ADAPTER_DESC aDesc;
-				pAdapter->GetDesc(&aDesc);
-				std::wstring aName = aDesc.Description;
-				if (IsNvDeviceID(aDesc.VendorId))
-				{
-					targetAdapter = pAdapter;
-					isNv = true;
-				}
-			}
-		}
-		if (targetAdapter == nullptr)
-			targetAdapter = adapters[0];
-		for (int i = 0; i < adapters.size(); ++i)
-		{
-			IDXGIAdapter* pAdapter = adapters[i];
-			if (pAdapter != targetAdapter)
-			{
-				pAdapter->Release();
-			}
-		}
-
-		if (IDXGIFactory_0001)
-			IDXGIFactory_0001->Release();
-
-		return targetAdapter;
-	}
-
-	// Adjust window rect so that it is centred on the given adapter.  Clamps to fit if it's too big.
-	RECT MoveWindowOntoAdapter(IDXGIAdapter* targetAdapter, const RECT& rect)
-	{
-		assert(targetAdapter != NULL);
-
-		RECT result = rect;
-		HRESULT hres = S_OK;
-		unsigned int outputNo = 0;
-		while (SUCCEEDED(hres))
-		{
-			IDXGIOutput* pOutput = NULL;
-			hres = targetAdapter->EnumOutputs(outputNo++, &pOutput);
-
-			if (SUCCEEDED(hres) && pOutput)
-			{
-				DXGI_OUTPUT_DESC OutputDesc;
-				pOutput->GetDesc( &OutputDesc );
-				const RECT desktop = OutputDesc.DesktopCoordinates;
-				const int centreX = (int) desktop.left + (int)(desktop.right - desktop.left) / 2;
-				const int centreY = (int) desktop.top + (int)(desktop.bottom - desktop.top) / 2;
-				const int winW = rect.right - rect.left;
-				const int winH = rect.bottom - rect.top;
-				int left = centreX - winW/2;
-				int right = left + winW;
-				int top = centreY - winH/2;
-				int bottom = top + winH;
-				result.left = std::max(left, (int) desktop.left);
-				result.right = std::min(right, (int) desktop.right);
-				result.bottom = std::min(bottom, (int) desktop.bottom);
-				result.top = std::max(top, (int) desktop.top);
-                pOutput->Release();
-
-				// If there is more than one output, go with the first found.  Multi-monitor support could go here.
-				break;
-			}
-		}
-		return result;
-	}
-}
-
-HRESULT
-DeviceManager::CreateWindowDeviceAndSwapChain(const DeviceCreationParameters& params)
-{
-	IDXGIAdapter* targetAdapter = FindAdapter(params.adapterNameSubstring, m_IsNvidia);
-	if (targetAdapter)
-	{
-		RECT rect = { 0, 0, params.backBufferWidth, params.backBufferHeight };
-		rect = MoveWindowOntoAdapter(targetAdapter, rect);
-	}
-	else
-	{
-		return E_FAIL;
-	}
-
-    HRESULT hr = E_FAIL;
-
-	m_hWnd = params.hWnd;
-
-    RECT clientRect;
-    GetClientRect(m_hWnd, &clientRect);
-    UINT width = clientRect.right - clientRect.left;
-    UINT height = clientRect.bottom - clientRect.top;
-
-    ZeroMemory(&m_SwapChainDesc, sizeof(m_SwapChainDesc));
-    m_SwapChainDesc.BufferCount = params.swapChainBufferCount;
-    m_SwapChainDesc.BufferDesc.Width = width;
-    m_SwapChainDesc.BufferDesc.Height = height;
-    m_SwapChainDesc.BufferDesc.Format = params.swapChainFormat;
-    m_SwapChainDesc.BufferDesc.RefreshRate.Numerator = params.refreshRate;
-    m_SwapChainDesc.BufferDesc.RefreshRate.Denominator = 0;
-    m_SwapChainDesc.BufferUsage = params.swapChainUsage;
-    m_SwapChainDesc.OutputWindow = m_hWnd;
-    m_SwapChainDesc.SampleDesc.Count = params.swapChainSampleCount;
-    m_SwapChainDesc.SampleDesc.Quality = params.swapChainSampleQuality;
-    m_SwapChainDesc.Windowed = !params.startFullscreen;
-    m_SwapChainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
-
-	// The D3D documentation says that if adapter is non-null, driver type must be unknown.  Why not put
-	// this logic in the CreateDevice fns then?!?
-	const D3D_DRIVER_TYPE dType = (targetAdapter)? D3D_DRIVER_TYPE_UNKNOWN: params.driverType;
-
-    hr = D3D11CreateDeviceAndSwapChain(
-        targetAdapter,          // pAdapter
-        dType,					// DriverType
-        NULL,                   // Software
-        params.createDeviceFlags, // Flags
-        &params.featureLevel,   // pFeatureLevels
-        1,                      // FeatureLevels
-        D3D11_SDK_VERSION,      // SDKVersion
-        &m_SwapChainDesc,       // pSwapChainDesc
-        &m_SwapChain,           // ppSwapChain
-        &m_Device,              // ppDevice
-        NULL,                   // pFeatureLevel
-        &m_ImmediateContext     // ppImmediateContext
-    );
-
-	if (targetAdapter)
-		targetAdapter->Release();
-    
-    if(FAILED(hr))
-        return hr;
-
-    m_DepthStencilDesc.ArraySize = 1;
-    m_DepthStencilDesc.BindFlags = D3D11_BIND_DEPTH_STENCIL;
-    m_DepthStencilDesc.CPUAccessFlags = 0;
-    m_DepthStencilDesc.Format = params.depthStencilFormat;
-    m_DepthStencilDesc.Width = width;
-    m_DepthStencilDesc.Height = height;
-    m_DepthStencilDesc.MipLevels = 1;
-    m_DepthStencilDesc.MiscFlags = 0;
-    m_DepthStencilDesc.SampleDesc.Count = params.swapChainSampleCount;
-    m_DepthStencilDesc.SampleDesc.Quality = 0;
-    m_DepthStencilDesc.Usage = D3D11_USAGE_DEFAULT;
-    
-    hr = CreateRenderTargetAndDepthStencil();
-
-	return hr;
-}
-
-void
-DeviceManager::Shutdown() 
-{   
-    if(m_SwapChain && GetWindowState() == kWindowFullscreen)
-        m_SwapChain->SetFullscreenState(false, NULL);
-
-    DeviceDestroyed();
-
-	// changed by Junma Lixu
-	//SAFE_RELEASE(m_BackBufferRTV);
-    //SAFE_RELEASE(m_DepthStencilDSV);
-    //SAFE_RELEASE(m_DepthStencilBuffer);
-
-//    g_DeviceManagerInstance = NULL;
-
-	// changed by Junma Lixu
-	//SAFE_RELEASE(m_ImmediateContext);
-	//SAFE_RELEASE(m_SwapChain);
-
-#if defined(DEBUG) || defined(_DEBUG)
-	ID3D11Debug * d3dDebug = nullptr;
-    if (nullptr != m_Device)
-    {
-        ID3D11DeviceContext* pCtx;
-        m_Device->GetImmediateContext(&pCtx);
-        pCtx->ClearState();
-        pCtx->Flush();
-        pCtx->Release();
-        if (SUCCEEDED(m_Device->QueryInterface(__uuidof(ID3D11Debug), reinterpret_cast<void**>(&d3dDebug))))
-        {
-            d3dDebug->ReportLiveDeviceObjects(D3D11_RLDO_DETAIL);
-            d3dDebug->Release();
-        }
-    }
-#endif
-
-	// changed by Junma Lixu
-	//SAFE_RELEASE(m_Device);
-
-    if(m_hWnd)
-    {
-        DestroyWindow(m_hWnd);
-        m_hWnd = NULL;
-    }
-}
-
-HRESULT
-DeviceManager::CreateRenderTargetAndDepthStencil()
-{
-    HRESULT hr;
-
-    ID3D11Texture2D *backBuffer = NULL; 
-    hr = m_SwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&backBuffer);
-    if (FAILED(hr))
-        return hr;
-
-    hr = m_Device->CreateRenderTargetView(backBuffer, NULL, &m_BackBufferRTV);
-    backBuffer->Release();
-    if (FAILED(hr))
-        return hr;
-
-    if(m_DepthStencilDesc.Format != DXGI_FORMAT_UNKNOWN)
-    {
-        hr = m_Device->CreateTexture2D(&m_DepthStencilDesc, NULL, &m_DepthStencilBuffer);
-        if (FAILED(hr))
-            return hr;
-
-        hr = m_Device->CreateDepthStencilView(m_DepthStencilBuffer, NULL, &m_DepthStencilDSV);
-        if (FAILED(hr))
-            return hr;
-	}
-
-    return S_OK;
-}
-
-#include "SimpleScene.h"
-#include "RenderInterface.h"
-
-void
-DeviceManager::MessageLoop() 
-{    
-	LARGE_INTEGER newTime;
-	QueryPerformanceCounter(&newTime);
-
-	double elapsedSeconds = (m_FixedFrameInterval >= 0)
-		? m_FixedFrameInterval
-		: (double)(newTime.QuadPart - previousTime.QuadPart) / (double)perfFreq.QuadPart;
-
-	if (m_SwapChain && GetWindowState() != kWindowMinimized)
-	{
-		Animate(elapsedSeconds);
-		Render();
-		Sleep(0);
-	}
-	else
-	{
-		// Release CPU resources when idle
-		Sleep(1);
-	}
-
-	{
-		m_vFrameTimes.push_back(elapsedSeconds);
-		double timeSum = 0;
-		for (auto it = m_vFrameTimes.begin(); it != m_vFrameTimes.end(); it++)
-			timeSum += *it;
-
-		if (timeSum > m_AverageTimeUpdateInterval)
-		{
-			m_AverageFrameTime = timeSum / (double)m_vFrameTimes.size();
-			m_vFrameTimes.clear();
-		}
-	}
-
-	previousTime = newTime;
-}
-
-LRESULT 
-DeviceManager::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    switch(uMsg)
-    {
-        case WM_DESTROY:
-        case WM_CLOSE:
-            PostQuitMessage(0);
-            return 0;
-
-        case WM_SYSKEYDOWN:
-            if(wParam == VK_F4)
-            {
-                PostQuitMessage(0);
-                return 0;
-            }
-            break;
-
-        case WM_ENTERSIZEMOVE:
-            m_InSizingModalLoop = true;
-            m_NewWindowSize.cx = m_SwapChainDesc.BufferDesc.Width;
-            m_NewWindowSize.cy = m_SwapChainDesc.BufferDesc.Height;
-            break;
-
-        case WM_EXITSIZEMOVE:
-            m_InSizingModalLoop = false;
-            ResizeSwapChain();
-            break;
-
-        case WM_SIZE:
-            // Ignore the WM_SIZE event if there is no device,
-            // or if the window has been minimized (size == 0),
-            // or if it has been restored to the previous size (this part is tested inside ResizeSwapChain)
-            if (m_Device && (lParam != 0))
-            {
-                m_NewWindowSize.cx = LOWORD(lParam);
-                m_NewWindowSize.cy = HIWORD(lParam);
-                    
-                if(!m_InSizingModalLoop)
-                    ResizeSwapChain();
-            }
-    }
-
-    if( uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST )
-    {
-        // processing messages front-to-back
-        for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
-        {
-            if((*it)->IsEnabled())
-            {
-                // for kb/mouse messages, 0 means the message has been handled
-                if(0 == (*it)->MsgProc(hWnd, uMsg, wParam, lParam))
-                    return 0;
-            }
-        }
-    }
-
-	if (uMsg >= WM_KEYFIRST && uMsg <= WM_KEYLAST)
-	{
-		return 0;
-	}
-
-    return DefWindowProc(hWnd, uMsg, wParam, lParam);
-}
-
-void
-DeviceManager::ResizeSwapChain()
-{
-	// changed by Junma Lixu
-	RenderPlugin* pPlugin = RenderPlugin::Instance();
-	D3DHandles handles;
-	SetWindowDeviceAndSwapChain(pPlugin->GetDeviceHandles(handles));
-	BackBufferResized();
-	return;
-
-	if (m_NewWindowSize.cx == (LONG)m_SwapChainDesc.BufferDesc.Width &&
-		m_NewWindowSize.cy == (LONG)m_SwapChainDesc.BufferDesc.Height)
-		return;
-
-	m_SwapChainDesc.BufferDesc.Width = m_NewWindowSize.cx;
-    m_SwapChainDesc.BufferDesc.Height = m_NewWindowSize.cy;
-
-    ID3D11RenderTargetView *nullRTV = NULL;
-    m_ImmediateContext->OMSetRenderTargets(1, &nullRTV, NULL);
-    SAFE_RELEASE(m_BackBufferRTV);
-    SAFE_RELEASE(m_DepthStencilDSV);
-    SAFE_RELEASE(m_DepthStencilBuffer);
-
-    if (m_SwapChain)
-    {
-        // Resize the swap chain
-        m_SwapChain->ResizeBuffers(m_SwapChainDesc.BufferCount, m_SwapChainDesc.BufferDesc.Width, 
-                                    m_SwapChainDesc.BufferDesc.Height, m_SwapChainDesc.BufferDesc.Format, 
-                                    m_SwapChainDesc.Flags);
-                    
-        m_DepthStencilDesc.Width = m_NewWindowSize.cx;
-        m_DepthStencilDesc.Height = m_NewWindowSize.cy;
-
-        CreateRenderTargetAndDepthStencil();
-
-        BackBufferResized();
-    }
-}
-
-void
-DeviceManager::Render()
-{
-    D3D11_VIEWPORT viewport = { 0.0f, 0.0f, (float)m_SwapChainDesc.BufferDesc.Width, (float)m_SwapChainDesc.BufferDesc.Height, 0.0f, 1.0f };
-
-    // rendering back-to-front
-    for(auto it = m_vControllers.rbegin(); it != m_vControllers.rend(); it++)
-    {
-        if((*it)->IsEnabled())
-        {
-            m_ImmediateContext->OMSetRenderTargets(1, &m_BackBufferRTV, m_DepthStencilDSV);
-            m_ImmediateContext->RSSetViewports(1, &viewport);
-
-            (*it)->Render(m_Device, m_ImmediateContext, m_BackBufferRTV, m_DepthStencilDSV);
-        }
-    }
-
-    m_ImmediateContext->OMSetRenderTargets(1, &m_BackBufferRTV, m_DepthStencilDSV);
-	GlobalSettings::Inst().m_renderFrameCnt++;
-}
-
-void
-DeviceManager::Animate(double fElapsedTimeSeconds)
-{
-    // front-to-back, but the order shouldn't matter
-    for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
-    {
-        if((*it)->IsEnabled())
-        {
-            (*it)->Animate(fElapsedTimeSeconds);
-        }
-    }
-}
-
-void
-DeviceManager::DeviceCreated()
-{
-    // creating resources front-to-back
-    for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
-    {
-        (*it)->DeviceCreated(m_Device);
-    }
-}
-
-void
-DeviceManager::DeviceDestroyed()
-{
-    // releasing resources back-to-front
-    for(auto it = m_vControllers.rbegin(); it != m_vControllers.rend(); it++)
-    {
-        (*it)->DeviceDestroyed();
-    }
-}
-
-void
-DeviceManager::BackBufferResized()
-{
-    if(m_SwapChain == NULL)
-        return;
-
-    DXGI_SURFACE_DESC backSD;
-    backSD.Format = m_SwapChainDesc.BufferDesc.Format;
-    backSD.Width = m_SwapChainDesc.BufferDesc.Width;
-    backSD.Height = m_SwapChainDesc.BufferDesc.Height;
-    backSD.SampleDesc = m_SwapChainDesc.SampleDesc;
-
-    for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
-    {
-        (*it)->BackBufferResized(m_Device, &backSD);
-    }
-}
-
-HRESULT
-DeviceManager::ChangeBackBufferFormat(DXGI_FORMAT format, UINT sampleCount)
-{
-    HRESULT hr = E_FAIL;
-
-    if((format == DXGI_FORMAT_UNKNOWN || format == m_SwapChainDesc.BufferDesc.Format) &&
-       (sampleCount == 0 || sampleCount == m_SwapChainDesc.SampleDesc.Count))
-        return S_FALSE;
-
-    if(m_Device)
-    {
-        bool fullscreen = (GetWindowState() == kWindowFullscreen);
-        if(fullscreen)
-            m_SwapChain->SetFullscreenState(false, NULL);
-
-        IDXGISwapChain* newSwapChain = NULL;
-        DXGI_SWAP_CHAIN_DESC newSwapChainDesc = m_SwapChainDesc;
-
-        if(format != DXGI_FORMAT_UNKNOWN)
-            newSwapChainDesc.BufferDesc.Format = format;
-        if(sampleCount != 0)
-            newSwapChainDesc.SampleDesc.Count = sampleCount;
-
-        IDXGIAdapter* pDXGIAdapter = GetDXGIAdapter();
-
-        IDXGIFactory* pDXGIFactory = NULL;
-        pDXGIAdapter->GetParent(__uuidof(IDXGIFactory), reinterpret_cast<void**>(&pDXGIFactory));
-
-        hr = pDXGIFactory->CreateSwapChain(m_Device, &newSwapChainDesc, &newSwapChain);
-
-        pDXGIFactory->Release();
-        pDXGIAdapter->Release();
-        
-        if (FAILED(hr))
-        {
-            if(fullscreen)
-                m_SwapChain->SetFullscreenState(true, NULL);
-
-            return hr;
-        }
-
-        SAFE_RELEASE(m_BackBufferRTV);
-        SAFE_RELEASE(m_SwapChain);
-        SAFE_RELEASE(m_DepthStencilBuffer);
-        SAFE_RELEASE(m_DepthStencilDSV);
-
-        m_SwapChain = newSwapChain;
-        m_SwapChainDesc = newSwapChainDesc;
-
-        m_DepthStencilDesc.SampleDesc.Count = sampleCount;
-
-        if(fullscreen)                
-            m_SwapChain->SetFullscreenState(true, NULL);
-
-        CreateRenderTargetAndDepthStencil();
-        BackBufferResized();
-    }
-
-    return S_OK;
-}
-
-void
-DeviceManager::AddControllerToFront(IVisualController* pController) 
-{ 
-    m_vControllers.remove(pController);
-    m_vControllers.push_front(pController);
-}
-
-void
-DeviceManager::AddControllerToBack(IVisualController* pController) 
-{
-    m_vControllers.remove(pController);
-    m_vControllers.push_back(pController);
-}
-
-void
-DeviceManager::RemoveController(IVisualController* pController) 
-{ 
-    m_vControllers.remove(pController);
-}
-
-HRESULT 
-DeviceManager::ResizeWindow(int width, int height)
-{
-    if(m_SwapChain == NULL)
-        return E_FAIL;
-
-    RECT rect;
-    GetWindowRect(m_hWnd, &rect);
-
-    ShowWindow(m_hWnd, SW_RESTORE);
-
-    if(!MoveWindow(m_hWnd, rect.left, rect.top, width, height, true))
-        return E_FAIL;
-
-    // No need to call m_SwapChain->ResizeBackBuffer because MoveWindow will send WM_SIZE, which calls that function.
-
-    return S_OK;
-}
-
-#define WINDOW_STYLE_NORMAL         (WS_OVERLAPPEDWINDOW | WS_VISIBLE)
-#define WINDOW_STYLE_FULLSCREEN     (WS_POPUP | WS_SYSMENU | WS_VISIBLE)
-
-HRESULT            
-DeviceManager::EnterFullscreenMode(int width, int height)
-{
-    if(m_SwapChain == NULL)
-        return E_FAIL;
-
-    if(GetWindowState() == kWindowFullscreen)
-        return S_FALSE;
-    
-    if(width <= 0 || height <= 0)
-    {
-        width = m_SwapChainDesc.BufferDesc.Width;
-        height = m_SwapChainDesc.BufferDesc.Height;
-    }
-     
-    SetWindowLong(m_hWnd, GWL_STYLE, WINDOW_STYLE_FULLSCREEN);
-    MoveWindow(m_hWnd, 0, 0, width, height, true);
-
-    HRESULT hr = m_SwapChain->SetFullscreenState(true, NULL);
-
-    if(FAILED(hr)) 
-    {
-        SetWindowLong(m_hWnd, GWL_STYLE, WINDOW_STYLE_NORMAL);
-        return hr;
-    }
-
-    UpdateWindow(m_hWnd);
-    m_SwapChain->GetDesc(&m_SwapChainDesc);
-
-    return S_OK;
-}
-
-HRESULT            
-DeviceManager::LeaveFullscreenMode(int windowWidth, int windowHeight)
-{
-    if(m_SwapChain == NULL)
-        return E_FAIL;
-
-    if(GetWindowState() != kWindowFullscreen)
-        return S_FALSE;
-     
-    HRESULT hr = m_SwapChain->SetFullscreenState(false, NULL);
-    if(FAILED(hr)) return hr;
-
-    SetWindowLong(m_hWnd, GWL_STYLE, WINDOW_STYLE_NORMAL);
-
-    if(windowWidth <= 0 || windowHeight <= 0)
-    {
-        windowWidth = m_SwapChainDesc.BufferDesc.Width;
-        windowHeight = m_SwapChainDesc.BufferDesc.Height;
-    }
-    
-    RECT rect = { 0, 0, windowWidth, windowHeight };
-    AdjustWindowRect(&rect, WINDOW_STYLE_NORMAL, FALSE);
-    MoveWindow(m_hWnd, 0, 0, rect.right - rect.left, rect.bottom - rect.top, true);
-    UpdateWindow(m_hWnd);
-
-    m_SwapChain->GetDesc(&m_SwapChainDesc);
-
-    return S_OK;
-}
-
-HRESULT            
-DeviceManager::ToggleFullscreen()
-{
-    if(GetWindowState() == kWindowFullscreen)
-        return LeaveFullscreenMode();
-    else
-        return EnterFullscreenMode();
-}
-
-DeviceManager::WindowState
-DeviceManager::GetWindowState() 
-{ 
-    if(m_SwapChain && !m_SwapChainDesc.Windowed)
-        return kWindowFullscreen;
-
-    if(m_hWnd == INVALID_HANDLE_VALUE)
-        return kWindowNone;
-
-    if(IsZoomed(m_hWnd))
-        return kWindowMaximized;
-
-    if(IsIconic(m_hWnd))
-        return kWindowMinimized;
-
-    return kWindowNormal;
-}
-
-HRESULT
-DeviceManager::GetDisplayResolution(int& width, int& height)
-{
-    if(m_hWnd != INVALID_HANDLE_VALUE)
-    {
-        HMONITOR monitor = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTOPRIMARY);
-        MONITORINFO info;
-        info.cbSize = sizeof(MONITORINFO);
-
-        if(GetMonitorInfo(monitor, &info))
-        {
-            width = info.rcMonitor.right - info.rcMonitor.left;
-            height = info.rcMonitor.bottom - info.rcMonitor.top;
-            return S_OK;
-        }
-    }
-
-    return E_FAIL;
-}
-
-IDXGIAdapter*   
-DeviceManager::GetDXGIAdapter()
-{   
-    if(!m_Device)
-        return NULL;
-
-    IDXGIDevice* pDXGIDevice = NULL;
-    m_Device->QueryInterface(__uuidof(IDXGIDevice), reinterpret_cast<void**>(&pDXGIDevice));
-
-    IDXGIAdapter* pDXGIAdapter = NULL;
-    pDXGIDevice->GetParent(__uuidof(IDXGIAdapter), reinterpret_cast<void**>(&pDXGIAdapter));
-
-    pDXGIDevice->Release();
-
-    return pDXGIAdapter;
-}
-
-// added by Junma Lixu
-void
-DeviceManager::SetWindowHandle(HWND hWnd)
-{
-	m_hWnd = hWnd;
-}
-
-HRESULT 
-DeviceManager::SetWindowDeviceAndSwapChain(D3DHandles& deviceHandles)
-{
-	ID3D11Device* pDevice = (ID3D11Device*)(deviceHandles.pDevice);
-	ID3D11DeviceContext* pImmediateContext = (ID3D11DeviceContext*)(deviceHandles.pDeviceContext);
-	if (pDevice == nullptr || pImmediateContext == nullptr)
-	{
-		return E_FAIL;
-	}
-
-	m_Device = pDevice;
-	m_ImmediateContext = pImmediateContext;
-	m_SwapChain = deviceHandles.pDXGISwapChain;
-	HRESULT res0 = m_SwapChain->GetDesc(&m_SwapChainDesc);
-	assert(m_SwapChainDesc.OutputWindow == m_hWnd);
-
-	m_BackBufferRTV = (ID3D11RenderTargetView*)deviceHandles.pD3D11RenderTargetView;
-	m_DepthStencilBuffer = (ID3D11Texture2D*)deviceHandles.pD3D11DepthBuffer;
-	m_DepthStencilDSV = (ID3D11DepthStencilView*)deviceHandles.pD3D11DepthStencilView;
-	m_DepthStencilBuffer->GetDesc(&m_DepthStencilDesc);
-
-	return S_OK;
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/DeviceManager.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/core/DeviceManager.h
deleted file mode 100644
index bd6f7e2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/DeviceManager.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// TAGRELEASE: PUBLIC
-
-#pragma once
-#include <Windows.h>
-#include <DXGI.h>
-#include <D3D11.h>
-#include <list>
-// added by Junma Lixu
-#include "RenderPlugin.h"
-
-struct DeviceCreationParameters
-{
-    bool startMaximized;
-    bool startFullscreen;
-    int backBufferWidth;
-    int backBufferHeight;
-    int refreshRate;
-    int swapChainBufferCount;
-    DXGI_FORMAT swapChainFormat;
-    DXGI_FORMAT depthStencilFormat;
-    DXGI_USAGE swapChainUsage;
-    int swapChainSampleCount;
-    int swapChainSampleQuality;
-    UINT createDeviceFlags;
-    D3D_DRIVER_TYPE driverType;
-    D3D_FEATURE_LEVEL featureLevel;
-	HWND hWnd;
-
-	// For use in the case of multiple adapters.  If this is non-null, device creation will try to match
-	// the given string against an adapter name.  If the specified string exists as a sub-string of the 
-	// adapter name, the device and window will be created on that adapter.  Case sensitive.
-	const WCHAR* adapterNameSubstring;
-
-    DeviceCreationParameters() 
-        : startMaximized(false)
-        , startFullscreen(false)
-        , backBufferWidth(1280)
-        , backBufferHeight(720)
-        , refreshRate(0)
-        , swapChainBufferCount(1)
-        , swapChainFormat(DXGI_FORMAT_R8G8B8A8_UNORM)
-        , depthStencilFormat(DXGI_FORMAT_D24_UNORM_S8_UINT)
-        , swapChainUsage(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT)
-        , swapChainSampleCount(1)
-        , swapChainSampleQuality(0)
-        , createDeviceFlags(0)
-        , driverType(D3D_DRIVER_TYPE_HARDWARE)
-        , featureLevel(D3D_FEATURE_LEVEL_11_0)
-		, adapterNameSubstring(L"")
-		, hWnd(0)
-    { }
-};
-
-#pragma warning(push)
-#pragma warning(disable: 4100) // unreferenced formal parameter
-class IVisualController
-{
-private:
-    bool            m_Enabled;
-public:
-    IVisualController() : m_Enabled(true) { }
-
-    virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return 1; }
-    virtual void Render(ID3D11Device* pDevice, ID3D11DeviceContext* pDeviceContext, ID3D11RenderTargetView* pRTV, ID3D11DepthStencilView* pDSV) { }
-    virtual void Animate(double fElapsedTimeSeconds) { }
-    virtual HRESULT DeviceCreated(ID3D11Device* pDevice) { return S_OK; }
-    virtual void DeviceDestroyed() { }
-    virtual void BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc) { }
-
-    virtual void EnableController() { m_Enabled = true; }
-    virtual void DisableController() { m_Enabled = false; }
-    virtual bool IsEnabled() { return m_Enabled; }
-};
-#pragma warning(pop)
-
-struct D3DHandles;
-
-class DeviceManager
-{
-public:
-    enum WindowState
-    {
-        kWindowNone,
-        kWindowNormal,
-        kWindowMinimized,
-        kWindowMaximized,
-        kWindowFullscreen
-    };
-
-protected:
-    ID3D11Device*           m_Device;
-    ID3D11DeviceContext*    m_ImmediateContext;
-    IDXGISwapChain*         m_SwapChain;
-    ID3D11RenderTargetView* m_BackBufferRTV;
-    ID3D11Texture2D*        m_DepthStencilBuffer;
-    ID3D11DepthStencilView* m_DepthStencilDSV;
-    DXGI_SWAP_CHAIN_DESC    m_SwapChainDesc;
-    D3D11_TEXTURE2D_DESC    m_DepthStencilDesc;
-	bool					m_IsNvidia;
-    HWND                    m_hWnd;
-    std::list<IVisualController*> m_vControllers;
-    std::wstring            m_WindowTitle;
-    double                  m_FixedFrameInterval;
-    UINT                    m_SyncInterval;
-    std::list<double>       m_vFrameTimes;
-    double                  m_AverageFrameTime;
-    double                  m_AverageTimeUpdateInterval;
-    bool                    m_InSizingModalLoop;
-	SIZE                    m_NewWindowSize;
-	LARGE_INTEGER perfFreq, previousTime;
-private:
-    HRESULT                 CreateRenderTargetAndDepthStencil();
-    void                    ResizeSwapChain();
-public:
-
-    DeviceManager()
-        : m_Device(NULL)
-        , m_ImmediateContext(NULL)
-        , m_SwapChain(NULL)
-        , m_BackBufferRTV(NULL)
-        , m_DepthStencilBuffer(NULL)
-        , m_DepthStencilDSV(NULL)
-		, m_IsNvidia(false)
-        , m_hWnd(NULL)
-        , m_WindowTitle(L"")
-        , m_FixedFrameInterval(-1)
-        , m_SyncInterval(0)
-        , m_AverageFrameTime(0)
-        , m_AverageTimeUpdateInterval(0.5)
-        , m_InSizingModalLoop(false)
-	{
-		QueryPerformanceFrequency(&perfFreq);
-		QueryPerformanceCounter(&previousTime);
-	}
-
-    virtual ~DeviceManager() 
-    { Shutdown(); }
-
-    virtual HRESULT CreateWindowDeviceAndSwapChain(const DeviceCreationParameters& params);
-    virtual HRESULT ChangeBackBufferFormat(DXGI_FORMAT format, UINT sampleCount);
-    virtual HRESULT ResizeWindow(int width, int height);
-    virtual HRESULT EnterFullscreenMode(int width = 0, int height = 0);
-    virtual HRESULT LeaveFullscreenMode(int windowWidth = 0, int windowHeight = 0);
-    virtual HRESULT ToggleFullscreen();
-
-    virtual void    Shutdown();
-    virtual void    MessageLoop();
-    virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-    virtual void    Render();
-    virtual void    Animate(double fElapsedTimeSeconds);
-    virtual void    DeviceCreated();
-    virtual void    DeviceDestroyed();
-    virtual void    BackBufferResized();
-
-    void            AddControllerToFront(IVisualController* pController);
-    void            AddControllerToBack(IVisualController* pController);
-    void            RemoveController(IVisualController* pController);
-
-    void            SetFixedFrameInterval(double seconds) { m_FixedFrameInterval = seconds; }
-    void            DisableFixedFrameInterval() { m_FixedFrameInterval = -1; }
-
-	bool			IsNvidia() const { return m_IsNvidia; }
-    HWND            GetHWND() { return m_hWnd; }
-    ID3D11Device*   GetDevice() { return m_Device; }
-    WindowState     GetWindowState();
-    bool            GetVsyncEnabled() { return m_SyncInterval > 0; }
-    void            SetVsyncEnabled(bool enabled) { m_SyncInterval = enabled ? 1 : 0; }
-    HRESULT         GetDisplayResolution(int& width, int& height);
-    IDXGIAdapter*   GetDXGIAdapter();
-    double          GetAverageFrameTime() { return m_AverageFrameTime; }
-    void            SetAverageTimeUpdateInterval(double value) { m_AverageTimeUpdateInterval = value; }
-
-	// added by Junma Lixu
-	void SetWindowHandle(HWND hWnd);
-	virtual HRESULT SetWindowDeviceAndSwapChain(D3DHandles& pDeviceHandles);
-};
-
-
-DeviceManager* GetDeviceManager();
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleController.cpp
deleted file mode 100644
index cd8ea4c..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleController.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "SampleController.h"
-#include "SceneController.h"
-#include "CommonUIController.h"
-#include "BlastController.h"
-#include "PhysXController.h"
-#include "Renderer.h"
-
-#include "imgui.h"
-
-SampleController::SampleController()
-{
-}
-
-SampleController::~SampleController()
-{
-}
-
-void SampleController::onSampleStart()
-{
-	// start with GPU physics by default
-	setUseGPUPhysics(true);
-}
-
-
-void SampleController::setUseGPUPhysics(bool useGPUPhysics)
-{
-	if (!getPhysXController().getGPUPhysicsAvailable())
-	{
-		useGPUPhysics = false;
-	}
-
-	if (getPhysXController().getUseGPUPhysics() == useGPUPhysics)
-	{
-		return;
-	}
-
-	int assetNum = getSceneController().releaseAll();
-
-	getBlastController().notifyPhysXControllerRelease();
-	getPhysXController().setUseGPUPhysics(useGPUPhysics);
-	getBlastController().reinitialize();
-
-	getRenderer().clearQueue();
-
-	getSceneController().spawnAsset(assetNum);
-}
-
-
-void SampleController::drawPhysXGpuUI()
-{
-	// GPU Physics
-	bool useGPU = getPhysXController().getUseGPUPhysics();
-	if (ImGui::Checkbox("Use GPU Physics", &useGPU))
-	{
-		getCommonUIController().addDelayedCall([=]() { setUseGPUPhysics(useGPU); }, "Loading...");
-	}
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleController.h
deleted file mode 100644
index 6d478c1..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleController.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SAMPLE_CONTROLLER_H
-#define SAMPLE_CONTROLLER_H
-
-#include "SampleManager.h"
-
-class SampleController : public ISampleController
-{
-public:
-	SampleController();
-	virtual ~SampleController();
-
-	virtual void onSampleStart();
-	void drawPhysXGpuUI();
-
-private:
-	SampleController& operator= (SampleController&);
-
-
-	//////// used controllers ////////
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-	BlastController& getBlastController() const
-	{
-		return getManager()->getBlastController();
-	}
-
-	SceneController& getSceneController() const
-	{
-		return getManager()->getSceneController();
-	}
-
-	CommonUIController& getCommonUIController() const
-	{
-		return getManager()->getCommonUIController();
-	}
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-
-	//////// private methods ////////
-
-	void setUseGPUPhysics(bool useGPUPhysics);
-};
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleManager.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleManager.cpp
deleted file mode 100644
index f26fdb3..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleManager.cpp
+++ /dev/null
@@ -1,3179 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "AppMainWindow.h"
-#include "GlobalSettings.h"
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include "NvBlastExtAuthoringTypes.h"
-#include "NvBlastExtAuthoringFractureTool.h"
-#include "NvBlastExtAuthoringBondGenerator.h"
-#include "NvBlastIndexFns.h"
-
-#include "SampleManager.h"
-
-#include "Utils.h"
-
-#include "Renderer.h"
-#include "PhysXController.h"
-#include "BlastController.h"
-#include "CommonUIController.h"
-#include "DamageToolController.h"
-#include "SelectionToolController.h"
-#include "ExplodeToolController.h"
-#include "GizmoToolController.h"
-#include "EditionToolController.h"
-#include "SceneController.h"
-#include "SampleController.h"
-
-#include "tclap/CmdLine.h"
-#include "PxPhysics.h"
-#include "PsFileBuffer.h"
-#include "NvBlast.h"
-#include "NvBlastExtAuthoringCollisionBuilder.h"
-#include "NvBlastExtPxAsset.h"
-#include "BlastFractureTool.h"
-#include <set>
-#include "MaterialLibraryPanel.h"
-#include "MaterialAssignmentsPanel.h"
-#include "ViewerOutput.h"
-
-#include "NvBlastTkAsset.h"
-#include "BlastAssetModelSimple.h"
-#include "CorelibUtils.h"
-#include "BlastAssetModel.h"
-#include "SimpleScene.h"
-#include "FileReferencesPanel.h"
-#include "BlastPlugin.h"
-#include "BlastToolBar.h"
-#include "NvBlastExtAuthoring.h"
-#include "NvBlastExtExporter.h"
-using namespace physx;
-
-const uint32_t DEFAULT_VORONOI_UNIFORM_SITES_NUMBER = 5;
-physx::PxFoundation* foundation = nullptr;
-physx::PxPhysics* physics = nullptr;
-physx::PxCooking* cooking = nullptr;
-Nv::Blast::ExtPxManager* physicsManager = nullptr;
-SampleManager* sSampleManager = nullptr;
-
-class SimpleRandomGenerator : public RandomGeneratorBase
-{
-public:
-	SimpleRandomGenerator() {
-		remember = false;
-	};
-
-	virtual float getRandomValue()
-	{
-		float r = (float)rand();
-		r = r / RAND_MAX;
-		return r;
-	}
-
-	virtual float getExponential(float lambda)
-	{
-		return -1.0f / lambda * log(1 - getRandomValue());
-	}
-
-	virtual void seed(int32_t seed)
-	{
-		srand(seed);
-	}
-
-	virtual ~SimpleRandomGenerator() {};
-
-private:
-	bool remember;
-};
-static SimpleRandomGenerator sRandomGenerator;
-
-void loggingCallback(int type, const char* msg, const char* file, int line)
-{
-	(void)type;
-
-	std::cout << msg << " FILE:" << file << " Line: " << line << "\n";
-}
-
-void buildPxChunks(const std::vector<std::vector<Triangle>>& chunkGeometry, std::vector<ExtPxAssetDesc::ChunkDesc>& pxChunks,
-	std::vector<ExtPxAssetDesc::SubchunkDesc>& pxSubchunks, std::vector<bool>& statics)
-{
-	std::shared_ptr<Nv::Blast::ConvexMeshBuilder> collisionBuilder(
-		NvBlastExtAuthoringCreateConvexMeshBuilder(cooking, &physics->getPhysicsInsertionCallback()),
-		[](Nv::Blast::ConvexMeshBuilder* cmb) {cmb->release(); });
-
-	pxChunks.resize(chunkGeometry.size());
-	pxSubchunks.resize(chunkGeometry.size());
-
-	for (uint32_t i = 0; i < chunkGeometry.size(); ++i)
-	{
-		std::vector<physx::PxVec3> vertices;
-		for (uint32_t p = 0; p < chunkGeometry[i].size(); ++p)
-		{
-			vertices.push_back(chunkGeometry[i][p].a.p);
-			vertices.push_back(chunkGeometry[i][p].b.p);
-			vertices.push_back(chunkGeometry[i][p].c.p);
-		}
-		pxSubchunks[i].transform = physx::PxTransform(physx::PxIdentity);
-		pxSubchunks[i].geometry = physx::PxConvexMeshGeometry(
-			collisionBuilder.get()->buildConvexMesh(*collisionBuilder.get()->buildCollisionGeometry((uint32_t)vertices.size(), vertices.data())));
-		pxChunks[i].isStatic = statics.size() == 0 ? false : statics[i];
-		pxChunks[i].subchunkCount = 1;
-		pxChunks[i].subchunks = &pxSubchunks[i];
-	}
-
-	// only effect when chunk is support
-	pxChunks[0].isStatic = true;
-}
-
-void saveFractureToObj(std::vector<std::vector<Triangle> > chunksGeometry, std::string name, std::string path)
-{
-	std::vector<std::string> materialNames(2);
-	std::vector<std::string> materialPaths(2);
-	float diffuseColor[2][4];
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	BlastAsset* pCurBlastAsset = nullptr;
-	int nCurIndex = -1;
-	pSampleManager->getCurrentSelectedInstance(&pCurBlastAsset, nCurIndex);
-	if (pCurBlastAsset != nullptr && nCurIndex != -1)
-	{
-		pSampleManager->getMaterialForCurrentFamily(materialNames[0], true);
-		pSampleManager->getMaterialForCurrentFamily(materialNames[1], false);
-
-		BPPGraphicsMaterial* pMaterialEx = BlastProject::ins().getGraphicsMaterial(materialNames[0].c_str());
-		BPPGraphicsMaterial* pMaterialIn = BlastProject::ins().getGraphicsMaterial(materialNames[1].c_str());
-
-		diffuseColor[0][0] = pMaterialEx->diffuseColor.x;
-		diffuseColor[0][1] = pMaterialEx->diffuseColor.y;
-		diffuseColor[0][2] = pMaterialEx->diffuseColor.z;
-		diffuseColor[0][3] = pMaterialEx->diffuseColor.w;
-		if (pMaterialEx->diffuseTextureFilePath != nullptr)
-		{
-			materialPaths[0] = pMaterialEx->diffuseTextureFilePath;
-		}
-
-		if (pMaterialIn == nullptr)
-		{
-			pMaterialIn = pMaterialEx;
-		}
-
-		diffuseColor[1][0] = pMaterialIn->diffuseColor.x;
-		diffuseColor[1][1] = pMaterialIn->diffuseColor.y;
-		diffuseColor[1][2] = pMaterialIn->diffuseColor.z;
-		diffuseColor[1][3] = pMaterialIn->diffuseColor.w;
-		if (pMaterialIn->diffuseTextureFilePath != nullptr)
-		{
-			materialPaths[1] = pMaterialIn->diffuseTextureFilePath;
-		}
-	}
-	else
-	{
-		MaterialAssignmentsPanel* pMaterialAssignmentsPanel = MaterialAssignmentsPanel::ins();
-		pMaterialAssignmentsPanel->getMaterialNameAndPaths(materialNames, materialPaths);
-
-		if (materialPaths[0] == "")
-		{
-			RenderMaterial* pMaterialEx = RenderMaterial::getDefaultRenderMaterial();
-			pMaterialEx->getDiffuseColor(diffuseColor[0][0], diffuseColor[0][1], diffuseColor[0][2], diffuseColor[0][3]);
-		}
-		if (materialPaths[1] == "")
-		{
-			RenderMaterial* pMaterialIn = RenderMaterial::getDefaultRenderMaterial();
-			pMaterialIn->getDiffuseColor(diffuseColor[1][0], diffuseColor[1][1], diffuseColor[1][2], diffuseColor[1][3]);
-		}
-	}
-
-	uint32_t submeshCount = 2;
-	// export materials (mtl file)
-	{
-		std::string mtlFilePath = GlobalSettings::MakeFileName(path.c_str(), std::string(name + ".mtl").c_str());
-		FILE* f = fopen(mtlFilePath.c_str(), "w");
-		if (!f)
-			return;
-
-		for (uint32_t submeshIndex = 0; submeshIndex < submeshCount; ++submeshIndex)
-		{
-			// Add By Lixu Begin
-			std::string& matName = materialNames[submeshIndex];
-			fprintf(f, "newmtl %s\n", matName.size()? matName.c_str() : "neverMat123XABCnever");  // this speical string is also used in another BlastModel.cpp.
-			// Add By Lixu End
-			fprintf(f, "\tmap_Kd %s\n", materialPaths[submeshIndex].c_str());
-			fprintf(f, "\tKd %f %f %f\n", diffuseColor[submeshIndex][0], diffuseColor[submeshIndex][1], diffuseColor[submeshIndex][2]);
-			fprintf(f, "\n");
-		}
-
-		fclose(f);
-	}
-
-	{
-		std::string objFilePath = GlobalSettings::MakeFileName(path.c_str(), std::string(name + ".obj").c_str());
-		FILE* outStream = fopen(objFilePath.c_str(), "w");
-
-		fprintf(outStream, "mtllib %s.mtl\n", name.c_str());
-		fprintf(outStream, "o frac \n");
-
-
-		for (uint32_t vc = 0; vc < chunksGeometry.size(); ++vc)
-		{
-			std::vector<Triangle>& chunk = chunksGeometry[vc];
-			for (uint32_t i = 0; i < chunk.size(); ++i)
-			{
-				fprintf(outStream, "v %lf %lf %lf\n", chunk[i].a.p.x, chunk[i].a.p.y, chunk[i].a.p.z);
-				fprintf(outStream, "v %lf %lf %lf\n", chunk[i].b.p.x, chunk[i].b.p.y, chunk[i].b.p.z);
-				fprintf(outStream, "v %lf %lf %lf\n", chunk[i].c.p.x, chunk[i].c.p.y, chunk[i].c.p.z);
-			}
-
-			for (uint32_t i = 0; i < chunk.size(); ++i)
-			{
-				fprintf(outStream, "vt %lf %lf \n", chunk[i].a.uv[0].x, chunk[i].a.uv[0].y);
-				fprintf(outStream, "vt %lf %lf \n", chunk[i].b.uv[0].x, chunk[i].b.uv[0].y);
-				fprintf(outStream, "vt %lf %lf \n", chunk[i].c.uv[0].x, chunk[i].c.uv[0].y);
-			}
-
-			for (uint32_t i = 0; i < chunk.size(); ++i)
-			{
-				fprintf(outStream, "vn %lf %lf %lf\n", chunk[i].a.n.x, chunk[i].a.n.y, chunk[i].a.n.z);
-				fprintf(outStream, "vn %lf %lf %lf\n", chunk[i].b.n.x, chunk[i].b.n.y, chunk[i].b.n.z);
-				fprintf(outStream, "vn %lf %lf %lf\n", chunk[i].c.n.x, chunk[i].c.n.y, chunk[i].c.n.z);
-			}
-		}
-		int indx = 1;
-		for (uint32_t vc = 0; vc < chunksGeometry.size(); ++vc)
-		{
-			fprintf(outStream, "g %d_%d \n", vc, 0);
-			fprintf(outStream, "usemtl %s\n", materialNames[0].c_str());
-			int totalSize = chunksGeometry[vc].size();
-			std::vector<int> internalSurfaces;
-			for (uint32_t i = 0; i < totalSize; ++i)
-			{
-				if (chunksGeometry[vc][i].materialId != 0)
-				{
-					internalSurfaces.push_back(indx++);
-					internalSurfaces.push_back(indx++);
-					internalSurfaces.push_back(indx++);
-					continue;
-				}
-				fprintf(outStream, "f %d/%d/%d  ", indx, indx, indx);
-				indx++;
-				fprintf(outStream, "%d/%d/%d  ", indx, indx, indx);
-				indx++;
-				fprintf(outStream, "%d/%d/%d \n", indx, indx, indx);
-				indx++;
-			}
-			int internalSize = internalSurfaces.size();
-			if (internalSize > 0)
-			{
-				fprintf(outStream, "g %d_%d \n", vc, 1);
-				fprintf(outStream, "usemtl %s\n", materialNames[1].c_str());
-				int isIndex;
-				for (uint32_t is = 0; is < internalSize;)
-				{
-					isIndex = internalSurfaces[is++];
-					fprintf(outStream, "f %d/%d/%d  ", isIndex, isIndex, isIndex);
-					isIndex = internalSurfaces[is++];
-					fprintf(outStream, "%d/%d/%d  ", isIndex, isIndex, isIndex);
-					isIndex = internalSurfaces[is++];
-					fprintf(outStream, "%d/%d/%d \n", isIndex, isIndex, isIndex);
-				}
-			}
-		}
-		fclose(outStream);
-	}
-}
-
-#include "NvBlastExtLlSerialization.h"
-#include "NvBlastExtTkSerialization.h"
-#include "NvBlastExtPxSerialization.h"
-#include "NvBlastExtSerialization.h"
-
-bool saveBlastObject(const std::string& outputDir, const std::string& objectName, const void* object, uint32_t objectTypeID)
-{
-	ExtSerialization* mSerialization = SampleManager::ins()->getBlastController().getExtSerialization();
-
-	void* buffer;
-	const uint64_t bufferSize = mSerialization->serializeIntoBuffer(buffer, object, objectTypeID);
-	if (bufferSize == 0)
-	{
-		std::cerr << "saveBlastObject: Serialization failed.\n";
-		return false;
-	}
-
-	// Add By Lixu Begin
-	physx::PsFileBuffer fileBuf((outputDir + "/" + objectName).c_str(), physx::PxFileBuf::OPEN_WRITE_ONLY);
-	// Add By Lixu End
-
-	bool result = fileBuf.isOpen();
-
-	if (!result)
-	{
-		std::cerr << "Can't open output buffer.\n";
-	}
-	else
-	{
-		result = (bufferSize == (size_t)fileBuf.write(buffer, (uint32_t)bufferSize));
-		if (!result)
-		{
-			std::cerr << "Buffer write failed.\n";
-		}
-		fileBuf.close();
-	}
-
-	NVBLAST_FREE(buffer);
-
-	return result;
-}
-
-bool saveLlAsset(const std::string& outputDir, const std::string& objectName, const NvBlastAsset* assetLL)
-{
-	return saveBlastObject(outputDir, objectName, assetLL, LlObjectTypeID::Asset);
-}
-
-bool saveTkAsset(const std::string& outputDir, const std::string& objectName, const TkAsset* tkAsset)
-{
-	return saveBlastObject(outputDir, objectName, tkAsset, TkObjectTypeID::Asset);
-}
-
-bool saveExtAsset(const std::string& outputDir, const std::string& objectName, const ExtPxAsset* pxAsset)
-{
-	return saveBlastObject(outputDir, objectName, pxAsset, ExtPxObjectTypeID::Asset);
-}
-
-void FractureExecutor::setSourceAsset(BlastAsset* blastAsset)
-{
-	assert(m_fractureTool);
-	m_fractureTool->setSourceAsset(blastAsset);
-	m_pCurBlastAsset = blastAsset;
-}
-
-VoronoiFractureExecutor::VoronoiFractureExecutor()
-: m_voronoi(nullptr)
-{
-	if (sSampleManager)
-		m_fractureTool = sSampleManager->m_fTool;
-}
-
-bool VoronoiFractureExecutor::execute()
-{
-	std::vector<uint32_t>::iterator it;
-	for (it = m_chunkIds.begin(); it != m_chunkIds.end(); it++)
-	{
-		Nv::Blast::Mesh* mesh = m_fractureTool->getSourceMesh(*it);
-		if (mesh == nullptr)
-			continue;
-
-		VoronoiSitesGenerator* siteGenerator = NvBlastExtAuthoringCreateVoronoiSitesGenerator(mesh, m_randomGenerator == nullptr ? &sRandomGenerator : m_randomGenerator);
-		if (m_voronoi)
-		{
-//			siteGenerator = new VoronoiSitesGenerator(mesh, m_randomGenerator == nullptr ? &sRandomGenerator : m_randomGenerator);
-			if (0 == m_voronoi->siteGeneration)
-			{
-				siteGenerator->uniformlyGenerateSitesInMesh(m_voronoi->numSites);
-			}
-			else if (1 == m_voronoi->siteGeneration)
-			{
-				siteGenerator->clusteredSitesGeneration(m_voronoi->numberOfClusters, m_voronoi->sitesPerCluster, m_voronoi->clusterRadius);
-			}
-		}
-		else
-		{
-//			siteGenerator = new VoronoiSitesGenerator(mesh, m_randomGenerator == nullptr ? &sRandomGenerator : m_randomGenerator);
-			siteGenerator->uniformlyGenerateSitesInMesh(DEFAULT_VORONOI_UNIFORM_SITES_NUMBER);
-		}
-
-		const physx::PxVec3* sites = nullptr;
-		uint32_t sitesCount = siteGenerator->getVoronoiSites(sites);
-		m_fractureTool->voronoiFracturing(*it, sitesCount, sites, false);
-		delete siteGenerator;
-	}
-	m_fractureTool->finalizeFracturing();
-
-	std::vector<bool> supports;
-	std::vector<bool> statics;
-	std::vector<uint8_t> joints;
-	std::vector<uint32_t> worlds;
-	BlastAsset* pNewBlastAsset = sSampleManager->_replaceAsset(m_pCurBlastAsset, supports, statics, joints, worlds);
-	if (nullptr == pNewBlastAsset)
-	{
-		return false;
-	}
-
-	std::vector<uint32_t> NewChunkIndexes;
-	for (uint32_t ci = 0; ci < m_fractureTool->getChunkCount(); ci++)
-	{
-		for (uint32_t chunkId : m_chunkIds)
-		{
-			if (m_fractureTool->getChunkInfo(ci).parent == chunkId)
-			{
-				NewChunkIndexes.push_back(ci);
-			}
-		}
-	}
-
-	sSampleManager->ApplyAutoSelectNewChunks(pNewBlastAsset, NewChunkIndexes);
-
-	return true;
-}
-
-SliceFractureExecutor::SliceFractureExecutor()
-: m_slice(nullptr)
-{
-	if (sSampleManager)
-		m_fractureTool = sSampleManager->m_fTool;
-}
-
-bool SliceFractureExecutor::execute()
-{
-	SlicingConfiguration config;
-	if (m_slice)
-	{
-		config.x_slices = m_slice->numSlicesX;
-		config.y_slices = m_slice->numSlicesY;
-		config.z_slices = m_slice->numSlicesZ;
-		config.offset_variations = m_slice->offsetVariation;
-		config.angle_variations = m_slice->rotationVariation;
-		config.noiseAmplitude = m_slice->noiseAmplitude;
-		config.noiseFrequency = m_slice->noiseFrequency;
-		config.noiseOctaveNumber = m_slice->noiseOctaveNumber;
-		config.surfaceResolution = m_slice->surfaceResolution;
-	}
-
-	if (m_randomGenerator == nullptr)
-	{
-		sRandomGenerator.seed(m_slice->noiseSeed);
-	}
-	else
-	{
-		m_randomGenerator->seed(m_slice->noiseSeed);
-	}
-
-	std::vector<uint32_t>::iterator it;
-	for (it = m_chunkIds.begin(); it != m_chunkIds.end(); it++)
-	{
-		m_fractureTool->slicing(*it, config, false, (m_randomGenerator == nullptr ? &sRandomGenerator : m_randomGenerator));
-	}
-	m_fractureTool->finalizeFracturing();
-
-	std::vector<bool> supports;
-	std::vector<bool> statics;
-	std::vector<uint8_t> joints;
-	std::vector<uint32_t> worlds;
-	BlastAsset* pNewBlastAsset = sSampleManager->_replaceAsset(m_pCurBlastAsset, supports, statics, joints, worlds);
-	if (nullptr == pNewBlastAsset)
-	{
-		return false;
-	}
-
-	std::vector<uint32_t> NewChunkIndexes;
-	for (uint32_t ci = 0; ci < m_fractureTool->getChunkCount(); ci++)
-	{
-		for (uint32_t chunkId : m_chunkIds)
-		{
-			if (m_fractureTool->getChunkInfo(ci).parent == chunkId)
-			{
-				NewChunkIndexes.push_back(ci);
-			}
-		}
-	}
-
-	sSampleManager->ApplyAutoSelectNewChunks(pNewBlastAsset, NewChunkIndexes);
-
-	return true;
-}
-
-static VoronoiFractureExecutor sVoronoiFracture;
-
-SampleManager* SampleManager::ins()
-{
-	return sSampleManager;
-}
-
-SampleManager::SampleManager(DeviceManager* pDeviceManager)
-{
-	sSampleManager = this;
-	m_bNeedRefreshTree = false;
-
-	m_renderer = new Renderer();
-	m_physXController = new PhysXController(ExtImpactDamageManager::FilterShader);
-	m_blastController = new BlastController();
-	m_sceneController = new SceneController();
-	m_damageToolController = new DamageToolController();
-	m_selectionToolController = new SelectionToolController();
-	m_explodeToolController = new ExplodeToolController();
-	m_gizmoToolController = new GizmoToolController();
-	m_editionToolController = new EditionToolController();
-	m_sampleController = new SampleController();
-	m_commonUIController = nullptr; // new CommonUIController();
-
-	m_pApplication = new Application(pDeviceManager);
-
-	Application& app = *m_pApplication;
-
-	app.addControllerToFront(m_renderer);
-	app.addControllerToFront(m_physXController);
-	app.addControllerToFront(m_blastController);
-	app.addControllerToFront(m_sceneController);
-	app.addControllerToFront(m_damageToolController);
-	app.addControllerToFront(m_selectionToolController);
-	app.addControllerToFront(m_explodeToolController);
-	app.addControllerToFront(m_gizmoToolController);
-//	app.addControllerToFront(m_editionToolController);
-	app.addControllerToFront(m_sampleController);
-//	app.addControllerToFront(m_commonUIController);
-
-	for (IApplicationController* c : app.getControllers())
-	{
-		(static_cast<ISampleController*>(c))->setManager(this);
-	}
-
-	m_fTool = new BlastFractureTool();
-	m_fractureExecutor = nullptr;
-
-	setFractureExecutor(&sVoronoiFracture);
-
-	m_pCurBlastAsset = nullptr;
-	m_nCurFamilyIndex = -1;
-	EnableSimulating(false);
-}
-
-SampleManager::~SampleManager()
-{
-	delete m_renderer;
-	delete m_physXController;
-	delete m_blastController;
-	delete m_sceneController;
-	delete m_damageToolController;
-	delete m_selectionToolController;
-	delete m_explodeToolController;
-	delete m_gizmoToolController;
-	delete m_editionToolController;
-	delete m_sampleController;
-	delete m_fTool;
-//	delete m_commonUIController;
-}
-
-int SampleManager::init()
-{
-	Application& app = *m_pApplication;
-	app.init();
-
-	m_damageToolController->DisableController();
-	m_selectionToolController->EnableController();
-	m_explodeToolController->DisableController();
-	m_gizmoToolController->DisableController();
-	BlastPlugin::Inst().GetMainToolbar()->updateCheckIconsStates();
-
-	EnableSimulating(false);
-
-	return 0;
-}
-
-int SampleManager::run()
-{
-	m_physXController->setPlaneVisible(AppMainWindow::Inst().m_bShowPlane);
-
-	Application& app = *m_pApplication;
-	app.run();
-
-	std::vector<std::string>::iterator itStr;
-	std::vector<Renderable*>::iterator itRenderable;
-	std::map<std::string, RenderMaterial*>::iterator itRenderMaterial;
-	for (itStr = m_NeedDeleteRenderMaterials.begin(); itStr != m_NeedDeleteRenderMaterials.end(); itStr++)
-	{
-		itRenderMaterial = m_RenderMaterialMap.find(*itStr);
-		if (itRenderMaterial == m_RenderMaterialMap.end())
-		{
-			continue;
-		}
-		RenderMaterial* pRenderMaterial = itRenderMaterial->second;
-
-		std::vector<Renderable*>& renderables = pRenderMaterial->getRelatedRenderables();
-		for (itRenderable = renderables.begin(); itRenderable != renderables.end(); itRenderable++)
-		{
-			Renderable* pRenderable = *itRenderable;
-			pRenderable->setMaterial(*RenderMaterial::getDefaultRenderMaterial());
-		}
-
-		delete pRenderMaterial;
-		pRenderMaterial = nullptr;
-		m_RenderMaterialMap.erase(itRenderMaterial);
-	}
-	m_NeedDeleteRenderMaterials.clear();
-
-	return 0;
-}
-
-int SampleManager::free()
-{
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator it;
-	for (it = m_AssetFamiliesMap.begin(); it != m_AssetFamiliesMap.end(); it++)
-	{
-		std::vector<BlastFamily*>& fs = it->second;
-		fs.clear();
-	}
-	m_AssetFamiliesMap.clear();
-	m_AssetDescMap.clear();
-
-	Application& app = *m_pApplication;
-	app.free();
-
-	return 0;
-}
-
-bool SampleManager::createAsset(
-	BlastAssetModelSimple** ppBlastAsset,
-	std::vector<Nv::Blast::Mesh*>& meshes,
-	std::vector<int32_t>& parentIds,
-	std::vector<bool>& supports,
-	std::vector<bool>& statics,
-	std::vector<uint8_t>& joints,
-	std::vector<uint32_t>& worlds)
-{
-	m_fTool->setSourceMeshes(meshes, parentIds);
-	m_fTool->finalizeFracturing();
-
-	_createAsset(ppBlastAsset, supports, statics, joints, worlds);
-
-	return true;
-}
-
-bool SampleManager::saveAsset(BlastAsset* pBlastAsset)
-{
-	if (pBlastAsset == nullptr)
-	{
-		return false;
-	}
-
-	AssetList::ModelAsset& desc = m_AssetDescMap[pBlastAsset];
-	
-	PhysXController& pc = getPhysXController();
-	BlastController& bc = getBlastController();
-	physics = &pc.getPhysics();
-	foundation = &physics->getFoundation();
-	cooking = &pc.getCooking();
-	physicsManager = &bc.getExtPxManager();
-
-	std::string outDir = GlobalSettings::Inst().m_projectFileDir;
-
-	std::string outBlastFilePath = GlobalSettings::MakeFileName(outDir.c_str(), std::string(desc.name + ".blast").c_str());
-	const ExtPxAsset* asset = pBlastAsset->getPxAsset();
-	if (asset == nullptr)
-	{
-		return false;
-	}
-	saveExtAsset(outDir, std::string(desc.name + ".blast"), asset);
-
-	m_fTool->setSourceAsset(pBlastAsset);
-	m_fTool->finalizeFracturing();
-
-	size_t nChunkListSize = m_fTool->getChunkCount();
-	std::vector<Triangle*> chunkMeshes(nChunkListSize);
-	std::vector<uint32_t> chunkMeshesTriangleCount(nChunkListSize);
-	std::shared_ptr<bool> isSupport(new bool[nChunkListSize] { false }, [](bool* b) {delete[] b; });
-	for (uint32_t i = 0; i < nChunkListSize; ++i)
-	{
-		chunkMeshesTriangleCount[i] = m_fTool->getBaseMesh(i, chunkMeshes[i]);
-		isSupport.get()[i] = m_fTool->getChunkInfo(i).isLeaf;
-	}
-
-	std::shared_ptr<Nv::Blast::BlastBondGenerator> bondGenerator(
-		NvBlastExtAuthoringCreateBondGenerator(cooking, &physics->getPhysicsInsertionCallback()),
-		[](Nv::Blast::BlastBondGenerator* bg) {bg->release(); });
-	BondGenerationConfig cnf;
-	cnf.bondMode = BondGenerationConfig::AVERAGE;
-	NvBlastChunkDesc* chunkDesc;
-	NvBlastBondDesc* bondDescs;
-	const uint32_t bondCount = bondGenerator.get()->buildDescFromInternalFracture(m_fTool, isSupport.get(), bondDescs, chunkDesc);
-	const uint32_t chunkCount = nChunkListSize;
-	if (bondCount == 0)
-	{
-		std::cout << "Can't create bonds descriptors..." << std::endl;
-	}
-
-	std::vector<uint32_t> chunkReorderInvMap;
-	{
-		std::vector<uint32_t> chunkReorderMap(chunkCount);
-		std::vector<char> scratch(chunkCount * sizeof(NvBlastChunkDesc));
-		NvBlastEnsureAssetExactSupportCoverage(chunkDesc, chunkCount, scratch.data(), loggingCallback);
-		NvBlastBuildAssetDescChunkReorderMap(chunkReorderMap.data(), chunkDesc, chunkCount, scratch.data(), loggingCallback);
-		NvBlastApplyAssetDescChunkReorderMapInPlace(chunkDesc, chunkCount, bondDescs, bondCount, chunkReorderMap.data(), true, scratch.data(), loggingCallback);
-		chunkReorderInvMap.resize(chunkReorderMap.size());
-		Nv::Blast::invertMap(chunkReorderInvMap.data(), chunkReorderMap.data(), static_cast<unsigned int>(chunkReorderMap.size()));
-	}
-
-	std::vector<std::vector<Triangle>> resultGeometry(nChunkListSize);
-	for (uint32_t i = 0; i < nChunkListSize; ++i)
-	{
-		uint32_t chunkIndex = chunkReorderInvMap[i];
-		resultGeometry[chunkIndex].resize(chunkMeshesTriangleCount[i]);
-		memcpy(resultGeometry[chunkIndex].data(), chunkMeshes[i], chunkMeshesTriangleCount[i] * sizeof(Triangle));
-	}
-
-	saveFractureToObj(resultGeometry, desc.name, outDir);
-
-	char message[MAX_PATH];
-	sprintf(message, "Blast file %s was saved.", outBlastFilePath.c_str());
-	output(message);
-
-	return true;
-}
-
-#include "fbxsdk.h"
-
-uint32_t currentDepth;
-bool bOutputFBXAscii = true;
-
-void PxVec3ToFbx(physx::PxVec3& inVector, FbxVector4& outVector)
-{
-	outVector[0] = inVector.x;
-	outVector[1] = inVector.y;
-	outVector[2] = inVector.z;
-	outVector[3] = 0;
-}
-
-void PxVec2ToFbx(physx::PxVec2& inVector, FbxVector2& outVector)
-{
-	outVector[0] = inVector.x;
-	outVector[1] = inVector.y;
-}
-
-void VertexToFbx(Nv::Blast::Vertex& vert, FbxVector4& outVertex, FbxVector4& outNormal, FbxVector2& outUV)
-{
-	PxVec3ToFbx(vert.p, outVertex);
-	PxVec3ToFbx(vert.n, outNormal);
-	PxVec2ToFbx(vert.uv[0], outUV);
-}
-
-uint32_t createChunkRecursive(FbxManager* sdkManager, uint32_t currentCpIdx, uint32_t chunkIndex, FbxNode *meshNode, FbxNode* parentNode, FbxSkin* skin, const NvBlastAsset* asset, std::vector<std::vector<Nv::Blast::Triangle>> chunksGeometry)
-{
-	currentDepth++;
-
-	auto chunks = NvBlastAssetGetChunks(asset, nullptr);
-	const NvBlastChunk* chunk = &chunks[chunkIndex];
-	auto triangles = chunksGeometry[chunkIndex];
-	physx::PxVec3 centroid = physx::PxVec3(chunk->centroid[0], chunk->centroid[1], chunk->centroid[2]);
-
-	std::ostringstream namestream;
-
-	//mesh->InitTextureUV(triangles.size() * 3);
-
-	std::ostringstream().swap(namestream); // Swap namestream with a default constructed ostringstream
-	namestream << "bone_" << chunkIndex;
-	std::string boneName = namestream.str();
-
-	FbxSkeleton* skelAttrib;
-	if (chunk->parentChunkIndex == UINT32_MAX)
-	{
-		skelAttrib = FbxSkeleton::Create(sdkManager, "SkelRootAttrib");
-		skelAttrib->SetSkeletonType(FbxSkeleton::eRoot);
-
-		// Change the centroid to origin
-		centroid = physx::PxVec3(0.0f);
-	}
-	else
-	{
-		skelAttrib = FbxSkeleton::Create(sdkManager, boneName.c_str());
-		skelAttrib->SetSkeletonType(FbxSkeleton::eLimbNode);
-	}
-
-	skelAttrib->Size.Set(1.0); // What's this for?
-
-
-	FbxNode* boneNode = FbxNode::Create(sdkManager, boneName.c_str());
-	boneNode->SetNodeAttribute(skelAttrib);
-
-	auto mat = parentNode->EvaluateGlobalTransform().Inverse();
-
-	FbxVector4 vec(centroid.x, centroid.y, centroid.z, 0);
-	FbxVector4 c2 = mat.MultT(vec);
-
-	boneNode->LclTranslation.Set(c2);
-
-	parentNode->AddChild(boneNode);
-
-	std::ostringstream().swap(namestream); // Swap namestream with a default constructed ostringstream
-	namestream << "cluster_" << std::setw(5) << std::setfill('0') << chunkIndex;
-	std::string clusterName = namestream.str();
-
-	FbxCluster* cluster = FbxCluster::Create(sdkManager, clusterName.c_str());
-	cluster->SetTransformMatrix(FbxAMatrix());
-	cluster->SetLink(boneNode);
-	cluster->SetLinkMode(FbxCluster::eTotalOne);
-
-	skin->AddCluster(cluster);
-
-	FbxMesh* mesh = static_cast<FbxMesh*>(meshNode->GetNodeAttribute());
-
-	FbxVector4* controlPoints = mesh->GetControlPoints();
-	auto geNormal = mesh->GetElementNormal();
-	auto geUV = mesh->GetElementUV("diffuseElement");
-	FbxGeometryElementMaterial* matElement = mesh->GetElementMaterial();
-
-	auto addVert = [&](Nv::Blast::Vertex vert, int controlPointIdx)
-	{
-		FbxVector4 vertex;
-		FbxVector4 normal;
-		FbxVector2 uv;
-
-		VertexToFbx(vert, vertex, normal, uv);
-
-		controlPoints[controlPointIdx] = vertex;
-		geNormal->GetDirectArray().Add(normal);
-		geUV->GetDirectArray().Add(uv);
-		// Add this control point to the bone with weight 1.0
-		cluster->AddControlPointIndex(controlPointIdx, 1.0);
-	};
-
-	uint32_t cpIdx = 0;
-	uint32_t polyCount = mesh->GetPolygonCount();
-	for (auto tri : triangles)
-	{
-		addVert(tri.a, currentCpIdx + cpIdx + 0);
-		addVert(tri.b, currentCpIdx + cpIdx + 1);
-		addVert(tri.c, currentCpIdx + cpIdx + 2);
-
-		mesh->BeginPolygon();
-		mesh->AddPolygon(currentCpIdx + cpIdx + 0);
-		mesh->AddPolygon(currentCpIdx + cpIdx + 1);
-		mesh->AddPolygon(currentCpIdx + cpIdx + 2);
-		mesh->EndPolygon();
-		if (tri.materialId == 0)
-		{
-			matElement->GetIndexArray().SetAt(polyCount, 0);
-		}
-		else
-		{
-			matElement->GetIndexArray().SetAt(polyCount, 1);
-		}
-		polyCount++;
-		cpIdx += 3;
-	}
-
-	mat = meshNode->EvaluateGlobalTransform();
-	cluster->SetTransformMatrix(mat);
-
-	mat = boneNode->EvaluateGlobalTransform();
-	cluster->SetTransformLinkMatrix(mat);
-
-	uint32_t addedCps = static_cast<uint32_t>(triangles.size() * 3);
-
-	for (uint32_t i = chunk->firstChildIndex; i < chunk->childIndexStop; i++)
-	{
-		addedCps += createChunkRecursive(sdkManager, currentCpIdx + addedCps, i, meshNode, boneNode, skin, asset, chunksGeometry);
-	}
-
-	return addedCps;
-}
-
-bool finalizeFbxAndSave(FbxManager* sdkManager, FbxScene* scene, FbxSkin* skin, const std::string& outputFilePath)
-{
-	// Store the bind pose
-
-	std::unordered_set<FbxNode*> clusterNodes;
-
-	std::function<void(FbxNode*)> addRecursively = [&](FbxNode* node)
-	{
-		if (node)
-		{
-			addRecursively(node->GetParent());
-
-			clusterNodes.insert(node);
-		}
-	};
-
-	for (uint32_t i = 0; i < (uint32_t)skin->GetClusterCount(); i++)
-	{
-		FbxNode* clusterNode = skin->GetCluster(i)->GetLink();
-
-		addRecursively(clusterNode);
-	}
-
-	assert(clusterNodes.size() > 0);
-
-	FbxPose* pose = FbxPose::Create(sdkManager, "BasePose");
-	pose->SetIsBindPose(true);
-
-	for (auto node : clusterNodes)
-	{
-		FbxMatrix bindMat = node->EvaluateGlobalTransform();
-
-		pose->Add(node, bindMat);
-	}
-
-	scene->AddPose(pose);
-
-	FbxExporter* exporter = FbxExporter::Create(sdkManager, "Scene Exporter");
-
-	int lFormat;
-
-	if (bOutputFBXAscii)
-	{
-		lFormat = sdkManager->GetIOPluginRegistry()->FindWriterIDByDescription("FBX ascii (*.fbx)");
-	}
-	else
-	{
-		lFormat = sdkManager->GetIOPluginRegistry()->FindWriterIDByDescription("FBX binary (*.fbx)");
-	}
-
-	bool exportStatus = exporter->Initialize(outputFilePath.c_str(), lFormat, sdkManager->GetIOSettings());
-
-	if (!exportStatus)
-	{
-		std::cerr << "Call to FbxExporter::Initialize failed" << std::endl;
-		std::cerr << "Error returned: " << exporter->GetStatus().GetErrorString() << std::endl;
-		return false;
-	}
-
-	exportStatus = exporter->Export(scene);
-
-	if (!exportStatus)
-	{
-		auto fbxStatus = exporter->GetStatus();
-
-		std::cerr << "Call to FbxExporter::Export failed" << std::endl;
-		std::cerr << "Error returned: " << fbxStatus.GetErrorString() << std::endl;
-		return false;
-	}
-
-	return true;
-}
-
-bool SampleManager::exportAsset()
-{
-	if (m_pCurBlastAsset == nullptr)
-	{
-		viewer_err("Please select one asset instance before saving!");
-		return false;
-	}
-
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itADM = m_AssetDescMap.find(m_pCurBlastAsset);
-	if (itADM == m_AssetDescMap.end())
-	{
-		viewer_err("Fails to find out the selected asset instance in current project!");
-		return false;
-	}
-
-	BPParams& projectParams = BlastProject::ins().getParams();
-
-	AssetList::ModelAsset& desc = itADM->second;
-
-	BPPAssetArray& assetArray = projectParams.blast.blastAssets;
-	BPPAsset asset;
-	int aaas = 0;
-	for (; aaas < assetArray.arraySizes[0]; aaas++)
-	{
-		asset = assetArray.buf[aaas];
-		std::string assetname = asset.name;
-		if (assetname == desc.name)
-			break;
-	}
-	if (aaas == assetArray.arraySizes[0])
-	{
-		return false;
-	}
-
-	PhysXController& pc = getPhysXController();
-	BlastController& bc = getBlastController();
-	physics = &pc.getPhysics();
-	foundation = &physics->getFoundation();
-	cooking = &pc.getCooking();
-	physicsManager = &bc.getExtPxManager();
-
-	std::string outDir = GlobalSettings::Inst().m_projectFileDir;
-
-	m_fTool->setSourceAsset(m_pCurBlastAsset);
-	m_fTool->finalizeFracturing();
-
-	size_t nChunkListSize = m_fTool->getChunkCount();
-	std::vector<Triangle*> chunkMeshes(nChunkListSize);
-	std::vector<uint32_t> chunkMeshesTriangleCount(nChunkListSize);
-	std::shared_ptr<bool> isSupport(new bool[nChunkListSize] { false }, [](bool* b) {delete[] b; });
-	for (uint32_t i = 0; i < nChunkListSize; ++i)
-	{
-		chunkMeshesTriangleCount[i] = m_fTool->getBaseMesh(i, chunkMeshes[i]);
-		isSupport.get()[i] = m_fTool->getChunkInfo(i).isLeaf;
-	}
-
-	std::shared_ptr<Nv::Blast::BlastBondGenerator> bondGenerator(
-		NvBlastExtAuthoringCreateBondGenerator(cooking, &physics->getPhysicsInsertionCallback()),
-		[](Nv::Blast::BlastBondGenerator* bg) {bg->release(); });
-	BondGenerationConfig cnf;
-	cnf.bondMode = BondGenerationConfig::AVERAGE;
-	NvBlastChunkDesc* chunkDesc;
-	NvBlastBondDesc* bondDescs;
-	const uint32_t bondCount = bondGenerator.get()->buildDescFromInternalFracture(m_fTool, isSupport.get(), bondDescs, chunkDesc);
-	const uint32_t chunkCount = nChunkListSize;
-	if (bondCount == 0)
-	{
-		std::cout << "Can't create bonds descriptors..." << std::endl;
-	}
-
-	std::vector<uint32_t> chunkReorderInvMap;
-	{
-		std::vector<uint32_t> chunkReorderMap(chunkCount);
-		std::vector<char> scratch(chunkCount * sizeof(NvBlastChunkDesc));
-		NvBlastEnsureAssetExactSupportCoverage(chunkDesc, chunkCount, scratch.data(), loggingCallback);
-		NvBlastBuildAssetDescChunkReorderMap(chunkReorderMap.data(), chunkDesc, chunkCount, scratch.data(), loggingCallback);
-		NvBlastApplyAssetDescChunkReorderMapInPlace(chunkDesc, chunkCount, bondDescs, bondCount, chunkReorderMap.data(), true, scratch.data(), loggingCallback);
-		chunkReorderInvMap.resize(chunkReorderMap.size());
-		Nv::Blast::invertMap(chunkReorderInvMap.data(), chunkReorderMap.data(), static_cast<unsigned int>(chunkReorderMap.size()));
-	}
-
-	std::vector<std::vector<Triangle>> resultGeometry(nChunkListSize);
-	for (uint32_t i = 0; i < nChunkListSize; ++i)
-	{
-		uint32_t chunkIndex = chunkReorderInvMap[i];
-		resultGeometry[chunkIndex].resize(chunkMeshesTriangleCount[i]);
-		memcpy(resultGeometry[chunkIndex].data(), chunkMeshes[i], chunkMeshesTriangleCount[i] * sizeof(Triangle));
-	}
-
-	if (asset.exportFBX)
-	{
-		std::string outputFilePath = GlobalSettings::MakeFileName(outDir.c_str(), asset.fbx.buf);
-
-		Nv::Blast::ConvexMeshBuilder* collisionBuilder = NvBlastExtAuthoringCreateConvexMeshBuilder(cooking, &physics->getPhysicsInsertionCallback());
-		Nv::Blast::AuthoringResult* result = NvBlastExtAuthoringProcessFracture(*m_fTool, *bondGenerator, *collisionBuilder);
-
-		if (!asset.embedFBXCollision)
-		{
-			result->releaseCollisionHulls();
-		}
-
-		std::shared_ptr<IMeshFileWriter> fileWriter(NvBlastExtExporterCreateFbxFileWriter(bOutputFBXAscii), [](IMeshFileWriter* p) {p->release(); });
-		fileWriter->appendMesh(*result, asset.name.buf);
-		if (!fileWriter->saveToFile(asset.fbx.buf, outDir.c_str()))
-		{
-			std::cerr << "Can't write geometry to FBX file." << std::endl;
-			return false;
-		}
-
-#if (0)
-		FbxManager* sdkManager = FbxManager::Create();
-
-		FbxIOSettings* ios = FbxIOSettings::Create(sdkManager, IOSROOT);
-		// Set some properties on the io settings
-		
-		sdkManager->SetIOSettings(ios);
-
-		sdkManager->GetIOSettings()->SetBoolProp(EXP_ASCIIFBX, bOutputFBXAscii);
-
-		FbxScene* scene = FbxScene::Create(sdkManager, "Export Scene");
-		/*
-		if (getConvertToUE4())
-		{
-			FbxAxisSystem::EFrontVector FrontVector = (FbxAxisSystem::EFrontVector) - FbxAxisSystem::eParityOdd;
-			const FbxAxisSystem UnrealZUp(FbxAxisSystem::eZAxis, FrontVector, FbxAxisSystem::eRightHanded);
-
-			scene->GetGlobalSettings().SetAxisSystem(UnrealZUp);
-		}
-		*/
-		// Otherwise default to Maya defaults
-
-		FbxMesh* mesh = FbxMesh::Create(sdkManager, "meshgeo");
-
-		FbxGeometryElementNormal* geNormal = mesh->CreateElementNormal();
-		geNormal->SetMappingMode(FbxGeometryElement::eByControlPoint);
-		geNormal->SetReferenceMode(FbxGeometryElement::eDirect);
-
-		FbxGeometryElementUV* geUV = mesh->CreateElementUV("diffuseElement");
-		geUV->SetMappingMode(FbxGeometryElement::eByPolygonVertex);
-		geUV->SetReferenceMode(FbxGeometryElement::eDirect);
-
-		// Get the triangles count for all of the mesh parts
-
-		size_t triangleCount = 0;
-		for (auto triangles : resultGeometry)
-		{
-			triangleCount += triangles.size();
-		}
-
-		mesh->InitControlPoints((int)triangleCount * 3);
-
-		FbxNode* meshNode = FbxNode::Create(scene, "meshnode");
-		meshNode->SetNodeAttribute(mesh);
-		meshNode->SetShadingMode(FbxNode::eTextureShading);
-
-		FbxNode* lRootNode = scene->GetRootNode();
-		lRootNode->AddChild(meshNode);
-
-		FbxSkin* skin = FbxSkin::Create(sdkManager, "Skin of the thing");
-		skin->SetGeometry(mesh);
-
-		mesh->AddDeformer(skin);
-
-		// Add a material otherwise UE4 freaks out on import
-
-		FbxGeometryElementMaterial* matElement = mesh->CreateElementMaterial();
-		matElement->SetMappingMode(FbxGeometryElement::eByPolygon);
-		matElement->SetReferenceMode(FbxGeometryElement::eIndexToDirect);
-
-		FbxSurfacePhong* material = FbxSurfacePhong::Create(sdkManager, "FirstExportMaterial");
-
-		material->Diffuse.Set(FbxDouble3(1.0, 1.0, 0));
-		material->DiffuseFactor.Set(1.0);
-
-		meshNode->AddMaterial(material);
-
-		FbxSurfacePhong* material2 = FbxSurfacePhong::Create(sdkManager, "SecondExportMaterial");
-
-		material2->Diffuse.Set(FbxDouble3(1.0, 0.0, 1.0));
-		material2->DiffuseFactor.Set(1.0);
-
-		meshNode->AddMaterial(material2);
-
-		const ExtPxAsset* pExtPxAsset = m_pCurBlastAsset->getPxAsset();
-		if (pExtPxAsset == nullptr)
-		{
-			return false;
-		}
-
-		const TkAsset& tkAsset = pExtPxAsset->getTkAsset();
-		const NvBlastAsset* pAssetLL = tkAsset.getAssetLL();
-		uint32_t chunkCount = NvBlastAssetGetChunkCount(pAssetLL, nullptr);
-
-		auto chunks = NvBlastAssetGetChunks(pAssetLL, nullptr);
-
-		currentDepth = 0;
-		uint32_t cpIdx = 0;
-		for (uint32_t i = 0; i < chunkCount; i++)
-		{
-			const NvBlastChunk* chunk = &chunks[i];
-
-			if (chunk->parentChunkIndex == UINT32_MAX)
-			{
-				uint32_t addedCps = createChunkRecursive(sdkManager, cpIdx, i, meshNode, lRootNode, skin, pAssetLL, resultGeometry);
-
-				cpIdx += addedCps;
-			}
-		}
-
-		std::string outputFilePath = GlobalSettings::MakeFileName(outDir.c_str(), asset.fbx.buf);
-		finalizeFbxAndSave(sdkManager, scene, skin, outputFilePath);
-
-		sdkManager->Destroy();
-		sdkManager = nullptr;
-#endif
-
-		std::string info = outputFilePath + " is saved.";
-		viewer_info(info.c_str());
-	}
-
-	if (asset.exportOBJ)
-	{
-		std::string filename = asset.obj.buf;
-		filename = filename.substr(0, filename.find_last_of('.'));
-		saveFractureToObj(resultGeometry, filename, outDir);
-
-		std::string outputFilePath = GlobalSettings::MakeFileName(outDir.c_str(), asset.obj.buf);
-		std::string info = outputFilePath + " is saved.";
-		viewer_info(info.c_str());
-	}
-
-	if (asset.exportBPXA)
-	{
-		std::string outputFilePath = GlobalSettings::MakeFileName(outDir.c_str(), asset.bpxa.buf);
-		const ExtPxAsset* pExtPxAsset = m_pCurBlastAsset->getPxAsset();
-		if (pExtPxAsset == nullptr)
-		{
-			return false;
-		}
-		saveExtAsset(outDir, std::string(asset.bpxa.buf), pExtPxAsset);
-
-		std::string info = outputFilePath + " is saved.";
-		viewer_info(info.c_str());
-	}
-
-	if (asset.exportTKAsset)
-	{
-		std::string outputFilePath = GlobalSettings::MakeFileName(outDir.c_str(), asset.tkasset.buf);
-		const ExtPxAsset* pExtPxAsset = m_pCurBlastAsset->getPxAsset();
-		if (pExtPxAsset == nullptr)
-		{
-			return false;
-		}
-
-		const TkAsset& tkAsset = pExtPxAsset->getTkAsset();
-
-		saveTkAsset(outDir, std::string(asset.tkasset.buf), &tkAsset);
-
-		std::string info = outputFilePath + " is saved.";
-		viewer_info(info.c_str());
-	}
-
-	if (asset.exportLLAsset)
-	{
-		std::string outputFilePath = GlobalSettings::MakeFileName(outDir.c_str(), asset.llasset.buf);
-		const ExtPxAsset* pExtPxAsset = m_pCurBlastAsset->getPxAsset();
-		if (pExtPxAsset == nullptr)
-		{
-			return false;
-		}
-
-		const TkAsset& tkAsset = pExtPxAsset->getTkAsset();
-		const NvBlastAsset* pAssetLL = tkAsset.getAssetLL();
-
-		saveLlAsset(outDir, std::string(asset.llasset.buf), pAssetLL);
-
-		std::string info = outputFilePath + " is saved.";
-		viewer_info(info.c_str());
-	}
-
-	return true;
-}
-
-void SampleManager::_createAsset(BlastAssetModelSimple** ppBlastAsset, 
-	std::vector<bool>& supports,
-	std::vector<bool>& statics,
-	std::vector<uint8_t>& joints,
-	std::vector<uint32_t>& worlds)
-{
-	PhysXController& pc = getPhysXController();
-	BlastController& bc = getBlastController();
-
-	physics = &pc.getPhysics();
-	foundation = &physics->getFoundation();
-	cooking = &pc.getCooking();
-	physicsManager = &bc.getExtPxManager();
-	TkFramework& tk = bc.getTkFramework();
-
-	size_t nChunkListSize = m_fTool->getChunkCount();
-
-	std::vector<Triangle*> chunkMeshes;
-	std::vector<uint32_t> chunkMeshesTriangleCount(nChunkListSize);
-	std::shared_ptr<bool> isSupport(new bool[nChunkListSize] { false }, [](bool* b) {delete[] b; });
-
-	chunkMeshes.resize(nChunkListSize);
-	for (uint32_t i = 0; i < nChunkListSize; ++i)
-	{
-		chunkMeshesTriangleCount[i] = m_fTool->getBaseMesh(i, chunkMeshes[i]);
-		isSupport.get()[i] = supports.size() == 0 ? m_fTool->getChunkInfo(i).isLeaf : supports[i];
-	}
-
-	std::shared_ptr<Nv::Blast::BlastBondGenerator> bondGenerator(
-		NvBlastExtAuthoringCreateBondGenerator(cooking, &physics->getPhysicsInsertionCallback()),
-		[](Nv::Blast::BlastBondGenerator* bg) {bg->release(); });
-	BondGenerationConfig cnf;
-	cnf.bondMode = BondGenerationConfig::AVERAGE;
-	NvBlastChunkDesc* chunkDesc;
-	NvBlastBondDesc* bondDescs;
-	const uint32_t bondCount = bondGenerator.get()->buildDescFromInternalFracture(m_fTool, isSupport.get(), bondDescs, chunkDesc);
-	const uint32_t chunkCount = nChunkListSize;
-	int bondDescsSize = bondCount;
-	if (bondDescsSize == worlds.size())
-	{		
-		for (int bds = 0; bds < bondDescsSize; bds++)
-		{
-			if (worlds[bds] == 0xFFFFFFFF)
-			{
-				bondDescs[bds].chunkIndices[1] = worlds[bds];
-			}
-		}
-	}
-
-	if (bondCount == 0)
-	{
-		std::cout << "Can't create bonds descriptors..." << std::endl;
-	}
-
-	// order chunks, build map
-	std::vector<uint32_t> chunkReorderInvMap;
-	{
-		std::vector<uint32_t> chunkReorderMap(chunkCount);
-		std::vector<char> scratch(chunkCount * sizeof(NvBlastChunkDesc));
-		NvBlastEnsureAssetExactSupportCoverage(chunkDesc, chunkCount, scratch.data(), loggingCallback);
-		NvBlastBuildAssetDescChunkReorderMap(chunkReorderMap.data(), chunkDesc, chunkCount, scratch.data(), loggingCallback);
-		NvBlastApplyAssetDescChunkReorderMapInPlace(chunkDesc, chunkCount, bondDescs, bondCount, chunkReorderMap.data(), true, scratch.data(), loggingCallback);
-		chunkReorderInvMap.resize(chunkReorderMap.size());
-		Nv::Blast::invertMap(chunkReorderInvMap.data(), chunkReorderMap.data(), static_cast<unsigned int>(chunkReorderMap.size()));
-	}
-
-	// get result geometry
-	std::vector<std::vector<Triangle>> resultGeometry(nChunkListSize);
-	for (uint32_t i = 0; i < nChunkListSize; ++i)
-	{
-		uint32_t chunkIndex = chunkReorderInvMap[i];
-		resultGeometry[chunkIndex].resize(chunkMeshesTriangleCount[i]);
-		memcpy(resultGeometry[chunkIndex].data(), chunkMeshes[i], chunkMeshesTriangleCount[i] * sizeof(Triangle));
-	}
-
-	// prepare physics data (convexes)
-	std::vector<ExtPxAssetDesc::ChunkDesc> pxChunks(chunkCount);
-	std::vector<ExtPxAssetDesc::SubchunkDesc> pxSubchunks;
-	buildPxChunks(resultGeometry, pxChunks, pxSubchunks, statics);
-
-	// build and serialize ExtPhysicsAsset
-	ExtPxAssetDesc	descriptor;
-	descriptor.bondCount = bondCount;
-	descriptor.bondDescs = bondDescs;
-	descriptor.chunkCount = chunkCount;
-	descriptor.chunkDescs = chunkDesc;
-	descriptor.bondFlags = joints.data();
-	descriptor.pxChunks = pxChunks.data();
-	ExtPxAsset* asset = ExtPxAsset::create(descriptor, tk);
-	if (asset == nullptr)
-	{
-		return;
-	}
-
-	std::string tempFilePath = utils::GetTempFilePath();
-	QFileInfo tempFileInfo(tempFilePath.c_str());
-	std::string tempdir = QDir::toNativeSeparators(tempFileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-	std::string tempfile = tempFileInfo.fileName().toLocal8Bit();
-	saveFractureToObj(resultGeometry, tempfile, tempdir);
-	std::string objFilePath = tempFilePath + ".obj";
-	std::string mtlFilePath = tempFilePath + ".mtl";
-	BlastModel* pBlastModel = BlastModel::loadFromFileTinyLoader(objFilePath.c_str());
-	DeleteFileA(tempFilePath.c_str());
-	DeleteFileA(objFilePath.c_str());
-	DeleteFileA(mtlFilePath.c_str());
-
-	*ppBlastAsset = new BlastAssetModelSimple(asset, pBlastModel, getRenderer());
-}
-
-BlastAsset* SampleManager::_replaceAsset(BlastAsset* pBlastAsset,
-	std::vector<bool>& supports,
-	std::vector<bool>& statics,
-	std::vector<uint8_t>& joints,
-	std::vector<uint32_t>& worlds)
-{
-	if (pBlastAsset == nullptr)
-	{
-		return false;
-	}
-
-	BlastAsset* pCurBlastAsset = nullptr;
-	int nFamilyIndex = -1;
-	getCurrentSelectedInstance(&pCurBlastAsset, nFamilyIndex);
-
-	std::vector<BlastFamily*> familiesOld = m_AssetFamiliesMap[pBlastAsset];
-	int familiesSize = familiesOld.size();
-	std::vector<physx::PxTransform> transforms(familiesSize);
-	std::vector<std::string> extMaterials(familiesSize);
-	std::vector<std::string> intMaterials(familiesSize);
-	for (int fs = 0; fs < familiesSize; fs++)
-	{
-		transforms[fs] = familiesOld[fs]->getSettings().transform;
-
-		setCurrentSelectedInstance(pBlastAsset, fs);
-		getMaterialForCurrentFamily(extMaterials[fs], true);
-		getMaterialForCurrentFamily(intMaterials[fs], false);
-	}
-
-	BlastAssetModelSimple* pBlastAssetNew;
-	_createAsset(&pBlastAssetNew, supports, statics, joints, worlds);
-
-	BlastAssetModelSimple* pBlastAssetOld = (BlastAssetModelSimple*)pBlastAsset;	
-	AssetList::ModelAsset desc = m_AssetDescMap[pBlastAsset];
-	removeBlastAsset(pBlastAssetOld);
-	addBlastAsset(pBlastAssetNew, desc);
-
-	for (int fs = 0; fs < familiesSize; fs++)
-	{
-		addBlastFamily(pBlastAssetNew, transforms[fs]);
-
-		setCurrentSelectedInstance(pBlastAssetNew, fs);
-
-		setMaterialForCurrentFamily(extMaterials[fs], true);
-		setMaterialForCurrentFamily(intMaterials[fs], false);
-	}
-
-	if (pCurBlastAsset == pBlastAsset)
-	{
-		pCurBlastAsset = pBlastAssetNew;
-	}
-	setCurrentSelectedInstance(pCurBlastAsset, nFamilyIndex);
-
-	return pBlastAssetNew;
-}
-
-std::vector<uint32_t> SampleManager::getCurrentSelectedChunks()
-{
-	std::vector<uint32_t> selectedChunks;
-	std::vector<BlastFamilyPtr>& spFamilies = m_blastController->getFamilies();
-	if (spFamilies.size() > 0)
-	{
-		return spFamilies.back()->getSelectedChunks();
-	}
-	return selectedChunks;
-}
-
-std::map<BlastAsset*, std::vector<uint32_t>> SampleManager::getSelectedChunks()
-{
-	std::map<BlastAsset*, std::vector<uint32_t>> selectedChunks;
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itrBlast = m_AssetFamiliesMap.begin();
-	for (; itrBlast != m_AssetFamiliesMap.end(); ++itrBlast)
-	{
-		std::set<uint32_t> assetChunks;
-		std::vector<BlastFamily*>& families = itrBlast->second;
-		std::vector<BlastFamily*>::iterator itrFamily = families.begin();
-		for (; itrFamily != families.end(); ++itrFamily)
-		{
-			std::vector<uint32_t> familyChunks = (*itrFamily)->getSelectedChunks();
-			for (std::vector<uint32_t>::iterator itrChunk = familyChunks.begin(); itrChunk != familyChunks.end(); ++itrChunk)
-			{
-				assetChunks.insert(*itrChunk);
-			}
-		}
-
-		if (assetChunks.size() == 0)
-			continue;
-
-		std::vector<uint32_t> vecAssetChunks;
-		for (std::set<uint32_t>::iterator itrChunk = assetChunks.begin(); itrChunk != assetChunks.end(); ++itrChunk)
-		{
-			vecAssetChunks.push_back(*itrChunk);
-		}
-
-		selectedChunks.insert(std::make_pair(itrBlast->first, vecAssetChunks));
-	}
-
-	return selectedChunks;
-}
-
-void SampleManager::clearChunksSelected()
-{
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itr = m_AssetFamiliesMap.begin();
-	for (; itr != m_AssetFamiliesMap.end(); ++itr)
-	{
-		BlastAsset* pBlastAsset = itr->first;
-		std::vector<BlastFamily*>& fs = itr->second;
-
-		for (BlastFamily* f : fs)
-		{
-			f->clearChunksSelected();
-		}
-	}
-}
-
-void SampleManager::setChunkSelected(std::vector<uint32_t> depths, bool selected)
-{
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itrBlast = m_AssetFamiliesMap.begin();
-	for (; itrBlast != m_AssetFamiliesMap.end(); ++itrBlast)
-	{
-		std::vector<BlastFamily*>& families = itrBlast->second;
-		std::vector<BlastFamily*>::iterator itrFamily = families.begin();
-		for (; itrFamily != families.end(); ++itrFamily)
-		{
-			(*itrFamily)->setChunkSelected(depths, selected);
-		}
-	}
-}
-
-void SampleManager::setChunkVisible(std::vector<uint32_t> depths, bool bVisible)
-{
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itrBlast = m_AssetFamiliesMap.begin();
-	for (; itrBlast != m_AssetFamiliesMap.end(); ++itrBlast)
-	{
-		std::vector<BlastFamily*>& families = itrBlast->second;
-		std::vector<BlastFamily*>::iterator itrFamily = families.begin();
-		for (; itrFamily != families.end(); ++itrFamily)
-		{
-			(*itrFamily)->setChunkVisible(depths, bVisible);
-		}
-	}
-}
-
-void SampleManager::setFractureExecutor(FractureExecutor* executor)
-{
-	m_fractureExecutor = executor;
-	if (executor)
-	{
-		executor->m_fractureTool = m_fTool;
-		if (executor->m_randomGenerator == nullptr)
-			executor->m_randomGenerator = &sRandomGenerator;
-	}
-}
-
-void SampleManager::EnableStepforward(bool bStepforward)
-{
-	m_stepforward = bStepforward;
-}
-
-void SampleManager::EnableSimulating(bool bSimulating)
-{
-	m_simulating = bSimulating;
-	m_stepforward = false;
-	m_physXController->setPaused(!m_simulating);
-
-	if (!m_simulating)
-	{
-		m_damageToolController->DisableController();
-#if 0
-		BlastSceneTree* pBlastSceneTree = BlastSceneTree::ins();
-		if (pBlastSceneTree)
-		{
-			pBlastSceneTree->hideAllChunks();
-			// make sure chunk0 shows.
-			std::vector<uint32_t> depths(1, 0);
-			pBlastSceneTree->setChunkVisible(depths, true);
-			// refresh in scene tree and viewport
-			//pBlastSceneTree->updateValues(false);
-			SampleManager::ins()->m_bNeedRefreshTree = true;
-		}
-#endif
-	}
-}
-
-#include <ViewerOutput.h>
-void SampleManager::output(const char* str)
-{
-	viewer_msg("%s", str);
-}
-
-void SampleManager::output(float value)
-{
-	viewer_msg("%f", value);
-}
-
-void SampleManager::output(physx::PxVec3& vec)
-{
-	viewer_msg("%f,%f,%f", vec.x, vec.y, vec.z);
-}
-
-void SampleManager::clearScene()
-{
-	m_gizmoToolController->resetPos();
-	/*
-	BPPAssetArray& assets = BlastProject::ins().getParams().blast.blastAssets;
-	int assetSize = assets.arraySizes[0];
-	for (int as = 0; as < assetSize; as++)
-	{
-		BPPAsset& asset = assets.buf[as];
-		BlastSceneTree::ins()->removeBlastInstances(asset);
-		BlastSceneTree::ins()->removeBlastAsset(asset);
-	}
-	BlastSceneTree::ins()->clearProjectile();
-	*/
-	m_sceneController->ClearScene();
-
-	EnableSimulating(false);
-
-	std::map<std::string, RenderMaterial*>::iterator itRenderMaterial;
-	for (itRenderMaterial = m_RenderMaterialMap.begin();
-		itRenderMaterial != m_RenderMaterialMap.end(); itRenderMaterial++)
-	{
-		RenderMaterial* pRenderMaterial = itRenderMaterial->second;
-		delete pRenderMaterial;
-		pRenderMaterial = nullptr;
-	}
-	m_RenderMaterialMap.clear();
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itAssetFamilies;
-	for (itAssetFamilies = m_AssetFamiliesMap.begin(); 
-		itAssetFamilies != m_AssetFamiliesMap.end(); itAssetFamilies++)
-	{
-		std::vector<BlastFamily*>& fs = itAssetFamilies->second;
-		fs.clear();
-	}
-	m_AssetFamiliesMap.clear();
-	m_AssetDescMap.clear();
-	m_instanceFamilyMap.clear();
-
-	physx::PxVec3 zero(0.0f, 0.0f, 0.0f);
-	m_assetExtents = zero;
-
-	m_bNeedRefreshTree = true;
-
-	m_pCurBlastAsset = nullptr;
-	m_nCurFamilyIndex = -1;
-
-	SimpleScene::Inst()->m_pCamera->SetDefaults();
-}
-
-void SampleManager::resetScene()
-{
-	std::map<BPPAssetInstance*, std::set<uint32_t>> selectChunks;
-
-	if (m_selectionToolController->IsEnabled())
-	{
-		std::set<PxActor*> actors = m_selectionToolController->getTargetActors();
-		for (PxActor* actor : actors)
-		{
-			BlastFamily* pBlastFamily = m_blastController->getFamilyByPxActor(*actor);
-			if (pBlastFamily)
-			{
-				BPPAssetInstance* assetInstance = getInstanceByFamily(pBlastFamily);
-				uint32_t chunkIndex = pBlastFamily->getChunkIndexByPxActor(*actor);
-				selectChunks[assetInstance].insert(chunkIndex);
-			}
-		}
-	}
-	else if (m_gizmoToolController->IsEnabled())
-	{
-		PxActor* actor = m_gizmoToolController->getTargetActor();
-
-		if (actor)
-		{
-			BlastFamily* pBlastFamily = m_blastController->getFamilyByPxActor(*actor);
-			if (pBlastFamily)
-			{
-				BPPAssetInstance* assetInstance = getInstanceByFamily(pBlastFamily);
-				uint32_t chunkIndex = pBlastFamily->getChunkIndexByPxActor(*actor);
-				selectChunks[assetInstance].insert(chunkIndex);
-			}
-		}
-	}
-
-	m_selectionToolController->clearSelect();
-	/*
-	std::map<BPPAssetInstance*, BlastFamily*>::iterator itIFM;
-	for (itIFM = m_instanceFamilyMap.begin(); itIFM != m_instanceFamilyMap.end(); itIFM++)
-	{
-		BPPAssetInstance* pInstance = itIFM->first;
-		BlastSceneTree::ins()->removeBlastInstance(*pInstance);
-	}
-	BlastSceneTree::ins()->clearProjectile();
-	*/
-	getSceneController().ResetScene();
-	EnableSimulating(false);
-	/*
-	for (itIFM = m_instanceFamilyMap.begin(); itIFM != m_instanceFamilyMap.end(); itIFM++)
-	{
-		BPPAssetInstance* pInstance = itIFM->first;
-		BlastSceneTree::ins()->addBlastInstance(*pInstance);
-	}
-	*/
-	std::set<PxActor*> actors;
-	for (std::map<BPPAssetInstance*, std::set<uint32_t>>::iterator itr = selectChunks.begin(); itr != selectChunks.end(); ++itr)
-	{
-		BlastFamily* family = getFamilyByInstance(itr->first);
-		std::set<uint32_t>& chunkIndexes = itr->second;
-
-		if (nullptr != family)
-		{
-			for (uint32_t chunkIndex : chunkIndexes)
-			{
-				PxActor* actor = nullptr;
-				family->getPxActorByChunkIndex(chunkIndex, &actor);
-
-				if (actor)
-					actors.insert(actor);
-			}
-		}
-	}
-
-	if (m_selectionToolController->IsEnabled())
-	{
-		m_selectionToolController->setTargetActors(actors);
-	}
-	else if (m_gizmoToolController->IsEnabled())
-	{
-		if (actors.size() > 0)
-		 m_gizmoToolController->setTargetActor(*actors.begin());
-	}
-
-	// reset scene should not restore camera
-	//SimpleScene::Inst()->m_pCamera->SetDefaults();
-}
-
-bool isChunkVisible(std::vector<BlastFamily*>& fs, uint32_t chunkIndex)
-{
-	int fsSize = fs.size();
-	if (fsSize == 0)
-	{
-		return true;
-	}
-
-	bool visible = false;
-	for (int i = 0; i < fsSize; i++)
-	{
-		if (fs[i]->isChunkVisible(chunkIndex))
-		{
-			visible = true;
-			break;
-		}
-	}
-	return visible;
-}
-
-void SampleManager::_setSourceAsset()
-{
-	std::vector<BlastFamilyPtr>& families = m_blastController->getFamilies();
-	if (families.size() > 0)
-	{
-		BlastFamilyPtr spLastFamily = families.back();
-
-		m_fTool->setSourceAsset(&(spLastFamily->getBlastAsset()));
-	}
-}
-
-BlastFamily* SampleManager::getFamilyByInstance(BPPAssetInstance* instance)
-{
-	if (instance)
-	{
-		if (m_instanceFamilyMap.find(instance) != m_instanceFamilyMap.end())
-		{
-			return m_instanceFamilyMap[instance];
-		}
-	}
-	return nullptr;
-}
-
-BPPAssetInstance* SampleManager::getInstanceByFamily(BlastFamily* family)
-{
-	if (family)
-	{
-		std::map<BPPAssetInstance*, BlastFamily*>::iterator itr = m_instanceFamilyMap.begin();
-		for (; itr != m_instanceFamilyMap.end(); ++itr)
-		{
-			if (itr->second == family)
-			{
-				return itr->first;
-			}
-		}
-	}
-	return nullptr;
-}
-
-void SampleManager::updateFamily(BlastFamily* oldFamily, BlastFamily* newFamily)
-{
-	if (oldFamily)
-	{
-		BPPAssetInstance* instance = getInstanceByFamily(oldFamily);
-		if (instance)
-		{
-			m_instanceFamilyMap[instance] = newFamily;
-		}
-	}
-}
-
-void SampleManager::removeRenderMaterial(std::string name)
-{
-	if (name.empty())
-	{
-		return;
-	}
-
-	std::map<std::string, RenderMaterial*>::iterator it = m_RenderMaterialMap.find(name);
-	if (it != m_RenderMaterialMap.end())
-	{
-		m_NeedDeleteRenderMaterials.push_back(name);
-	}
-}
-
-void SampleManager::renameRenderMaterial(std::string oldName, std::string newName)
-{
-	if (oldName.empty() || newName.empty())
-	{
-		return;
-	}
-
-	std::map<std::string, RenderMaterial*>::iterator it = m_RenderMaterialMap.find(oldName);
-	if (it != m_RenderMaterialMap.end())
-	{
-		RenderMaterial* pRenderMaterial = it->second;
-		m_RenderMaterialMap.erase(it);
-		pRenderMaterial->setMaterialName(newName);
-		m_RenderMaterialMap[newName] = pRenderMaterial;
-	}
-}
-
-void SampleManager::reloadRenderMaterial(std::string name, float r, float g, float b, bool diffuse)
-{
-	if (name.empty())
-	{
-		return;
-	}
-
-	std::map<std::string, RenderMaterial*>::iterator it = m_RenderMaterialMap.find(name);
-	if (it != m_RenderMaterialMap.end())
-	{
-		RenderMaterial* pRenderMaterial = it->second;
-		if (diffuse)
-		{
-			pRenderMaterial->setDiffuseColor(r, g, b);
-		}
-		else
-		{
-			pRenderMaterial->setSpecularColor(r, g, b);
-		}
-	}
-}
-
-void SampleManager::reloadRenderMaterial(std::string name, std::string texture, RenderMaterial::TextureType tt)
-{
-	if (name.empty())
-	{
-		return;
-	}
-
-	std::map<std::string, RenderMaterial*>::iterator it = m_RenderMaterialMap.find(name);
-	if (it != m_RenderMaterialMap.end())
-	{
-		RenderMaterial* pRenderMaterial = it->second;
-		pRenderMaterial->setTextureFileName(texture, tt);
-	}
-}
-
-void SampleManager::reloadRenderMaterial(std::string name, float specularShininess)
-{
-	if (name.empty())
-	{
-		return;
-	}
-
-	std::map<std::string, RenderMaterial*>::iterator it = m_RenderMaterialMap.find(name);
-	if (it != m_RenderMaterialMap.end())
-	{
-		RenderMaterial* pRenderMaterial = it->second;
-		pRenderMaterial->setSpecularShininess(specularShininess);
-	}
-}
-
-RenderMaterial* SampleManager::getRenderMaterial(std::string name, bool create)
-{
-	if (name == "" || name == "None")
-	{
-		return RenderMaterial::getDefaultRenderMaterial();
-	}
-
-	std::map<std::string, RenderMaterial*>::iterator itRenderMaterial = m_RenderMaterialMap.find(name);
-	RenderMaterial* pRenderMaterial = nullptr;
-	if (itRenderMaterial != m_RenderMaterialMap.end())
-	{
-		pRenderMaterial = itRenderMaterial->second;
-	}
-	else if(create)
-	{
-		ResourceManager* pResourceManager = ResourceManager::ins();
-
-		BPPGraphicsMaterial* pBPPGraphicsMaterial = BlastProject::ins().getGraphicsMaterial(name.c_str());
-		
-		if (pBPPGraphicsMaterial == nullptr)
-		{
-			return RenderMaterial::getDefaultRenderMaterial();
-		}
-		else if (pBPPGraphicsMaterial->diffuseTextureFilePath.buf != nullptr)
-		{
-			pRenderMaterial = new RenderMaterial(name.c_str(), *pResourceManager,
-				"model_simple_textured_ex",
-				pBPPGraphicsMaterial->diffuseTextureFilePath.buf);
-			pRenderMaterial->setDiffuseColor(
-				pBPPGraphicsMaterial->diffuseColor[0],
-				pBPPGraphicsMaterial->diffuseColor[1],
-				pBPPGraphicsMaterial->diffuseColor[2],
-				pBPPGraphicsMaterial->diffuseColor[3]);
-		}
-		else
-		{
-			pRenderMaterial = new RenderMaterial(name.c_str(), *pResourceManager,
-				"model_simple_textured_ex",
-				pBPPGraphicsMaterial->diffuseColor[0],
-				pBPPGraphicsMaterial->diffuseColor[1],
-				pBPPGraphicsMaterial->diffuseColor[2],
-				pBPPGraphicsMaterial->diffuseColor[3]);
-		}
-
-		m_RenderMaterialMap[name] = pRenderMaterial;
-	}
-	return pRenderMaterial;
-}
-
-void SampleManager::getCurrentSelectedInstance(BlastAsset** ppBlastAsset, int& index)
-{
-	*ppBlastAsset = m_pCurBlastAsset;
-	index = m_nCurFamilyIndex;
-}
-
-void SampleManager::setCurrentSelectedInstance(BlastAsset* pBlastAsset, int index)
-{
-	m_pCurBlastAsset = pBlastAsset;
-	m_nCurFamilyIndex = index;
-
-	MaterialAssignmentsPanel::ins()->updateValues();
-	FileReferencesPanel::ins()->updateValues();
-}
-
-void SampleManager::getMaterialForCurrentFamily(std::string& name, bool externalSurface)
-{
-	name = "";
-
-	if (m_pCurBlastAsset == nullptr || m_nCurFamilyIndex < 0)
-	{
-		return;
-	}
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator it = m_AssetFamiliesMap.find(m_pCurBlastAsset);
-	if (it == m_AssetFamiliesMap.end())
-	{
-		return;
-	}
-
-	std::vector<BlastFamily*>& fs = it->second;
-	int fsSize = fs.size();
-	if (fsSize == 0 || fsSize <= m_nCurFamilyIndex)
-	{
-		return;
-	}
-
-	BlastFamily* pBlastFamily = fs[m_nCurFamilyIndex];
-	RenderMaterial* pRenderMaterial = nullptr;
-	pBlastFamily->getMaterial(&pRenderMaterial, externalSurface);
-	if (pRenderMaterial != nullptr)
-	{
-		name = pRenderMaterial->getMaterialName();
-		if (name != "")
-		{
-			return;
-		}
-	}
-
-	AssetList::ModelAsset modelAsset = m_AssetDescMap[m_pCurBlastAsset];
-	int assetID = BlastProject::ins().getAssetIDByName(modelAsset.name.c_str());
-	BPPAssetInstance* instance = BlastProject::ins().getAssetInstance(assetID, m_nCurFamilyIndex);
-	if (externalSurface && instance->exMaterial.buf != nullptr)
-	{
-		name = instance->exMaterial.buf;
-	}
-	else if (!externalSurface && instance->inMaterial.buf != nullptr)
-	{
-		name = instance->inMaterial.buf;
-	}
-}
-
-void SampleManager::setMaterialForCurrentFamily(std::string name, bool externalSurface)
-{
-	if (m_pCurBlastAsset == nullptr || m_nCurFamilyIndex < 0)
-	{
-		return;
-	}
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator it = m_AssetFamiliesMap.find(m_pCurBlastAsset);
-	if (it == m_AssetFamiliesMap.end())
-	{
-		return;
-	}
-
-	std::vector<BlastFamily*>& fs = it->second;
-	int fsSize = fs.size();
-	if (fsSize == 0 || fsSize <= m_nCurFamilyIndex)
-	{
-		return;
-	}
-
-	RenderMaterial* pRenderMaterial = getRenderMaterial(name);
-
-	BlastFamily* pBlastFamily = fs[m_nCurFamilyIndex];
-	pBlastFamily->setMaterial(pRenderMaterial, externalSurface);
-
-	AssetList::ModelAsset modelAsset = m_AssetDescMap[m_pCurBlastAsset];
-	int assetID = BlastProject::ins().getAssetIDByName(modelAsset.name.c_str());
-	BPPAssetInstance* instance = BlastProject::ins().getAssetInstance(assetID, m_nCurFamilyIndex);
-	if (externalSurface)
-	{
-		copy(instance->exMaterial, name.c_str());
-	}
-	else
-	{
-		copy(instance->inMaterial, name.c_str());
-	}
-}
-
-#if 0
-void SampleManager::applyAssetToProjectParam(BlastAsset* pBlastAsset, bool addTo)
-{
-	BlastAssetModel* assetModel = dynamic_cast<BlastAssetModel*>(pBlastAsset);
-
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = getAssetFamiliesMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = getAssetDescMap();
-
-	AssetList::ModelAsset desc = AssetDescMap[pBlastAsset];
-	std::vector<BlastFamily*>& fs = AssetFamiliesMap[pBlastAsset];
-
-	BlastController& blastController = getBlastController();
-	SceneController& sceneController = getSceneController();
-
-	char str[MAX_PATH];
-
-	// asset array
-	BPPAssetArray assetArray;
-	assetArray.arraySizes[0] = 1;
-	assetArray.buf = new BPPAsset[1];
-	BPPAsset& asset = assetArray.buf[0];
-	::init(asset);
-	copy(asset.name, desc.name.c_str());
-	if (addTo)
-	{
-		asset.ID = BlastProject::ins().generateNewAssetID();
-		merge(blast.blastAssets, assetArray);
-	}
-	else
-	{
-		asset.ID = BlastProject::ins().getAssetIDByName(asset.name.buf);
-		apart(blast.blastAssets, assetArray);
-	}
-
-	const ExtPxAsset* pExtPxAsset = pBlastAsset->getPxAsset();
-	const ExtPxChunk* pExtPxChunk = pExtPxAsset->getChunks();
-
-	const TkAsset& tkAsset = pExtPxAsset->getTkAsset();
-	uint32_t chunkCount = tkAsset.getChunkCount();
-	const NvBlastChunk* pNvBlastChunk = tkAsset.getChunks();
-	uint32_t bondCount = tkAsset.getBondCount();
-	const NvBlastBond* pNvBlastBond = tkAsset.getBonds();
-
-	const NvBlastSupportGraph supportGraph = tkAsset.getGraph();
-	uint32_t* chunkIndices = supportGraph.chunkIndices;
-	uint32_t* adjacencyPartition = supportGraph.adjacencyPartition;
-	uint32_t* adjacentNodeIndices = supportGraph.adjacentNodeIndices;
-	uint32_t* adjacentBondIndices = supportGraph.adjacentBondIndices;
-
-	std::vector<bool> isSupports(chunkCount);
-	isSupports.assign(chunkCount, false);
-	std::vector<uint32_t> fromIDs(bondCount);
-	std::vector<uint32_t> toIDs(bondCount);
-	fromIDs.assign(bondCount, -1);
-	toIDs.assign(bondCount, -1);
-
-	for (uint32_t node0 = 0; node0 < supportGraph.nodeCount; ++node0)
-	{
-		const uint32_t chunkIndex0 = supportGraph.chunkIndices[node0];
-		if (chunkIndex0 >= chunkCount)
-		{
-			continue;
-		}
-
-		isSupports[chunkIndex0] = true;
-
-		for (uint32_t adjacencyIndex = adjacencyPartition[node0]; adjacencyIndex < adjacencyPartition[node0 + 1]; adjacencyIndex++)
-		{
-			uint32_t node1 = supportGraph.adjacentNodeIndices[adjacencyIndex];
-
-			// add this condition if you don't want to iterate all bonds twice
-			if (node0 > node1)
-				continue;
-
-			const uint32_t chunkIndex1 = supportGraph.chunkIndices[node1];
-
-			uint32_t bondIndex = supportGraph.adjacentBondIndices[adjacencyIndex];
-
-			if (chunkIndex0 < chunkIndex1)
-			{
-				fromIDs[bondIndex] = chunkIndex0;
-				toIDs[bondIndex] = chunkIndex1;
-			}
-			else
-			{
-				fromIDs[bondIndex] = chunkIndex1;
-				toIDs[bondIndex] = chunkIndex0;
-			}
-		}
-	}
-
-	// chunks
-	BPPChunkArray chunkArray;
-	{
-		chunkArray.buf = new BPPChunk[chunkCount];
-		chunkArray.arraySizes[0] = chunkCount;
-		char chunkname[10];
-		for (int cc = 0; cc < chunkCount; ++cc)
-		{
-			BPPChunk& chunk = chunkArray.buf[cc];
-			::init(chunk);
-
-			std::vector<uint32_t> parentChunkIndexes;
-			parentChunkIndexes.push_back(cc);
-			uint32_t parentChunkIndex = cc;
-			while ((parentChunkIndex = pNvBlastChunk[parentChunkIndex].parentChunkIndex) != -1)
-			{
-				parentChunkIndexes.push_back(parentChunkIndex);
-			}
-
-			std::string strChunkName = "Chunk";
-			for (int pcIndex = parentChunkIndexes.size() - 1; pcIndex >= 0; pcIndex--)
-			{
-				sprintf(chunkname, "_%d", parentChunkIndexes[pcIndex]);
-				strChunkName += chunkname;
-			}
-			copy(chunk.name, strChunkName.c_str());
-
-			chunk.asset = asset.ID;
-			chunk.ID = cc;
-			chunk.parentID = pNvBlastChunk[cc].parentChunkIndex;
-			chunk.staticFlag = pExtPxChunk[cc].isStatic;
-			chunk.visible = isChunkVisible(fs, cc);
-			chunk.support = isSupports[cc];
-
-			if (assetModel != nullptr)
-			{
-				const BlastModel& model = assetModel->getModel();
-
-				BPPGraphicsMesh& graphicsMesh = chunk.graphicsMesh;
-				::init(graphicsMesh);
-
-				const BlastModel::Chunk& chunk = model.chunks[cc];
-
-				const std::vector<BlastModel::Chunk::Mesh>& meshes = chunk.meshes;
-				int meshSize = meshes.size();
-
-				if (meshSize == 0)
-				{
-					continue;
-				}
-
-				std::vector<physx::PxVec3> positions;
-				std::vector<physx::PxVec3> normals;
-				std::vector<physx::PxVec2> uv;
-				std::vector<uint32_t>  ind;
-				std::vector<int>  faceBreakPoint;
-				std::vector<uint32_t>  materialIndexes;
-				uint16_t curIndex = 0;
-				for (int ms = 0; ms < meshSize; ms++)
-				{
-					const BlastModel::Chunk::Mesh& mesh = meshes[ms];
-					materialIndexes.push_back(mesh.materialIndex);
-					const SimpleMesh& simpleMesh = mesh.mesh;
-					const std::vector<SimpleMesh::Vertex>& vertices = simpleMesh.vertices;
-					const std::vector<uint16_t>& indices = simpleMesh.indices;
-
-					int NumVertices = vertices.size();
-					for (uint32_t i = 0; i < NumVertices; ++i)
-					{
-						positions.push_back(physx::PxVec3(vertices[i].position.x, vertices[i].position.y, vertices[i].position.z));
-						normals.push_back(physx::PxVec3(vertices[i].normal.x, vertices[i].normal.y, vertices[i].normal.z));
-						uv.push_back(physx::PxVec2(vertices[i].uv.x, vertices[i].uv.y));
-					}
-					int NumIndices = indices.size();
-					for (uint32_t i = 0; i < NumIndices; ++i)
-					{
-						ind.push_back(indices[i] + curIndex);
-					}
-					curIndex += NumIndices;
-					faceBreakPoint.push_back(NumIndices / 3);
-				}
-
-				graphicsMesh.materialAssignments.buf = new BPPMaterialAssignments[materialIndexes.size()];
-				graphicsMesh.materialAssignments.arraySizes[0] = materialIndexes.size();
-				for (size_t i = 0; i < materialIndexes.size(); ++i)
-				{
-					BPPMaterialAssignments& assignment = graphicsMesh.materialAssignments.buf[i];
-					assignment.libraryMaterialID = materialIndexes[i];
-					assignment.faceMaterialID = materialIndexes[i];
-				}
-
-				graphicsMesh.positions.buf = new nvidia::NvVec3[positions.size()];
-				graphicsMesh.positions.arraySizes[0] = positions.size();
-				for (size_t i = 0; i < positions.size(); ++i)
-				{
-					nvidia::NvVec3& item = graphicsMesh.positions.buf[i];
-					item.x = positions[i].x;
-					item.y = positions[i].y;
-					item.z = positions[i].z;
-				}
-
-				graphicsMesh.normals.buf = new nvidia::NvVec3[normals.size()];
-				graphicsMesh.normals.arraySizes[0] = normals.size();
-				for (size_t i = 0; i < normals.size(); ++i)
-				{
-					nvidia::NvVec3& item = graphicsMesh.normals.buf[i];
-					item.x = normals[i].x;
-					item.y = normals[i].y;
-					item.z = normals[i].z;
-				}
-
-				graphicsMesh.texcoords.buf = new nvidia::NvVec2[uv.size()];
-				graphicsMesh.texcoords.arraySizes[0] = uv.size();
-				for (size_t i = 0; i < uv.size(); ++i)
-				{
-					nvidia::NvVec2& item = graphicsMesh.texcoords.buf[i];
-					item.x = uv[i].x;
-					item.y = uv[i].y;
-				}
-
-				size_t indexCount = ind.size();
-				size_t faceCount = ind.size() / 3;
-
-				graphicsMesh.vertextCountInFace = 3;
-
-				graphicsMesh.positionIndexes.buf = new int32_t[indexCount];
-				graphicsMesh.positionIndexes.arraySizes[0] = indexCount;
-
-				graphicsMesh.normalIndexes.buf = new int32_t[indexCount];
-				graphicsMesh.normalIndexes.arraySizes[0] = indexCount;
-
-				graphicsMesh.texcoordIndexes.buf = new int32_t[indexCount];
-				graphicsMesh.texcoordIndexes.arraySizes[0] = indexCount;
-
-				graphicsMesh.materialIDs.buf = new int32_t[faceCount];
-				graphicsMesh.materialIDs.arraySizes[0] = faceCount;
-
-				for (size_t i = 0; i < indexCount; ++i)
-				{
-					graphicsMesh.positionIndexes.buf[i] = ind[i];
-					graphicsMesh.normalIndexes.buf[i] = ind[i];
-					graphicsMesh.texcoordIndexes.buf[i] = ind[i];
-					/*
-					size_t j = 0;
-					for (; j < faceBreakPoint.size(); ++j)
-					{
-						if (i < faceBreakPoint[j])
-							break;
-					}
-					graphicsMesh.materialIDs.buf[i / 3] = j;
-					*/
-				}
-
-				for (size_t f = 0; f < faceCount; f++)
-				{
-					int32_t ex = f < faceBreakPoint[0] ? 0 : 1;
-					graphicsMesh.materialIDs.buf[f] = ex;
-				}
-			}
-		}
-
-		if (addTo)
-		{
-			merge(blast.chunks, chunkArray);
-		}
-		else
-		{
-			apart(blast.chunks, chunkArray);
-		}
-	}
-
-	// bonds
-	BPPBondArray bondArray;
-	{
-		bondArray.buf = new BPPBond[bondCount];
-		bondArray.arraySizes[0] = bondCount;
-		char bondname[10];
-		bool visible;
-		for (int bc = 0; bc < bondCount; ++bc)
-		{
-			BPPBond& bond = bondArray.buf[bc];
-			bond.name.buf = nullptr;
-			::init(bond);
-
-			visible = isChunkVisible(fs, fromIDs[bc]) || isChunkVisible(fs, toIDs[bc]);
-			bond.visible = visible;
-			bond.fromChunk = fromIDs[bc];
-			bond.toChunk = toIDs[bc];
-
-			sprintf(bondname, "Bond_%d_%d", bond.fromChunk, bond.toChunk);
-			copy(bond.name, bondname);
-			bond.asset = asset.ID;
-
-			bond.support.healthMask.buf = nullptr;
-			bond.support.bondStrength = 1.0;
-			bond.support.enableJoint = false;
-		}
-
-		if (addTo)
-		{
-			merge(blast.bonds, bondArray);
-		}
-		else
-		{
-			apart(blast.bonds, bondArray);
-		}
-	}
-
-	freeBlast(bondArray);
-	freeBlast(chunkArray);
-	freeBlast(assetArray);
-
-	m_bNeedRefreshTree = true;
-}
-#endif
-
-void SampleManager::updateAssetFamilyStressSolver(BPPAsset* bppAsset, BPPStressSolver& stressSolver)
-{
-	if (nullptr == bppAsset || nullptr == bppAsset->name.buf || 0 == strlen(bppAsset->name.buf))
-		return;
-
-	BlastAsset* blastAsset = nullptr;
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itr = m_AssetDescMap.begin();
-	for (; itr != m_AssetDescMap.end(); ++itr)
-	{
-		if (itr->second.name == bppAsset->name.buf)
-		{
-			blastAsset = itr->first;
-			break;
-		}
-	}
-
-	if (nullptr == blastAsset)
-		return;
-
-	std::vector<BlastFamily*>& families = m_AssetFamiliesMap[blastAsset];
-
-	for (BlastFamily* family : families)
-	{
-		BlastFamily::Settings settings = family->getSettings();
-
-		ExtStressSolverSettings & stressSolverSettings = settings.stressSolverSettings;
-		stressSolverSettings.hardness = stressSolver.hardness;
-		stressSolverSettings.stressLinearFactor = stressSolver.linearFactor;
-		stressSolverSettings.stressAngularFactor = stressSolver.angularFactor;
-		stressSolverSettings.bondIterationsPerFrame = stressSolver.bondIterationsPerFrame;
-		stressSolverSettings.graphReductionLevel = stressSolver.graphReductionLevel;
-		family->setSettings(settings);
-	}
-}
-
-void SampleManager::updateModelMeshToProjectParam(BlastAsset* pBlastAsset)
-{
-	BlastProject& project = BlastProject::ins();
-	BlastAssetModel* assetModel = dynamic_cast<BlastAssetModel*>(pBlastAsset);
-	BPPBlast& blast = project.getParams().blast;
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = getAssetDescMap();
-	AssetList::ModelAsset desc = AssetDescMap[pBlastAsset];
-
-	int assetId = project.getAssetIDByName(desc.name.c_str());
-	if (-1 == assetId)
-		return;
-
-	std::vector<BPPChunk*> chunks = project.getChildrenChunks(assetId);
-
-	BPPChunk& chunk = *chunks[0];//unfracture model only has one chunk
-
-	if (assetModel != nullptr)
-	{
-		const BlastModel& model = assetModel->getModel();
-
-		BPPGraphicsMesh& graphicsMesh = chunk.graphicsMesh;
-
-		const BlastModel::Chunk& chunk = model.chunks[0];//unfracture model only has one chunk
-
-		const std::vector<BlastModel::Chunk::Mesh>& meshes = chunk.meshes;
-		int meshSize = meshes.size();
-
-		if (meshSize == 0)
-		{
-			return;
-		}
-
-		std::vector<physx::PxVec3> positions;
-		for (int ms = 0; ms < meshSize; ms++)
-		{
-			const BlastModel::Chunk::Mesh& mesh = meshes[ms];
-			const SimpleMesh& simpleMesh = mesh.mesh;
-			const std::vector<SimpleMesh::Vertex>& vertices = simpleMesh.vertices;
-
-			int NumVertices = vertices.size();
-			for (uint32_t i = 0; i < NumVertices; ++i)
-			{
-				positions.push_back(physx::PxVec3(vertices[i].position.x, vertices[i].position.y, vertices[i].position.z));
-			}
-		}
-
-		for (size_t i = 0; i < positions.size(); ++i)
-		{
-			nvidia::NvVec3& item = graphicsMesh.positions.buf[i];
-			item.x = positions[i].x;
-			item.y = positions[i].y;
-			item.z = positions[i].z;
-		}
-	}
-}
-
-#if 0
-void SampleManager::applyFamilyToProjectParam(BlastFamily* pBlastFamily, bool addTo)
-{
-	const BlastAsset& blastAsset = pBlastFamily->getBlastAsset();
-	BlastAsset* pBlastAsset = (BlastAsset*)&blastAsset;
-
-	std::vector<BlastFamily*>& fs = m_AssetFamiliesMap[pBlastAsset];
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = getAssetDescMap();
-	AssetList::ModelAsset desc = AssetDescMap[pBlastAsset];
-
-	const BlastFamily::Settings& familySetting = pBlastFamily->getSettings();
-	physx::PxTransform transform = familySetting.transform;
-
-	char str[MAX_PATH];
-
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-	int assetID = BlastProject::ins().getAssetIDByName(desc.name.c_str());
-
-	// instance array
-	BPPAssetInstanceArray instanceArray;
-	instanceArray.arraySizes[0] = 1;
-	instanceArray.buf = new BPPAssetInstance[1];
-	BPPAssetInstance& instance = instanceArray.buf[0];
-	if (addTo)
-	{
-		::init(instance);
-		int instanceIndex = fs.size() - 1;
-		sprintf(str, "%s_%d", desc.name.c_str(), instanceIndex);
-		copy(instance.name, str);
-		instance.asset = assetID;
-		PxVec3 p = transform.p;
-		PxQuat q = transform.q;
-		instance.transform.position = nvidia::NvVec3(p.x, p.y, p.z);
-		instance.transform.rotation = nvidia::NvVec4(q.x, q.y, q.z, q.w);
-	}
-	else
-	{
-		BPPAssetInstance* pInstance = getInstanceByFamily(pBlastFamily);
-		copy(instance, *pInstance);
-	}
-
-	std::vector<BPPAssetInstance*> instances;
-	BlastProject::ins().getAssetInstances(assetID, instances);
-	int instanceSize = instances.size();
-	std::vector<std::string> instanceNames(instanceSize);
-	std::vector<BlastFamily*> instanceFamilys(instanceSize);
-	for (int is = 0; is < instanceSize; is++)
-	{
-		instanceNames[is] = instances[is]->name;
-		instanceFamilys[is] = m_instanceFamilyMap[instances[is]];
-		m_instanceFamilyMap.erase(m_instanceFamilyMap.find(instances[is]));
-	}
-
-	if (addTo)
-	{
-		merge(blast.blastAssetInstances, instanceArray);
-		instanceNames.push_back(str);
-		instanceFamilys.push_back(pBlastFamily);
-
-		std::vector<BPPChunk*> chunks = BlastProject::ins().getChildrenChunks(assetID);
-		for (size_t i = 0; i < chunks.size(); ++i)
-		{
-			chunks[i]->visible = isChunkVisible(fs, i);
-		}
-	}
-	else
-	{
-		apart(blast.blastAssetInstances, instanceArray);
-	}
-
-	instanceSize = instanceNames.size();
-	for (int is = 0; is < instanceSize; is++)
-	{
-		BPPAssetInstance* curInstance = BlastProject::ins().getAssetInstance(assetID, instanceNames[is].c_str());
-		if (curInstance != nullptr)
-		{
-			m_instanceFamilyMap[curInstance] = instanceFamilys[is];
-		}
-	}
-
-	freeBlast(instanceArray);
-
-	m_bNeedRefreshTree = true;
-}
-#endif
-
-BlastAsset* SampleManager::loadBlastFile(std::string dir, std::string file, AssetList::ModelAsset modelAsset)
-{
-	GlobalSettings::Inst().m_projectFileDir = dir;
-	GlobalSettings::Inst().m_projectFileName = file;
-
-	TkFramework& framework = getBlastController().getTkFramework();
-	PxPhysics& physics = getPhysXController().getPhysics();
-	PxCooking& cooking = getPhysXController().getCooking();
-	Renderer& renderer = getRenderer();
-	ExtSerialization& serialization = *getBlastController().getExtSerialization();
-
-	BlastAssetModelSimple* pBlastAssetModelSimple = new BlastAssetModelSimple(
-		framework, physics, cooking, serialization, renderer, file.c_str());
-
-	addBlastAsset(pBlastAssetModelSimple, modelAsset);
-
-	return pBlastAssetModelSimple;
-}
-
-void SampleManager::addBlastAsset(BlastAssetModelSimple* pBlastAssetModelSimple, AssetList::ModelAsset modelAsset, bool inProject)
-{
-	// 1
-	m_AssetDescMap[pBlastAssetModelSimple] = modelAsset;
-	m_AssetFamiliesMap[pBlastAssetModelSimple].clear();
-	pBlastAssetModelSimple->initialize();
-
-	// 2
-	m_sceneController->addBlastAsset(pBlastAssetModelSimple, modelAsset);
-
-	if (!inProject)
-	{
-		// 3
-		_addAssetToProjectParam(pBlastAssetModelSimple);
-	}
-
-	//4
-	const BlastModel& model = pBlastAssetModelSimple->getModel();
-	const physx::PxVec3 extent = (model.bbMax - model.bbMin) * 0.5f;
-	atcore_float3 max = gfsdk_max(*(atcore_float3*)&m_assetExtents, *(atcore_float3*)&(extent));
-	m_assetExtents = *(physx::PxVec3*)&max;
-
-	getGizmoToolController().setAxisLength(m_assetExtents.magnitude());
-
-	m_bNeedRefreshTree = true;
-	/*
-	BPPAsset* pBPPAsset = BlastProject::ins().getAsset(modelAsset.name.c_str());
-	BlastSceneTree::ins()->addBlastAsset(*pBPPAsset);
-	*/
-}
-
-void SampleManager::removeBlastAsset(BlastAssetModelSimple* pBlastAssetModelSimple)
-{
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itADM = m_AssetDescMap.find(pBlastAssetModelSimple);
-	/*
-	AssetList::ModelAsset modelAsset = itADM->second;
-	BPPAsset* pBPPAsset = BlastProject::ins().getAsset(modelAsset.name.c_str());
-	BlastSceneTree::ins()->removeBlastInstances(*pBPPAsset);
-	BlastSceneTree::ins()->removeBlastAsset(*pBPPAsset);
-	*/
-	// 3
-	_removeInstancesFromProjectParam(pBlastAssetModelSimple);
-	_removeAssetFromProjectParam(pBlastAssetModelSimple);
-
-	// 2
-	m_sceneController->removeBlastAsset(pBlastAssetModelSimple);
-
-	_refreshInstanceFamilyMap();
-
-	// 1
-	m_AssetDescMap.erase(itADM);
-
-	m_bNeedRefreshTree = true;
-}
-
-BlastFamily* SampleManager::addBlastFamily(BlastAsset* pBlastAsset, physx::PxTransform transform, bool inProject)
-{
-	if (pBlastAsset == nullptr)
-	{
-		return nullptr;
-	}
-
-	BlastFamily* pBlastFamily = m_sceneController->addBlastFamily(pBlastAsset, transform);
-
-	if (!inProject)
-	{
-		_addInstanceToProjectParam(pBlastFamily);
-	}
-
-	_refreshInstanceFamilyMap();
-	/*
-	BPPAssetInstance* pBPPAssetInstance = getInstanceByFamily(pBlastFamily);
-	BlastSceneTree::ins()->addBlastInstance(*pBPPAssetInstance);
-	*/
-	/*
-	AssetList::ModelAsset modelAsset = m_AssetDescMap[pBlastAsset];
-	int assetID = BlastProject::ins().getAssetIDByName(modelAsset.name.c_str());
-	std::vector<BPPAssetInstance*> instances;
-	BlastProject::ins().getAssetInstances(assetID, instances);
-	std::vector<BlastFamily*> families = m_AssetFamiliesMap[pBlastAsset];
-	int familiesSize = families.size();
-	for (int fs = 0; fs < familiesSize; fs++)
-	{
-		m_instanceFamilyMap.insert(std::make_pair(instances[fs], families[fs]));
-	}
-	*/
-	// should not quit here. we still need set up right bounding extent
-	m_bNeedRefreshTree = true;
-	return pBlastFamily;
-}
-
-bool SampleManager::removeBlastFamily(BlastAsset* pBlastAsset, int nFamilyIndex)
-{
-	if (pBlastAsset == nullptr)
-	{
-		return false;
-	}
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itAFM = m_AssetFamiliesMap.find(pBlastAsset);
-	if (itAFM == m_AssetFamiliesMap.end())
-	{
-		return false;
-	}
-
-	std::vector<BlastFamily*> families = itAFM->second;
-	int familySize = families.size();
-	if (familySize == 0 || familySize <= nFamilyIndex)
-	{
-		return false;
-	}
-
-	_removeInstanceFromProjectParam(families[nFamilyIndex]);
-	/*
-	BPPAssetInstance* pBPPAssetInstance = getInstanceByFamily(families[nFamilyIndex]);
-	BlastSceneTree::ins()->addBlastInstance(*pBPPAssetInstance);
-	*/
-	m_sceneController->removeBlastFamily(pBlastAsset, nFamilyIndex);
-
-	_refreshInstanceFamilyMap();
-	m_bNeedRefreshTree = true;
-	return true;
-}
-
-void SampleManager::refreshAsset(BlastAsset* pBlastAsset)
-{
-	m_fTool->setSourceAsset(pBlastAsset);
-	m_fTool->finalizeFracturing();
-
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator it = m_AssetDescMap.find(pBlastAsset);
-	AssetList::ModelAsset desc = it->second;
-
-	int nChunkCount = pBlastAsset->getPxAsset()->getChunkCount();
-	int nBondCount = pBlastAsset->getPxAsset()->getTkAsset().getBondCount();
-
-	std::vector<bool> supports(nChunkCount);
-	std::vector<bool> statics(nChunkCount);
-
-	int nCur = 0;
-
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-	int assetID = BlastProject::ins().getAssetIDByName(desc.name.c_str());
-	int chunkSize = blast.chunks.arraySizes[0];
-	for (int cs = 0; cs < chunkSize; cs++)
-	{
-		BPPChunk& chunk = blast.chunks.buf[cs];
-		if (chunk.asset == assetID)
-		{
-			supports[nCur] = chunk.support;
-			statics[nCur] = chunk.staticFlag;
-			nCur++;
-		}
-	}
-
-	if (nCur != nChunkCount)
-	{
-		assert("chunk size not right");
-	}
-
-	nCur = 0;
-
-	std::vector<uint8_t> joints(nBondCount);
-	std::vector<uint32_t> worlds(nBondCount);
-	int bondSize = blast.bonds.arraySizes[0];
-	for (int bs = 0; bs < bondSize; bs++)
-	{
-		BPPBond& bond = blast.bonds.buf[bs];
-		if (bond.asset == assetID)
-		{
-			joints[nCur] = bond.support.enableJoint;
-			worlds[nCur] = bond.toChunk;
-			nCur++;
-		}
-	}
-
-	if (nCur != nBondCount)
-	{
-		assert("bond size not right");
-	}
-
-	_replaceAsset(pBlastAsset, supports, statics, joints, worlds);
-}
-
-void SampleManager::UpdateCamera()
-{
-	m_renderer->UpdateCamera();
-}
-
-void SampleManager::ResetUpDir(bool zup)
-{
-	m_physXController->ResetUpDir(zup);
-}
-
-void SampleManager::_addAssetToProjectParam(BlastAsset* pBlastAsset)
-{
-	BlastAssetModel* assetModel = dynamic_cast<BlastAssetModel*>(pBlastAsset);
-
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = getAssetFamiliesMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = getAssetDescMap();
-
-	AssetList::ModelAsset desc = AssetDescMap[pBlastAsset];
-	std::vector<BlastFamily*>& fs = AssetFamiliesMap[pBlastAsset];
-
-	BlastController& blastController = getBlastController();
-	SceneController& sceneController = getSceneController();
-
-	char str[MAX_PATH];
-
-	// asset array
-	BPPAssetArray assetArray;
-	assetArray.arraySizes[0] = 1;
-	assetArray.buf = new BPPAsset[1];
-	BPPAsset& asset = assetArray.buf[0];
-	::init(asset);
-	copy(asset.name, desc.name.c_str());
-	asset.ID = BlastProject::ins().generateNewAssetID();
-	merge(blast.blastAssets, assetArray);
-
-	const ExtPxAsset* pExtPxAsset = pBlastAsset->getPxAsset();
-	const ExtPxChunk* pExtPxChunk = pExtPxAsset->getChunks();
-
-	const TkAsset& tkAsset = pExtPxAsset->getTkAsset();
-	uint32_t chunkCount = tkAsset.getChunkCount();
-	const NvBlastChunk* pNvBlastChunk = tkAsset.getChunks();
-	uint32_t bondCount = tkAsset.getBondCount();
-	const NvBlastBond* pNvBlastBond = tkAsset.getBonds();
-
-	const NvBlastSupportGraph supportGraph = tkAsset.getGraph();
-	uint32_t* chunkIndices = supportGraph.chunkIndices;
-	uint32_t* adjacencyPartition = supportGraph.adjacencyPartition;
-	uint32_t* adjacentNodeIndices = supportGraph.adjacentNodeIndices;
-	uint32_t* adjacentBondIndices = supportGraph.adjacentBondIndices;
-
-	std::vector<bool> isSupports(chunkCount);
-	isSupports.assign(chunkCount, false);
-	std::vector<uint32_t> fromIDs(bondCount);
-	std::vector<uint32_t> toIDs(bondCount);
-	fromIDs.assign(bondCount, -1);
-	toIDs.assign(bondCount, -1);
-
-	for (uint32_t node0 = 0; node0 < supportGraph.nodeCount; ++node0)
-	{
-		const uint32_t chunkIndex0 = supportGraph.chunkIndices[node0];
-		if (chunkIndex0 >= chunkCount)
-		{
-			continue;
-		}
-
-		isSupports[chunkIndex0] = true;
-
-		for (uint32_t adjacencyIndex = adjacencyPartition[node0]; adjacencyIndex < adjacencyPartition[node0 + 1]; adjacencyIndex++)
-		{
-			uint32_t node1 = supportGraph.adjacentNodeIndices[adjacencyIndex];
-
-			// add this condition if you don't want to iterate all bonds twice
-			if (node0 > node1)
-				continue;
-
-			const uint32_t chunkIndex1 = supportGraph.chunkIndices[node1];
-
-			uint32_t bondIndex = supportGraph.adjacentBondIndices[adjacencyIndex];
-
-			if (chunkIndex0 < chunkIndex1)
-			{
-				fromIDs[bondIndex] = chunkIndex0;
-				toIDs[bondIndex] = chunkIndex1;
-			}
-			else
-			{
-				fromIDs[bondIndex] = chunkIndex1;
-				toIDs[bondIndex] = chunkIndex0;
-			}
-		}
-	}
-
-	// chunks
-	BPPChunkArray chunkArray;
-	{
-		chunkArray.buf = new BPPChunk[chunkCount];
-		chunkArray.arraySizes[0] = chunkCount;
-		char chunkname[32];
-		for (int cc = 0; cc < chunkCount; ++cc)
-		{
-			BPPChunk& chunk = chunkArray.buf[cc];
-			::init(chunk);
-
-			//std::vector<uint32_t> parentChunkIndexes;
-			//parentChunkIndexes.push_back(cc);
-			//uint32_t parentChunkIndex = cc;
-			//while ((parentChunkIndex = pNvBlastChunk[parentChunkIndex].parentChunkIndex) != -1)
-			//{
-			//	parentChunkIndexes.push_back(parentChunkIndex);
-			//}
-
-			std::string strChunkName = "Chunk";
-			sprintf(chunkname, "_%d", cc);
-			strChunkName += chunkname;
-			//for (int pcIndex = parentChunkIndexes.size() - 1; pcIndex >= 0; pcIndex--)
-			//{
-			//	sprintf(chunkname, "_%d", parentChunkIndexes[pcIndex]);
-			//	strChunkName += chunkname;
-			//}
-			copy(chunk.name, strChunkName.c_str());
-
-			chunk.asset = asset.ID;
-			chunk.ID = cc;
-			chunk.parentID = pNvBlastChunk[cc].parentChunkIndex;
-			chunk.staticFlag = pExtPxChunk[cc].isStatic;
-			chunk.visible = isChunkVisible(fs, cc);
-			chunk.support = isSupports[cc];
-
-			if (assetModel != nullptr)
-			{
-				const BlastModel& model = assetModel->getModel();
-
-				BPPGraphicsMesh& graphicsMesh = chunk.graphicsMesh;
-				::init(graphicsMesh);
-
-				const BlastModel::Chunk& chunk = model.chunks[cc];
-
-				const std::vector<BlastModel::Chunk::Mesh>& meshes = chunk.meshes;
-				int meshSize = meshes.size();
-
-				if (meshSize == 0)
-				{
-					continue;
-				}
-
-				std::vector<physx::PxVec3> positions;
-				std::vector<physx::PxVec3> normals;
-				std::vector<physx::PxVec3> tangents;
-				std::vector<physx::PxVec2> uv;
-				std::vector<uint32_t>  ind;
-				std::vector<int>  faceBreakPoint;
-				std::vector<uint32_t>  materialIndexes;
-				uint16_t curIndex = 0;
-				for (int ms = 0; ms < meshSize; ms++)
-				{
-					const BlastModel::Chunk::Mesh& mesh = meshes[ms];
-					materialIndexes.push_back(mesh.materialIndex);
-					const SimpleMesh& simpleMesh = mesh.mesh;
-					const std::vector<SimpleMesh::Vertex>& vertices = simpleMesh.vertices;
-					const std::vector<uint16_t>& indices = simpleMesh.indices;
-
-					int NumVertices = vertices.size();
-					for (uint32_t i = 0; i < NumVertices; ++i)
-					{
-						positions.push_back(physx::PxVec3(vertices[i].position.x, vertices[i].position.y, vertices[i].position.z));
-						normals.push_back(physx::PxVec3(vertices[i].normal.x, vertices[i].normal.y, vertices[i].normal.z));
-						tangents.push_back(physx::PxVec3(vertices[i].tangent.x, vertices[i].tangent.y, vertices[i].tangent.z));
-						uv.push_back(physx::PxVec2(vertices[i].uv.x, vertices[i].uv.y));
-					}
-					int NumIndices = indices.size();
-					for (uint32_t i = 0; i < NumIndices; ++i)
-					{
-						ind.push_back(indices[i] + curIndex);
-					}
-					curIndex += NumVertices;
-					faceBreakPoint.push_back(NumIndices / 3);
-				}
-
-				graphicsMesh.materialAssignments.buf = new BPPMaterialAssignments[materialIndexes.size()];
-				graphicsMesh.materialAssignments.arraySizes[0] = materialIndexes.size();
-				for (size_t i = 0; i < materialIndexes.size(); ++i)
-				{
-					BPPMaterialAssignments& assignment = graphicsMesh.materialAssignments.buf[i];
-					assignment.libraryMaterialID = materialIndexes[i];
-					assignment.faceMaterialID = materialIndexes[i];
-				}
-
-				graphicsMesh.positions.buf = new nvidia::NvVec3[positions.size()];
-				graphicsMesh.positions.arraySizes[0] = positions.size();
-				for (size_t i = 0; i < positions.size(); ++i)
-				{
-					nvidia::NvVec3& item = graphicsMesh.positions.buf[i];
-					item.x = positions[i].x;
-					item.y = positions[i].y;
-					item.z = positions[i].z;
-				}
-
-				graphicsMesh.normals.buf = new nvidia::NvVec3[normals.size()];
-				graphicsMesh.normals.arraySizes[0] = normals.size();
-				for (size_t i = 0; i < normals.size(); ++i)
-				{
-					nvidia::NvVec3& item = graphicsMesh.normals.buf[i];
-					item.x = normals[i].x;
-					item.y = normals[i].y;
-					item.z = normals[i].z;
-				}
-
-				graphicsMesh.tangents.buf = new nvidia::NvVec3[tangents.size()];
-				graphicsMesh.tangents.arraySizes[0] = tangents.size();
-				for (size_t i = 0; i < tangents.size(); ++i)
-				{
-					nvidia::NvVec3& item = graphicsMesh.tangents.buf[i];
-					item.x = tangents[i].x;
-					item.y = tangents[i].y;
-					item.z = tangents[i].z;
-				}
-
-				graphicsMesh.texcoords.buf = new nvidia::NvVec2[uv.size()];
-				graphicsMesh.texcoords.arraySizes[0] = uv.size();
-				for (size_t i = 0; i < uv.size(); ++i)
-				{
-					nvidia::NvVec2& item = graphicsMesh.texcoords.buf[i];
-					item.x = uv[i].x;
-					item.y = uv[i].y;
-				}
-
-				size_t indexCount = ind.size();
-				size_t faceCount = ind.size() / 3;
-
-				graphicsMesh.vertextCountInFace = 3;
-
-				graphicsMesh.positionIndexes.buf = new int32_t[indexCount];
-				graphicsMesh.positionIndexes.arraySizes[0] = indexCount;
-
-				graphicsMesh.normalIndexes.buf = new int32_t[indexCount];
-				graphicsMesh.normalIndexes.arraySizes[0] = indexCount;
-
-				graphicsMesh.texcoordIndexes.buf = new int32_t[indexCount];
-				graphicsMesh.texcoordIndexes.arraySizes[0] = indexCount;
-
-				graphicsMesh.materialIDs.buf = new int32_t[faceCount];
-				graphicsMesh.materialIDs.arraySizes[0] = faceCount;
-
-				for (size_t i = 0; i < indexCount; ++i)
-				{
-					graphicsMesh.positionIndexes.buf[i] = ind[i];
-					graphicsMesh.normalIndexes.buf[i] = ind[i];
-					graphicsMesh.texcoordIndexes.buf[i] = ind[i];
-				}
-
-				for (size_t f = 0; f < faceCount; f++)
-				{
-					int32_t ex = f < faceBreakPoint[0] ? 0 : 1;
-					graphicsMesh.materialIDs.buf[f] = ex;
-				}
-			}
-		}
-
-		merge(blast.chunks, chunkArray);
-	}
-
-	// bonds
-	BPPBondArray bondArray;
-	{
-		bondArray.buf = new BPPBond[bondCount];
-		bondArray.arraySizes[0] = bondCount;
-		char bondname[64];
-		bool visible;
-		for (int bc = 0; bc < bondCount; ++bc)
-		{
-			BPPBond& bond = bondArray.buf[bc];
-			bond.name.buf = nullptr;
-			::init(bond);
-
-			visible = isChunkVisible(fs, fromIDs[bc]) || isChunkVisible(fs, toIDs[bc]);
-			bond.visible = visible;
-			bond.fromChunk = fromIDs[bc];
-			bond.toChunk = toIDs[bc];
-
-			if (bond.toChunk == 0xFFFFFFFF)
-			{
-				sprintf(bondname, "Bond_%d_world", bond.fromChunk);
-			}
-			else
-			{
-				sprintf(bondname, "Bond_%d_%d", bond.fromChunk, bond.toChunk);
-			}
-			copy(bond.name, bondname);
-			bond.asset = asset.ID;
-
-			bond.support.healthMask.buf = nullptr;
-			bond.support.bondStrength = 1.0;
-			bond.support.enableJoint = false;
-		}
-
-		merge(blast.bonds, bondArray);
-	}
-
-	freeBlast(bondArray);
-	freeBlast(chunkArray);
-	freeBlast(assetArray);
-
-	m_bNeedRefreshTree = true;
-}
-
-void SampleManager::_removeAssetFromProjectParam(BlastAsset* pBlastAsset)
-{
-	if (pBlastAsset == nullptr)
-	{
-		return;
-	}
-
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itADM = m_AssetDescMap.find(pBlastAsset);
-	if (itADM == m_AssetDescMap.end())
-	{
-		return;
-	}
-
-	AssetList::ModelAsset desc = m_AssetDescMap[pBlastAsset];
-
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-	
-	int32_t assetId = BlastProject::ins().getAssetIDByName(desc.name.c_str());
-
-	apart(blast.blastAssets, assetId);
-	apart(blast.chunks, assetId);
-	apart(blast.bonds, assetId);
-}
-
-void SampleManager::_addInstanceToProjectParam(BlastFamily* pBlastFamily)
-{
-	const BlastAsset& blastAsset = pBlastFamily->getBlastAsset();
-	BlastAsset* pBlastAsset = (BlastAsset*)&blastAsset;
-
-	std::vector<BlastFamily*>& fs = m_AssetFamiliesMap[pBlastAsset];
-	AssetList::ModelAsset desc = m_AssetDescMap[pBlastAsset];
-
-	const BlastFamily::Settings& familySetting = pBlastFamily->getSettings();
-	physx::PxTransform transform = familySetting.transform;
-
-	char str[MAX_PATH];
-
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-	int assetID = BlastProject::ins().getAssetIDByName(desc.name.c_str());
-
-	// instance array
-	BPPAssetInstanceArray instanceArray;
-	instanceArray.arraySizes[0] = 1;
-	instanceArray.buf = new BPPAssetInstance[1];
-	BPPAssetInstance& instance = instanceArray.buf[0];
-	::init(instance);
-	int instanceIndex = fs.size() - 1;
-	sprintf(str, "%s_%d", desc.name.c_str(), instanceIndex);
-	copy(instance.name, str);
-	instance.asset = assetID;
-	PxVec3 p = transform.p;
-	PxQuat q = transform.q;
-	instance.transform.position = nvidia::NvVec3(p.x, p.y, p.z);
-	instance.transform.rotation = nvidia::NvVec4(q.x, q.y, q.z, q.w);
-
-	merge(blast.blastAssetInstances, instanceArray);
-
-	std::vector<BPPChunk*> chunks = BlastProject::ins().getChildrenChunks(assetID);
-	for (size_t i = 0; i < chunks.size(); ++i)
-	{
-		chunks[i]->visible = isChunkVisible(fs, i);
-	}
-
-	freeBlast(instanceArray);
-
-	m_bNeedRefreshTree = true;
-}
-
-void SampleManager::_removeInstanceFromProjectParam(BlastFamily* pBlastFamily)
-{
-	BPPAssetInstance* pInstance = getInstanceByFamily(pBlastFamily);
-	if (pInstance == nullptr)
-	{
-		return;
-	}
-
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-	apart(blast.blastAssetInstances, pInstance->asset, pInstance->name.buf);
-}
-
-void SampleManager::_removeInstancesFromProjectParam(BlastAsset* pBlastAsset)
-{
-	if (pBlastAsset == nullptr)
-	{
-		return;
-	}
-
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itADM = m_AssetDescMap.find(pBlastAsset);
-	if (itADM == m_AssetDescMap.end())
-	{
-		return;
-	}
-
-	AssetList::ModelAsset desc = m_AssetDescMap[pBlastAsset];
-
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-
-	int32_t assetId = BlastProject::ins().getAssetIDByName(desc.name.c_str());
-
-	apart(blast.blastAssetInstances, assetId);
-}
-
-void SampleManager::_refreshInstanceFamilyMap()
-{
-	m_instanceFamilyMap.clear();
-
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itADM;
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itAFM;
-	for (itADM = m_AssetDescMap.begin(); itADM != m_AssetDescMap.end(); itADM++)
-	{
-		BlastAsset* pBlastAsset = itADM->first;
-		itAFM = m_AssetFamiliesMap.find(pBlastAsset);
-		if (itAFM == m_AssetFamiliesMap.end())
-		{
-			continue;
-		}
-
-		AssetList::ModelAsset modelAsset = itADM->second;
-		int assetID = BlastProject::ins().getAssetIDByName(modelAsset.name.c_str());
-		std::vector<BPPAssetInstance*> instances;
-		BlastProject::ins().getAssetInstances(assetID, instances);
-		int instancesSize = instances.size();
-		std::vector<BlastFamily*> families = itAFM->second;
-		int familiesSize = families.size();
-		if (instancesSize != familiesSize)
-		{
-			assert("size of instance in scene and project not equal");
-		}
-		for (int fs = 0; fs < familiesSize; fs++)
-		{
-			m_instanceFamilyMap.insert(std::make_pair(instances[fs], families[fs]));
-		}
-	}
-}
-
-bool SampleManager::eventAlreadyHandled()
-{
-	bool isAlt = (GetAsyncKeyState(VK_MENU) && 0x8000);
-	bool isLight = (GetAsyncKeyState('L') && 0x8000);
-	return m_selectionToolController->IsEnabled() && !(isAlt || isLight);
-}
-
-void SampleManager::ApplyAutoSelectNewChunks(BlastAsset* pNewBlastAsset, std::vector<uint32_t>& NewChunkIndexes)
-{
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itAFM = m_AssetFamiliesMap.find(pNewBlastAsset);
-	if (itAFM == m_AssetFamiliesMap.end())
-	{
-		return;
-	}
-
-	bool autoSelectNewChunks = BlastProject::ins().getParams().fracture.general.autoSelectNewChunks;
-
-	std::vector<BlastFamily*> families = itAFM->second;
-	for (BlastFamily* pBlastFamily : families)
-	{
-		pBlastFamily->clearChunksSelected();
-
-		if (!autoSelectNewChunks)
-		{
-			continue;
-		}
-
-		for (uint32_t chunkInd : NewChunkIndexes)
-		{
-			pBlastFamily->setChunkSelected(chunkInd, true);
-			pBlastFamily->setChunkVisible(chunkInd, true);
-		}
-	}
-
-	BlastSceneTree::ins()->ApplyAutoSelectNewChunks(pNewBlastAsset, NewChunkIndexes);
-}
-
-void SampleManager::ApplySelectionDepthTest()
-{
-	bool selectionDepthTest = BlastProject::ins().getParams().fracture.general.selectionDepthTest;
-
-	std::vector<BlastFamily*>& families = m_blastController->getFamilies();
-
-	for (BlastFamily* pBlastFamily : families)
-	{
-		std::vector<uint32_t> selectedChunks = pBlastFamily->getSelectedChunks();
-
-		for (uint32_t chunkInd : selectedChunks)
-		{
-			pBlastFamily->setChunkSelected(chunkInd, true);
-			pBlastFamily->setChunkVisible(chunkInd, true);
-		}
-	}
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleManager.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleManager.h
deleted file mode 100644
index 8daceb4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/core/SampleManager.h
+++ /dev/null
@@ -1,363 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SAMPLE_MANAGER_H
-#define SAMPLE_MANAGER_H
-
-#include "Application.h"
-#include "Sample.h"
-#include <map>
-#include <functional>
-#include "ProjectParams.h"
-#include "RenderMaterial.h"
-class SampleManager;
-class BlastFractureTool;
-class BlastAsset;
-class BlastFamily;
-
-namespace Nv
-{
-	namespace Blast
-	{
-		class Mesh;
-		class RandomGeneratorBase;
-		class VoronoiSitesGenerator;
-		struct SlicingConfiguration;
-	}
-}
-
-class ISampleController : public IApplicationController
-{
-public:
-
-	void setManager(SampleManager* manager)
-	{
-		m_manager = manager;
-	}
-protected:
-
-	SampleManager* getManager() const
-	{
-		return m_manager;
-	}
-
-private:
-	SampleManager* m_manager;
-};
-
-class FractureExecutor
-{
-	friend class SampleManager;
-public:
-	FractureExecutor()
-		: m_fractureTool(0)
-		, m_randomGenerator(nullptr)
-		, m_pCurBlastAsset(nullptr)
-	{
-		m_chunkIds.clear();
-	}
-
-	virtual bool execute() = 0;
-	void setSourceAsset(BlastAsset* blastAsset);
-	void setTargetChunk(uint32_t chunkId) 
-	{ 
-		m_chunkIds.clear();
-		m_chunkIds.push_back(chunkId); 
-	}
-	void setTargetChunks(std::vector<uint32_t>& chunkIds) 
-	{ 
-		m_chunkIds.clear();
-		std::vector<uint32_t>::iterator it;
-		for (it = chunkIds.begin(); it != chunkIds.end(); it++)
-		{
-			m_chunkIds.push_back(*it);
-		}
-		std::sort(m_chunkIds.begin(), m_chunkIds.end(), std::greater<uint32_t>());
-	}
-	void setRandomGenerator(Nv::Blast::RandomGeneratorBase* randomGenerator)	{ m_randomGenerator = randomGenerator; }
-protected:
-	BlastFractureTool*					m_fractureTool;
-	std::vector<uint32_t>				m_chunkIds;
-	Nv::Blast::RandomGeneratorBase*		m_randomGenerator;
-	BlastAsset*							m_pCurBlastAsset;
-};
-
-class VoronoiFractureExecutor : public FractureExecutor
-{
-public:
-	VoronoiFractureExecutor();
-	void setBPPVoronoi(BPPVoronoi* voronoi) { m_voronoi = voronoi; }
-
-	virtual bool execute();
-
-private:
-	BPPVoronoi* m_voronoi;
-};
-
-class SliceFractureExecutor : public FractureExecutor
-{
-public:
-	SliceFractureExecutor();
-	void setBPPSlice(BPPSlice* slice) { m_slice = slice; }
-
-	virtual bool execute();
-
-private:
-	BPPSlice* m_slice;
-};
-
-enum SelectMode
-{
-	SM_RESET = 0,
-	SM_ADD,
-	SM_SUB,
-	SM_REMAIN,
-};
-
-class Renderer;
-class PhysXController;
-class BlastController;
-class SceneController;
-class DamageToolController;
-class SelectionToolController;
-class ExplodeToolController;
-class GizmoToolController;
-class EditionToolController;
-class SampleController;
-class CommonUIController;
-class SimpleRandomGenerator;
-class BlastAssetModelSimple;
-/**
-*/
-class SampleManager
-{
-	friend class VoronoiFractureExecutor;
-	friend class SliceFractureExecutor;
-  public:
-	static SampleManager* ins();
-	SampleManager(DeviceManager* pDeviceManager);
-	~SampleManager();
-
-	int init();
-	int run();
-	int free();
-
-	bool createAsset(
-		BlastAssetModelSimple** ppBlastAsset,
-		std::vector<Nv::Blast::Mesh*>& meshes,
-		std::vector<int32_t>& parentIds,
-		std::vector<bool>& supports,
-		std::vector<bool>& statics,
-		std::vector<uint8_t>& joints,
-		std::vector<uint32_t>& worlds);
-
-	bool saveAsset(BlastAsset* pBlastAsset);
-
-	bool exportAsset();
-
-	Renderer& getRenderer()
-	{
-		return *m_renderer;
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return *m_physXController;
-	}
-
-	BlastController& getBlastController() const
-	{
-		return *m_blastController;
-	}
-
-	SceneController& getSceneController() const
-	{
-		return *m_sceneController;
-	}
-
-	DamageToolController& getDamageToolController() const
-	{
-		return *m_damageToolController;
-	}
-
-	SelectionToolController& getSelectionToolController() const
-	{
-		return *m_selectionToolController;
-	}
-
-	ExplodeToolController& getExplodeToolController() const
-	{
-		return *m_explodeToolController;
-	}
-	GizmoToolController& getGizmoToolController() const
-	{
-		return *m_gizmoToolController;
-	}
-
-	EditionToolController& getEditionToolController() const
-	{
-		return *m_editionToolController;
-	}
-
-	SampleController& getSampleController() const
-	{
-		return *m_sampleController;
-	}
-
-	CommonUIController& getCommonUIController() const
-	{
-		return *m_commonUIController;
-	}
-
-	std::vector<uint32_t> getCurrentSelectedChunks();
-	std::map<BlastAsset*, std::vector<uint32_t>> getSelectedChunks();
-	void clearChunksSelected();
-	void setChunkSelected(std::vector<uint32_t> depths, bool selected);
-	void setChunkVisible(std::vector<uint32_t> depths, bool bVisible);
-
-	void setFractureExecutor(FractureExecutor* executor);
-
-	void output(const char* str);
-	void output(float value);
-	void output(physx::PxVec3& vec);
-
-	void clearScene();
-	void resetScene();
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& getAssetFamiliesMap()
-	{
-		return m_AssetFamiliesMap;
-	}
-	std::map<BlastAsset*, AssetList::ModelAsset>& getAssetDescMap()
-	{
-		return m_AssetDescMap;
-	}
-
-	BlastFamily* getFamilyByInstance(BPPAssetInstance* instance);
-	BPPAssetInstance* getInstanceByFamily(BlastFamily* family);
-	void updateFamily(BlastFamily* oldFamily, BlastFamily* newFamily);
-
-	std::map<std::string, RenderMaterial*>& getRenderMaterials(){ return m_RenderMaterialMap; }
-	void removeRenderMaterial(std::string name);
-	void renameRenderMaterial(std::string oldName, std::string newName);
-	void reloadRenderMaterial(std::string name, float r, float g, float b, bool diffuse = true);
-	void reloadRenderMaterial(std::string name, std::string texture, RenderMaterial::TextureType tt = RenderMaterial::TT_Diffuse);
-	void reloadRenderMaterial(std::string name, float specularShininess);
-	RenderMaterial* getRenderMaterial(std::string name, bool create = true);
-	
-	bool m_bNeedRefreshTree;
-
-	void getCurrentSelectedInstance(BlastAsset** ppBlastAsset, int& index);
-	void setCurrentSelectedInstance(BlastAsset* pBlastAsset, int index);
-	void getMaterialForCurrentFamily(std::string& name, bool externalSurface);
-	void setMaterialForCurrentFamily(std::string name, bool externalSurface);
-
-	void updateAssetFamilyStressSolver(BPPAsset* bppAsset, BPPStressSolver& stressSolver);
-	// only update unfractured mode mesh
-	void updateModelMeshToProjectParam(BlastAsset* pBlastAsset);
-
-	BlastAsset* loadBlastFile(std::string dir, std::string file, AssetList::ModelAsset modelAsset);
-	void addBlastAsset(BlastAssetModelSimple* pBlastAsset, AssetList::ModelAsset modelAsset, bool inProject = false);
-	void removeBlastAsset(BlastAssetModelSimple* pBlastAsset);
-	BlastFamily* addBlastFamily(BlastAsset* pBlastAsset, physx::PxTransform transform, bool inProject = false);
-	bool removeBlastFamily(BlastAsset* pBlastAsset, int nFamilyIndex);
-
-	BlastAsset* getCurBlastAsset() { return m_pCurBlastAsset; }
-
-	void refreshAsset(BlastAsset* pBlastAsset);
-
-	void UpdateCamera();
-	void ResetUpDir(bool zup);
-
-	bool IsSimulating() { return m_simulating; }
-	void EnableSimulating(bool bSimulating);
-	bool IsStepforward() { return m_stepforward; }
-	void EnableStepforward(bool bStepforward);
-
-	physx::PxVec3 getAssetExtent() { return m_assetExtents; }
-
-	bool eventAlreadyHandled();
-
-	void ApplyAutoSelectNewChunks(BlastAsset* pNewBlastAsset, std::vector<uint32_t>& NewChunkIndexes);
-	void ApplySelectionDepthTest();
-
-private:
-	void _createAsset(BlastAssetModelSimple** ppBlastAsset, 
-		std::vector<bool>& supports,
-		std::vector<bool>& statics,
-		std::vector<uint8_t>& joints,
-		std::vector<uint32_t>& worlds);
-
-	BlastAsset* _replaceAsset(BlastAsset* pBlastAsset,
-		std::vector<bool>& supports,
-		std::vector<bool>& statics,
-		std::vector<uint8_t>& joints,
-		std::vector<uint32_t>& worlds);
-
-	void _setSourceAsset();
-
-	void _addAssetToProjectParam(BlastAsset* pBlastAsset);
-	void _removeAssetFromProjectParam(BlastAsset* pBlastAsset);
-	void _addInstanceToProjectParam(BlastFamily* pBlastFamily);
-	void _removeInstanceFromProjectParam(BlastFamily* pBlastFamily);
-	void _removeInstancesFromProjectParam(BlastAsset* pBlastAsset);
-	void _refreshInstanceFamilyMap();
-
-private:
-	Renderer*             m_renderer;
-	PhysXController*      m_physXController;
-	BlastController*      m_blastController;
-	SceneController*      m_sceneController;
-	DamageToolController* m_damageToolController;
-	SelectionToolController* m_selectionToolController;
-	ExplodeToolController*   m_explodeToolController;
-	GizmoToolController*  m_gizmoToolController;
-	EditionToolController* m_editionToolController;
-	SampleController*     m_sampleController;
-	CommonUIController*   m_commonUIController;
-	
-	Application* m_pApplication;
-
-	BlastFractureTool*			m_fTool;
-	FractureExecutor*			m_fractureExecutor;
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>> m_AssetFamiliesMap;
-	std::map<BlastAsset*, AssetList::ModelAsset> m_AssetDescMap;
-	std::map<std::string, RenderMaterial*> m_RenderMaterialMap;
-	std::vector<std::string> m_NeedDeleteRenderMaterials;
-	std::map<BPPAssetInstance*, BlastFamily*> m_instanceFamilyMap;
-
-	BlastAsset* m_pCurBlastAsset;
-	int m_nCurFamilyIndex;
-	physx::PxVec3 m_assetExtents;
-	bool m_simulating;
-	bool m_stepforward;
-};
-
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/physx/PhysXController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/physx/PhysXController.cpp
deleted file mode 100644
index ba21a2e..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/physx/PhysXController.cpp
+++ /dev/null
@@ -1,1192 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "PhysXController.h"
-#include "RenderMaterial.h"
-#include "ResourceManager.h"
-#include "Renderer.h"
-
-#include "XInput.h"
-#include "DXUTMisc.h"
-#include "DXUTCamera.h"
-#include "ConvexRenderMesh.h"
-#include "RenderUtils.h"
-#include "SampleProfiler.h"
-#include "NvBlastExtCustomProfiler.h"
-#include "NvBlastPxCallbacks.h"
-// Add By Lixu Begin
-#include "Mesh.h"
-// Add By Lixu End
-
-#include "PxPhysicsVersion.h"
-#include "PxPvdTransport.h"
-#include "PxDefaultCpuDispatcher.h"
-#include "PxPhysics.h"
-#include "PxScene.h"
-#include "PxCooking.h"
-#include "PxGpu.h"
-#include "PxSimpleFactory.h"
-#include "PxRigidBodyExt.h"
-#include "PxRigidDynamic.h"
-#include "PxRigidStatic.h"
-#include "PxMaterial.h"
-#include "PxFoundationVersion.h"
-#include "PxMath.h"
-// Add By Lixu Begin
-#include "PxRigidActorExt.h"
-#include "SimpleScene.h"
-#include "GlobalSettings.h"
-// Add By Lixu End
-
-#include <imgui.h>
-#include <chrono>
-
-using namespace std::chrono;
-
-#define PVD_TO_FILE 0
-
-const DirectX::XMFLOAT4 PLANE_COLOR(1.0f, 1.0f, 1.0f, 1.0f);
-const DirectX::XMFLOAT4 HOOK_LINE_COLOR(1.0f, 1.0f, 1.0f, 1.0f);
-const float DEFAULT_FIXED_TIMESTEP = 1.0f / 60.0f;
-
-
-PhysXController::PhysXController(PxSimulationFilterShader filterShader)
-: m_filterShader(filterShader)
-, m_gpuPhysicsAvailable(true)
-, m_isSimulating(false)
-, m_useGPUPhysics(true)
-, m_lastSimulationTime(0)
-, m_paused(false)
-, m_draggingActor(nullptr)
-, m_draggingEnabled(false)
-, m_draggingTryReconnect(false)
-, m_perfWriter(NULL)
-, m_fixedTimeStep(DEFAULT_FIXED_TIMESTEP)
-, m_timeAccumulator(0)
-, m_useFixedTimeStep(true)
-, m_maxSubstepCount(1)
-{
-	QueryPerformanceFrequency(&m_performanceFreq);
-
-// Add By Lixu Begin
-	m_bFirstTime = true;
-// Add By Lixu End
-}
-
-PhysXController::~PhysXController()
-{
-}
-
-void PhysXController::onInitialize()
-{
-	initPhysX();
-	initPhysXPrimitives();
-}
-
-void PhysXController::onTerminate()
-{
-	simualtionSyncEnd();
-	releasePhysXPrimitives();
-	releasePhysX();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												PhysX init/release
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void PhysXController::initPhysX()
-{
-	m_foundation = PxCreateFoundation(PX_FOUNDATION_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());
-
-	m_pvd = PxCreatePvd(*m_foundation);
-
-	static Nv::Blast::ExtCustomProfiler gBlastProfiler;
-	NvBlastProfilerSetCallback(&gBlastProfiler);
-	NvBlastProfilerSetDetail(Nv::Blast::ProfilerDetail::LOW);
-	gBlastProfiler.setPlatformEnabled(false);
-
-	PxTolerancesScale scale;
-
-	m_physics = PxCreatePhysics(PX_PHYSICS_VERSION, *m_foundation, scale, true, m_pvd);
-
-	PxCookingParams cookingParams(scale);
-	cookingParams.buildGPUData = true;
-	m_cooking = PxCreateCooking(PX_PHYSICS_VERSION, m_physics->getFoundation(), cookingParams);
-
-	PxCudaContextManagerDesc ctxMgrDesc;
-	m_cudaContext = PxCreateCudaContextManager(m_physics->getFoundation(), ctxMgrDesc);
-	if (m_cudaContext && !m_cudaContext->contextIsValid())
-	{
-		m_cudaContext->release();
-		m_cudaContext = NULL;
-	}
-
-	PxSceneDesc sceneDesc(m_physics->getTolerancesScale());
-	sceneDesc.gravity = PxVec3(0.0f, -9.81f, 0.0f);
-	m_dispatcher = PxDefaultCpuDispatcherCreate(4);
-	sceneDesc.cpuDispatcher = m_dispatcher;
-	sceneDesc.gpuDispatcher = m_cudaContext != NULL ? m_cudaContext->getGpuDispatcher() : NULL;
-	sceneDesc.filterShader = m_filterShader;
-	sceneDesc.flags |= PxSceneFlag::eENABLE_STABILIZATION;
-	sceneDesc.flags |= PxSceneFlag::eENABLE_PCM;
-	if (sceneDesc.gpuDispatcher == nullptr)
-	{
-		m_gpuPhysicsAvailable = false;
-		m_useGPUPhysics = false;
-	}
-	if (m_useGPUPhysics)
-	{
-		sceneDesc.flags |= PxSceneFlag::eENABLE_GPU_DYNAMICS;
-		sceneDesc.broadPhaseType = PxBroadPhaseType::eGPU;
-
-		sceneDesc.gpuDynamicsConfig.constraintBufferCapacity *= 4;
-		sceneDesc.gpuDynamicsConfig.contactBufferCapacity *= 4;
-		sceneDesc.gpuDynamicsConfig.contactStreamSize *= 4;
-		sceneDesc.gpuDynamicsConfig.forceStreamCapacity *= 4;
-		sceneDesc.gpuDynamicsConfig.foundLostPairsCapacity *= 4;
-		sceneDesc.gpuDynamicsConfig.patchStreamSize *= 4;
-		sceneDesc.gpuDynamicsConfig.tempBufferCapacity *= 4;
-
-	}
-	m_physicsScene = m_physics->createScene(sceneDesc);
-	m_editPhysicsScene = m_physics->createScene(sceneDesc);
-
-	m_defaultMaterial = m_physics->createMaterial(0.8f, 0.7f, 0.1f);
-
-	PxPvdSceneClient* pvdClient = m_physicsScene->getScenePvdClient();
-	if(pvdClient)
-	{
-		pvdClient->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONSTRAINTS, true);
-		pvdClient->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONTACTS, true);
-		pvdClient->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_SCENEQUERIES, true);
-	}
-
-	m_physicsScene->setVisualizationParameter(PxVisualizationParameter::eSCALE, 0);
-
-#if NV_DEBUG || NV_CHECKED || NV_PROFILE
-	PxPvdTransport* transport = PxDefaultPvdSocketTransportCreate("localhost", 5425, 10);
-	if (transport)
-	{
-		m_pvd->connect(*transport,
-#if NV_DEBUG || NV_CHECKED
-			PxPvdInstrumentationFlag::eALL
-#else
-			PxPvdInstrumentationFlag::ePROFILE
-#endif
-			);
-	}
-#endif
-}
-
-void PhysXController::releasePhysX()
-{
-	m_defaultMaterial->release();
-	m_physicsScene->release();
-	m_editPhysicsScene->release();
-	if (m_cudaContext)
-		m_cudaContext->release();
-	m_dispatcher->release();
-	m_physics->release();
-	if (m_pvd)
-	{
-		PxPvdTransport* transport = m_pvd->getTransport();
-		m_pvd->release();
-		if (transport)
-			transport->release();
-	}
-	m_cooking->release();
-	m_foundation->release();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												GPU toggle
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void PhysXController::setUseGPUPhysics(bool useGPUPhysics)
-{
-	if (!m_gpuPhysicsAvailable)
-	{
-		useGPUPhysics = false;
-	}
-
-	if (m_useGPUPhysics == useGPUPhysics)
-	{
-		return;
-	}
-
-	onTerminate();
-
-	m_useGPUPhysics = useGPUPhysics;
-
-	onInitialize();
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												PhysX wrappers
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-PxRigidDynamic* PhysXController::createRigidDynamic(const PxTransform& transform)
-{
-	return m_physics->createRigidDynamic(transform);
-}
-
-void PhysXController::releaseRigidDynamic(PxRigidDynamic* rigidDynamic)
-{
-	notifyRigidDynamicDestroyed(rigidDynamic);
-
-	m_physXActorsToRemove.push_back(rigidDynamic);
-}
-
-void PhysXController::notifyRigidDynamicDestroyed(PxRigidDynamic* rigidDynamic)
-{
-	if (m_draggingActor == rigidDynamic)
-	{
-		m_draggingActor = nullptr;
-		m_draggingTryReconnect = true;
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												Simulation control
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void PhysXController::simulationBegin(float dt)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-// Add By Lixu Begin
-	if (m_paused && !m_bFirstTime)
-		return;
-	if (m_bFirstTime)
-	{
-		m_paused = true;
-		m_bFirstTime = false;
-	}
-// Add By Lixu End
-
-	updateDragging(dt);
-	processExplosionQueue();
-
-	// slower physics if fps is too low
-	dt = PxClamp(dt, 0.0f, 0.0333f);
-
-	{
-		PROFILER_SCOPED("PhysX simulate call");
-		if (m_useFixedTimeStep)
-		{
-			m_timeAccumulator += dt;
-			m_substepCount = (uint32_t)std::floor(m_timeAccumulator / m_fixedTimeStep);
-			m_timeAccumulator -= m_fixedTimeStep * m_substepCount;
-			m_substepCount = m_maxSubstepCount > 0 ? physx::PxClamp<uint32_t>(m_substepCount, 0, m_maxSubstepCount) : m_substepCount;
-			if (m_substepCount > 0)
-			{
-				m_physicsScene->simulate(m_fixedTimeStep);
-				m_isSimulating = true;
-			}
-		}
-		else
-		{
-			m_substepCount = 1;
-			PX_ASSERT(!m_isSimulating);
-			m_physicsScene->simulate(dt);
-			m_isSimulating = true;
-
-		}
-	}
-
-// Add By Lixu Begin	
-	if (getManager()->IsStepforward())
-	{
-		m_paused = true;
-		getManager()->EnableStepforward(false);
-	}
-// Add By Lixu End
-}
-
-void PhysXController::simualtionSyncEnd()
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	if (m_isSimulating)
-	{
-		steady_clock::time_point start = steady_clock::now();
-		m_physicsScene->fetchResults(true);
-
-		// For fixed time step case it could be that we need more then one step (m_maxSubstepCount > 1). We will run leftover steps synchronously right there.
-		// Ideally is to make them overlap with other logic too, but it's much harder and requires more synchronization logic. Don't want to obfuscate sample code.
-		if (m_useFixedTimeStep && m_substepCount > 1)
-		{
-			for (uint32_t i = 0; i < m_substepCount - 1; i++)
-			{
-				m_physicsScene->simulate(m_fixedTimeStep);
-				m_physicsScene->fetchResults(true);
-			}
-		}
-		m_lastSimulationTime = duration_cast<microseconds>(steady_clock::now() - start).count() * 0.000001;
-
-		m_isSimulating = false;
-
-		updateActorTransforms();
-
-		PROFILER_BEGIN("Debug Render Buffer");
-		getRenderer().queueRenderBuffer(&m_physicsScene->getRenderBuffer());
-		PROFILER_END();
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Dragging
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void PhysXController::setDraggingEnabled(bool enabled)
-{
-	m_draggingEnabled = enabled;
-
-	if (!m_draggingEnabled)
-	{
-		m_draggingActor = nullptr;
-	}
-}
-
-void PhysXController::updateDragging(double dt)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	// If dragging actor was recently removed we try to reconnect to new one once, using previous hook world point.
-	// Often it is removed because it was split into smaller chunks (actors), so we wont to stay connected for nicer user experience.
-	if (m_draggingActor == nullptr && m_draggingTryReconnect)
-	{
-		class OverlapCallback : public PxOverlapBufferN<32>
-		{
-		public:
-			OverlapCallback() : hitActor(nullptr) {}
-
-			PxAgain processTouches(const PxOverlapHit* buffer, PxU32 nbHits)
-			{
-				for (PxU32 i = 0; i < nbHits; ++i)
-				{
-					PxRigidDynamic* rigidDynamic = buffer[i].actor->is<PxRigidDynamic>();
-					if (rigidDynamic)
-					{
-						hitActor = rigidDynamic;
-						break;
-					}
-				}
-				return true;
-			}
-
-			PxRigidDynamic* hitActor;
-		};
-
-		OverlapCallback overlapCallback;
-		PxSphereGeometry sphere(0.15f);
-		bool isHit = getPhysXScene().overlap(sphere, PxTransform(m_draggingActorLastHookWorldPoint), overlapCallback, PxQueryFilterData(PxQueryFlag::eDYNAMIC));
-		if (isHit && overlapCallback.hitActor)
-		{
-			m_draggingActor = overlapCallback.hitActor;
-		}
-
-		m_draggingTryReconnect = false;
-	}
-
-	// Update dragging force and debug render (line)
-	if (m_draggingEnabled && m_draggingActor != NULL)
-	{
-		const float DRAGGING_FORCE_FACTOR = 10.0f;
-		const float DRAGGING_VELOCITY_FACTOR = 2.0f;
-		PxVec3 attractionPoint = m_dragAttractionPoint;
-		PxVec3 hookPoint = m_draggingActor->getGlobalPose().transform(m_draggingActorHookLocalPoint);
-		m_draggingActorLastHookWorldPoint = hookPoint;
-		m_dragVector = (m_dragAttractionPoint - hookPoint);
-		if (!m_draggingActor->getRigidBodyFlags().isSet(PxRigidBodyFlag::eKINEMATIC))
-		{
-			PxVec3 dragVeloctiy = (m_dragVector * DRAGGING_FORCE_FACTOR - DRAGGING_VELOCITY_FACTOR * m_draggingActor->getLinearVelocity()) * dt;
-			PxRigidBodyExt::addForceAtLocalPos(*m_draggingActor, dragVeloctiy * m_draggingActor->getMass(), m_draggingActorHookLocalPoint, PxForceMode::eIMPULSE, true);
-		}
-
-		// debug render line
-		m_dragDebugRenderBuffer.clear();
-		m_dragDebugRenderBuffer.m_lines.push_back(PxDebugLine(attractionPoint, hookPoint, XMFLOAT4ToU32Color(HOOK_LINE_COLOR)));
-		getRenderer().queueRenderBuffer(&m_dragDebugRenderBuffer);
-	}
-}
-
-void PhysXController::resetDragging()
-{
-	m_draggingActor = nullptr;
-}
-
-
-LRESULT PhysXController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	if (m_draggingEnabled && (uMsg == WM_LBUTTONDOWN || uMsg == WM_MOUSEMOVE || uMsg == WM_LBUTTONUP))
-	{
-		float mouseX = (short)LOWORD(lParam);
-		float mouseY = (short)HIWORD(lParam);
-
-		PxVec3 eyePos, pickDir;
-		getEyePoseAndPickDir(mouseX, mouseY, eyePos, pickDir);
-		pickDir = pickDir.getNormalized();
-
-		if (uMsg == WM_LBUTTONDOWN)
-		{
-			if (pickDir.magnitude() > 0)
-			{
-				PxRaycastHit	hit;
-				PxRaycastBuffer rcBuffer(&hit, 1);
-				bool isHit = getPhysXScene().raycast(eyePos, pickDir, PX_MAX_F32, rcBuffer, PxHitFlag::ePOSITION, PxQueryFilterData(PxQueryFlag::eDYNAMIC));
-				if (isHit)
-				{
-					m_dragDistance = (eyePos - hit.position).magnitude();
-					m_draggingActor = hit.actor->is<PxRigidDynamic>();
-					m_draggingActorHookLocalPoint = m_draggingActor->getGlobalPose().getInverse().transform(hit.position);
-					m_dragAttractionPoint = hit.position;
-					if (!m_draggingActor->getRigidBodyFlags().isSet(PxRigidBodyFlag::eKINEMATIC))
-					{
-						m_draggingActor->setLinearVelocity(PxVec3(0, 0, 0));
-						m_draggingActor->setAngularVelocity(PxVec3(0, 0, 0));
-					}
-				}
-			}
-		}
-		else if (uMsg == WM_MOUSEMOVE)
-		{
-			PxRaycastHit	hit;
-			PxRaycastBuffer rcBuffer(&hit, 1);
-			bool isHit = getPhysXScene().raycast(eyePos, pickDir, PX_MAX_F32, rcBuffer, PxHitFlag::ePOSITION, PxQueryFilterData(PxQueryFlag::eSTATIC));
-			if (isHit)
-			{
-				m_dragDistance = PxMin(m_dragDistance, (eyePos - hit.position).magnitude());
-			}
-
-			m_dragAttractionPoint = eyePos + pickDir * m_dragDistance;
-		}
-		else if (uMsg == WM_LBUTTONUP)
-		{
-			m_draggingActor = NULL;
-		}
-	}
-
-	return 1;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Explosion
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class ExplodeOverlapCallback : public PxOverlapCallback
-{
-public:
-	ExplodeOverlapCallback(PxVec3 worldPos, float radius, float explosiveImpulse)
-		: m_worldPos(worldPos)
-		, m_radius(radius)
-		, m_explosiveImpulse(explosiveImpulse)
-		, PxOverlapCallback(m_hitBuffer, sizeof(m_hitBuffer) / sizeof(m_hitBuffer[0])) {}
-
-	PxAgain processTouches(const PxOverlapHit* buffer, PxU32 nbHits)
-	{
-		for (PxU32 i = 0; i < nbHits; ++i)
-		{
-			PxRigidActor* actor = buffer[i].actor;
-			PxRigidDynamic* rigidDynamic = actor->is<PxRigidDynamic>();
-			if (rigidDynamic && !(rigidDynamic->getRigidBodyFlags() & PxRigidBodyFlag::eKINEMATIC))
-			{
-				if (m_actorBuffer.find(rigidDynamic) == m_actorBuffer.end())
-				{
-					m_actorBuffer.insert(rigidDynamic);
-					PxVec3 dr = rigidDynamic->getGlobalPose().transform(rigidDynamic->getCMassLocalPose()).p - m_worldPos;
-					float distance = dr.magnitude();
-					float factor = PxClamp(1.0f - (distance * distance) / (m_radius * m_radius), 0.0f, 1.0f);
-					float impulse = factor * m_explosiveImpulse * 1000.0f;
-					PxVec3 vel = dr.getNormalized() * impulse / rigidDynamic->getMass();
-					rigidDynamic->setLinearVelocity(rigidDynamic->getLinearVelocity() + vel);
-				}
-			}
-		}
-		return true;
-	}
-
-private:
-	PxOverlapHit					m_hitBuffer[1000];
-	float							m_explosiveImpulse;
-	std::set<PxRigidDynamic*>		m_actorBuffer;
-	PxVec3							m_worldPos;
-	float							m_radius;
-};
-
-void PhysXController::explode(PxVec3 worldPos, float damageRadius, float explosiveImpulse)
-{
-	ExplodeOverlapCallback overlapCallback(worldPos, damageRadius, explosiveImpulse);
-	m_physicsScene->overlap(PxSphereGeometry(damageRadius), PxTransform(worldPos), overlapCallback);
-}
-
-void PhysXController::explodeDelayed(PxVec3 worldPos, float damageRadius, float explosiveImpulse)
-{
-	m_explosionQueue.push_back({ worldPos, damageRadius, explosiveImpulse });
-}
-
-void PhysXController::processExplosionQueue()
-{
-	for (auto& e : m_explosionQueue)
-	{
-		explode(e.worldPos, e.damageRadius, e.explosiveImpulse);
-	}
-	m_explosionQueue.clear();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//														UI
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void PhysXController::drawUI()
-{
-	ImGui::Checkbox("Use Fixed Timestep", &m_useFixedTimeStep);
-	if (m_useFixedTimeStep)
-	{
-		ImGui::InputFloat("Fixed Timestep", &m_fixedTimeStep);
-		ImGui::InputInt("Max Substep Count", &m_maxSubstepCount);
-	}
-
-	ImGui::Text("Substep Count:     %d", m_substepCount);
-	ImGui::Text("Sync Simulation Time (total):        %4.2f ms", getLastSimulationTime() * 1000);
-}
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												  PhysX Primitive
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Add By Lixu Begin
-// 0 means GROUND_YUP 1 means GROUND_ZUP
-PhysXController::Actor* planeActor_Pri[2] = { nullptr, nullptr };
-// Add By Lixu End
-
-void PhysXController::initPhysXPrimitives()
-{
-	// physx primitive render materials
-	{
-// Add By Lixu Begin
-		m_physXPrimitiveRenderMaterial = new RenderMaterial("", getRenderer().getResourceManager(), "physx_primitive", "");
-		m_physXPlaneRenderMaterial = new RenderMaterial("", getRenderer().getResourceManager(), "physx_primitive_plane", "");
-		m_physXPrimitiveTransparentRenderMaterial = new RenderMaterial("", getRenderer().getResourceManager(), "physx_primitive_transparent", "", RenderMaterial::BLEND_ALPHA_BLENDING);
-// Add By Lixu End
-	}
-
-	// create plane
-	Actor* plane = spawnPhysXPrimitivePlane(PxPlane(PxVec3(0, 1, 0).getNormalized(), 0));
-	plane->setColor(PLANE_COLOR);
-
-// Add By Lixu Begin
-	planeActor_Pri[0] = plane;
-	planeActor_Pri[0]->setHidden(true);
-	plane = spawnPhysXPrimitivePlane(PxPlane(PxVec3(0, 0, 1).getNormalized(), 0));
-	plane->setColor(PLANE_COLOR);
-	planeActor_Pri[1] = plane;
-	planeActor_Pri[1]->setHidden(true);
-// Add By Lixu End
-}
-
-void PhysXController::releasePhysXPrimitives()
-{
-	// remove all actors
-	for (std::set<Actor*>::iterator it = m_actors.begin(); it != m_actors.end(); it++)
-	{
-		delete (*it);
-	}
-	m_actors.clear();
-
-	// remove all materials
-	SAFE_DELETE(m_physXPrimitiveRenderMaterial);
-	SAFE_DELETE(m_physXPlaneRenderMaterial);
-	SAFE_DELETE(m_physXPrimitiveTransparentRenderMaterial);
-
-	// remove all convex render meshes
-	for (auto it = m_convexRenderMeshes.begin(); it != m_convexRenderMeshes.end(); it++)
-	{
-		SAFE_DELETE((*it).second);
-	}
-	m_convexRenderMeshes.clear();
-}
-
-void PhysXController::updateActorTransforms()
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	for (std::set<Actor*>::iterator it = m_actors.begin(); it != m_actors.end(); it++)
-	{
-		(*it)->update();
-	}
-}
-
-PhysXController::Actor* PhysXController::spawnPhysXPrimitiveBox(const PxTransform& position, PxVec3 extents, float density)
-{
-	PxBoxGeometry geom = PxBoxGeometry(extents);
-	PxRigidDynamic* actor = PxCreateDynamic(*m_physics, position, geom, *m_defaultMaterial, density);
-
-	return spawnPhysXPrimitive(actor);
-}
-
-PhysXController::Actor* PhysXController::spawnPhysXPrimitivePlane(const PxPlane& plane)
-{
-	PxRigidStatic* actor = PxCreatePlane(*m_physics, plane, *m_defaultMaterial);
-	PhysXController::Actor* p = spawnPhysXPrimitive(actor, false, true);
-	return p;
-}
-
-PhysXController::Actor* PhysXController::spawnPhysXPrimitive(PxRigidActor* actor, bool addToScene, bool ownPxActor)
-{
-	if (addToScene)
-	{
-		m_physicsScene->addActor(*actor);
-	}
-
-	Actor* a = new Actor(this, actor, ownPxActor);
-
-	m_actors.emplace(a);
-
-	return a;
-}
-
-void PhysXController::removePhysXPrimitive(Actor* actor)
-{
-	if (m_actors.find(actor) == m_actors.end())
-		return;
-
-	m_actors.erase(actor);
-
-	if (!actor->ownsPxActor())
-	{
-		m_physXActorsToRemove.push_back(actor->getActor());
-	}
-
-	if (m_draggingActor == actor->getActor())
-	{
-		m_draggingActor = nullptr;
-	}
-
-	delete actor;
-}
-
-void PhysXController::removeUnownedPhysXActors()
-{
-	if (m_physXActorsToRemove.size())
-	{
-		m_physicsScene->removeActors(m_physXActorsToRemove.data(), (PxU32)m_physXActorsToRemove.size());
-		for (size_t i = 0; i < m_physXActorsToRemove.size(); ++i)
-		{
-			m_physXActorsToRemove[i]->release();
-		}
-		m_physXActorsToRemove.resize(0);
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Actor
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-PhysXController::Actor::Actor(PhysXController* controller, PxRigidActor* actor, bool ownPxActor) :
-	m_controller(controller),
-	m_ownPxActor(ownPxActor),
-	m_hidden(false)
-{
-	m_actor = actor;
-
-	uint32_t shapesCount = actor->getNbShapes();
-	m_shapes.resize(shapesCount);
-	actor->getShapes(m_shapes.data(), shapesCount);
-
-	m_renderables.resize(m_shapes.size());
-	for (uint32_t i = 0; i < m_shapes.size(); i++)
-	{
-		PxShape* shape = m_shapes[i];
-		IRenderMesh* mesh = m_controller->getRenderMeshForShape(shape);
-		RenderMaterial* material = shape->getGeometryType() == PxGeometryType::ePLANE ? m_controller->m_physXPlaneRenderMaterial : m_controller->m_physXPrimitiveRenderMaterial;
-		m_renderables[i] = m_controller->getRenderer().createRenderable(*mesh, *material);
-		m_renderables[i]->setScale(m_controller->getMeshScaleForShape(shape));
-	}
-}
-
-PhysXController::Actor::~Actor()
-{
-	for (uint32_t i = 0; i < m_renderables.size(); i++)
-	{
-		m_controller->getRenderer().removeRenderable(m_renderables[i]);
-	}
-	if (m_ownPxActor)
-	{
-		m_actor->release();
-	}
-}
-
-void PhysXController::Actor::setColor(DirectX::XMFLOAT4 color)
-{
-	m_color = color;
-
-	for (uint32_t i = 0; i < m_renderables.size(); i++)
-	{
-		m_renderables[i]->setColor(color);
-	}
-}
-
-void PhysXController::Actor::setHidden(bool hidden)
-{
-	m_hidden = hidden;
-
-	for (uint32_t i = 0; i < m_renderables.size(); i++)
-	{
-		m_renderables[i]->setHidden(hidden);
-	}
-}
-
-void PhysXController::Actor::update()
-{
-	for (uint32_t i = 0; i < m_renderables.size(); i++)
-	{
-		m_renderables[i]->setTransform(m_actor->getGlobalPose() * m_shapes[i]->getLocalPose());
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												PhysX Shapes Renderer
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-IRenderMesh* PhysXController::getConvexRenderMesh(const PxConvexMesh* mesh)
-{
-	auto it = m_convexRenderMeshes.find(mesh);
-	if (it != m_convexRenderMeshes.end())
-	{
-		return (*it).second;
-	}
-	else
-	{
-		ConvexRenderMesh* renderMesh = new ConvexRenderMesh(mesh);
-		m_convexRenderMeshes[mesh] = renderMesh;
-		return renderMesh;
-	}
-}
-
-IRenderMesh* PhysXController::getRenderMeshForShape(const PxShape* shape)
-{
-	switch (shape->getGeometryType())
-	{
-	case PxGeometryType::eBOX:
-		return getRenderer().getPrimitiveRenderMesh(PrimitiveRenderMeshType::Box);
-	case PxGeometryType::ePLANE:
-		return getRenderer().getPrimitiveRenderMesh(PrimitiveRenderMeshType::Plane);
-	case PxGeometryType::eSPHERE:
-		return getRenderer().getPrimitiveRenderMesh(PrimitiveRenderMeshType::Sphere);
-	case PxGeometryType::eCONVEXMESH:
-	{
-		PxConvexMeshGeometry geom;
-		shape->getConvexMeshGeometry(geom);
-		return getConvexRenderMesh(geom.convexMesh);
-	}
-	default:
-		PX_ALWAYS_ASSERT_MESSAGE("Unsupported PxGeometryType");
-		return NULL;
-	}
-}
-
-PxVec3 PhysXController::getMeshScaleForShape(const PxShape* shape)
-{
-	switch (shape->getGeometryType())
-	{
-	case PxGeometryType::eBOX:
-	{
-		PxBoxGeometry boxGeom;
-		shape->getBoxGeometry(boxGeom);
-		return boxGeom.halfExtents;
-	}
-	case PxGeometryType::ePLANE:
-	{
-		return PxVec3(1, 2000, 2000);
-	}
-	case PxGeometryType::eSPHERE:
-	{
-		PxSphereGeometry sphereGeom;
-		shape->getSphereGeometry(sphereGeom);
-		return PxVec3(sphereGeom.radius, sphereGeom.radius, sphereGeom.radius);
-	}
-	case PxGeometryType::eCONVEXMESH:
-	{
-		PxConvexMeshGeometry convexGeom;
-		shape->getConvexMeshGeometry(convexGeom);
-		return convexGeom.scale.scale; // maybe incorrect because of rotation not used
-	}
-	default:
-		return PxVec3(1, 1, 1);
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Utils
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// work right
-PxVec3 unprojectRH(PxMat44& proj, PxMat44& view, float x, float y)
-{
-	PxVec4 screenPoint(x, y, 0, 1);
-	PxVec4 viewPoint = PxVec4(x / proj[0][0], y / proj[1][1], 1, 1);
-	PxVec4 nearPoint = view.inverseRT().transform(viewPoint);
-	if (nearPoint.w)
-		nearPoint *= 1.0f / nearPoint.w;
-	return PxVec3(nearPoint.x, nearPoint.y, nearPoint.z);
-}
-
-// work wrong
-PxVec3 unprojectRH2(PxMat44& proj, PxMat44& view, float x, float y)
-{
-	PxMat44 matProj = view * proj;
-	PxMat44 matInverse = matProj.inverseRT();
-
-	PxVec4 screenPoint(x, y, 0, 0);
-	PxVec4 pos = matInverse.transform(screenPoint);
-	return PxVec3(pos.x, pos.y, pos.z);
-}
-
-// work right
-PxVec3 unprojectLH(PxMat44& proj, PxMat44& view, float x, float y)
-{
-	DirectX::XMMATRIX proj1 = PxMat44ToXMMATRIX(proj);
-	DirectX::XMMATRIX view1 = PxMat44ToXMMATRIX(view);
-	DirectX::XMMATRIX invProjectionView = DirectX::XMMatrixInverse(&DirectX::XMMatrixDeterminant(view1 *  proj1), (view1 *  proj1));
-
-	DirectX::XMVECTOR mousePosition = DirectX::XMVectorSet(x, y, 0.0f, 0.0f);
-	DirectX::XMVECTOR mouseInWorldSpace = DirectX::XMVector3Transform(mousePosition, invProjectionView);
-	return PxVec3(DirectX::XMVectorGetX(mouseInWorldSpace), DirectX::XMVectorGetY(mouseInWorldSpace), DirectX::XMVectorGetZ(mouseInWorldSpace));
-}
-
-// work right
-PxVec3 unprojectLH(DirectX::XMMATRIX& proj, DirectX::XMMATRIX& view, float x, float y)
-{
-	//DirectX::XMMATRIX invProjectionView = DirectX::XMMatrixInverse(&DirectX::XMMatrixDeterminant(view *  proj), (view *  proj));
-
-	//DirectX::XMVECTOR mousePosition = DirectX::XMVectorSet(x, y, 0.0f, 0.0f);
-	//DirectX::XMVECTOR mouseInWorldSpace = DirectX::XMVector3Transform(mousePosition, invProjectionView);
-	//return PxVec3(DirectX::XMVectorGetX(mouseInWorldSpace), DirectX::XMVectorGetY(mouseInWorldSpace), DirectX::XMVectorGetZ(mouseInWorldSpace));
-
-
-	DirectX::XMMATRIX inView = DirectX::XMMatrixInverse(&DirectX::XMMatrixDeterminant(view), view);
-
-	DirectX::XMVECTOR screenPoint = DirectX::XMVectorSet(x, y, 0, 1);
-	DirectX::XMVECTOR viewPoint = DirectX::XMVectorSet(x / DirectX::XMVectorGetX(proj.r[0]), y / DirectX::XMVectorGetY(proj.r[1]), 1, 1);
-	DirectX::XMVECTOR nearPoint = DirectX::XMVector3Transform(viewPoint, inView);
-	PxVec3 nearPnt = PxVec3(DirectX::XMVectorGetX(nearPoint), DirectX::XMVectorGetY(nearPoint), DirectX::XMVectorGetZ(nearPoint));
-	if (DirectX::XMVectorGetW(nearPoint))
-		nearPnt *= 1.0f / DirectX::XMVectorGetW(nearPoint);
-	return nearPnt;
-}
-
-#include "SimpleScene.h"
-
-void PhysXController::getEyePoseAndPickDir(float mouseX, float mouseY, PxVec3& eyePos, PxVec3& pickDir)
-{
-#if(0)
-	// Add By Lixu Begin
-	PxMat44 view, proj;
-	SimpleScene* simpleScene = SimpleScene::Inst();
-	Camera* pSceneCamera = simpleScene->GetCamera();
-	if (pSceneCamera->UseLHS())
-	{
-		DirectX::XMMATRIX viewMatrix = SimpleScene::Inst()->GetViewMatrix();
-		DirectX::XMMATRIX projMatrix = SimpleScene::Inst()->GetProjMatrix();
-		view = XMMATRIXToPxMat44(viewMatrix);
-		proj = XMMATRIXToPxMat44(projMatrix);
-	}
-	else
-	{
-		view = XMMATRIXToPxMat44(getRenderer().getCamera().GetViewMatrix());
-		proj = XMMATRIXToPxMat44(getRenderer().getCamera().GetProjMatrix());
-	}
-	// Add By Lixu End
-
-	PxMat44 eyeTransform = view.inverseRT();
-	eyePos = eyeTransform.getPosition();
-	PxVec3 nearPos = unprojectRH(proj, view, mouseX * 2 - 1, 1 - mouseY * 2);
-	pickDir = nearPos - eyePos;
-#endif
-
-#if(0)
-	if (SimpleScene::Inst()->m_pCamera->UseLHS())
-	{
-		DirectX::XMMATRIX view = SimpleScene::Inst()->GetViewMatrix();
-		DirectX::XMMATRIX proj = SimpleScene::Inst()->GetProjMatrix();
-
-		DirectX::XMMATRIX eyeTransform = DirectX::XMMatrixInverse(&DirectX::XMMatrixDeterminant(view), view);
-		eyePos = PxVec3(DirectX::XMVectorGetX(eyeTransform.r[3]), DirectX::XMVectorGetY(eyeTransform.r[3]), DirectX::XMVectorGetZ(eyeTransform.r[3]));
-
-		PxVec3 nearPos = unprojectLH(proj, view, mouseX * 2 - 1, 1 - mouseY * 2);
-
-		pickDir = nearPos - eyePos;
-	}
-	else
-	{
-		PxMat44 view = XMMATRIXToPxMat44(getRenderer().getCamera().GetViewMatrix());
-		PxMat44 proj = XMMATRIXToPxMat44(getRenderer().getCamera().GetProjMatrix());
-
-		PxMat44 eyeTransform = view.inverseRT();
-		eyePos = eyeTransform.getPosition();
-
-		PxVec3 nearPos = unprojectRH(proj, view, mouseX * 2 - 1, 1 - mouseY * 2);
-
-		pickDir = nearPos - eyePos;
-	}
-#endif
-
-	atcore_float3 eye = SimpleScene::Inst()->m_pCamera->GetEye();
-	eyePos = PxVec3(eye.x, eye.y, eye.z);
-
-	float x = 0, y = 0, z = 0;
-	SimpleScene::Inst()->m_pCamera->getWorldCoord(mouseX, mouseY, x, y, z);
-
-	PxVec3 nearPos(x, y, z);
-	pickDir = nearPos - eyePos;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Add By Lixu Begin
-#include "PxExtensionsAPI.h"
-#include "PxDefaultStreams.h"
-#include "PxCollectionExt.h"
-// export collision as RepX. In exported file, it includes collisions as convexMesh. But for Rigidbodies, it will only export those exists.
-// if export as file A before damaging, it exports all of the chunks as convexMeshes. And Chunk 0 as Dynamic rigid body.
-// if export as file B after damaging and fracturing in the middle of simulation, it exports all of the chunks as convexMeshes. And the existing chunks as dynamic rigid bodies.
-bool PhysXController::ExportCollisionRepX(const char* fname, physx::PxPhysics* pSDK, physx::PxScene* pScene, bool asBinary)
-{
-	if ((pSDK == NULL) || (pScene == NULL) || (fname == NULL))
-		return false;
-
-	int count = pSDK->getNbScenes();
-
-	physx::PxSerializationRegistry* psr = physx::PxSerialization::createSerializationRegistry(*pSDK);
-
-	physx::PxCollection* collectionSdk = physx::PxCollectionExt::createCollection(*pSDK);
-	PX_ASSERT(collectionSdk);
-
-	physx::PxCollection* collectionScene = physx::PxCollectionExt::createCollection(*pScene);
-	PX_ASSERT(collectionScene);
-
-	collectionSdk->add(*collectionScene);
-	physx::PxSerialization::complete(*collectionSdk, *psr, NULL, true);
-
-	physx::PxDefaultFileOutputStream theStream(fname);
-	bool exportNames = true;
-	bool bExportOk = false;
-	if (asBinary)
-		bExportOk = physx::PxSerialization::serializeCollectionToBinary(theStream, *collectionSdk, *psr, NULL, exportNames);
-	else
-		bExportOk = physx::PxSerialization::serializeCollectionToXml(theStream, *collectionSdk, *psr);
-
-	if (!bExportOk)
-	{
-		std::string warning = "Fail to save scene: ";
-		warning += fname;
-		warning += "!";
-		MessageBoxA(NULL, warning.c_str(), "", MB_OK | MB_ICONWARNING);
-		bExportOk = false;
-	}
-
-	collectionScene->release();
-	collectionSdk->release();
-
-	psr->release();
-
-	return bExportOk;
-}
-
-// we have to clear those convexMeshes when init scene. if not, they increase.
-void PhysXController::ClearOldCOllisions()
-{
-	physx::PxU32 size = m_physics->getNbShapes();
-	if (size > 0)
-	{
-		physx::PxShape** pShapes = new physx::PxShape*[size];
-		memset(pShapes, 0, size); // clear
-		physx::PxU32 count = m_physics->getShapes(pShapes, size);
-		for (physx::PxU32 i = 0; i < count; i++)
-		{
-			physx::PxShape& shape = *pShapes[i];
-			PxGeometryType::Enum type = shape.getGeometryType();
-			if (type == PxGeometryType::eCONVEXMESH)
-				shape.release();
-		}
-		delete[] pShapes;
-		size = m_physics->getNbShapes();
-	}
-	// release convexMesh
-	size = m_physics->getNbConvexMeshes();
-	if (size > 0)
-	{
-		physx::PxConvexMesh** pConvex = new physx::PxConvexMesh*[size];
-		memset(pConvex, 0, size); // clear
-		physx::PxU32 count = m_physics->getConvexMeshes(pConvex, size);
-		for (physx::PxU32 i = 0; i < count; i++)
-		{
-			pConvex[i]->release();
-		}
-		delete[] pConvex;
-		size = m_physics->getNbConvexMeshes();
-	}
-}
-
-bool PhysXController::isPlaneVisible()
-{
-	if (GlobalSettings::Inst().m_zup)
-	{
-		return !planeActor_Pri[1]->isHidden();
-	}
-	else
-	{
-		return !planeActor_Pri[0]->isHidden();
-	}
-}
-
-void PhysXController::setPlaneVisible(bool bVisible)
-{
-	if (GlobalSettings::Inst().m_zup)
-	{
-		planeActor_Pri[0]->setHidden(true);
-		planeActor_Pri[1]->setHidden(!bVisible);
-	}
-	else
-	{
-		planeActor_Pri[0]->setHidden(!bVisible);
-		planeActor_Pri[1]->setHidden(true);
-	}
-}
-
-PxRigidDynamic* PhysXController::createEditPhysXActor(const std::vector<BlastModel::Chunk::Mesh>& meshes, const PxTransform& pos)
-{
-	PxRigidDynamic *actor = m_physics->createRigidDynamic(PxTransform(pos));
-
-	for (size_t i = 0; i < meshes.size(); ++i)
-	{
-		const SimpleMesh& mesh = meshes[i].mesh;
-
-		size_t vertexCount = mesh.vertices.size();
-		if (vertexCount == 0)
-		{
-			continue;
-		}
-		PxVec3* verts = new PxVec3[vertexCount];
-		for (size_t i = 0; i < vertexCount; ++i)
-		{
-			verts[i] = mesh.vertices[i].position;
-		}
-
-		PxConvexMeshDesc convexDesc;
-		convexDesc.points.count = vertexCount;
-		convexDesc.points.stride = sizeof(PxVec3);
-		convexDesc.points.data = verts;
-		convexDesc.flags = PxConvexFlag::eCOMPUTE_CONVEX;
-
-		{
-			PxCookingParams params = m_cooking->getParams();
-			params.convexMeshCookingType = PxConvexMeshCookingType::eQUICKHULL;
-			m_cooking->setParams(params);
-
-			PxDefaultMemoryOutputStream outStream;
-			bool bCooking = m_cooking->cookConvexMesh(convexDesc, outStream);
-			PxU8* outStreamData = outStream.getData();
-			PxU32 outStreamSize = outStream.getSize();
-			if (!bCooking || outStreamData == nullptr || outStreamSize == 0)
-			{
-				delete[] verts;
-				continue;
-			}
-
-			PxDefaultMemoryInputData input(outStreamData, outStreamSize);
-			PxConvexMesh* convexMesh = m_physics->createConvexMesh(input);
-			if (convexMesh == nullptr)
-			{
-				delete[] verts;
-				continue;
-			}
-			PxShape* shape = m_physics->createShape(PxConvexMeshGeometry(convexMesh), *m_defaultMaterial);
-			if (shape)
-			{
-				actor->attachShape(*shape);
-			}
-
-		}
-
-		delete[] verts;
-	}
-
-	actor->setRigidBodyFlag(PxRigidBodyFlag::eKINEMATIC, true);
-	m_editPhysicsScene->addActor(*actor);
-	return actor;
-}
-
-void PhysXController::setPaused(bool paused)
-{
-	m_paused = paused;
-	if (m_paused)
-	{
-		return;
-	}
-
-	if (GlobalSettings::Inst().m_zup)
-	{
-		m_physicsScene->removeActor(*planeActor_Pri[0]->getActor());
-		m_physicsScene->addActor(*planeActor_Pri[1]->getActor());
-	}
-	else
-	{
-		m_physicsScene->removeActor(*planeActor_Pri[1]->getActor());
-		m_physicsScene->addActor(*planeActor_Pri[0]->getActor());
-	}
-}
-
-void PhysXController::ResetUpDir(bool zup)
-{
-	setPaused(m_paused);
-	setPlaneVisible(isPlaneVisible());
-	if (zup)
-	{
-		m_physicsScene->setGravity(PxVec3(0.0f, 0.0f, -9.81f));
-	}
-	else
-	{
-		m_physicsScene->setGravity(PxVec3(0.0f, -9.81f, 0.0f));
-	}	
-}
-// Add By Lixu End
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/physx/PhysXController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/physx/PhysXController.h
deleted file mode 100644
index 9394adb..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/physx/PhysXController.h
+++ /dev/null
@@ -1,339 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef PHYSX_CONTROLLER_H
-#define PHYSX_CONTROLLER_H
-
-#include "SampleManager.h"
-#include <DirectXMath.h>
-#include "DebugRenderBuffer.h"
-#include "PxFiltering.h"
-#include <set>
-#include <map>
-// Add By Lixu Begin
-#include "BlastModel.h"
-// Add By Lixu End
-
-
-using namespace physx;
-
-class PerformanceDataWriter;
-class RenderMaterial;
-class Renderable;
-class IRenderMesh;
-// Add By Lixu Begin
-class SimpleMesh;
-// Add By Lixu End
-
-namespace physx
-{
-class PxCpuDispatcher;
-class PxFoundation;
-class PxPhysics;
-class PxCooking;
-class PxPvd;
-class PxCudaContextManager;
-class PxDefaultCpuDispatcher;
-}
-
-
-/**
-SampleController which manages all the PhysX related work:
-1. initialization, scene updates, release.
-2. it can create update and render physx primitives. They are represented by PhysXController::Actor, see public API.
-3. provides ability to drag actors by mouse or other similar input
-
-NOTE: this class does too much, probably should be split in a few smaller ones.
-*/
-class PhysXController : public ISampleController
-{
-  public:
-
-	//////// Actor ////////
-
-	class Actor
-	{
-	public:
-
-		Actor(PhysXController* controller, PxRigidActor* actor, bool ownPxActor = true);
-		~Actor();
-
-		void setColor(DirectX::XMFLOAT4 color);
-		DirectX::XMFLOAT4 getColor() const { return m_color; }
-
-		bool isHidden() { return m_hidden; }
-		void setHidden(bool hidden);
-
-		void update();
-		PxRigidActor* getActor() const { return m_actor; }
-
-		bool ownsPxActor() const { return m_ownPxActor; }
-
-	private:
-		PhysXController*      m_controller;
-		PxRigidActor*         m_actor;
-		std::vector<PxShape*> m_shapes;
-
-		std::vector<Renderable*>   m_renderables;
-		DirectX::XMFLOAT4     m_color;
-
-		bool                  m_hidden;
-		bool                  m_ownPxActor;
-	};
-
-
-	//////// ctor ////////
-
-	PhysXController(PxSimulationFilterShader filterShader);
-	virtual ~PhysXController();
-
-
-	//////// virtual callbacks ////////
-
-	virtual void onInitialize() override;
-	virtual void onTerminate() override;
-
-	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-
-	//////// public API ////////
-
-	void simulationBegin(float dt);
-	void simualtionSyncEnd();
-
-	void getEyePoseAndPickDir(float mouseX, float mouseY, PxVec3& eyePos, PxVec3& pickDir);
-
-	// wrappers to physx calls
-	PxRigidDynamic* createRigidDynamic(const PxTransform& transform);
-	void			releaseRigidDynamic(PxRigidDynamic*);
-
-	Actor*	spawnPhysXPrimitiveBox(const PxTransform& position, PxVec3 extents = PxVec3(1, 1, 1), float density = 2000.0f);
-	Actor*	spawnPhysXPrimitivePlane(const PxPlane& plane);
-	Actor*	spawnPhysXPrimitive(PxRigidActor* actor, bool addToScene = true, bool ownPxActor = true);
-	void	removePhysXPrimitive(Actor*);
-
-	IRenderMesh* getConvexRenderMesh(const PxConvexMesh* mesh);
-	IRenderMesh* getRenderMeshForShape(const PxShape* shape);
-	PxVec3		 getMeshScaleForShape(const PxShape* shape);
-
-	void removeUnownedPhysXActors();
-
-	bool isPaused() const
-	{
-		return m_paused;
-	}
-
-	void setPaused(bool paused);
-	void ResetUpDir(bool zup);
-
-	void setDraggingEnabled(bool enabled);
-	bool getDraggingEnabled() const { return m_draggingEnabled; }
-	void resetDragging();
-
-	void notifyRigidDynamicDestroyed(PxRigidDynamic*);
-
-	void explode(PxVec3 worldPos, float damageRadius, float explosiveImpulse);
-	void explodeDelayed(PxVec3 worldPos, float damageRadius, float explosiveImpulse);
-
-	void drawUI();
-
-	//////// public getters ////////
-
-	double getLastSimulationTime() const
-	{
-		return m_lastSimulationTime;
-	}
-
-	RenderMaterial* getPrimitiveRenderMaterial() 
-	{ 
-		return m_physXPrimitiveRenderMaterial; 
-	}
-
-// Add By Lixu Begin
-	bool ExportCollisionRepX(const char* fname, physx::PxPhysics* pSDK, physx::PxScene* pScene, bool asBinary);
-	void ClearOldCOllisions();
-	RenderMaterial* getFBXRenderMaterial()
-	{
-		return m_physXPlaneRenderMaterial;
-	}
-	bool m_bFirstTime;
-	bool isPlaneVisible();
-	void setPlaneVisible(bool bVisible);
-
-	PxScene& getEditPhysXScene() const
-	{
-		return *m_editPhysicsScene;
-	}
-
-	PxRigidDynamic* createEditPhysXActor(const std::vector<BlastModel::Chunk::Mesh>& meshes, const PxTransform& pos);
-// Add By Lixu End
-
-	PxPhysics& getPhysics() const
-	{
-		return *m_physics;
-	}
-
-	PxScene& getPhysXScene() const
-	{
-		return *m_physicsScene;
-	}
-
-	PxMaterial* getDefaultMaterial() const
-	{
-		return m_defaultMaterial;
-	}
-
-	PxCooking& getCooking() const
-	{
-		return *m_cooking;
-	}
-
-	PxDefaultCpuDispatcher* getCPUDispatcher() const
-	{
-		return m_dispatcher;
-	}
-
-	void setPerformanceWriter(PerformanceDataWriter* perfWriter)
-	{
-		m_perfWriter = perfWriter;
-	}
-
-	bool getGPUPhysicsAvailable() const
-	{
-		return m_gpuPhysicsAvailable;
-	}
-
-	void setUseGPUPhysics(bool useGPUPhysics);
-
-	bool getUseGPUPhysics() const
-	{
-		return m_useGPUPhysics;
-	}
-
-	const PxVec3& getDragActorHookLocalPoint() const
-	{
-		return m_draggingActorHookLocalPoint;
-	}
-
-	const PxVec3& getDragVector() const
-	{
-		return m_dragVector;
-	}
-
-	PxRigidDynamic* getDraggingActor() const
-	{
-		return m_draggingActor;
-	}
-
-  private:
-	//////// internal methods ////////
-
-	void initPhysX();
-	void releasePhysX();
-
-	void initPhysXPrimitives();
-	void releasePhysXPrimitives();
-	void updateActorTransforms();
-	void updateDragging(double dt);
-	void processExplosionQueue();
-
-	
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-
-	//////// internal data ////////
-
-	// PhysX 
-	PxFoundation*                               m_foundation;
-	PxPhysics*                                  m_physics;
-	PxCooking*                                  m_cooking;
-	PxPvd*                                      m_pvd;
-	PxCudaContextManager*                       m_cudaContext;
-	PxDefaultCpuDispatcher*                     m_dispatcher;
-	PxMaterial*                                 m_defaultMaterial;
-	PxSimulationFilterShader                    m_filterShader;
-	PxScene*                                    m_physicsScene;
-	// Add By Lixu Begin
-	PxScene*                                    m_editPhysicsScene;
-	// Add By Lixu End
-
-	// PhysX API related
-	std::vector<PxActor*>                       m_physXActorsToRemove;
-
-	// primitives/actors
-	std::set<Actor*>                            m_actors;
-	std::map<const PxConvexMesh*, IRenderMesh*> m_convexRenderMeshes;
-	RenderMaterial*                             m_physXPrimitiveRenderMaterial;
-	RenderMaterial*                             m_physXPlaneRenderMaterial;
-	RenderMaterial*                             m_physXPrimitiveTransparentRenderMaterial;
-
-	// simulation
-	bool										m_isSimulating;
-	bool										m_gpuPhysicsAvailable;
-	bool										m_useGPUPhysics;
-	double                                      m_lastSimulationTime;
-	LARGE_INTEGER                               m_performanceFreq;
-	bool                                        m_paused;
-	bool										m_useFixedTimeStep;
-	float										m_fixedTimeStep;
-	float										m_timeAccumulator;
-	uint32_t									m_substepCount;
-	int32_t										m_maxSubstepCount;
-
-	// dragging
-	bool                                        m_draggingEnabled;
-	PxRigidDynamic*                             m_draggingActor;
-	PxVec3                                      m_draggingActorHookLocalPoint;
-	PxVec3                                      m_dragAttractionPoint;
-	PxVec3                                      m_dragVector;
-	float                                       m_dragDistance;
-	DebugRenderBuffer                           m_dragDebugRenderBuffer;
-	PxVec3										m_draggingActorLastHookWorldPoint;
-	bool										m_draggingTryReconnect;
-
-	// Performance writer
-	PerformanceDataWriter*						m_perfWriter;
-
-	// explosion
-	struct ExplosionData
-	{
-		PxVec3 worldPos;
-		float damageRadius;
-		float explosiveImpulse;
-	};
-
-	std::vector<ExplosionData>					m_explosionQueue;
-
-};
-
-#endif
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ConvexRenderMesh.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ConvexRenderMesh.cpp
deleted file mode 100644
index dc938b9..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ConvexRenderMesh.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "ConvexRenderMesh.h"
-#include "Renderer.h"
-#include "PxConvexMesh.h"
-
-
-struct Vertex
-{
-	PxVec3 position;
-	PxVec3 normal;
-};
-
-ConvexRenderMesh::ConvexRenderMesh(const PxConvexMesh* mesh)
-{
-	const uint32_t nbPolygons = mesh->getNbPolygons();
-	const uint8_t* indexBuffer = mesh->getIndexBuffer();
-	const PxVec3* meshVertices = mesh->getVertices();
-
-	uint32_t nbVerts = 0;
-	uint32_t nbFaces = 0;
-
-	for (uint32_t i = 0; i < nbPolygons; i++)
-	{
-		PxHullPolygon data;
-		mesh->getPolygonData(i, data);
-		uint32_t nbPolyVerts = data.mNbVerts;
-		nbVerts += nbPolyVerts;
-		nbFaces += (nbPolyVerts - 2) * 3;
-	}
-
-	std::vector<Vertex> vertices;
-	std::vector<uint16_t> faces;
-
-	vertices.resize(nbVerts);
-	faces.resize(nbFaces);
-
-	uint32_t vertCounter = 0;
-	uint32_t facesCounter = 0;
-	for (uint32_t i = 0; i < nbPolygons; i++)
-	{
-		PxHullPolygon data;
-		mesh->getPolygonData(i, data);
-
-		PxVec3 normal(data.mPlane[0], data.mPlane[1], data.mPlane[2]);
-
-		uint32_t vI0 = vertCounter;
-		for (uint32_t vI = 0; vI < data.mNbVerts; vI++)
-		{
-			vertices[vertCounter].position = meshVertices[indexBuffer[data.mIndexBase + vI]];
-			vertices[vertCounter].normal = normal;
-			vertCounter++;
-		}
-
-		for (uint32_t vI = 1; vI < uint32_t(data.mNbVerts) - 1; vI++)
-		{
-			faces[facesCounter++] = uint16_t(vI0);
-			faces[facesCounter++] = uint16_t(vI0 + vI + 1);
-			faces[facesCounter++] = uint16_t(vI0 + vI);
-		}
-	}
-	
-	std::vector<D3D11_INPUT_ELEMENT_DESC> layout;
-	layout.push_back({ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	layout.push_back({ "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-
-	initialize(vertices.data(), (uint32_t)vertices.size(), sizeof(Vertex), layout, faces.data(), nbFaces);
-}
-
-
-ConvexRenderMesh::~ConvexRenderMesh()
-{
-}
-
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ConvexRenderMesh.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ConvexRenderMesh.h
deleted file mode 100644
index f7bc5c6..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ConvexRenderMesh.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef CONVEX_RENDER_MESH_H
-#define CONVEX_RENDER_MESH_H
-
-#include "CustomRenderMesh.h"
-
-namespace physx
-{
-class PxConvexMesh;
-}
-
-
-/**
-PxConvexMesh render mesh 
-(this class relates to PhysX more then to Renderer)
-*/
-class ConvexRenderMesh : public CustomRenderMesh
-{
-public:
-	ConvexRenderMesh(const PxConvexMesh* mesh);
-	virtual ~ConvexRenderMesh();
-};
-
-
-#endif //CONVEX_RENDER_MESH_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/CustomRenderMesh.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/CustomRenderMesh.cpp
deleted file mode 100644
index 0feae3f..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/CustomRenderMesh.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "CustomRenderMesh.h"
-
-
-CustomRenderMesh::CustomRenderMesh()
-	: m_indexBuffer(nullptr)
-{
-}
-
-CustomRenderMesh::CustomRenderMesh(const void* vertices, uint32_t numVertices, uint32_t vertexSize, std::vector<D3D11_INPUT_ELEMENT_DESC>& inputDesc, const uint16_t* faces, uint32_t numFaces)
-	: m_indexBuffer(nullptr)
-{
-	initialize(vertices, numVertices, vertexSize, inputDesc, faces, numFaces);
-}
-
-void CustomRenderMesh::initialize(const void* vertices, uint32_t numVertices, uint32_t vertexSize, std::vector<D3D11_INPUT_ELEMENT_DESC>& inputDesc, const uint16_t* faces, uint32_t numFaces)
-{
-	ID3D11Device* device = GetDeviceManager()->GetDevice();
-
-	m_inputDesc = inputDesc;
-	m_numVertices = numVertices;
-	m_vertexSize = vertexSize;
-	m_numFaces = numFaces;
-
-	// VB
-	{
-		D3D11_SUBRESOURCE_DATA vertexBufferData;
-
-		ZeroMemory(&vertexBufferData, sizeof(vertexBufferData));
-		vertexBufferData.pSysMem = vertices;
-
-		D3D11_BUFFER_DESC bufferDesc;
-
-		memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-		bufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-		bufferDesc.ByteWidth = vertexSize * numVertices;
-		bufferDesc.CPUAccessFlags = 0;
-		bufferDesc.MiscFlags = 0;
-		bufferDesc.Usage = D3D11_USAGE_IMMUTABLE;
-
-		V(device->CreateBuffer(&bufferDesc, &vertexBufferData, &m_vertexBuffer));
-	}
-
-	// IB
-	if (faces != nullptr)
-	{
-		D3D11_SUBRESOURCE_DATA indexBufferData;
-
-		ZeroMemory(&indexBufferData, sizeof(indexBufferData));
-		indexBufferData.pSysMem = faces;
-
-		D3D11_BUFFER_DESC bufferDesc;
-
-		memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-		bufferDesc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-		bufferDesc.ByteWidth = sizeof(uint16_t) * numFaces;
-		bufferDesc.CPUAccessFlags = 0;
-		bufferDesc.MiscFlags = 0;
-		bufferDesc.Usage = D3D11_USAGE_IMMUTABLE;
-
-		V(device->CreateBuffer(&bufferDesc, &indexBufferData, &m_indexBuffer));
-	}
-}
-
-CustomRenderMesh::~CustomRenderMesh()
-{
-	SAFE_RELEASE(m_vertexBuffer);
-	SAFE_RELEASE(m_indexBuffer);
-}
-
-
-void CustomRenderMesh::render(ID3D11DeviceContext& context) const
-{
-	context.IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-
-	UINT strides[1] = { m_vertexSize };
-	UINT offsets[1] = { 0 };
-	context.IASetVertexBuffers(0, 1, &m_vertexBuffer, strides, offsets);
-
-	context.IASetIndexBuffer(m_indexBuffer, DXGI_FORMAT_R16_UINT, 0);
-
-	if (m_indexBuffer)
-		context.DrawIndexed(m_numFaces, 0, 0);
-	else
-		context.Draw(m_numVertices, 0);
-}
-
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/CustomRenderMesh.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/CustomRenderMesh.h
deleted file mode 100644
index 025d3bf..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/CustomRenderMesh.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef CUSTOM_RENDER_MESH_H
-#define CUSTOM_RENDER_MESH_H
-
-#include "Renderable.h"
-
-
-class CustomRenderMesh : public IRenderMesh
-{
-public:
-	const std::vector<D3D11_INPUT_ELEMENT_DESC>& getInputElementDesc() const { return m_inputDesc; }
-	void render(ID3D11DeviceContext& context) const;
-
-	CustomRenderMesh(const void* vertices, uint32_t numVertices, uint32_t vertexSize, std::vector<D3D11_INPUT_ELEMENT_DESC>& inputDesc, const uint16_t* faces = nullptr, uint32_t numFaces = 0);
-	virtual ~CustomRenderMesh();
-
-protected:
-	CustomRenderMesh();
-	void initialize(const void* vertices, uint32_t numVertices, uint32_t vertexSize, std::vector<D3D11_INPUT_ELEMENT_DESC>& inputDesc, const uint16_t* faces, uint32_t numFaces);
-
-private:
-	ID3D11Buffer* m_vertexBuffer;
-	ID3D11Buffer* m_indexBuffer;
-	uint32_t      m_numFaces;
-	uint32_t      m_numVertices;
-	uint32_t      m_vertexSize;
-
-	std::vector<D3D11_INPUT_ELEMENT_DESC> m_inputDesc;
-};
-
-
-#endif //CUSTOM_RENDER_MESH_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/DebugRenderBuffer.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/DebugRenderBuffer.h
deleted file mode 100644
index 06cd509..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/DebugRenderBuffer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef DEBUGRENDERBUFFER_H
-#define DEBUGRENDERBUFFER_H
-
-#include "PxRenderBuffer.h"
-#include <vector>
-
-using namespace physx;
-
-
-/**
-Simple PxRenderBuffer implementation for easy debug primitives adding
-*/
-class DebugRenderBuffer : public PxRenderBuffer
-{
-public:
-	~DebugRenderBuffer() {}
-
-	virtual PxU32 getNbPoints() const { return 0; }
-	virtual const PxDebugPoint* getPoints() const { return nullptr; }
-
-	virtual PxU32 getNbLines() const { return static_cast<PxU32>(m_lines.size()); }
-	virtual const PxDebugLine* getLines() const { return m_lines.data(); }
-
-	virtual PxU32 getNbTriangles() const { return 0; }
-	virtual const PxDebugTriangle* getTriangles() const { return nullptr; }
-
-	virtual PxU32 getNbTexts() const { return 0; }
-	virtual const PxDebugText* getTexts() const { return nullptr; }
-
-	virtual void append(const PxRenderBuffer& other) {}
-	virtual void clear()
-	{
-		m_lines.clear();
-	}
-
-	std::vector<PxDebugLine> m_lines;
-};
-
-
-#endif //DEBUGRENDERBUFFER_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Mesh.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Mesh.cpp
deleted file mode 100644
index c6c8398..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Mesh.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "Mesh.h"
-
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Mesh.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Mesh.h
deleted file mode 100644
index 3ef7090..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Mesh.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef MESH_H
-#define MESH_H
-
-#include <vector>
-#include "PxVec2.h"
-#include "PxVec3.h"
-
-// Add By Lixu Begin
-class MeshBase
-// Add By Lixu End
-{
-	virtual uint32_t getVertexStride() = 0;
-	// ... TBD
-};
-
-/**
-SimpleMesh: position + normal + uv
-We use only this type everywhere, once other versions will be required we should generalize Mesh and refactor code.
-*/
-// Add By Lixu Begin
-class SimpleMesh : public MeshBase
-// Add By Lixu End
-{
-public:
-
-	class Vertex
-	{
-	public:
-		physx::PxVec3 position;
-		physx::PxVec3 normal;
-		physx::PxVec3 facenormal;
-		physx::PxVec3 tangent;
-		physx::PxVec2 uv;
-	};
-
-	virtual uint32_t getVertexStride() { return sizeof(Vertex); }
-
-	std::vector<Vertex> vertices;
-	std::vector<uint16_t> indices;
-
-	physx::PxVec3 extents;
-	physx::PxVec3 center;
-};
-
-
-#endif //MESH_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/PrimitiveRenderMesh.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/PrimitiveRenderMesh.cpp
deleted file mode 100644
index bcb1580..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/PrimitiveRenderMesh.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "PrimitiveRenderMesh.h"
-#include "Renderer.h"
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//											Base Mesh internal class
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-PrimitiveRenderMesh::PrimitiveRenderMesh(const float v[], UINT numVertices)
-{
-	std::vector<D3D11_INPUT_ELEMENT_DESC> layout;
-	layout.push_back({ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	layout.push_back({ "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-
-	initialize(v, numVertices, sizeof(float) * 6, layout, nullptr, 0);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Box Mesh
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const float boxVertices[] =
-{
-		-1.0f, -1.0f, -1.0f,  0.0f,  0.0f, -1.0f,
-		 1.0f, -1.0f, -1.0f,  0.0f,  0.0f, -1.0f, 
-		 1.0f,  1.0f, -1.0f,  0.0f,  0.0f, -1.0f, 
-		 1.0f,  1.0f, -1.0f,  0.0f,  0.0f, -1.0f, 
-		-1.0f,  1.0f, -1.0f,  0.0f,  0.0f, -1.0f, 
-		-1.0f, -1.0f, -1.0f,  0.0f,  0.0f, -1.0f, 
-
-		-1.0f, -1.0f,  1.0f,  0.0f,  0.0f, 1.0f,
-		 1.0f,  1.0f,  1.0f,  0.0f,  0.0f, 1.0f,
-		 1.0f, -1.0f,  1.0f,  0.0f,  0.0f, 1.0f,
-		 1.0f,  1.0f,  1.0f,  0.0f,  0.0f, 1.0f,
-		-1.0f, -1.0f,  1.0f,  0.0f,  0.0f, 1.0f,
-		-1.0f,  1.0f,  1.0f,  0.0f,  0.0f, 1.0f,
-
-		-1.0f,  1.0f,  1.0f, -1.0f,  0.0f,  0.0f,
-		-1.0f, -1.0f, -1.0f, -1.0f,  0.0f,  0.0f,
-		-1.0f,  1.0f, -1.0f, -1.0f,  0.0f,  0.0f,
-		-1.0f, -1.0f, -1.0f, -1.0f,  0.0f,  0.0f,
-		-1.0f,  1.0f,  1.0f, -1.0f,  0.0f,  0.0f,
-		-1.0f, -1.0f,  1.0f, -1.0f,  0.0f,  0.0f,
-
-		 1.0f,  1.0f,  1.0f,  1.0f,  0.0f,  0.0f,
-		 1.0f,  1.0f, -1.0f,  1.0f,  0.0f,  0.0f,
-		 1.0f, -1.0f, -1.0f,  1.0f,  0.0f,  0.0f,
-		 1.0f, -1.0f, -1.0f,  1.0f,  0.0f,  0.0f,
-		 1.0f, -1.0f,  1.0f,  1.0f,  0.0f,  0.0f,
-		 1.0f,  1.0f,  1.0f,  1.0f,  0.0f,  0.0f,
-
-		-1.0f, -1.0f, -1.0f,  0.0f, -1.0f,  0.0f,
-		 1.0f, -1.0f,  1.0f,  0.0f, -1.0f,  0.0f,
-		 1.0f, -1.0f, -1.0f,  0.0f, -1.0f,  0.0f,
-		 1.0f, -1.0f,  1.0f,  0.0f, -1.0f,  0.0f,
-		-1.0f, -1.0f, -1.0f,  0.0f, -1.0f,  0.0f,
-		-1.0f, -1.0f,  1.0f,  0.0f, -1.0f,  0.0f,
-
-		-1.0f,  1.0f, -1.0f,  0.0f,  1.0f,  0.0f,
-		 1.0f,  1.0f, -1.0f,  0.0f,  1.0f,  0.0f,
-		 1.0f,  1.0f,  1.0f,  0.0f,  1.0f,  0.0f,
-		 1.0f,  1.0f,  1.0f,  0.0f,  1.0f,  0.0f,
-		-1.0f,  1.0f,  1.0f,  0.0f,  1.0f,  0.0f,
-		-1.0f,  1.0f, -1.0f,  0.0f,  1.0f,  0.0f
-};
-
-BoxRenderMesh::BoxRenderMesh() : PrimitiveRenderMesh(boxVertices, sizeof(boxVertices) / (6 * sizeof(boxVertices[0]))) {}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Plane Mesh
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const float planeSize = 1.0f; // we use scaling instead
-const float planeTilesCount = 1000.0f;
-
-const float planeVertices[] =
-{
-	0,  planeSize,  planeSize, 1.0f, 0.0f, 0.0f,  planeTilesCount,  planeTilesCount,
-	0,  planeSize, -planeSize, 1.0f, 0.0f, 0.0f,  planeTilesCount, -planeTilesCount,
-	0, -planeSize, -planeSize, 1.0f, 0.0f, 0.0f, -planeTilesCount, -planeTilesCount,
-	0, -planeSize, -planeSize, 1.0f, 0.0f, 0.0f, -planeTilesCount, -planeTilesCount,
-	0, -planeSize,  planeSize, 1.0f, 0.0f, 0.0f, -planeTilesCount,  planeTilesCount,
-	0,  planeSize,  planeSize, 1.0f, 0.0f, 0.0f,  planeTilesCount,  planeTilesCount
-};
-
-PlaneRenderMesh::PlaneRenderMesh()
-{
-	std::vector<D3D11_INPUT_ELEMENT_DESC> layout;
-	layout.push_back({ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	layout.push_back({ "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	layout.push_back({ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-
-	initialize(planeVertices, sizeof(planeVertices) / (8 * sizeof(planeVertices[0])), sizeof(float) * 8, layout, nullptr, 0);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Sphere Mesh
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-const uint32_t g_numSlices = 8;  // along lines of longitude
-const uint32_t g_numStacks = 16; // along lines of latitude
-
-const uint32_t g_numSphereVertices = (g_numSlices * 2 + 1)*(g_numStacks + 1);
-const uint32_t g_numSphereIndices = g_numSlices * 2 * g_numStacks * 6;
-
-const uint32_t g_numConeVertices = (g_numSlices * 2 + 1) * 2;
-const uint32_t g_numConeIndices = g_numSlices * 2 * 6;
-
-PxVec3 g_spherePositions[g_numSphereVertices];
-uint16_t g_sphereIndices[g_numSphereIndices];
-
-void generateSphereMesh(uint16_t slices, uint16_t stacks, PxVec3* positions, uint16_t* indices)
-{
-	const PxF32 thetaStep = PxPi / stacks;
-	const PxF32 phiStep = PxTwoPi / (slices * 2);
-
-	PxF32 theta = 0.0f;
-
-	// generate vertices
-	for (uint16_t y = 0; y <= stacks; ++y)
-	{
-		PxF32 phi = 0.0f;
-
-		PxF32 cosTheta = PxCos(theta);
-		PxF32 sinTheta = PxSin(theta);
-
-		for (uint16_t x = 0; x <= slices * 2; ++x)
-		{
-			PxF32 cosPhi = PxCos(phi);
-			PxF32 sinPhi = PxSin(phi);
-
-			PxVec3 p(cosPhi*sinTheta, cosTheta, sinPhi*sinTheta);
-
-			// write vertex
-			*(positions++) = p;
-
-			phi += phiStep;
-		}
-
-		theta += thetaStep;
-	}
-
-	const uint16_t numRingQuads = 2 * slices;
-	const uint16_t numRingVerts = 2 * slices + 1;
-
-	// add faces
-	for (uint16_t y = 0; y < stacks; ++y)
-	{
-		for (uint16_t i = 0; i < numRingQuads; ++i)
-		{
-			// add a quad
-			*(indices++) = (y + 0)*numRingVerts + i;
-			*(indices++) = (y + 1)*numRingVerts + i;
-			*(indices++) = (y + 1)*numRingVerts + i + 1;
-
-			*(indices++) = (y + 1)*numRingVerts + i + 1;
-			*(indices++) = (y + 0)*numRingVerts + i + 1;
-			*(indices++) = (y + 0)*numRingVerts + i;
-		}
-	}
-}
-
-
-struct SphereVertex
-{
-	PxVec3 position;
-	PxVec3 normal;
-};
-
-SphereRenderMesh::SphereRenderMesh()
-{
-	generateSphereMesh(g_numSlices, g_numStacks, g_spherePositions, g_sphereIndices);
-
-	std::vector<SphereVertex> vertices;
-	for (uint32_t i = 0; i < g_numSphereVertices; i++)
-	{
-		vertices.push_back({ g_spherePositions[i], g_spherePositions[i] });
-	}
-
-	std::vector<D3D11_INPUT_ELEMENT_DESC> layout;
-	layout.push_back({ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	layout.push_back({ "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-
-	initialize(vertices.data(), (uint32_t)vertices.size(), sizeof(SphereVertex), layout, g_sphereIndices, g_numSphereIndices);
-}
-
-
-SphereRenderMesh::~SphereRenderMesh()
-{
-}
-
-// Add By Lixu Begin
-const float coneVertices[] =
-{
-	0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 0.0f,//top
-	-1.0f, -1.0f, 1.0f, -1.0f, 0.0f, 0.0f,//left bottom
-	-1.0f, -1.0f, -1.0f, -1.0f, 0.0f, 0.0f,//left top
-
-	0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f,//top
-	1.0f, -1.0f, -1.0f, 1.0f, 0.0f, 0.0f,//right top
-	1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f,//right bottom
-
-	0.0f, 1.0f, 0.0f, 0.0f, 0.0f, -1.0f,//top
-	-1.0f, -1.0f, -1.0f, 0.0f, 0.0f, -1.0f,//left top
-	1.0f, -1.0f, -1.0f, 0.0f, 0.0f, -1.0f,//right top
-
-	0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f,//top
-	1.0f, -1.0f, 1.0f, 0.0f, 0.0f, 1.0f,//right bottom
-	-1.0f, -1.0f, 1.0f, 0.0f, 0.0f, 1.0f,//left bottom
-
-	-1.0f, -1.0f, -1.0f, 0.0f, -1.0f, 0.0f,//left top
-	1.0f, -1.0f, 1.0f, 0.0f, -1.0f, 0.0f,//right bottom
-	1.0f, -1.0f, -1.0f, 0.0f, -1.0f, 0.0f,//right top
-
-	1.0f, -1.0f, 1.0f, 0.0f, -1.0f, 0.0f,//right bottom
-	-1.0f, -1.0f, -1.0f, 0.0f, -1.0f, 0.0f,//left top
-	-1.0f, -1.0f, 1.0f, 0.0f, -1.0f, 0.0f,//left bottom
-};
-
-ConeRenderMesh::ConeRenderMesh() : PrimitiveRenderMesh(coneVertices, sizeof(coneVertices) / (6 * sizeof(coneVertices[0]))) {}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//											FBX Mesh class
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#include <AnimUtil.h>
-#include <PxVec2.h>
-#include <vector>
-
-struct FBXVertex
-{
-	PxVec3 position;
-	PxVec3 normal;
-	PxVec2 uv;
-};
-
-FBXRenderMesh::FBXRenderMesh(MeshDesc* pMeshData)
-{
-	std::vector<D3D11_INPUT_ELEMENT_DESC> layout;
-	layout.push_back({ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	layout.push_back({ "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	layout.push_back({ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-
-	std::vector<FBXVertex> vertices;
-	std::vector<uint16_t>  indices;
-
-	for (uint32_t i = 0; i < pMeshData->m_NumVertices; ++i)
-	{
-		atcore_float3 pos = pMeshData->m_pVertices[i];
-		atcore_float3 vertexNormal = pMeshData->m_pVertexNormals[i];
-		atcore_float2 texcoord = pMeshData->m_pTexCoords[i];
-
-		FBXVertex newVertex;
-		newVertex.position = physx::PxVec3(pos.x, pos.y, pos.z);
-		newVertex.normal = physx::PxVec3(vertexNormal.x, vertexNormal.y, vertexNormal.z);
-		newVertex.uv = physx::PxVec2(texcoord.x, texcoord.y);
-
-		vertices.push_back(newVertex);
-	}
-
-	for (uint32_t i = 0; i < pMeshData->m_NumTriangles; ++i)
-	{
-		indices.push_back(pMeshData->m_pIndices[i * 3 + 0]);
-		indices.push_back(pMeshData->m_pIndices[i * 3 + 1]);
-		indices.push_back(pMeshData->m_pIndices[i * 3 + 2]);
-	}
-
-	initialize(vertices.data(), (uint32_t)vertices.size(), sizeof(FBXVertex), layout, indices.data(), (uint32_t)indices.size());
-}
-// Add By Lixu End
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/PrimitiveRenderMesh.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/PrimitiveRenderMesh.h
deleted file mode 100644
index 107af25..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/PrimitiveRenderMesh.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef PRIMITIVE_RENDER_MESH_H
-#define PRIMITIVE_RENDER_MESH_H
-
-#include "Utils.h"
-#include <DirectXMath.h>
-
-#include <vector>
-#include "Renderable.h"
-#include "CustomRenderMesh.h"
-
-
-class PrimitiveRenderMesh : public CustomRenderMesh
-{
-protected:
-	PrimitiveRenderMesh(const float v[], UINT numVertices);
-};
-
-class BoxRenderMesh : public PrimitiveRenderMesh
-{
-public:
-	BoxRenderMesh();
-};
-
-
-class PlaneRenderMesh : public CustomRenderMesh
-{
-public:
-	PlaneRenderMesh();
-};
-
-
-class SphereRenderMesh : public CustomRenderMesh
-{
-public:
-	SphereRenderMesh();
-	virtual ~SphereRenderMesh();
-};
-
-
-// Add By Lixu Begin
-class ConeRenderMesh : public PrimitiveRenderMesh
-{
-public:
-	ConeRenderMesh();
-};
-
-class MeshDesc;
-
-class FBXRenderMesh : public CustomRenderMesh
-{
-public:
-	FBXRenderMesh(MeshDesc* pMeshData);
-};
-// Add By Lixu End
-
-
-struct PrimitiveRenderMeshType
-{
-	enum Enum
-	{
-		Box,
-		Plane,
-		Sphere,
-// Add By Lixu Begin
-		Cone,
-// Add By Lixu End
-		Count
-	};
-};
-
-#endif //PRIMITIVE_RENDER_MESH_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RenderMaterial.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RenderMaterial.cpp
deleted file mode 100644
index 88533cb..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RenderMaterial.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "RenderMaterial.h"
-#include <DirectXMath.h>
-#include "ShaderUtils.h"
-#include "Renderer.h"
-#include "SampleManager.h"
-#include "Light.h"
-#include "D3D11TextureResource.h"
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												RenderMaterial
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-RenderMaterial::RenderMaterial(const char* materialName, ResourceManager& resourceCallback, const char* shaderFileName,
-	const char* textureFileName, BlendMode blendMode)
-{
-	mMaterialName = materialName;
-	setDiffuseColor(0.5, 0.5, 0.5, 1.0);
-	mTextureFileNames[TT_Diffuse] = textureFileName;
-
-	this->initialize(resourceCallback, shaderFileName, textureFileName, blendMode);
-}
-
-RenderMaterial::RenderMaterial(const char* materialName, ResourceManager& resourceCallback, const char* shaderFileName, float r, float g, float b, float a, BlendMode blendMode)
-{
-	mMaterialName = materialName;
-	setDiffuseColor(r, g, b, a);
-	this->initialize(resourceCallback, shaderFileName, "", blendMode);
-}
-
-void RenderMaterial::initialize(ResourceManager& resourceCallback, const char* shaderFileName, const char* textureFileName, BlendMode blendMode)
-{
-	std::vector<std::string> v;
-	v.push_back(shaderFileName);
-	initialize(resourceCallback, v, textureFileName, blendMode);
-}
-
-void RenderMaterial::initialize(ResourceManager& resourceCallback, std::vector<std::string> shaderFileNames, const char* textureFileName, BlendMode blendMode)
-{
-	for (int i = 0; i < TT_Num; i++)
-	{
-		m_TextureSRVs[i] = nullptr;
-		mTextureResources[i] = nullptr;
-	}
-	mBlendState = nullptr;
-
-	memset(mSpecularColor, 0, sizeof(float) * 4);
-	mSpecularShininess = 20;
-
-	for (uint32_t i = 0; i < shaderFileNames.size(); i++)
-	{
-		const ShaderFileResource* resource = resourceCallback.requestShaderFile(shaderFileNames[i].c_str());
-		if (resource)
-		{
-			std::string shaderFilePath = resource->path;
-			mShaderFilePathes.push_back(shaderFilePath);
-		}
-	}
-	mShaderGroups.reserve(mShaderFilePathes.size());
-
-	if (!mTextureFileNames[TT_Diffuse].empty())
-	{
-		mTextureResources[TT_Diffuse] = resourceCallback.requestTexture(mTextureFileNames[TT_Diffuse].c_str());
-	}
-
-	setBlending(blendMode);
-
-	reload();
-}
-
-void RenderMaterial::releaseReloadableResources()
-{
-	for (std::vector<ShaderGroup*>::iterator it = mShaderGroups.begin(); it != mShaderGroups.end(); it++)
-	{
-		delete *it;
-	}
-	mShaderGroups.clear();
-
-// Add By Lixu Begin
-	for (std::map<const IRenderMesh*, Instance*>::iterator it = mRenderMeshToInstanceMap.begin();
-		it != mRenderMeshToInstanceMap.end(); it++)
-	{
-		delete it->second;
-	}
-	mRenderMeshToInstanceMap.clear();
-// Add By Lixu End
-
-	for (int i = 0; i < TT_Num; i++)
-	{
-		SAFE_RELEASE(m_TextureSRVs[i]);
-	}	
-}
-
-RenderMaterial::~RenderMaterial()
-{
-	releaseReloadableResources();
-	SAFE_RELEASE(mBlendState);
-}
-
-void RenderMaterial::setBlending(BlendMode blendMode)
-{
-	mBlendMode = blendMode;
-
-	SAFE_RELEASE(mBlendState);
-
-	D3D11_BLEND_DESC desc;
-	ZeroMemory(&desc, sizeof(desc));
-
-	switch (blendMode)
-	{
-	case BLEND_NONE:
-		desc.RenderTarget[0].BlendEnable = FALSE;
-		desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-		break;
-	case BLEND_ALPHA_BLENDING:
-		desc.AlphaToCoverageEnable = FALSE;
-		desc.IndependentBlendEnable = TRUE;
-		desc.RenderTarget[0].BlendEnable = TRUE;
-		desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
-		desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-		desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
-		desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
-		desc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
-		desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA;
-		desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-		break;
-	case BLEND_ADDITIVE: // actually, is's additive by alpha
-		desc.AlphaToCoverageEnable = FALSE;
-		desc.IndependentBlendEnable = TRUE;
-		desc.RenderTarget[0].BlendEnable = TRUE;
-		desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
-		desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-		desc.RenderTarget[0].DestBlend = D3D11_BLEND_ONE;
-		desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE;
-		desc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
-		desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA;
-		desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-		break;
-	default:
-		PX_ALWAYS_ASSERT_MESSAGE("Unknown blend mode");
-	}
-
-	ID3D11Device* device = GetDeviceManager()->GetDevice();
-	V(device->CreateBlendState(&desc, &mBlendState));
-}
-
-void RenderMaterial::reload()
-{
-	releaseReloadableResources();
-
-	// load shaders
-	ID3D11Device* device = GetDeviceManager()->GetDevice();
-
-	for (std::vector<std::string>::iterator it = mShaderFilePathes.begin(); it != mShaderFilePathes.end(); it++)
-	{
-		const char* shaderFilePath = (*it).c_str();
-		ShaderGroup* shaderGroup = new ShaderGroup();
-		V(createShaderFromFile(device, shaderFilePath, "VS", &(shaderGroup->vs), shaderGroup->buffer));
-		createShaderFromFile(device, shaderFilePath, "PS", &shaderGroup->ps);
-		createShaderFromFile(device, shaderFilePath, "GS", &shaderGroup->gs);
-		mShaderGroups.push_back(shaderGroup);
-	}
-
-	// load texture
-	for (int i = 0; i < TT_Num; i++)
-	{
-		if (mTextureResources[i])
-		{
-			V(DirectX::CreateShaderResourceView(device,
-				mTextureResources[i]->image.GetImages(),
-				mTextureResources[i]->image.GetImageCount(),
-				mTextureResources[i]->metaData, &m_TextureSRVs[i]));
-		}
-	}
-}
-
-
-
-RenderMaterial::InstancePtr RenderMaterial::getMaterialInstance(const IRenderMesh* mesh)
-{
-	// look in cache
-	auto it = mRenderMeshToInstanceMap.find(mesh);
-	if (it != mRenderMeshToInstanceMap.end())
-	{
-// Add By Lixu Begin
-		/*
-		if (!(*it).second.expired())
-		{
-			return (*it).second.lock();
-		}
-		*/
-		return it->second;
-// Add By Lixu End
-	}
-
-	// create new
-	const std::vector<D3D11_INPUT_ELEMENT_DESC>& descs = mesh->getInputElementDesc();
-	RenderMaterial::InstancePtr instance = getMaterialInstance(&descs[0], (uint32_t)descs.size());
-	mRenderMeshToInstanceMap[mesh] = instance;
-	return instance;
-}
-
-RenderMaterial::InstancePtr RenderMaterial::getMaterialInstance(const D3D11_INPUT_ELEMENT_DESC* elementDescs, uint32_t numElements)
-{
-	ID3D11Device* device = GetDeviceManager()->GetDevice();
-
-	for (uint32_t i = 0; i < mShaderGroups.size(); i++)
-	{
-		if (mShaderGroups[i]->buffer == NULL)
-			continue;
-
-		ID3D11InputLayout* inputLayout = NULL;
-		device->CreateInputLayout(elementDescs, numElements, mShaderGroups[i]->buffer->GetBufferPointer(), mShaderGroups[i]->buffer->GetBufferSize(), &inputLayout);
-
-		if (inputLayout)
-		{
-			RenderMaterial::InstancePtr materialInstance(new Instance(*this, inputLayout, i));
-			return materialInstance;
-		}
-	}
-	PX_ALWAYS_ASSERT();
-	return NULL;
-}
-
-void RenderMaterial::Instance::bind(ID3D11DeviceContext& context, uint32_t slot, bool depthStencilOnly)
-{
-	mMaterial.mShaderGroups[mShaderNum]->Set(&context, !depthStencilOnly);
-
-	GPUShaderResource* pResource = Light::GetEnvTextureSRV();
-	ID3D11ShaderResourceView* pEnvTextureSRV = D3D11TextureResource::GetResource(pResource);
-
-	context.OMSetBlendState(mMaterial.mBlendState, nullptr, 0xFFFFFFFF);
-	context.PSSetShaderResources(slot, TT_Num, mMaterial.m_TextureSRVs);
-	context.PSSetShaderResources(TT_Num, 1, &pEnvTextureSRV);
-	context.IASetInputLayout(mInputLayout);
-}
-
-bool RenderMaterial::Instance::isValid()
-{
-	return mMaterial.mShaderGroups.size() > 0 && mMaterial.mShaderGroups[mShaderNum]->IsValid();
-}
-
-// Add By Lixu Begin
-void RenderMaterial::setTextureFileName(std::string textureFileName, TextureType tt)
-{ 
-	if (mTextureFileNames[tt] == textureFileName)
-	{
-		return;
-	}
-	mTextureFileNames[tt] = textureFileName;
-
-	mTextureResources[tt] = nullptr;
-	SAFE_RELEASE(m_TextureSRVs[tt]);
-
-	if (mTextureFileNames[tt].empty())
-	{
-		return;
-	}
-
-	std::string searchDir = mTextureFileNames[tt];
-	size_t ind = searchDir.find_last_of('/');
-	if (ind > 0 && (ind != std::string::npos))
-		searchDir = searchDir.substr(0, ind);
-
-	ResourceManager* pResourceManager = ResourceManager::ins();
-	pResourceManager->addSearchDir(searchDir.c_str());
-	mTextureResources[tt] = pResourceManager->requestTexture(mTextureFileNames[tt].c_str());
-	if (mTextureResources[tt] == nullptr)
-	{
-		return;
-	}
-
-	ID3D11Device* device = GetDeviceManager()->GetDevice();
-	DirectX::CreateShaderResourceView(device, 
-		mTextureResources[tt]->image.GetImages(), 
-		mTextureResources[tt]->image.GetImageCount(),
-		mTextureResources[tt]->metaData, &m_TextureSRVs[tt]);
-}
-
-void RenderMaterial::setDiffuseColor(float r, float g, float b, float a)
-{
-	mDiffuseColor[0] = r;
-	mDiffuseColor[1] = g;
-	mDiffuseColor[2] = b;
-	mDiffuseColor[3] = a;
-}
-
-void RenderMaterial::getDiffuseColor(float& r, float& g, float& b, float& a)
-{
-	r = mDiffuseColor[0];
-	g = mDiffuseColor[1];
-	b = mDiffuseColor[2];
-	a = mDiffuseColor[3];
-}
-
-void RenderMaterial::setSpecularColor(float r, float g, float b, float a)
-{
-	mSpecularColor[0] = r;
-	mSpecularColor[1] = g;
-	mSpecularColor[2] = b;
-	mSpecularColor[3] = a;
-}
-
-void RenderMaterial::getSpecularColor(float& r, float& g, float& b, float& a)
-{
-	r = mSpecularColor[0];
-	g = mSpecularColor[1];
-	b = mSpecularColor[2];
-	a = mSpecularColor[3];
-}
-
-RenderMaterial* g_DefaultRenderMaterial = nullptr;
-RenderMaterial* RenderMaterial::getDefaultRenderMaterial()
-{
-	if (g_DefaultRenderMaterial == nullptr)
-	{
-		ResourceManager* pResourceManager = ResourceManager::ins();
-		g_DefaultRenderMaterial = new RenderMaterial("", *pResourceManager, "model_simple_textured_ex", 0.5, 0.5, 0.5);
-	}
-	return g_DefaultRenderMaterial;
-}
-
-bool RenderMaterial::isBadTexture(TextureType tt)
-{
-	return (nullptr == m_TextureSRVs[tt]);
-}
-// Add By Lixu End
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RenderMaterial.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RenderMaterial.h
deleted file mode 100644
index 27f0672..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RenderMaterial.h
+++ /dev/null
@@ -1,178 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef RENDER_MATERIAL_H
-#define RENDER_MATERIAL_H
-
-#include "Utils.h"
-#include "DirectXTex.h"
-
-#include <string>
-#include <vector>
-#include <list>
-#include <map>
-#include <memory>
-
-
-class IRenderMesh;
-class ResourceManager;
-struct TextureResource;
-class Renderable;
-
-
-class RenderMaterial
-{
-  public:
-
-	enum BlendMode
-	{
-		BLEND_NONE,
-		BLEND_ALPHA_BLENDING,
-		BLEND_ADDITIVE
-	};
-
-	enum TextureType
-	{
-		TT_Diffuse,
-		TT_Specular,
-		TT_Normal,
-		TT_Num
-	};
-
-	RenderMaterial(const char* materialName, ResourceManager& resourceProvider, const char* shaderFileName, const char* textureFileName = "", BlendMode blendMode = BLEND_NONE);
-	RenderMaterial(const char* materialName, ResourceManager& resourceProvider, const char* shaderFileName, float r, float g, float b, float a = 1.0, BlendMode blendMode = BLEND_NONE);
-	~RenderMaterial();
-
-	void setBlending(BlendMode blendMode);
-	BlendMode getBlending() const { return mBlendMode; }
-
-	void reload();
-
-	class Instance
-	{
-	public:
-		Instance(RenderMaterial& material, ID3D11InputLayout* inputLayout, uint32_t shaderNum = 0) : mMaterial(material), mInputLayout(inputLayout), mShaderNum(shaderNum) {}
-		~Instance() { SAFE_RELEASE(mInputLayout); }
-
-		bool isValid();
-		void bind(ID3D11DeviceContext& context, uint32_t slot, bool depthStencilOnly = false);
-		RenderMaterial& getMaterial() const { return mMaterial; }
-	private:
-		RenderMaterial& mMaterial;
-		ID3D11InputLayout* mInputLayout;
-		uint32_t mShaderNum;
-	};
-
-// Add By Lixu Begin
-	typedef Instance* InstancePtr;
-	std::string getMaterialName(){ return mMaterialName; }
-	void setMaterialName(std::string materialName){ mMaterialName = materialName; }
-	std::string getTextureFileName(TextureType tt = TT_Diffuse){ return mTextureFileNames[tt]; }
-	void setTextureFileName(std::string textureFileName, TextureType tt = TT_Diffuse);
-	void getDiffuseColor(float& r, float& g, float& b, float& a);
-	void setDiffuseColor(float r, float g, float b, float a = 1.0);
-	void getSpecularColor(float& r, float& g, float& b, float& a);
-	void setSpecularColor(float r, float g, float b, float a = 1.0);
-	float getSpecularShininess() { return mSpecularShininess; }
-	void setSpecularShininess(float specularShininess) { mSpecularShininess = specularShininess; }
-	void addRelatedRenderable(Renderable* pRenderable){ mRelatedRenderables.push_back(pRenderable); }
-	std::vector<Renderable*>& getRelatedRenderables(){ return mRelatedRenderables; }
-	void clearRelatedRenderables(){ mRelatedRenderables.clear(); }
-	bool isBadTexture(TextureType tt = TT_Diffuse);
-	static RenderMaterial* getDefaultRenderMaterial();
-// Add By Lixu End
-
-	InstancePtr getMaterialInstance(const IRenderMesh* mesh);
-	InstancePtr getMaterialInstance(const D3D11_INPUT_ELEMENT_DESC* elementDescs, uint32_t numElements);
-
-  private:
-	void initialize(ResourceManager& resourceCallback, const char* shaderFileName, const char* textureFileName, BlendMode blendMode);
-	void initialize(ResourceManager&resourceProvider, std::vector<std::string> shaderFileNames, const char* textureFileName, BlendMode blendMode);
-
-	void releaseReloadableResources();
-
-	std::string mMaterialName;
-	std::string mShaderFileName;
-//	std::string mTextureFileName;
-
-	struct ShaderGroup
-	{
-		ShaderGroup() : vs(nullptr), gs(nullptr), ps(nullptr), buffer(nullptr)
-		{
-		}
-		~ShaderGroup()
-		{
-			Release();
-		}
-		void Release()
-		{
-			SAFE_RELEASE(vs);
-			SAFE_RELEASE(gs);
-			SAFE_RELEASE(ps);
-			SAFE_RELEASE(buffer);
-		}
-		void Set(ID3D11DeviceContext* c, bool setPixelShader = true)
-		{
-			c->VSSetShader(vs, nullptr, 0);
-			c->GSSetShader(gs, nullptr, 0);
-			c->PSSetShader(setPixelShader  ? ps : nullptr, nullptr, 0);
-		}
-		bool IsValid()
-		{
-			return vs != nullptr;
-		}
-		ID3D11VertexShader* vs;
-		ID3D11GeometryShader* gs;
-		ID3D11PixelShader* ps;
-		ID3DBlob* buffer;
-	};
-
-// Add By Lixu Begin
-	std::map<const IRenderMesh*, Instance*> mRenderMeshToInstanceMap;
-	std::vector<Renderable*> mRelatedRenderables;
-//	float mr;
-//	float mg;
-//	float mb;
-//	float ma;
-// Add By Lixu End
-//	const TextureResource*					mTexture;
-//	ID3D11ShaderResourceView*               mTextureSRV;
-	std::vector<std::string>                mShaderFilePathes;
-	std::vector<ShaderGroup*>               mShaderGroups;
-	ID3D11BlendState*                       mBlendState;
-	BlendMode                               mBlendMode;
-
-	std::string mTextureFileNames[TT_Num];
-	const TextureResource* mTextureResources[TT_Num];
-	ID3D11ShaderResourceView* m_TextureSRVs[TT_Num];
-	float mDiffuseColor[4];
-	float mSpecularColor[4];
-	float mSpecularShininess;
-};
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RenderUtils.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RenderUtils.h
deleted file mode 100644
index 098f7a9..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RenderUtils.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef RENDER_UTILS_H
-#define RENDER_UTILS_H
-
-#include "DirectXTex.h"
-#include <DirectXMath.h>
-#include "PxMat44.h"
-#include "PxVec3.h"
-#include "PxVec4.h"
-
-static DirectX::XMFLOAT4 getRandomPastelColor()
-{
-	float r = ((double)rand() / (RAND_MAX)) * 0.5f + 0.5f;
-	float g = ((double)rand() / (RAND_MAX)) * 0.5f + 0.5f;
-	float b = ((double)rand() / (RAND_MAX)) * 0.5f + 0.5f;
-	return DirectX::XMFLOAT4(r, g, b, 1.0f);
-}
-
-static physx::PxMat44 XMMATRIXToPxMat44(const DirectX::XMMATRIX& mat)
-{
-	physx::PxMat44 m;
-	memcpy(const_cast<float*>(m.front()), &mat.r[0], 4 * 4 * sizeof(float));
-	return m;
-}
-
-static DirectX::XMMATRIX PxMat44ToXMMATRIX(const physx::PxMat44& mat)
-{
-	return DirectX::XMMATRIX(mat.front());
-}
-
-static physx::PxVec4 XMVECTORToPxVec4(const DirectX::XMVECTOR& vec)
-{
-	DirectX::XMFLOAT4 f;
-	DirectX::XMStoreFloat4(&f, vec);
-	return physx::PxVec4(f.x, f.y, f.z, f.w);
-}
-
-static physx::PxVec3 XMFLOAT3ToPxVec3(const DirectX::XMFLOAT3& vec)
-{
-	return physx::PxVec3(vec.x, vec.y, vec.z);
-}
-
-static physx::PxVec4 XMFLOAT4ToPxVec4(const DirectX::XMFLOAT4& vec)
-{
-	return physx::PxVec4(vec.x, vec.y, vec.z, vec.w);
-}
-
-static uint32_t XMFLOAT4ToU32Color(const DirectX::XMFLOAT4& color)
-{
-	uint32_t c = 0;
-	c |= (int)(color.w * 255); c <<= 8;
-	c |= (int)(color.z * 255); c <<= 8;
-	c |= (int)(color.y * 255); c <<= 8;
-	c |= (int)(color.x * 255);
-	return c;
-}
-
-static DirectX::XMFLOAT4 XMFLOAT4Lerp(const DirectX::XMFLOAT4 v0, const DirectX::XMFLOAT4 v1, float val)
-{
-	DirectX::XMFLOAT4 v(
-		v0.x * (1 - val) + v1.x * val,
-		v0.y * (1 - val) + v1.y * val,
-		v0.z * (1 - val) + v1.z * val,
-		v0.w * (1 - val) + v1.w * val
-		);
-	return v;
-}
-
-static const physx::PxVec3 forwardVector = physx::PxVec3(0, 0, 1);
-static const physx::PxVec3 upVector = physx::PxVec3(0, 1, 0);
-static const physx::PxVec3 rightVector = physx::PxVec3(1, 0, 0);
-
-PX_INLINE physx::PxQuat quatLookAt(const physx::PxVec3 direction)
-{
-	float d = direction.dot(forwardVector);
-	if (physx::PxAbs(d + 1.0f) < 1e-5f)
-	{
-		return physx::PxQuat(physx::PxPi, upVector);
-	}
-	else if (physx::PxAbs(d - 1.0f) < 1e-5f)
-	{
-		return physx::PxQuat(physx::PxIdentity);
-	}
-	else
-	{
-		float angle = physx::PxAcos(d);
-		physx::PxVec3 axis = forwardVector.cross(direction).getNormalized();
-		return physx::PxQuat(angle, axis);
-	}
-}
-
-#endif //RENDER_UTILS_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderable.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderable.cpp
deleted file mode 100644
index b72c3b0..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderable.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "Renderable.h"
-#include "Renderer.h"
-#include "RenderUtils.h"
-#include "GlobalSettings.h"
-const DirectX::XMFLOAT4 DEFAULT_COLOR(0.5f, 0.5f, 0.5f, 1.0f);
-
-Renderable::Renderable(IRenderMesh& mesh, RenderMaterial& material) : m_mesh(mesh), m_scale(1, 1, 1), m_color(DEFAULT_COLOR), m_hidden(false), m_transform(PxIdentity)
-// Add By Lixu Begin
-, m_selected(false)
-, m_depthTest(true)
-, m_highlight(false)
-// Add By Lixu End
-{
-	setMaterial(material);
-}
-
-void Renderable::setMaterial(RenderMaterial& material)
-{
-	material.addRelatedRenderable(this);
-	m_materialInstance = material.getMaterialInstance(&m_mesh);
-}
-
-void Renderable::render(Renderer& renderer, bool depthStencilOnly) const
-{
-	if (renderer.bFetchSelection)
-	{
-		RenderMaterial::InstancePtr materialInstance = renderer.getSelectionRenderMaterialInstance();
-		if (!materialInstance->isValid())
-		{
-			PX_ALWAYS_ASSERT();
-			return;
-		}
-
-		materialInstance->bind(*renderer.m_context, 0);
-
-		// setup object CB
-		{
-			D3D11_MAPPED_SUBRESOURCE mappedResource;
-			renderer.m_context->Map(renderer.m_objectCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-			Renderer::CBObject* objectBuffer = (Renderer::CBObject*)mappedResource.pData;
-			objectBuffer->worldMatrix = PxMat44ToXMMATRIX(getModelMatrix());
-			// use selected to store mUniqueId
-			objectBuffer->selected = m_mesh.mUniqueId;
-			renderer.m_context->Unmap(renderer.m_objectCB, 0);
-		}
-
-		m_mesh.render(*renderer.m_context);
-
-		return;
-	}
-
-	if (!m_materialInstance->isValid())
-	{
-		PX_ALWAYS_ASSERT();
-		return;
-	}
-
-	m_materialInstance->bind(*renderer.m_context, 0, depthStencilOnly);
-	
-	DirectX::XMFLOAT4 diffuseColor = getColor();
-	DirectX::XMFLOAT4 specularColor = diffuseColor;
-	float useDiffuseTexture = -1.0;
-	float useSpecularTexture = -1.0;
-	float useNormalTexture = -1.0;
-	float specularShininess = 1.0;
-	bool useTexture = GlobalSettings::Inst().m_renderStyle == MESH_RENDER_TEXTURED;
-	RenderMaterial& renderMaterial = m_materialInstance->getMaterial();
-	std::string mName = renderMaterial.getMaterialName();
-	if (mName != "")
-	{
-		float r, g, b, a;
-		std::string texName;
-
-		renderMaterial.getDiffuseColor(r, g, b, a);
-		diffuseColor = DirectX::XMFLOAT4(r, g, b, a);
-		renderMaterial.getSpecularColor(r, g, b, a);
-		specularColor = DirectX::XMFLOAT4(r, g, b, a);
-			
-		texName = renderMaterial.getTextureFileName();
-		if (useTexture && texName != "" && !renderMaterial.isBadTexture())
-		{
-			useDiffuseTexture = 1.0;
-		}
-
-		texName = renderMaterial.getTextureFileName(RenderMaterial::TT_Specular);
-		if (useTexture && texName != "" && !renderMaterial.isBadTexture(RenderMaterial::TT_Specular))
-		{
-			useSpecularTexture = 1.0;
-		}
-
-		texName = renderMaterial.getTextureFileName(RenderMaterial::TT_Normal);
-		if (useTexture && texName != "" && !renderMaterial.isBadTexture(RenderMaterial::TT_Normal))
-		{
-			useNormalTexture = 1.0;
-		}
-
-		specularShininess = renderMaterial.getSpecularShininess();
-	}
-
-	float selected = -1.0;
-	if (m_selected || m_highlight)
-	{
-		selected = 1.0;
-	}
-
-	// setup object CB
-	{
-		D3D11_MAPPED_SUBRESOURCE mappedResource;
-		renderer.m_context->Map(renderer.m_objectCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-		Renderer::CBObject* objectBuffer = (Renderer::CBObject*)mappedResource.pData;
-		objectBuffer->worldMatrix = PxMat44ToXMMATRIX(getModelMatrix());
-		objectBuffer->diffuseColor = diffuseColor;
-		objectBuffer->specularColor = specularColor;
-		objectBuffer->useDiffuseTexture = useDiffuseTexture;
-		objectBuffer->useSpecularTexture = useSpecularTexture;
-		objectBuffer->useNormalTexture = useNormalTexture;
-		objectBuffer->specularShininess = specularShininess;
-		objectBuffer->selected = selected;
-		renderer.m_context->Unmap(renderer.m_objectCB, 0);
-	}
-
-	m_mesh.render(*renderer.m_context);
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderable.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderable.h
deleted file mode 100644
index 129b8f2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderable.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef RENDERABLE_H
-#define RENDERABLE_H
-
-#include "RenderMaterial.h"
-#include <DirectXMath.h>
-#include "PxMat44.h"
-#include "PxVec3.h"
-#include "PxVec4.h"
-
-using namespace physx;
-
-class Renderer;
-
-/**
-RenderMesh interface, used by Renderable
-*/
-class IRenderMesh
-{
-public:
-	virtual ~IRenderMesh() {}
-	virtual const std::vector<D3D11_INPUT_ELEMENT_DESC>& getInputElementDesc() const = 0;
-	virtual void render(ID3D11DeviceContext& context) const = 0;
-// Add By Lixu Begin
-	virtual void setScale(PxMat44 scale, bool replace) {};
-	int mUniqueId;
-// Add By Lixu End
-};
-
-/**
-Renderable, represents single object renderer by Renderer.
-Basically Renderable = RenderMaterial + RenderMesh
-*/
-class Renderable
-{
-public:
-	//////// public API ////////
-
-	// suppose chunk count is less than 10000
-	static int getRenderableId(int familyId, int chunkId)
-	{		
-		int renderableId = familyId * 10000 + chunkId;
-		return renderableId;
-	}
-	static void getFamilyChunkId(int renderableId, int& familyId, int& chunkId)
-	{
-		familyId = renderableId / 10000;
-		chunkId = renderableId % 10000;
-	}
-
-	void setMaterial(RenderMaterial& material);
-
-	PxMat44 getModelMatrix() const
-	{
-		return PxMat44(m_transform) * PxMat44(PxVec4(m_scale, 1));
-	}
-
-	void setTransform(PxTransform& transform)
-	{
-		m_transform = transform;
-	}
-
-	const PxTransform& getTransform() const
-	{
-		return m_transform;
-	}
-
-	void setScale(PxVec3 scale)
-	{
-		m_scale = scale;
-	}
-
-	const PxVec3& getScale() const
-	{
-		return m_scale;
-	}
-
-	void setColor(DirectX::XMFLOAT4 color)
-	{
-		m_color = color;
-	}
-	DirectX::XMFLOAT4 getColor() const
-	{
-		return m_color;
-	}
-
-	void setHidden(bool hidden)
-	{
-		m_hidden = hidden;
-	}
-
-	bool isHidden() const 
-	{ 
-		return m_hidden;
-	}
-
-// Add By Lixu Begin
-	void setSelected(bool selected)
-	{
-		m_selected = selected;
-	}
-
-	bool isSelected() const
-	{
-		return m_selected;
-	}
-
-	void setMeshScale(PxMat44 scale, bool replace)
-	{
-		m_mesh.setScale(scale, replace);
-	}
-
-	void setDepthTest(bool depthTest)
-	{
-		m_depthTest = depthTest;
-	}
-
-	bool isDepthTest() const
-	{
-		return m_depthTest;
-	}
-
-	void setHighlight(bool highlight)
-	{
-		m_highlight = highlight;
-	}
-
-	bool isHighlight() const
-	{
-		return m_highlight;
-	}
-// Add By Lixu End
-
-	bool isTransparent() const
-	{
-		return !(m_materialInstance->getMaterial().getBlending() == RenderMaterial::BLEND_NONE);
-	}
-
-	RenderMaterial& getMaterial() const { return m_materialInstance->getMaterial(); }
-
-private:
-	//////// methods used by Renderer ////////
-
-	friend class Renderer;
-
-	void render(Renderer& renderer) const
-	{
-		render(renderer, false);
-	}
-
-	void renderDepthStencilOnly(Renderer& renderer) const
-	{
-		render(renderer, true);
-	}
-
-	Renderable(IRenderMesh& mesh, RenderMaterial& material);
-
-	void render(Renderer& renderer, bool depthStencilOnly) const;
-
-
-	//////// internal data ////////
-
-	DirectX::XMFLOAT4           m_color;
-	PxTransform                 m_transform;
-	PxVec3                      m_scale;
-
-	RenderMaterial::InstancePtr m_materialInstance;
-	IRenderMesh&                m_mesh;
-	bool                        m_hidden;
-// Add By Lixu Begin
-	bool m_selected;
-	bool m_depthTest;
-	bool m_highlight;
-// Add By Lixu End
-};
-
-#endif //RENDERABLE_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderer.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderer.cpp
deleted file mode 100644
index 05941df..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderer.cpp
+++ /dev/null
@@ -1,1245 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "Renderer.h"
-#include "RenderUtils.h"
-#include "UIHelpers.h"
-#include "SampleProfiler.h"
-
-#include "PxRenderBuffer.h"
-
-#include <set>
-#include "SimpleScene.h"
-#include "GlobalSettings.h"
-#include "Light.h"
-#include "AppMainWindow.h"
-#include "PxVec2.h"
-
-
-const float CAMERA_CLIP_NEAR = 1.0f;
-const float CAMERA_CLIP_FAR = 1000.00f;
-
-const float CLEAR_SCENE_COLOR[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-
-const int RenderTarget_Size = 512;
-const float SelectionTexture_InitData = -1;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Renderer
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-Renderer* g_Renderer = nullptr;
-Renderer* Renderer::Inst()
-{
-	return g_Renderer;
-}
-
-
-Renderer::Renderer()
-: m_cameraCB(nullptr)
-, m_worldCB(nullptr)
-, m_objectCB(nullptr)
-, m_opaqueRenderDSState(nullptr)
-, m_transparencyRenderDSState(nullptr)
-, m_opaqueRenderNoDepthDSState(nullptr)
-, m_DSTexture(nullptr)
-, m_DSView(nullptr)
-, m_DSTextureSRV(nullptr)
-, m_selectionRenderTargetTexture(nullptr)
-, m_selectionRenderTargetView(nullptr)
-, m_selectionRenderTargetSRV(nullptr)
-, m_selectionDepthStencilTexture(nullptr)
-, m_selectionDepthStencilView(nullptr)
-, m_selectionDepthStencilSRV(nullptr)
-, m_selectionTextureForCPU(nullptr)
-, m_pointSampler(nullptr)
-, m_linearSampler(nullptr)
-, m_wireframeMode(false)
-, m_debugPrimitiveVB(nullptr)
-, m_debugPrimitiveVBVerticesCount(0)
-, m_screenPrimitiveVB(nullptr)
-, m_screenPrimitiveVBVerticesCount(0)
-, m_shadowEnabled(true)
-, m_HBAOEnabled(true)
-, m_visibleOpaqueRenderablesCount(0)
-, m_visibleTransparentRenderablesCount(0)
-{
-	m_worldCBData.ambientColor = DirectX::XMFLOAT3(0.21f, 0.21f, 0.22f);
-	m_worldCBData.pointLightColor = DirectX::XMFLOAT3(1.0f, 1.0f, 1.0f);
-	m_worldCBData.pointLightPos = DirectX::XMFLOAT3(0.0f, 30.0f, 12.0f);
-	m_worldCBData.dirLightColor = DirectX::XMFLOAT3(0.0f, 0.0f, 0.0f);
-	m_worldCBData.dirLightDir = DirectX::XMFLOAT3(-0.08f, -0.34f, -0.91f);
-	m_worldCBData.specularPower = 140.0f;
-	m_worldCBData.specularIntensity = 0.4f;
-	
-	m_RSState[0] = nullptr;
-	m_RSState[1] = nullptr;
-
-	toggleCameraSpeed(false);
-
-	g_Renderer = this;
-	bFetchSelection = false;
-}
-
-Renderer::~Renderer()
-{
-}
-
-void Renderer::initializeDefaultRSState()
-{
-	D3D11_RASTERIZER_DESC desc;
-	ZeroMemory(&desc, sizeof(desc));
-	desc.CullMode = D3D11_CULL_NONE;
-	desc.AntialiasedLineEnable = FALSE;
-	desc.DepthBias = 0;
-	desc.DepthBiasClamp = 0;
-	desc.DepthClipEnable = TRUE;
-	desc.FrontCounterClockwise = FALSE;
-	desc.MultisampleEnable = TRUE;
-	desc.ScissorEnable = FALSE;
-	desc.SlopeScaledDepthBias = 0;
-
-	desc.FillMode = D3D11_FILL_SOLID;
-	V(m_device->CreateRasterizerState(&desc, &m_RSState[0]));
-
-	desc.FillMode = D3D11_FILL_WIREFRAME;
-	V(m_device->CreateRasterizerState(&desc, &m_RSState[1]));
-}
-
-HRESULT Renderer::DeviceCreated(ID3D11Device* device)
-{
-	m_device = device;
-
-	// Camera constant buffer
-	{
-		D3D11_BUFFER_DESC buffer_desc;
-		ZeroMemory(&buffer_desc, sizeof(buffer_desc));
-		buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-		buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-		buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-		buffer_desc.ByteWidth = sizeof(CBCamera);
-		_ASSERT((buffer_desc.ByteWidth % 16) == 0);
-
-		V(device->CreateBuffer(&buffer_desc, nullptr, &m_cameraCB));
-	}
-
-	// World constant buffer
-	{
-		D3D11_BUFFER_DESC buffer_desc;
-		ZeroMemory(&buffer_desc, sizeof(buffer_desc));
-		buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-		buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-		buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-		buffer_desc.ByteWidth = sizeof(CBWorld);
-		_ASSERT((buffer_desc.ByteWidth % 16) == 0);
-
-		V(device->CreateBuffer(&buffer_desc, nullptr, &m_worldCB));
-	}
-
-	// Object constant buffer
-	{
-		D3D11_BUFFER_DESC buffer_desc;
-		ZeroMemory(&buffer_desc, sizeof(buffer_desc));
-		buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-		buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-		buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-		buffer_desc.ByteWidth = sizeof(CBObject);
-		_ASSERT((buffer_desc.ByteWidth % 16) == 0);
-
-		V(device->CreateBuffer(&buffer_desc, nullptr, &m_objectCB));
-	}
-
-	// Opaque Render Depth-Stencil state
-	{
-		D3D11_DEPTH_STENCIL_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.StencilEnable = FALSE;
-		desc.DepthEnable = TRUE;
-		desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
-		desc.DepthFunc = D3D11_COMPARISON_LESS_EQUAL;
-
-		V(device->CreateDepthStencilState(&desc, &m_opaqueRenderDSState));
-	}
-
-	// Transparency Render Depth-Stencil state
-	{
-		D3D11_DEPTH_STENCIL_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.StencilEnable = FALSE;
-		desc.DepthEnable = TRUE;
-		desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO;
-		desc.DepthFunc = D3D11_COMPARISON_LESS_EQUAL;
-
-		V(device->CreateDepthStencilState(&desc, &m_transparencyRenderDSState));
-	}
-
-	// Opaque Render Depth-Stencil state Without Depth Test
-	{
-		D3D11_DEPTH_STENCIL_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.StencilEnable = FALSE;
-		desc.DepthEnable = FALSE;
-		desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
-		desc.DepthFunc = D3D11_COMPARISON_LESS_EQUAL;
-
-		V(device->CreateDepthStencilState(&desc, &m_opaqueRenderNoDepthDSState));
-	}
-
-	// Linear sampler
-	{
-		D3D11_SAMPLER_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-		desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP;
-		desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP;
-		desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
-		desc.MaxAnisotropy = 1;
-		desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
-		desc.MinLOD = 0;
-		desc.MaxLOD = D3D11_FLOAT32_MAX;
-		V(device->CreateSamplerState(&desc, &m_linearSampler));
-	}
-
-	// Point sampler
-	{
-		D3D11_SAMPLER_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
-		desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP;
-		desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP;
-		desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
-		desc.MaxAnisotropy = 1;
-		desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
-		desc.MinLOD = 0;
-		desc.MaxLOD = D3D11_FLOAT32_MAX;
-		V(device->CreateSamplerState(&desc, &m_pointSampler));
-	}
-
-	// Rasterizer state
-	initializeDefaultRSState();
-
-	// init primitive render meshes
-	for (uint32_t i = 0; i < PrimitiveRenderMeshType::Count; i++)
-	{
-		m_primitiveRenderMeshes[i] = nullptr;
-	}
-
-	// init shadows
-	ID3D11DeviceContext* pd3dDeviceContext;
-	m_device->GetImmediateContext(&pd3dDeviceContext);
-	m_shadow.createResources(m_device, pd3dDeviceContext, &m_camera);
-
-	// init hbao
-	m_HBAO.createResources(m_device);
-
-	return S_OK;
-}
-
-void Renderer::DeviceDestroyed()
-{
-	SAFE_RELEASE(m_cameraCB);
-	SAFE_RELEASE(m_worldCB);
-	SAFE_RELEASE(m_objectCB);
-	SAFE_RELEASE(m_RSState[0]);
-	SAFE_RELEASE(m_RSState[1]);
-	SAFE_RELEASE(m_opaqueRenderDSState);
-	SAFE_RELEASE(m_transparencyRenderDSState);
-	SAFE_RELEASE(m_opaqueRenderNoDepthDSState);
-	SAFE_RELEASE(m_pointSampler);
-	SAFE_RELEASE(m_linearSampler);
-	SAFE_RELEASE(m_debugPrimitiveVB);
-	SAFE_RELEASE(m_screenPrimitiveVB);
-	SAFE_RELEASE(m_DSTexture);
-	SAFE_RELEASE(m_DSView);
-	SAFE_RELEASE(m_DSTextureSRV);
-	SAFE_RELEASE(m_selectionRenderTargetTexture);
-	SAFE_RELEASE(m_selectionRenderTargetView);
-	SAFE_RELEASE(m_selectionRenderTargetSRV);
-	SAFE_RELEASE(m_selectionDepthStencilTexture);
-	SAFE_RELEASE(m_selectionDepthStencilView);
-	SAFE_RELEASE(m_selectionDepthStencilSRV);
-	SAFE_RELEASE(m_selectionTextureForCPU);
-
-	for (uint32_t i = 0; i < PrimitiveRenderMeshType::Count; i++)
-	{
-		SAFE_DELETE(m_primitiveRenderMeshes[i]);
-	}
-}
-
-void Renderer::onInitialize()
-{
-	// search paths
-	m_resourceManager.addSearchDir("..\\resources");
-	m_resourceManager.addSearchDir("..\\..\\..\\..\\bin\\resources");
-	//m_resourceManager.addSearchDir("..\\..\\samples\\resources");
-	//m_resourceManager.addSearchDir("..\\..\\..\\samples\\resources");
-
-	// debug primitive render material and input layout
-	{
-		m_debugPrimitiveRenderMaterial = new RenderMaterial("", m_resourceManager, "debug_primitive", "");
-
-		D3D11_INPUT_ELEMENT_DESC layout[] = {
-			{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-			{ "COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 }
-		};
-
-		m_debugPrimitiveRenderMaterialInstance = m_debugPrimitiveRenderMaterial->getMaterialInstance(layout, ARRAYSIZE(layout));
-	}
-
-	// screen primitive render material and input layout
-	{
-		m_screenPrimitiveRenderMaterial = new RenderMaterial("", m_resourceManager, "screen_primitive_ex", "");
-
-		D3D11_INPUT_ELEMENT_DESC layout[] = {
-			{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-			{ "COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 }
-		};
-
-		m_screenPrimitiveRenderMaterialInstance = m_screenPrimitiveRenderMaterial->getMaterialInstance(layout, ARRAYSIZE(layout));
-	}
-
-	// selection render material and input layout
-	{
-		m_selectionRenderMaterial = new RenderMaterial("idm", m_resourceManager, "model_simple_id_ex", "");
-
-		D3D11_INPUT_ELEMENT_DESC layout[] = {
-			{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-			{ "VERTEX_NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-			{ "FACE_NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-			{ "TANGENT", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 36, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-			{ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 48, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-			{ "TEXCOORD", 1, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }
-		};
-
-		m_selectionRenderMaterialInstance = m_selectionRenderMaterial->getMaterialInstance(layout, ARRAYSIZE(layout));
-	}
-}
-
-void Renderer::onTerminate()
-{
-	SAFE_DELETE(m_debugPrimitiveRenderMaterial);
-	SAFE_DELETE(m_screenPrimitiveRenderMaterial);
-}
-
-void Renderer::BackBufferResized(ID3D11Device* /*device*/, const DXGI_SURFACE_DESC* sd)
-{
-	// Setup the camera's projection parameters
-	m_screenWidth = sd->Width;
-	m_screenHeight = sd->Height;
-	float fAspectRatio = m_screenWidth / m_screenHeight;
-	float fov = (GlobalSettings::Inst().m_fovAngle / 360.0f) * 3.141592653589793;
-	m_camera.SetProjParams(fov, fAspectRatio, CAMERA_CLIP_NEAR, CAMERA_CLIP_FAR);
-
-	SAFE_RELEASE(m_DSTexture);
-	SAFE_RELEASE(m_DSView);
-	SAFE_RELEASE(m_DSTextureSRV);
-	SAFE_RELEASE(m_selectionRenderTargetTexture);
-	SAFE_RELEASE(m_selectionRenderTargetView);
-	SAFE_RELEASE(m_selectionRenderTargetSRV);
-	SAFE_RELEASE(m_selectionDepthStencilTexture);
-	SAFE_RELEASE(m_selectionDepthStencilView);
-	SAFE_RELEASE(m_selectionDepthStencilSRV);
-	SAFE_RELEASE(m_selectionTextureForCPU);
-
-	// create m_selectionRenderTargetTexture
-	{
-		D3D11_TEXTURE2D_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Width = RenderTarget_Size;
-		desc.Height = RenderTarget_Size;
-		desc.MipLevels = 1;
-		desc.ArraySize = 1;
-		desc.Format = DXGI_FORMAT_R32_FLOAT; // Use a typeless type here so that it can be both depth-stencil and shader resource.
-		desc.SampleDesc.Count = 1;
-		desc.SampleDesc.Quality = 0;
-		desc.Usage = D3D11_USAGE_DEFAULT;
-		desc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
-		desc.CPUAccessFlags = 0;
-		desc.MiscFlags = 0;
-		V(m_device->CreateTexture2D(&desc, NULL, &m_selectionRenderTargetTexture));
-	}
-
-	// create m_selectionRenderTargetView
-	{
-		D3D11_RENDER_TARGET_VIEW_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
-		desc.Format = DXGI_FORMAT_R32_FLOAT;	// Make the view see this as D32_FLOAT instead of typeless
-		desc.Texture2D.MipSlice = 0;
-		V(m_device->CreateRenderTargetView(m_selectionRenderTargetTexture, &desc, &m_selectionRenderTargetView));
-	}
-
-	// create m_selectionRenderTargetSRV
-	{
-		D3D11_SHADER_RESOURCE_VIEW_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Format = DXGI_FORMAT_R32_FLOAT;	// Make the shaders see this as R32_FLOAT instead of typeless
-		desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-		desc.Texture2D.MipLevels = 1;
-		desc.Texture2D.MostDetailedMip = 0;
-		V(m_device->CreateShaderResourceView(m_selectionRenderTargetTexture, &desc, &m_selectionRenderTargetSRV));
-	}
-
-	// create m_selectionDepthStencilTexture
-	{
-		D3D11_TEXTURE2D_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Width = RenderTarget_Size;
-		desc.Height = RenderTarget_Size;
-		desc.MipLevels = 1;
-		desc.ArraySize = 1;
-		desc.Format = DXGI_FORMAT_R32_TYPELESS; // Use a typeless type here so that it can be both depth-stencil and shader resource.
-		desc.SampleDesc.Count = 1;
-		desc.SampleDesc.Quality = 0;
-		desc.Usage = D3D11_USAGE_DEFAULT;
-		desc.BindFlags = D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_SHADER_RESOURCE;
-		desc.CPUAccessFlags = 0;
-		desc.MiscFlags = 0;
-		V(m_device->CreateTexture2D(&desc, NULL, &m_selectionDepthStencilTexture));
-	}
-
-	// create m_selectionDepthStencilView
-	{
-		D3D11_DEPTH_STENCIL_VIEW_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
-		desc.Format = DXGI_FORMAT_D32_FLOAT;	// Make the view see this as D32_FLOAT instead of typeless
-		desc.Texture2D.MipSlice = 0;
-		V(m_device->CreateDepthStencilView(m_selectionDepthStencilTexture, &desc, &m_selectionDepthStencilView));
-	}
-
-	// create m_selectionDepthStencilSRV
-	{
-		D3D11_SHADER_RESOURCE_VIEW_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Format = DXGI_FORMAT_R32_FLOAT;	// Make the shaders see this as R32_FLOAT instead of typeless
-		desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-		desc.Texture2D.MipLevels = 1;
-		desc.Texture2D.MostDetailedMip = 0;
-		V(m_device->CreateShaderResourceView(m_selectionDepthStencilTexture, &desc, &m_selectionDepthStencilSRV));
-	}
-
-	// create m_selectionTextureForCPU
-	{
-		D3D11_TEXTURE2D_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Width = RenderTarget_Size;
-		desc.Height = RenderTarget_Size;
-		desc.MipLevels = 1;
-		desc.ArraySize = 1;
-		desc.Format = DXGI_FORMAT_R32_FLOAT; // Use a typeless type here so that it can be both depth-stencil and shader resource.
-		desc.SampleDesc.Count = 1;
-		desc.SampleDesc.Quality = 0;
-		desc.Usage = D3D11_USAGE_STAGING;
-		desc.BindFlags = 0;
-		desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-		desc.MiscFlags = 0;
-		V(m_device->CreateTexture2D(&desc, NULL, &m_selectionTextureForCPU));
-	}
-
-	// create a new Depth-Stencil texture 
-	{
-		D3D11_TEXTURE2D_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Width = sd->Width;
-		desc.Height = sd->Height;
-		desc.MipLevels = 1;
-		desc.ArraySize = 1;
-		desc.Format = DXGI_FORMAT_R32_TYPELESS; // Use a typeless type here so that it can be both depth-stencil and shader resource.
-		desc.SampleDesc.Count = sd->SampleDesc.Count;
-		desc.SampleDesc.Quality = sd->SampleDesc.Quality;
-		desc.Usage = D3D11_USAGE_DEFAULT;
-		desc.BindFlags = D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_SHADER_RESOURCE;
-		desc.CPUAccessFlags = 0;
-		desc.MiscFlags = 0;
-		V(m_device->CreateTexture2D(&desc, NULL, &m_DSTexture));
-	}
-
-	// create Depth-Stencil view
-	{
-		D3D11_DEPTH_STENCIL_VIEW_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.ViewDimension = sd->SampleDesc.Count > 1 ? D3D11_DSV_DIMENSION_TEXTURE2DMS : D3D11_DSV_DIMENSION_TEXTURE2D;
-		desc.Format = DXGI_FORMAT_D32_FLOAT;	// Make the view see this as D32_FLOAT instead of typeless
-		desc.Texture2D.MipSlice = 0;
-		V(m_device->CreateDepthStencilView(m_DSTexture, &desc, &m_DSView));
-	}
-
-	// create Depth-Stencil shader resource view
-	{
-		D3D11_SHADER_RESOURCE_VIEW_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Format = DXGI_FORMAT_R32_FLOAT;	// Make the shaders see this as R32_FLOAT instead of typeless
-		desc.ViewDimension = sd->SampleDesc.Count > 1 ? D3D11_SRV_DIMENSION_TEXTURE2DMS : D3D11_SRV_DIMENSION_TEXTURE2D;
-		desc.Texture2D.MipLevels = 1;
-		desc.Texture2D.MostDetailedMip = 0;
-		V(m_device->CreateShaderResourceView(m_DSTexture, &desc, &m_DSTextureSRV));
-	}
-
-	// setup viewport
-	m_viewport.Width = (FLOAT)sd->Width;
-	m_viewport.Height = (FLOAT)sd->Height;
-	m_viewport.MinDepth = 0;
-	m_viewport.MaxDepth = 1;
-	m_viewport.TopLeftX = 0;
-	m_viewport.TopLeftY = 0;
-
-	// setup shadows
-	m_shadow.setScreenResolution(0, sd->Width, sd->Height, sd->SampleDesc.Count, nullptr);
-}
-
-void Renderer::setAllConstantBuffers(ID3D11DeviceContext* ctx)
-{
-	ID3D11Buffer* cbs[3] = { m_cameraCB, m_worldCB, m_objectCB };
-	ctx->VSSetConstantBuffers(0, 3, cbs);
-	ctx->GSSetConstantBuffers(0, 3, cbs);
-	ctx->PSSetConstantBuffers(0, 3, cbs);
-}
-
-void Renderer::Render(ID3D11Device* /*device*/, ID3D11DeviceContext* ctx, ID3D11RenderTargetView* pRTV,
-						  ID3D11DepthStencilView*)
-{
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-	if (!globalSettings.m_showGraphicsMesh)
-		return;
-
-	PROFILER_SCOPED_FUNCTION();
-
-	m_context = ctx;
-
-	ctx->ClearDepthStencilView(m_DSView, D3D11_CLEAR_DEPTH, 1.0, 0);
-	ctx->RSSetViewports(1, &m_viewport);
-
-	// needed matrices
-	DirectX::XMMATRIX viewMatrix = SimpleScene::Inst()->GetViewMatrix();
-	DirectX::XMMATRIX projMatrix = SimpleScene::Inst()->GetProjMatrix();
-	DirectX::XMMATRIX projMatrixInv = DirectX::XMMatrixInverse(NULL, projMatrix);
-	DirectX::XMMATRIX viewProjMatrix = viewMatrix * projMatrix;
-
-	// Fill Camera constant buffer
-	{
-		D3D11_MAPPED_SUBRESOURCE mappedResource;
-		ctx->Map(m_cameraCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-		CBCamera* cameraBuffer = (CBCamera*)mappedResource.pData;
-		cameraBuffer->viewProjection = viewProjMatrix;
-		cameraBuffer->projectionInv = projMatrixInv;
-		DirectX::XMStoreFloat3(&(cameraBuffer->viewPos), SimpleScene::Inst()->GetEyePt());
-		ctx->Unmap(m_cameraCB, 0);
-	}
-
-	// Fill World constant buffer
-	{
-		D3D11_MAPPED_SUBRESOURCE mappedResource;
-		ctx->Map(m_worldCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-		CBWorld* worldBuffer = (CBWorld*)mappedResource.pData;
-		float flatNormal = -1.0;
-		if (globalSettings.m_renderStyle == MESH_RENDER_FLAT)
-		{
-			flatNormal = 1.0;
-		}
-		float useLighting = 1.0;
-		if (!globalSettings.m_useLighting)
-		{
-			useLighting = -1.0;
-		}
-		m_worldCBData.flatNormal = flatNormal;
-		m_worldCBData.wireFrameOver = -1.0;
-		m_worldCBData.useLighting = useLighting;
-		Light::FillLightShaderParam(m_worldCBData.lightParam);
-		memcpy(worldBuffer, &m_worldCBData, sizeof(m_worldCBData));
-		//worldBuffer->ambientColor = m_CBWorldData.ambientColor;
-		//worldBuffer->pointLightPos = m_CBWorldData.pointLightPos;
-		//worldBuffer->pointLightColor = m_CBWorldData.pointLightColor;
-		//worldBuffer->dirLightDir = m_CBWorldData.dirLightDir;
-		//worldBuffer->specularPower = m_CBWorldData.specularPower;
-		//worldBuffer->dirLightColor = m_CBWorldData.dirLightColor;
-		//worldBuffer->specularIntensity = m_CBWorldData.specularIntensity;
-		ctx->Unmap(m_worldCB, 0);
-	}
-
-	if (globalSettings.m_renderStyle != MESH_RENDER_WIREFRAME)
-	{
-		ctx->RSSetState(m_RSState[0]);
-	}
-	else
-	{
-		ctx->RSSetState(m_RSState[1]);
-	}
-	
-	ctx->PSSetSamplers(0, 1, &m_linearSampler);
-	ctx->PSSetSamplers(1, 1, &m_pointSampler);
-
-
-	if (m_shadowEnabled)
-	{
-		// render depth only
-		{
-			ctx->OMSetRenderTargets(0, nullptr, m_DSView);
-			ctx->OMSetDepthStencilState(m_opaqueRenderDSState, 0xFF);
-
-			// set constants buffers
-			setAllConstantBuffers(ctx);
-
-			for (auto it = m_renderables.begin(); it != m_renderables.end(); it++)
-			{
-				if (!(*it)->isTransparent() && !(*it)->isHidden())
-					(*it)->renderDepthStencilOnly(*this);
-			}
-		}
-
-		m_shadow.clearBuffer();
-
-		std::vector<Light>& lights = Light::GetDefaultLights();
-		for (int l = 0; l < 3; l++)
-		{
-			if (!lights[l].m_useShadows)
-			{
-				continue;
-			}
-
-			atcore_float3 eye = lights[l].m_lightCamera._eye;
-			eye.x = -eye.x;
-			atcore_float3 at = lights[l].m_lightCamera._at;
-			at.x = -at.x;
-
-			ctx->OMSetRenderTargets(0, nullptr, m_DSView);
-			m_shadow.renderShadowMaps(this, eye, at);
-			ctx->OMSetRenderTargets(0, nullptr, nullptr);
-			m_shadow.renderShadowBuffer(m_DSTextureSRV, nullptr);
-		}
-
-		m_shadow.finalizeBuffer();
-	}
-
-	// Opaque render
-	{
-		ctx->RSSetViewports(1, &m_viewport);
-		ctx->OMSetRenderTargets(1, &pRTV, m_DSView);
-		ctx->OMSetDepthStencilState(m_opaqueRenderDSState, 0xFF);
-
-		// set constants buffers
-		setAllConstantBuffers(ctx);
-
-		// Fill Camera constant buffer
-		{
-			D3D11_MAPPED_SUBRESOURCE mappedResource;
-			ctx->Map(m_cameraCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-			CBCamera* cameraBuffer = (CBCamera*)mappedResource.pData;
-			cameraBuffer->viewProjection = viewProjMatrix;
-			cameraBuffer->projectionInv = projMatrixInv;
-			DirectX::XMStoreFloat3(&(cameraBuffer->viewPos), SimpleScene::Inst()->GetEyePt());
-			ctx->Unmap(m_cameraCB, 0);
-		}
-
-		std::vector<Renderable*> renderablesWithoutDepthTest;
-
-		// Render opaque renderables
-		m_visibleOpaqueRenderablesCount = 0;
-		for (auto it = m_renderables.begin(); it != m_renderables.end(); it++)
-		{
-			if (!(*it)->isTransparent() && !(*it)->isHidden())
-			{
-				if (!(*it)->isDepthTest())
-				{
-					renderablesWithoutDepthTest.push_back(*it);
-					continue;
-				}
-				(*it)->render(*this);
-				m_visibleOpaqueRenderablesCount++;
-			}
-		}
-
-		if (renderablesWithoutDepthTest.size() > 0)
-		{
-			ctx->OMSetDepthStencilState(m_opaqueRenderNoDepthDSState, 0xFF);
-			std::vector<Renderable*>::iterator itR;
-			for (itR = renderablesWithoutDepthTest.begin(); itR != renderablesWithoutDepthTest.end(); itR++)
-			{
-				(*itR)->render(*this);
-			}
-			ctx->OMSetDepthStencilState(m_opaqueRenderDSState, 0xFF);
-		}
-	}
-
-	// draw overline	
-	if (globalSettings.m_showWireframe)
-	{
-		if (globalSettings.m_renderStyle != MESH_RENDER_WIREFRAME)
-		{
-			ctx->RSSetState(m_RSState[1]);
-		}
-
-		// update wireFrameOver
-		{
-			D3D11_MAPPED_SUBRESOURCE mappedResource;
-			ctx->Map(m_worldCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-			CBWorld* worldBuffer = (CBWorld*)mappedResource.pData;
-			float wireFrameOver = -1.0;
-			{
-				if (globalSettings.m_showWireframe)
-				{
-					wireFrameOver = 1.0;
-				}
-			}
-			m_worldCBData.wireFrameOver = wireFrameOver;
-			memcpy(worldBuffer, &m_worldCBData, sizeof(m_worldCBData));
-			ctx->Unmap(m_worldCB, 0);
-		}
-
-		for (auto it = m_renderables.begin(); it != m_renderables.end(); it++)
-		{
-			if (!(*it)->isTransparent() && !(*it)->isHidden())
-			{
-				(*it)->render(*this);
-			}
-		}
-
-		if (globalSettings.m_renderStyle != MESH_RENDER_WIREFRAME)
-		{
-			ctx->RSSetState(m_RSState[0]);
-		}
-	}
-
-	// modulate shadows
-	if (m_shadowEnabled && globalSettings.m_useLighting)
-	{
-		m_shadow.modulateShadowBuffer(pRTV);
-	}
-
-	// render AO
-	if (m_HBAOEnabled)
-	{
-		m_HBAO.renderAO(m_context, pRTV, m_DSTextureSRV, projMatrix);
-	}
-
-	ctx->RSSetViewports(1, &m_viewport);
-
-	// render debug render buffers
-	if (!AppMainWindow::Inst().m_bGizmoWithDepthTest)
-	{
-		ctx->OMSetDepthStencilState(m_opaqueRenderNoDepthDSState, 0xFF);
-	}
-	while (m_queuedRenderBuffers.size() > 0)
-	{
-		render(m_queuedRenderBuffers.back());
-		m_queuedRenderBuffers.pop_back();
-	}
-	while (m_screenRenderBuffers.size() > 0)
-	{
-		render(m_screenRenderBuffers.back(), true);
-		m_screenRenderBuffers.pop_back();
-	}
-
-	// Transparency render
-	ctx->OMSetRenderTargets(1, &pRTV, m_DSView);
-	ctx->OMSetDepthStencilState(m_transparencyRenderDSState, 0xFF);
-
-	// depth as SRV isn't used now (uncommenting will produce a warning, probably need readonly depth?)
-	//ctx->PSSetShaderResources(1, 1, &mDSTextureSRV);
-
-	// Render transparent renderables
-	m_visibleTransparentRenderablesCount = 0;
-	for (auto it = m_renderables.begin(); it != m_renderables.end(); it++)
-	{
-		if ((*it)->isTransparent() && !(*it)->isHidden())
-		{
-			(*it)->render(*this);
-			m_visibleTransparentRenderablesCount++;
-		}
-	}
-
-	// shadows debug render
-	if (0)
-	{
-		m_shadow.displayMapFrustums(pRTV, m_DSView);
-	}
-
-	// Reset RT and SRV state
-	ID3D11ShaderResourceView* nullAttach[16] = { nullptr };
-	ctx->PSSetShaderResources(0, 16, nullAttach);
-	ctx->OMSetRenderTargets(0, nullptr, nullptr);
-}
-
-LRESULT Renderer::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	PX_UNUSED(hWnd);
-	PX_UNUSED(wParam);
-	PX_UNUSED(lParam);
-
-	if (uMsg == WM_KEYDOWN || uMsg == WM_KEYUP)
-	{
-		// Camera overspeed event
-		int iKeyPressed = static_cast<int>(wParam);
-		if (iKeyPressed == VK_SHIFT)
-		{
-			toggleCameraSpeed(uMsg == WM_KEYDOWN);
-		}
-	}
-
-	UpdateCamera();
-
-	return 0;
-
-	// Camera events
-	return m_camera.HandleMessages(hWnd, uMsg, wParam, lParam);
-}
-
-void Renderer::Animate(double fElapsedTimeSeconds)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	m_camera.FrameMove((float)fElapsedTimeSeconds);
-}
-
-void Renderer::renderDepthOnly(DirectX::XMMATRIX* viewProjectionSubstitute)
-{
-	// Fill Camera constant buffer
-	if (viewProjectionSubstitute)
-	{
-		D3D11_MAPPED_SUBRESOURCE mappedResource;
-		m_context->Map(m_cameraCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-		CBCamera* cameraBuffer = (CBCamera*)mappedResource.pData;
-		cameraBuffer->viewProjection = *viewProjectionSubstitute;
-		m_context->Unmap(m_cameraCB, 0);
-	}
-
-	// set constants buffers
-	setAllConstantBuffers(m_context);
-
-	// render
-	for (auto it = m_renderables.begin(); it != m_renderables.end(); it++)
-	{
-		if (!(*it)->isTransparent() && !(*it)->isHidden())
-			(*it)->renderDepthStencilOnly(*this);
-	}
-}
-
-void Renderer::render(const PxRenderBuffer* renderBuffer, bool bScreen)
-{
-	// points 
-	uint32_t pointsCount = renderBuffer->getNbPoints();
-	if (pointsCount > 0)
-	{
-		RenderDebugVertex* verts = new RenderDebugVertex[pointsCount];
-		const PxDebugPoint* points = renderBuffer->getPoints();
-		for (uint32_t i = 0; i < pointsCount; i++)
-		{
-			verts[i].mPos = points[i].pos;
-			verts[i].mColor = points[i].color;
-		}
-
-		renderDebugPrimitive(verts, pointsCount, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST);
-		delete[] verts;
-	}
-
-	// lines 
-	uint32_t linesCount = renderBuffer->getNbLines();
-	if (linesCount > 0)
-	{
-		RenderDebugVertex* verts = new RenderDebugVertex[linesCount * 2];
-		const PxDebugLine* lines = renderBuffer->getLines();
-		for (uint32_t i = 0; i < linesCount; i++)
-		{
-			verts[i * 2].mPos = lines[i].pos0;
-			verts[i * 2].mColor = lines[i].color0;
-			verts[i * 2 + 1].mPos = lines[i].pos1;
-			verts[i * 2 + 1].mColor = lines[i].color1;
-		}
-
-		renderDebugPrimitive(verts, linesCount * 2, D3D11_PRIMITIVE_TOPOLOGY_LINELIST, bScreen);
-		delete[] verts;
-	}
-
-	// triangles 
-	uint32_t trianglesCount = renderBuffer->getNbTriangles();
-	if (trianglesCount > 0)
-	{
-		RenderDebugVertex* verts = new RenderDebugVertex[trianglesCount * 3];
-		const PxDebugTriangle* triangles = renderBuffer->getTriangles();
-		for (uint32_t i = 0; i < trianglesCount; i++)
-		{
-			verts[i * 3].mPos = triangles[i].pos0;
-			verts[i * 3].mColor = triangles[i].color0;
-			verts[i * 3 + 1].mPos = triangles[i].pos1;
-			verts[i * 3 + 1].mColor = triangles[i].color1;
-			verts[i * 3 + 2].mPos = triangles[i].pos2;
-			verts[i * 3 + 2].mColor = triangles[i].color2;
-		}
-
-		renderDebugPrimitive(verts, trianglesCount * 3, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-		delete[] verts;
-	}
-
-	// texts?
-	// ....
-}
-
-void Renderer::renderDebugPrimitive(const Renderer::RenderDebugVertex *vertices, uint32_t verticesCount, D3D11_PRIMITIVE_TOPOLOGY topology, bool bScreen)
-{
-	m_context->IASetPrimitiveTopology(topology);
-
-	if (bScreen)
-	{
-		m_screenPrimitiveRenderMaterialInstance->bind(*m_context, 0);
-	}
-	else
-	{
-		m_debugPrimitiveRenderMaterialInstance->bind(*m_context, 0);
-	}
-
-	D3D11_MAPPED_SUBRESOURCE mappedResource;
-	m_context->Map(m_objectCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-	CBObject* objectBuffer = (CBObject*)mappedResource.pData;
-
-	objectBuffer->worldMatrix = PxMat44ToXMMATRIX(PxMat44(PxIdentity));
-
-	m_context->Unmap(m_objectCB, 0);
-
-	if (m_debugPrimitiveVBVerticesCount < verticesCount)
-	{
-		m_debugPrimitiveVBVerticesCount = verticesCount;
-		SAFE_RELEASE(m_debugPrimitiveVB);
-
-		D3D11_BUFFER_DESC bufferDesc;
-
-		memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-		bufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-		bufferDesc.ByteWidth = sizeof(Renderer::RenderDebugVertex) * m_debugPrimitiveVBVerticesCount;
-		bufferDesc.CPUAccessFlags = 0;
-		bufferDesc.MiscFlags = 0;
-		bufferDesc.Usage = D3D11_USAGE_DEFAULT;
-
-		V(m_device->CreateBuffer(&bufferDesc, NULL, &m_debugPrimitiveVB));
-	}
-
-	CD3D11_BOX box(0, 0, 0, (LONG)(sizeof(Renderer::RenderDebugVertex) * verticesCount), 1, 1);
-	m_context->UpdateSubresource(m_debugPrimitiveVB, 0, &box, vertices, 0, 0);
-
-	ID3D11Buffer* pBuffers[1] = { m_debugPrimitiveVB };
-	UINT strides[1] = { sizeof(RenderDebugVertex) };
-	UINT offsets[1] = { 0 };
-	m_context->IASetVertexBuffers(0, 1, pBuffers, strides, offsets);
-
-	m_context->Draw(verticesCount, 0);
-}
-
-IRenderMesh* Renderer::getPrimitiveRenderMesh(PrimitiveRenderMeshType::Enum type)
-{
-	if (m_primitiveRenderMeshes[type] == NULL)
-	{
-		switch (type)
-		{
-		case PrimitiveRenderMeshType::Box:
-			m_primitiveRenderMeshes[type] = new BoxRenderMesh();
-			break;
-		case PrimitiveRenderMeshType::Plane:
-			m_primitiveRenderMeshes[type] = new PlaneRenderMesh();
-			break;
-		case PrimitiveRenderMeshType::Sphere:
-			m_primitiveRenderMeshes[type] = new SphereRenderMesh();
-			break;
-// Add By Lixu Begin
-		case PrimitiveRenderMeshType::Cone:
-			m_primitiveRenderMeshes[type] = new ConeRenderMesh();
-			break;
-// Add By Lixu End
-		default:
-			PX_ALWAYS_ASSERT_MESSAGE("Unsupported PxGeometryType");
-			return NULL;
-		}
-	}
-
-	return m_primitiveRenderMeshes[type];
-}
-
-
-Renderable* Renderer::createRenderable(IRenderMesh& mesh, RenderMaterial& material)
-{
-	Renderable* renderable = new Renderable(mesh, material);
-	m_renderables.emplace(renderable);
-	return renderable;
-}
-
-void Renderer::removeRenderable(Renderable* r)
-{
-	m_renderables.erase(m_renderables.find(r));
-	delete r;
-}
-
-void Renderer::toggleCameraSpeed(bool overspeed)
-{
-	m_camera.SetScalers(0.002f, overspeed ? 150.f : 25.f);
-}
-
-void Renderer::reloadShaders()
-{
-	// iterate Renderables materials and call reload()
-	std::set<RenderMaterial*> materials;
-	for (auto it = m_renderables.begin(); it != m_renderables.end(); it++)
-	{
-		materials.emplace(&((*it)->getMaterial()));
-	}
-	for (std::set<RenderMaterial*>::iterator it = materials.begin(); it != materials.end(); it++)
-	{
-		(*it)->reload();
-	}
-}
-
-void Renderer::drawUI()
-{
-	// Lighting
-	if (ImGui::TreeNode("Lighting"))
-	{
-		ImGui::ColorEdit3("Ambient Color", &(m_worldCBData.ambientColor.x));
-		ImGui::ColorEdit3("Point Light Color", &(m_worldCBData.pointLightColor.x));
-		ImGui::DragFloat3("Point Light Pos", &(m_worldCBData.pointLightPos.x));
-		ImGui::ColorEdit3("Dir Light Color", &(m_worldCBData.dirLightColor.x));
-		ImGui_DragFloat3Dir("Dir Light Dir", &(m_worldCBData.dirLightDir.x));
-		ImGui::DragFloat("Specular Power", &(m_worldCBData.specularPower), 1.0f, 1.0f, 500.0f);
-		ImGui::DragFloat("Specular Intensity", &(m_worldCBData.specularIntensity), 0.01f, 0.0f, 2.0f);
-
-		ImGui::TreePop();
-	}
-
-	// Shadow
-	if (ImGui::TreeNode("Shadow"))
-	{
-		ImGui::Checkbox("Shadows Enabled", &m_shadowEnabled);
-		if (m_shadowEnabled)
-		{
-			m_shadow.drawUI();
-		}
-
-		ImGui::TreePop();
-	}
-
-	// HBAO+
-	if (ImGui::TreeNode("HBAO+"))
-	{
-		ImGui::Checkbox("HBAO Enabled", &(m_HBAOEnabled));
-		if (m_HBAOEnabled)
-		{
-			m_HBAO.drawUI();
-		}
-
-		ImGui::TreePop();
-	}
-}
-
-void Renderer::UpdateCamera()
-{
-	Camera* pCamera = SimpleScene::Inst()->m_pCamera;
-	DirectX::XMVECTORF32 eyePt = { pCamera->_eye.x, pCamera->_eye.y, pCamera->_eye.z, 0 };
-	DirectX::XMVECTORF32 lookAtPt = { pCamera->_at.x, pCamera->_at.y, pCamera->_at.z, 0 };
-	m_camera.SetViewParams(eyePt, lookAtPt);
-	m_camera.SetProjParams(pCamera->_fov, pCamera->_aspectRatio, pCamera->_znear, pCamera->_zfar);
-}
-
-bool _pointInPolygon(std::vector<PxVec2>& screenPoints, PxVec2& test)
-{
-	int polySides = screenPoints.size();
-	int i, j = polySides - 1;
-	bool oddNodes = false;
-	for (i = 0; i < polySides; i++)
-	{
-		if ((screenPoints[i].y < test.y && screenPoints[j].y >= test.y
-			|| screenPoints[j].y <test.y && screenPoints[i].y >= test.y)
-			&& (screenPoints[i].x <= test.x || screenPoints[j].x <= test.x))
-		{
-			float temp = (test.y - screenPoints[i].y) /
-				(screenPoints[j].y - screenPoints[i].y) *
-				(screenPoints[j].x - screenPoints[i].x);
-			oddNodes ^= (screenPoints[i].x + temp < test.x);
-		}
-		j = i;
-	}
-	return oddNodes;
-}
-
-void Renderer::fetchSelection(std::vector<PxVec2>& screenPoints, std::map<int, std::set<int>>& selection)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	selection.clear();
-
-	int pointSize = screenPoints.size();
-	if (pointSize == 0)
-	{
-		return;
-	}
-
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-	if (!globalSettings.m_showGraphicsMesh)
-		return;
-
-	ID3D11DeviceContext* ctx = m_context;
-	
-	// needed matrices
-	DirectX::XMMATRIX viewMatrix = SimpleScene::Inst()->GetViewMatrix();
-	DirectX::XMMATRIX projMatrix = SimpleScene::Inst()->GetProjMatrix();
-	DirectX::XMMATRIX projMatrixInv = DirectX::XMMatrixInverse(NULL, projMatrix);
-	DirectX::XMMATRIX viewProjMatrix = viewMatrix * projMatrix;
-
-	// Fill Camera constant buffer
-	{
-		D3D11_MAPPED_SUBRESOURCE mappedResource;
-		ctx->Map(m_cameraCB, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-		CBCamera* cameraBuffer = (CBCamera*)mappedResource.pData;
-		cameraBuffer->viewProjection = viewProjMatrix;
-		ctx->Unmap(m_cameraCB, 0);
-	}
-
-	int width = RenderTarget_Size;
-	int height = RenderTarget_Size;
-	float init_data = SelectionTexture_InitData;
-	int dataSize = width * height;
-	if (m_selectionTextureData.size() != dataSize)
-	{
-		m_selectionTextureData.resize(dataSize);
-	}
-	std::fill(m_selectionTextureData.begin(), m_selectionTextureData.end(), init_data);
-
-	ctx->OMSetRenderTargets(1, &m_selectionRenderTargetView, m_selectionDepthStencilView);
-	float ClearColor[4] = { init_data, init_data, init_data, init_data };
-	ctx->ClearRenderTargetView(m_selectionRenderTargetView, ClearColor);
-	ctx->ClearDepthStencilView(m_selectionDepthStencilView, D3D11_CLEAR_DEPTH, 1.0, 0);
-	D3D11_VIEWPORT vp = { 0.0f, 0.0f, (float)width, (float)height, 0.0f, 1.0f };
-	ctx->RSSetViewports(1, &vp);
-	ctx->RSSetState(m_RSState[0]);
-	ctx->OMSetDepthStencilState(m_opaqueRenderDSState, 0xFF);
-
-	// set constants buffers
-	setAllConstantBuffers(ctx);
-
-	bFetchSelection = true;
-
-	// Render renderables
-	for (auto it = m_renderables.begin(); it != m_renderables.end(); it++)
-	{
-		if (!(*it)->isHidden())
-		{
-			(*it)->render(*this);
-		}
-	}
-
-	bFetchSelection = false;
-
-	{
-		ctx->CopyResource(m_selectionTextureForCPU, m_selectionRenderTargetTexture);
-		D3D11_MAPPED_SUBRESOURCE  mapResource;
-		HRESULT hr = ctx->Map(m_selectionTextureForCPU, 0, D3D11_MAP_READ, NULL, &mapResource);
-		memcpy(m_selectionTextureData.data(), mapResource.pData, dataSize * sizeof(float));
-		ctx->Unmap(m_selectionTextureForCPU, 0);
-	}
-
-	std::set<int> vids;
-	if (pointSize == 1)
-	{
-		// point selection
-		int centerX = screenPoints[0].x * width;
-		int centerY = screenPoints[0].y * height;
-
-		int ds = centerY * width + centerX;
-		int vid = m_selectionTextureData[ds];
-		vids.emplace(vid);
-	}
-	else if (pointSize == 2)
-	{
-		// rect selection
-		PxVec2 lefttop = screenPoints[0];
-		PxVec2 rightbottom = screenPoints[1];
-		int startX = lefttop.x * width;
-		int startY = lefttop.y * height;
-		int endX = rightbottom.x * width;
-		int endY = rightbottom.y * height;
-		for (int h = startY; h <= endY; h++)
-		{
-			for (int w = startX; w <= endX; w++)
-			{
-				int ds = h * width + w;
-				int vid = m_selectionTextureData[ds];
-				vids.emplace(vid);
-			}
-		}
-	}
-	else
-	{
-		// draw selection
-		PxVec2 pMin, pMax;
-		pMin = pMax = screenPoints[0];
-		for (int ps = 1; ps < pointSize; ps++)
-		{
-			PxVec2& p = screenPoints[ps];
-			if (p.x < pMin.x)
-			{
-				pMin.x = p.x;
-			}
-			if (p.y < pMin.y)
-			{
-				pMin.y = p.y;
-			}
-			if (p.x > pMax.x)
-			{
-				pMax.x = p.x;
-			}
-			if (p.y > pMax.y)
-			{
-				pMax.y = p.y;
-			}
-		}
-		int startX = pMin.x * width;
-		int startY = pMin.y * height;
-		int endX = pMax.x * width;
-		int endY = pMax.y * height;
-		for (int h = startY; h <= endY; h++)
-		{
-			for (int w = startX; w <= endX; w++)
-			{
-				PxVec2 test(1.0 * w / width, 1.0 * h / height);
-				bool valid = _pointInPolygon(screenPoints, test);
-				if (valid)
-				{
-					int ds = h * width + w;
-					int vid = m_selectionTextureData[ds];
-					vids.emplace(vid);
-				}
-			}
-		}
-	}
-
-	int familyId, chunkId;
-	for (int vid : vids)
-	{
-		if (vid < 0)
-		{
-			continue;
-		}
-
-		Renderable::getFamilyChunkId(vid, familyId, chunkId);
-		selection[familyId].emplace(chunkId);
-	}
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderer.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderer.h
deleted file mode 100644
index eeaf98c..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/Renderer.h
+++ /dev/null
@@ -1,317 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef RENDERER_H
-#define RENDERER_H
-
-#include "RenderMaterial.h"
-#include <DirectXMath.h>
-#include "XInput.h"
-#include "DXUTMisc.h"
-#include "DXUTCamera.h"
-#include "SampleManager.h"
-#include "Utils.h"
-#include "ResourceManager.h"
-#include "PrimitiveRenderMesh.h"
-#include "RendererShadow.h"
-#include "RendererHBAO.h"
-#include <unordered_set>
-#include "LightShaderParam.h"
-
-class CFirstPersonCamera;
-class PhysXPrimitive;
-class RenderDebugImpl;
-
-namespace physx
-{
-class PxRenderBuffer;
-}
-
-
-/**
-3D World Renderer
-- use createRenderable() to add objects to render.
-- use queueRenderBuffer() every frame to render debug primitives.
-- contains ResourceManager to search for file and load resources.
-- contains RendererShadow and RendererHBAO, use them through getters to control shadows.
-*/
-class Renderer : public ISampleController
-{
-	friend class Renderable;
-
-  public:
-	//////// ctor ////////
-
-	Renderer();
-	~Renderer();
-
-	static Renderer* Inst();
-	bool bFetchSelection;
-	void fetchSelection(std::vector<PxVec2>& screenPoints, std::map<int, std::set<int>>& selection);
-	//////// public API ////////
-
-	void reloadShaders();
-
-	bool getWireframeMode()
-	{
-		return m_wireframeMode;
-	}
-
-	void setWireframeMode(bool enabled)
-	{
-		if(m_wireframeMode != enabled)
-		{
-			m_wireframeMode = enabled;
-			initializeDefaultRSState();
-		}
-	}
-
-	IRenderMesh* getPrimitiveRenderMesh(PrimitiveRenderMeshType::Enum type);
-
-	Renderable* createRenderable(IRenderMesh& mesh, RenderMaterial& material);
-	void removeRenderable(Renderable* r);
-
-	void drawUI();
-
-
-	//////// public getters ////////
-
-	float getScreenWidth() const
-	{
-		return m_screenWidth;
-	}
-
-	float getScreenHeight() const
-	{
-		return m_screenHeight;
-	}
-
-	void queueRenderBuffer(const PxRenderBuffer* buffer, bool bScreen = false)
-	{
-		if (bScreen)
-		{
-			m_screenRenderBuffers.push_back(buffer);
-		}
-		else
-		{
-			m_queuedRenderBuffers.push_back(buffer);
-		}
-	}
-
-	void clearQueue()
-	{
-		m_screenRenderBuffers.clear();
-		m_queuedRenderBuffers.clear();
-	}
-
-	ResourceManager& getResourceManager()
-	{ 
-		return m_resourceManager; 
-	}
-
-	uint32_t getVisibleOpaqueRenderablesCount()
-	{
-		return m_visibleOpaqueRenderablesCount;
-	}
-
-	uint32_t getVisibleTransparentRenderablesCount()
-	{
-		return m_visibleTransparentRenderablesCount;
-	}
-
-	CFirstPersonCamera& getCamera()
-	{
-		return m_camera;
-	}
-
-	RenderMaterial::InstancePtr getSelectionRenderMaterialInstance()
-	{
-		return m_selectionRenderMaterialInstance;
-	}
-
-	//////// public 'internal' methods ////////
-
-	// for internal usage (used by RenderShadows)
-	void renderDepthOnly(DirectX::XMMATRIX* viewProjectionSubstitute);
-	void UpdateCamera();
-  protected:
-
-	//////// controller callbacks ////////
-
-	virtual HRESULT DeviceCreated(ID3D11Device* pDevice);
-	virtual void DeviceDestroyed();
-	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	virtual void Animate(double fElapsedTimeSeconds);
-	virtual void onInitialize();
-	virtual void onTerminate();
-	virtual void BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc);
-	virtual void Render(ID3D11Device* /*device*/, ID3D11DeviceContext* ctx, ID3D11RenderTargetView* pRTV,
-	                    ID3D11DepthStencilView* pDSV);
-
-  private:
-
-	//////// internal methods ////////
-
-	struct RenderDebugVertex
-	{
-		PxVec3 mPos;
-		uint32_t mColor;
-	};
-
-	void render(const PxRenderBuffer* renderBuffer, bool bScreen = false);
-	void render(Renderable* renderable);
-	void renderDebugPrimitive(const RenderDebugVertex *vertices, uint32_t verticesCount, D3D11_PRIMITIVE_TOPOLOGY topology, bool bScreen = false);
-	void initializeDefaultRSState();
-	void setAllConstantBuffers(ID3D11DeviceContext* ctx);
-	void toggleCameraSpeed(bool overspeed);
-
-
-	//////// constant buffers ////////
-
-	struct CBCamera
-	{
-		DirectX::XMMATRIX viewProjection;
-		DirectX::XMMATRIX projectionInv;
-		DirectX::XMFLOAT3 viewPos;
-		float unusedPad;
-	};
-	struct CBWorld
-	{
-		DirectX::XMFLOAT3 ambientColor;
-		float unusedPad1;
-		DirectX::XMFLOAT3 pointLightPos;
-		float unusedPad2;
-		DirectX::XMFLOAT3 pointLightColor;
-		float unusedPad3;
-		DirectX::XMFLOAT3 dirLightDir;
-		float specularPower;
-		DirectX::XMFLOAT3 dirLightColor;
-		float specularIntensity; // TODO: actually it's per object property
-		float flatNormal;
-		float wireFrameOver;
-		float useLighting;
-		float unusedPad4;
-		LightShaderParam lightParam;
-	};
-	struct CBObject
-	{
-		DirectX::XMMATRIX worldMatrix;
-		DirectX::XMFLOAT4 diffuseColor;
-		DirectX::XMFLOAT4 specularColor;
-		float useDiffuseTexture;
-		float useSpecularTexture;
-		float useNormalTexture;
-		float specularShininess;
-		float selected;
-	};
-
-
-	//////// internal data ////////
-
-	// camera
-	CFirstPersonCamera	               m_camera;
-	float							   m_screenWidth;
-	float							   m_screenHeight;
-
-	// resources
-	ResourceManager                    m_resourceManager;
-
-	// additional render modules(libs)
-	RendererShadow                     m_shadow;
-	bool                               m_shadowEnabled;
-	RendererHBAO                       m_HBAO;
-	bool                               m_HBAOEnabled;
-
-	// DX11 common
-	ID3D11Device*                      m_device;
-	ID3D11DeviceContext*               m_context;
-	D3D11_VIEWPORT                     m_viewport;
-
-	// DX11 states
-	ID3D11RasterizerState*             m_RSState[2];
-	ID3D11DepthStencilState*           m_opaqueRenderDSState;
-	ID3D11DepthStencilState*           m_transparencyRenderDSState;
-	ID3D11DepthStencilState*           m_opaqueRenderNoDepthDSState;
-
-	// DX11 samplers
-	ID3D11SamplerState*                m_pointSampler;
-	ID3D11SamplerState*                m_linearSampler;
-
-	// Depth Buffer
-	ID3D11Texture2D*                   m_DSTexture;
-	ID3D11DepthStencilView*	           m_DSView;
-	ID3D11ShaderResourceView*          m_DSTextureSRV;
-
-	// Constant Buffers
-	ID3D11Buffer*                      m_cameraCB;
-	ID3D11Buffer*                      m_worldCB;
-	CBWorld                            m_worldCBData;
-	ID3D11Buffer*                      m_objectCB;
-
-	// toggles (options)
-	bool                               m_wireframeMode;
-
-	// renderables
-	std::unordered_set<Renderable*>    m_renderables;
-
-	// primitive meshes cache
-	IRenderMesh*                       m_primitiveRenderMeshes[PrimitiveRenderMeshType::Count];
-
-	// stats
-	uint32_t						  m_visibleOpaqueRenderablesCount;
-	uint32_t						  m_visibleTransparentRenderablesCount;
-
-	// Debug Render
-	RenderMaterial*                    m_debugPrimitiveRenderMaterial;
-	RenderMaterial::InstancePtr        m_debugPrimitiveRenderMaterialInstance;
-	ID3D11Buffer*                      m_debugPrimitiveVB;
-	uint32_t                           m_debugPrimitiveVBVerticesCount;
-	std::vector<const PxRenderBuffer*> m_queuedRenderBuffers;
-
-	// Screen Render
-	RenderMaterial*                    m_screenPrimitiveRenderMaterial;
-	RenderMaterial::InstancePtr        m_screenPrimitiveRenderMaterialInstance;
-	ID3D11Buffer*                      m_screenPrimitiveVB;
-	uint32_t                           m_screenPrimitiveVBVerticesCount;
-	std::vector<const PxRenderBuffer*> m_screenRenderBuffers;
-	
-	// Selection Render Resource
-	RenderMaterial*                    m_selectionRenderMaterial;
-	RenderMaterial::InstancePtr        m_selectionRenderMaterialInstance;
-	ID3D11Texture2D*                   m_selectionRenderTargetTexture;
-	ID3D11RenderTargetView*	           m_selectionRenderTargetView;
-	ID3D11ShaderResourceView*          m_selectionRenderTargetSRV;
-	ID3D11Texture2D*                   m_selectionDepthStencilTexture;
-	ID3D11DepthStencilView*	           m_selectionDepthStencilView;
-	ID3D11ShaderResourceView*          m_selectionDepthStencilSRV;
-	ID3D11Texture2D*                   m_selectionTextureForCPU;
-	std::vector<float>				   m_selectionTextureData;
-};
-
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererHBAO.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererHBAO.cpp
deleted file mode 100644
index c674b2b..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererHBAO.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "RendererHBAO.h"
-#include "Renderer.h"
-#include "imgui.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//										Renderer HBAO (wrapper for hbao+)
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-RendererHBAO::RendererHBAO()
-{
-	m_SSAOContext = NULL;
-
-	// default parameters
-	m_SSAOParameters.Radius = 2.0f;
-}
-
-
-RendererHBAO::~RendererHBAO()
-{
-	releaseResources();
-}
-
-
-void RendererHBAO::createResources(ID3D11Device *pd3dDevice)
-{
-	GFSDK_SSAO_Status status;
-	status = GFSDK_SSAO_CreateContext_D3D11(pd3dDevice, &m_SSAOContext, nullptr);
-	assert(status == GFSDK_SSAO_OK);
-}
-
-
-void RendererHBAO::releaseResources()
-{
-	if (m_SSAOContext != NULL)
-	{
-		m_SSAOContext->Release();
-	}
-}
-
-
-void RendererHBAO::renderAO(ID3D11DeviceContext *pd3dDeviceContext, ID3D11RenderTargetView* pRTV, ID3D11ShaderResourceView* pDepthSRV, DirectX::XMMATRIX& projMatrix)
-{
-	GFSDK_SSAO_InputData_D3D11 InputData;
-	InputData.DepthData.pFullResDepthTextureSRV = pDepthSRV;
-	InputData.DepthData.DepthTextureType = GFSDK_SSAO_HARDWARE_DEPTHS;
-	InputData.DepthData.MetersToViewSpaceUnits = 1.0f;
-	InputData.DepthData.ProjectionMatrix.Data = GFSDK_SSAO_Float4x4(reinterpret_cast<const GFSDK_SSAO_FLOAT*>(&(projMatrix.r[0])));
-	InputData.DepthData.ProjectionMatrix.Layout = GFSDK_SSAO_ROW_MAJOR_ORDER;
-
-	GFSDK_SSAO_Output_D3D11 Output;
-	Output.pRenderTargetView = pRTV;// m_pSceneRTs->ColorRTV;
-	Output.Blend.Mode = GFSDK_SSAO_MULTIPLY_RGB;
-
-	m_SSAOContext->RenderAO(pd3dDeviceContext, InputData, m_SSAOParameters, Output);
-}
-
-
-void RendererHBAO::drawUI()
-{
-	ImGui::DragFloat("Radius", &(m_SSAOParameters.Radius), 0.05f, 0.0f, 100.0f);
-	ImGui::DragFloat("Bias", &(m_SSAOParameters.Bias), 0.01f, 0.0f, 0.5f);
-	ImGui::DragFloat("NearAO", &(m_SSAOParameters.NearAO), 0.01f, 1.0f, 4.0f);
-	ImGui::DragFloat("FarAO", &(m_SSAOParameters.FarAO), 0.01, 1.0f, 4.0f);
-	ImGui::DragFloat("PowerExponent", &(m_SSAOParameters.PowerExponent), 0.01f, 1.0f, 8.0f);
-	ImGui::Checkbox("ForegroundAO Enabled", (bool*)&(m_SSAOParameters.ForegroundAO.Enable));
-	ImGui::DragFloat("ForegroundAO ViewDepth", &(m_SSAOParameters.ForegroundAO.ForegroundViewDepth), 0.01f, 0.0f, 100.0f);
-	ImGui::Checkbox("BackgroundAO Enabled", (bool*)&(m_SSAOParameters.BackgroundAO.Enable));
-	ImGui::DragFloat("BackgroundAO ViewDepth", &(m_SSAOParameters.BackgroundAO.BackgroundViewDepth), 0.01f, 0.0f, 100.0f);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererHBAO.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererHBAO.h
deleted file mode 100644
index 3237ddf..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererHBAO.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef RENDERER_HBAO_H
-#define RENDERER_HBAO_H
-
-#include <DirectXMath.h>
-#include "GFSDK_SSAO.h"
-
-
-class Renderer;
-
-class RendererHBAO
-{
-public:
-	RendererHBAO();
-	~RendererHBAO();
-
-	void createResources(ID3D11Device *pd3dDevice);
-	void renderAO(ID3D11DeviceContext *pd3dDeviceContext, ID3D11RenderTargetView* pRTV, ID3D11ShaderResourceView* pDepthSRV, DirectX::XMMATRIX& projMatrix);
-
-	void drawUI();
-
-private:
-	void releaseResources();
-
-	GFSDK_SSAO_Parameters m_SSAOParameters;
-
-	GFSDK_SSAO_Context_D3D11* m_SSAOContext;
-};
-
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererShadow.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererShadow.cpp
deleted file mode 100644
index c26358b..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererShadow.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "RendererShadow.h"
-
-#include "XInput.h"
-#include "DXUTMisc.h"
-#include "DXUTCamera.h"
-#include "Renderer.h"
-#include "UIHelpers.h"
-#include "SimpleScene.h"
-#define CASCADES 1
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//										Renderer Shadows (wrapper for shadow_lib)
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const float DEFAULT_LIGHT_SIZE = 3.0f;
-const DirectX::XMFLOAT3 DEFAULT_LIGHT_POS(-25, 25, 25);
-const DirectX::XMFLOAT3 DEFAULT_LIGHT_LOOK_AT(0, 0, 0);
-const DirectX::XMFLOAT3 DEFAULT_SHADOW_COLOR(0.25f, 0.25f, 0.25f);
-
-RendererShadow::RendererShadow()
-{
-	m_shadowLibContext = NULL;
-
-	m_PCSSEnabled = false;
-	m_lightSize = DEFAULT_LIGHT_SIZE;
-	m_lightPos = DEFAULT_LIGHT_POS;
-	m_lightLookAt = DEFAULT_LIGHT_LOOK_AT;
-	m_shadowColor = DEFAULT_SHADOW_COLOR;
-
-	m_worldSpaceBBox0.x = m_worldSpaceBBox0.y = m_worldSpaceBBox0.z = -100;
-	m_worldSpaceBBox1.x = m_worldSpaceBBox1.y = m_worldSpaceBBox1.z = 100;
-
-	// Penumbra params
-	m_PCSSParams.fMaxThreshold = 80.0f;
-	m_PCSSParams.fMaxClamp = 40.0f;
-	m_PCSSParams.fMinSizePercent = 3.0f;
-	m_PCSSParams.fMinWeightExponent = 5.0f;
-	m_PCSSParams.fMinWeightThresholdPercent = 20.0f;
-
-	m_softShadowTestScale = 0.002f;
-
-	memset(&m_shadowBufferSRV, 0, sizeof(m_shadowBufferSRV));
-
-	m_shadowMapHandle = NULL;
-	m_shadowBufferHandle = NULL;
-}
-
-
-RendererShadow::~RendererShadow()
-{
-	ReleaseResources();
-}
-
-
-void RendererShadow::createResources(ID3D11Device *pd3dDevice, ID3D11DeviceContext* context, CFirstPersonCamera* camera)
-{
-	m_camera = camera;
-
-#if !CASCADES
-	uint32_t shadowMapScale = 5;
-	uint32_t shadowMapWidth = 1024;
-	uint32_t shadowMapHeight = 1024;
-
-	// SM Desc
-	m_SMDesc.eViewType = GFSDK_ShadowLib_ViewType_Single;
-	m_SMDesc.eMapType = GFSDK_ShadowLib_MapType_Texture;
-#else
-
-	uint32_t shadowMapScale = 5;
-	uint32_t shadowMapWidth = 1024;
-	uint32_t shadowMapHeight = 1024;
-
-	// SM Desc
-	m_SMDesc.eViewType = GFSDK_ShadowLib_ViewType_Cascades_2;
-	m_SMDesc.eMapType = GFSDK_ShadowLib_MapType_TextureArray;
-#endif
-
-	m_SMDesc.uResolutionWidth = shadowMapWidth * shadowMapScale;
-	m_SMDesc.uResolutionHeight = shadowMapHeight * shadowMapScale;
-	m_SMDesc.uArraySize = m_SMDesc.eViewType;
-
-	for (int j = 0; j < GFSDK_ShadowLib_ViewType_Cascades_4; j++)
-	{
-		m_SMDesc.ViewLocation[j].uMapID = j;
-		m_SMDesc.ViewLocation[j].v2Origin.x = 0;
-		m_SMDesc.ViewLocation[j].v2Origin.y = 0;
-		m_SMDesc.ViewLocation[j].v2Dimension.x = shadowMapWidth * shadowMapScale;
-		m_SMDesc.ViewLocation[j].v2Dimension.y = shadowMapHeight * shadowMapScale;
-	}
-
-
-	// SM Render Params
-	m_SMRenderParams.iDepthBias = 1000;
-	m_SMRenderParams.fSlopeScaledDepthBias = 8;
-
-	// SB Render Params
-	m_SBRenderParams.eTechniqueType = GFSDK_ShadowLib_TechniqueType_PCSS;
-	m_SBRenderParams.eQualityType = GFSDK_ShadowLib_QualityType_High;
-
-	// DLL version
-	GFSDK_ShadowLib_Version DLLVersion;
-	GFSDK_ShadowLib_Status retCode = GFSDK_ShadowLib_GetDLLVersion(&DLLVersion);
-
-	// Header version
-	GFSDK_ShadowLib_Version headerVersion;
-	headerVersion.uMajor = GFSDK_SHADOWLIB_MAJOR_VERSION;
-	headerVersion.uMinor = GFSDK_SHADOWLIB_MINOR_VERSION;
-
-	// Do they match?
-	if (DLLVersion.uMajor == headerVersion.uMajor && DLLVersion.uMinor == headerVersion.uMinor)
-	{
-		GFSDK_ShadowLib_DeviceContext deviceAndContext;
-		deviceAndContext.pD3DDevice = pd3dDevice;
-		deviceAndContext.pDeviceContext = context;
-
-		retCode = GFSDK_ShadowLib_Create(&headerVersion, &m_shadowLibContext, &deviceAndContext, NULL);
-
-		if (retCode != GFSDK_ShadowLib_Status_Ok) assert(false);
-	}
-	else
-	{
-		assert(false);
-	}
-}
-
-
-void RendererShadow::ReleaseResources()
-{
-	SAFE_RELEASE(m_downsampledShadowMap.pTexture);
-	SAFE_RELEASE(m_downsampledShadowMap.pSRV);
-	SAFE_RELEASE(m_downsampledShadowMap.pRTV);
-
-	if (m_shadowLibContext != NULL)
-	{
-		m_shadowLibContext->Destroy();
-		m_shadowLibContext = NULL;
-	}
-}
-
-
-void RendererShadow::setScreenResolution(float FovyRad, UINT Width, UINT Height, UINT uSampleCount, ID3D11DepthStencilView* pReadOnlyDSV)
-{
-	changeShadowSettings(Width, Height, uSampleCount, pReadOnlyDSV);
-}
-
-
-void RendererShadow::changeShadowSettings(UINT Width, UINT Height, UINT uSampleCount, ID3D11DepthStencilView* pReadOnlyDSV)
-{
-	m_SBDesc.uResolutionWidth = Width;
-	m_SBDesc.uResolutionHeight = Height;
-	m_SBDesc.uSampleCount = uSampleCount;
-	m_SBDesc.ReadOnlyDSV.pDSV = pReadOnlyDSV;
-
-	reloadBuffers();
-}
-
-void RendererShadow::reloadBuffers()
-{
-	{
-		if(m_shadowMapHandle != nullptr)
-		{
-			m_shadowLibContext->RemoveMap(&m_shadowMapHandle);
-		}
-
-		if (m_SMDesc.eMapType == GFSDK_ShadowLib_MapType_Texture &&
-			m_SMDesc.eViewType == GFSDK_ShadowLib_ViewType_Single && 
-			m_SBRenderParams.eTechniqueType == GFSDK_ShadowLib_TechniqueType_PCSS)
-		{
-			m_SMDesc.bDownsample = true;
-		}
-
-		m_shadowLibContext->AddMap(&m_SMDesc, &m_shadowMapHandle);
-	}
-
-	if (m_SMDesc.eMapType == GFSDK_ShadowLib_MapType_Texture && m_SMDesc.eViewType == GFSDK_ShadowLib_ViewType_Single)
-	{
-		m_downsampledShadowMap.uWidth = m_SMDesc.uResolutionWidth >> 1;
-		m_downsampledShadowMap.uHeight = m_SMDesc.uResolutionHeight >> 1;
-		m_downsampledShadowMap.uSampleCount = 1;
-		m_downsampledShadowMap.Format = DXGI_FORMAT_R32_FLOAT;
-		SAFE_RELEASE(m_downsampledShadowMap.pTexture);
-		SAFE_RELEASE(m_downsampledShadowMap.pSRV);
-		SAFE_RELEASE(m_downsampledShadowMap.pRTV);
-		m_shadowLibContext->DevModeCreateTexture2D(&m_downsampledShadowMap);
-	}
-
-	if (m_shadowBufferHandle != nullptr)
-	{
-		m_shadowLibContext->RemoveBuffer(&m_shadowBufferHandle);
-	}
-	m_shadowLibContext->AddBuffer(&m_SBDesc, &m_shadowBufferHandle);
-}
-
-
-
-//--------------------------------------------------------------------------------------
-// Data passed to the shadow map render function 
-//--------------------------------------------------------------------------------------
-struct ShadowMapRenderFunctionParams
-{
-	Renderer* renderer;
-};
-static ShadowMapRenderFunctionParams s_RenderParams;
-
-//--------------------------------------------------------------------------------------
-// Shadow map render function
-//--------------------------------------------------------------------------------------
-static void ShadowMapRenderFunction(void* pParams, gfsdk_float4x4* pViewProj)
-{
-	ShadowMapRenderFunctionParams* pRP = (ShadowMapRenderFunctionParams*)pParams;
-
-	DirectX::XMMATRIX viewProjection;
-	memcpy(&viewProjection, &pViewProj->_11, sizeof(gfsdk_float4x4));
-
-	pRP->renderer->renderDepthOnly(&viewProjection);
-}
-
-void RendererShadow::renderShadowMaps(Renderer* renderer, atcore_float3& lightPos, atcore_float3& lightLookAt)
-{
-	// select technique
-	GFSDK_ShadowLib_TechniqueType technique = m_SBRenderParams.eTechniqueType;
-	m_SBRenderParams.eTechniqueType = m_PCSSEnabled ? GFSDK_ShadowLib_TechniqueType_PCSS : GFSDK_ShadowLib_TechniqueType_PCF;
-	if (technique != m_SBRenderParams.eTechniqueType)
-		reloadBuffers();
-
-
-	DirectX::XMMATRIX viewMatrix = m_camera->GetViewMatrix();
-	DirectX::XMMATRIX projMatrix = m_camera->GetProjMatrix();
-
-	memcpy(&m_SMRenderParams.m4x4EyeViewMatrix, &viewMatrix.r[0], sizeof(gfsdk_float4x4));
-	memcpy(&m_SMRenderParams.m4x4EyeProjectionMatrix, &projMatrix.r[0], sizeof(gfsdk_float4x4));
-
-	// TODO: (better world space bbox needed)
-	m_SMRenderParams.v3WorldSpaceBBox[0] = m_worldSpaceBBox0;
-	m_SMRenderParams.v3WorldSpaceBBox[1] = m_worldSpaceBBox1;
-
-	m_SMRenderParams.LightDesc.eLightType = GFSDK_ShadowLib_LightType_Directional;
-	memcpy(&m_SMRenderParams.LightDesc.v3LightPos, &lightPos, sizeof(gfsdk_float3));
-	memcpy(&m_SMRenderParams.LightDesc.v3LightLookAt, &lightLookAt, sizeof(gfsdk_float3));
-	m_SMRenderParams.LightDesc.fLightSize = m_lightSize;
-	m_SMRenderParams.LightDesc.bLightFalloff = false;
-
-	// Scene specific setup for the shadow map phase that follows
-	s_RenderParams.renderer = renderer;
-	m_SMRenderParams.fnpDrawFunction = GFSDK_ShadowLib_FunctionPointer(ShadowMapRenderFunction);
-	m_SMRenderParams.pDrawFunctionParams = &s_RenderParams;
-
-	// render shadow map
-	m_shadowLibContext->RenderMap(m_shadowMapHandle, &m_SMRenderParams);
-}
-
-
-void RendererShadow::renderShadowBuffer(ID3D11ShaderResourceView* pDepthStencilSRV, ID3D11ShaderResourceView* pResolvedDepthStencilSRV)
-{
-	if (m_SBRenderParams.eTechniqueType == GFSDK_ShadowLib_TechniqueType_PCSS &&
-		m_SMDesc.eMapType == GFSDK_ShadowLib_MapType_Texture &&
-		m_SMDesc.eViewType == GFSDK_ShadowLib_ViewType_Single)
-	{
-		m_tempResources.pDownsampledShadowMap = &m_downsampledShadowMap;
-		m_shadowLibContext->SetTempResources(&m_tempResources);
-	}
-
-	m_SBRenderParams.PCSSPenumbraParams = m_PCSSParams;
-	m_SBRenderParams.fSoftShadowTestScale = m_softShadowTestScale;
-
-	m_SBRenderParams.DepthBufferDesc.DepthStencilSRV.pSRV = pDepthStencilSRV;
-
-	m_shadowLibContext->RenderBuffer(m_shadowMapHandle, m_shadowBufferHandle, &m_SBRenderParams);
-}
-
-
-void RendererShadow::modulateShadowBuffer(ID3D11RenderTargetView* pOutputRTV)
-{
-	GFSDK_ShadowLib_RenderTargetView ColorRTV;
-	ColorRTV.pRTV = pOutputRTV;
-
-	gfsdk_float3 v3ShadowColor = { m_shadowColor.x, m_shadowColor.y, m_shadowColor.z };
-	m_shadowLibContext->ModulateBuffer(m_shadowBufferHandle, &ColorRTV, v3ShadowColor, GFSDK_ShadowLib_ModulateBufferMask_RGB);
-}
-
-
-void RendererShadow::displayShadowMaps(ID3D11RenderTargetView* pOutputRTV, UINT Width, UINT Height)
-{
-	GFSDK_ShadowLib_RenderTargetView ColorRTV;
-	ColorRTV.pRTV = pOutputRTV;
-
-	float fMapResW = (float)m_SMDesc.uResolutionWidth;
-	float fMapResH = (float)m_SMDesc.uResolutionHeight;
-
-	float fWidthScale = Width / ((float)m_SMDesc.uArraySize * fMapResW);
-	fWidthScale = (fWidthScale > 1.0f) ? (1.0f) : (fWidthScale);
-
-	float fOneFifth = (float)Height / (5.0f);
-	float fHeightScale = fOneFifth / fMapResH;
-	fHeightScale = (fHeightScale > 1.0f) ? (1.0f) : (fHeightScale);
-
-	float fScale = (fHeightScale < fWidthScale) ? (fHeightScale) : (fWidthScale);
-
-	fMapResW = floorf(fMapResW * fScale);
-	fMapResH = floorf(fMapResH * fScale);
-
-	for (unsigned int j = 0; j < (unsigned int)m_SMDesc.uArraySize; j++)
-	{
-		m_shadowLibContext->DevModeDisplayMap(m_shadowBufferHandle,
-			&ColorRTV,
-			m_shadowMapHandle,
-			j,
-			j * (unsigned int)fMapResW + j,
-			Height - (unsigned int)fMapResH,
-			fScale);
-	}
-}
-
-
-void RendererShadow::displayMapFrustums(ID3D11RenderTargetView* pOutputRTV, ID3D11DepthStencilView* pDSV)
-{
-	gfsdk_float3 v3Color;
-	v3Color.x = 1.0f;
-	v3Color.y = 0.0f;
-	v3Color.z = 0.0f;
-
-	GFSDK_ShadowLib_RenderTargetView ColorRTV;
-	ColorRTV.pRTV = pOutputRTV;
-
-	GFSDK_ShadowLib_DepthStencilView DSV;
-	DSV.pDSV = pDSV;
-
-	unsigned int NumViews;
-	NumViews = m_SMDesc.eViewType;
-
-	for (unsigned int j = 0; j < NumViews; j++)
-	{
-		switch (j)
-		{
-		case 0:
-			v3Color.x = 1.0f;
-			v3Color.y = 0.0f;
-			v3Color.z = 0.0f;
-			break;
-		case 1:
-			v3Color.x = 0.0f;
-			v3Color.y = 1.0f;
-			v3Color.z = 0.0f;
-			break;
-		case 2:
-			v3Color.x = 0.0f;
-			v3Color.y = 0.0f;
-			v3Color.z = 1.0f;
-			break;
-		case 3:
-			v3Color.x = 1.0f;
-			v3Color.y = 1.0f;
-			v3Color.z = 0.0f;
-			break;
-		}
-
-		m_shadowLibContext->DevModeDisplayMapFrustum(m_shadowBufferHandle,
-			&ColorRTV,
-			&DSV,
-			m_shadowMapHandle,
-			j,
-			v3Color);
-	}
-}
-
-
-void RendererShadow::displayShadowBuffer(ID3D11RenderTargetView* pOutputRTV)
-{
-	gfsdk_float2 v2Scale;
-	v2Scale.x = 1.0f;
-	v2Scale.y = 1.0f;
-
-	GFSDK_ShadowLib_RenderTargetView ColorRTV;
-	ColorRTV.pRTV = pOutputRTV;
-
-	m_shadowLibContext->DevModeDisplayBuffer(m_shadowBufferHandle,
-		&ColorRTV,
-		v2Scale,
-		NULL);
-}
-
-
-void RendererShadow::toggleDisplayCascades(bool bToggle)
-{
-	m_shadowLibContext->DevModeToggleDebugCascadeShader(m_shadowBufferHandle,
-		bToggle);
-}
-
-
-void RendererShadow::drawUI()
-{
-	ImGui::Checkbox("PCSS", &m_PCSSEnabled);
-	ImGui::ColorEdit3("Shadow Color", &(m_shadowColor.x));
-	ImGui::DragFloat("Light Size", &m_lightSize, 0.05f, 0.0f, 100.0f);
-	ImGui::DragFloat3("Light Position", &(m_lightPos.x));
-	ImGui_DragFloat3Dir("Light LookAt", &(m_lightLookAt.x));
-	ImGui::DragFloat("SoftShadowTestScale", &(m_softShadowTestScale), 0.0001f, 0.0f, 10.0f);
-	if (m_PCSSEnabled)
-	{
-		ImGui::DragFloat("PCSS: fMaxClamp", &(m_PCSSParams.fMaxClamp), 0.001f, 0.0f, 100.0f);
-		ImGui::DragFloat("PCSS: fMaxThreshold", &(m_PCSSParams.fMaxThreshold), 0.001f, 0.0f, 100.0f);
-		ImGui::DragFloat("PCSS: fMinSizePercent", &(m_PCSSParams.fMinSizePercent), 0.001f, 0.0f, 100.0f);
-		ImGui::DragFloat("PCSS: fMinWeightExponent", &(m_PCSSParams.fMinWeightExponent), 0.001f, 0.0f, 100.0f);
-		ImGui::DragFloat("PCSS: fMinWeightThresholdPercent", &(m_PCSSParams.fMinWeightThresholdPercent), 0.001f, 0.0f, 100.0f);
-		ImGui::DragFloat("PCSS: fBlockerSearchDitherPercent", &(m_PCSSParams.fBlockerSearchDitherPercent), 0.001f, 0.0f, 100.0f);
-		ImGui::DragFloat("PCSS: fFilterDitherPercent", &(m_PCSSParams.fFilterDitherPercent), 0.001f, 0.0f, 100.0f);
-	}
-}
-
-void RendererShadow::clearBuffer()
-{
-	m_shadowLibContext->ClearBuffer(m_shadowBufferHandle);
-}
-
-void RendererShadow::finalizeBuffer()
-{
-	m_shadowLibContext->FinalizeBuffer(m_shadowBufferHandle, &m_shadowBufferSRV);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererShadow.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererShadow.h
deleted file mode 100644
index e16af1f..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/RendererShadow.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef RENDERER_SHADOW_H
-#define RENDERER_SHADOW_H
-
-#include <DirectXMath.h>
-#include "Utils.h"
-#include "gfsdk_shadowlib.h"
-
-#include <string>
-
-
-class CFirstPersonCamera;
-class Renderer;
-
-class RendererShadow
-{
-public:
-	RendererShadow();
-	~RendererShadow();
-
-	void createResources(ID3D11Device *pd3dDevice, ID3D11DeviceContext* context, CFirstPersonCamera* camera);
-
-	void setScreenResolution(float FovyRad, UINT Width, UINT Height, UINT uSampleCount, ID3D11DepthStencilView* pReadOnlyDSV);
-	void changeShadowSettings(UINT Width, UINT Height, UINT uSampleCount, ID3D11DepthStencilView* pReadOnlyDSV);
-	void renderShadowMaps(Renderer* renderer, atcore_float3& lightPos, atcore_float3& lightLookAt);
-	void renderShadowBuffer(ID3D11ShaderResourceView* pDepthStencilSRV, ID3D11ShaderResourceView* pResolvedDepthStencilSRV);
-	void modulateShadowBuffer(ID3D11RenderTargetView* pOutputRTV);
-	void displayShadowMaps(ID3D11RenderTargetView* pOutputRTV, UINT Width, UINT Height);
-	void displayMapFrustums(ID3D11RenderTargetView* pOutputRTV, ID3D11DepthStencilView* pDSV);
-	void displayShadowBuffer(ID3D11RenderTargetView* pOutputRTV);
-	void toggleDisplayCascades(bool bToggle);
-
-
-	void drawUI();
-
-	void clearBuffer();
-	void finalizeBuffer();
-
-private:
-	void reloadBuffers();
-	void ReleaseResources();
-
-		
-	GFSDK_ShadowLib_Context*			m_shadowLibContext;
-
-	GFSDK_ShadowLib_ShaderResourceView	m_shadowBufferSRV;
-	
-	GFSDK_ShadowLib_Map*			m_shadowMapHandle;
-	GFSDK_ShadowLib_MapDesc			m_SMDesc;
-	GFSDK_ShadowLib_BufferDesc		m_SBDesc;
-	GFSDK_ShadowLib_MapRenderParams	m_SMRenderParams;
-	
-	GFSDK_ShadowLib_Buffer*				m_shadowBufferHandle;
-	GFSDK_ShadowLib_BufferRenderParams	m_SBRenderParams;
-
-	GFSDK_ShadowLib_TempResources		m_tempResources;
-	GFSDK_ShadowLib_Texture2D			m_downsampledShadowMap;
-	
-	CFirstPersonCamera* m_camera;
-
-	// params
-	bool m_PCSSEnabled;
-	float m_lightSize;
-	DirectX::XMFLOAT3 m_lightPos;
-	DirectX::XMFLOAT3 m_lightLookAt;
-	DirectX::XMFLOAT3 m_shadowColor;
-	GFSDK_ShadowLib_PCSSPenumbraParams m_PCSSParams;
-	float m_softShadowTestScale;
-
-	gfsdk_float3 m_worldSpaceBBox0;
-	gfsdk_float3 m_worldSpaceBBox1;
-
-};
-
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ResourceManager.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ResourceManager.cpp
deleted file mode 100644
index d1d04e2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ResourceManager.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "ResourceManager.h"
-#include "PxAssert.h"
-#include "PsString.h"
-#include "Utils.h"
-
-#include <windows.h>
-
-
-using namespace physx;
-
-#define PATH_MAX_LEN 512
-
-// Add By Lixu Begin
-ResourceManager* pResourceManager = nullptr;
-ResourceManager* ResourceManager::ins()
-{
-	return pResourceManager;
-}
-// Add By Lixu End
-
-ResourceManager::ResourceManager()
-{
-	// search for root folder by default
-	addSearchDir(".");
-
-// Add By Lixu Begin
-	pResourceManager = this;
-// Add By Lixu End
-}
-
-const ShaderFileResource* ResourceManager::requestShaderFile(const char* name)
-{
-	const Resource* resource = requestResource(eSHADER_FILE, name);
-	return resource != nullptr ? static_cast<const ShaderFileResource*>(resource) : nullptr;
-}
-
-const TextureResource* ResourceManager::requestTexture(const char* name)
-{
-	const Resource* resource = requestResource(eTEXTURE, name);
-	return resource != nullptr ? static_cast<const TextureResource*>(resource) : nullptr;
-}
-
-void ResourceManager::releaseTexture(const char* name)
-{
-	std::pair<ResourceType, std::string> key(eTEXTURE, name);
-	auto val = m_loadedResources.find(key);
-	if (val != m_loadedResources.end())
-	{
-		Resource* pResource = val->second;
-		delete pResource;
-		pResource = nullptr;
-		m_loadedResources.erase(key);
-	}
-}
-
-const Resource* ResourceManager::requestResource(ResourceType type, const char* name)
-{
-	// search in loaded
-	std::pair<ResourceType, std::string> key(type, name);
-	auto val = m_loadedResources.find(key);
-	if (val != m_loadedResources.end())
-	{
-		return val->second;
-	}
-
-	Resource* resource = nullptr;
-	if (type == eSHADER_FILE)
-	{
-		char path[PATH_MAX_LEN];
-		const char* exts[] = { "hlsl" };
-		if (findFile(name, std::vector<const char*>(exts, exts + sizeof(exts) / sizeof(exts[0])), path))
-		{
-			resource = new ShaderFileResource(path);
-		}
-		else
-		{
-			PX_ALWAYS_ASSERT_MESSAGE(name);
-		}
-	}
-	else if (type == eTEXTURE)
-	{
-		char path[PATH_MAX_LEN];
-// Add By Lixu Begin
-		const char* exts[] = { "dds", "tga", "jpg", "png", "bmp" };
-// Add By Lixu End
-		if (findFile(name, std::vector<const char*>(exts, exts + sizeof(exts) / sizeof(exts[0])), path))
-		{
-			TextureResource* textureResource(new TextureResource());
-			WCHAR wPath[MAX_PATH];
-			MultiByteToWideChar(CP_ACP, 0, path, -1, wPath, MAX_PATH);
-			wPath[MAX_PATH - 1] = 0;
-
-			const char* ext = strext(path);
-			if (::stricmp(ext, "dds") == 0)
-			{
-				V(DirectX::LoadFromDDSFile(wPath, DirectX::DDS_FLAGS_NONE, &textureResource->metaData,
-					textureResource->image));
-			}
-			else if (::stricmp(ext, "tga") == 0)
-			{
-				V(DirectX::LoadFromTGAFile(wPath, &textureResource->metaData,
-					textureResource->image));
-			}
-// Add By Lixu Begin
-			else if (::stricmp(ext, "jpg") == 0)
-			{
-				V(DirectX::LoadFromWICFile(wPath, DirectX::TEX_FILTER_DEFAULT | DirectX::WIC_FLAGS_ALL_FRAMES, &textureResource->metaData,
-					textureResource->image));
-			}
-			else if (::stricmp(ext, "png") == 0)
-			{
-				V(DirectX::LoadFromWICFile(wPath, DirectX::TEX_FILTER_DEFAULT | DirectX::WIC_FLAGS_ALL_FRAMES, &textureResource->metaData,
-					textureResource->image));
-			}
-			else if (::stricmp(ext, "bmp") == 0)
-			{
-				V(DirectX::LoadFromWICFile(wPath, DirectX::TEX_FILTER_DEFAULT | DirectX::WIC_FLAGS_ALL_FRAMES, &textureResource->metaData,
-					textureResource->image));
-			}
-// Add By Lixu End
-			else
-			{
-				PX_ALWAYS_ASSERT_MESSAGE("Unsupported texture extension");
-			}
-			resource = textureResource;
-		}
-	}
-
-	if (resource)
-	{
-		m_loadedResources.emplace(key, resource);
-		return resource;
-	}
-	else
-	{
-		PX_ALWAYS_ASSERT_MESSAGE(name);
-		return nullptr;
-	}
-}
-
-bool dirExists(const char* dir)
-{
-	DWORD ftyp = GetFileAttributesA(dir);
-	if (ftyp == INVALID_FILE_ATTRIBUTES)
-		return false;  // something is wrong with path!
-
-	if (ftyp & FILE_ATTRIBUTE_DIRECTORY)
-		return true;   // this is a directory!
-
-	return false;    // this is not a directory!
-}
-
-bool ResourceManager::addSearchDir(const char* dir, bool recursive)
-{
-	if (dirExists(dir))
-	{
-		m_searchDirs.push_back(SearchDir(dir, recursive));
-		return true;
-	}
-	return false;
-}
-
-
-ResourceManager::~ResourceManager()
-{
-}
-
-
-bool ResourceManager::findFileInDir(std::string fileNameFull, const char* path, bool recursive, char* foundPath)
-{
-	WIN32_FIND_DATAA ffd;
-	char tmp[PATH_MAX_LEN];
-	shdfnd::snprintf(tmp, sizeof(tmp), "%s\\*", path);
-	HANDLE hFind = FindFirstFileA(tmp, &ffd);
-
-	if(INVALID_HANDLE_VALUE == hFind)
-	{
-		return NULL;
-	}
-
-	do
-	{
-		if (0 == shdfnd::strcmp(".", ffd.cFileName) || 0 == shdfnd::strcmp("..", ffd.cFileName))
-			continue;
-
-		if(ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-		{
-			shdfnd::snprintf(tmp, sizeof(tmp), "%s\\%s", path, ffd.cFileName);
-			if(findFileInDir(fileNameFull, tmp, recursive, foundPath))
-				return true;
-		}
-		else if (shdfnd::stricmp(ffd.cFileName, fileNameFull.c_str()) == 0)
-		{
-			shdfnd::snprintf(foundPath, PATH_MAX_LEN, "%s\\%s", path, ffd.cFileName);
-			return true;
-		}
-	} while(FindNextFileA(hFind, &ffd) != 0);
-	// release handle
-	FindClose(hFind);
-	return false;
-}
-
-bool ResourceManager::findFile(std::string fileName, const std::vector<const char*>& exts, char* foundPath)
-{
-	std::string fileNameOnly = fileName;
-	
-	std::string::size_type pos = 0;
-	pos = fileNameOnly.find("\\", pos);
-	while ((pos != std::string::npos))
-	{
-		fileNameOnly.replace(pos, 1, "/");
-		pos = fileNameOnly.find("\\", (pos + 1));
-	}
-
-	size_t ind = fileNameOnly.find_last_of('/');
-	if (ind > 0 && (ind != std::string::npos))
-		fileNameOnly = fileNameOnly.substr(ind + 1);
-
-// Add By Lixu Begin
-	std::string fileDir = ".";
-	size_t fl = fileName.length();
-	if (ind >= 0 && ind < fl)
-		fileDir = fileName.substr(0, ind);
-	if (findFileInDir(fileNameOnly.c_str(), fileDir.c_str(), true, foundPath))
-		return true;
-// Add By Lixu End
-
-	for(size_t i = 0; i < m_searchDirs.size(); i++)
-	{
-		const SearchDir& searchDir = m_searchDirs[i];
-
-		for(size_t j = 0; j < exts.size(); j++)
-		{
-			const char* ext = exts[j];
-			const uint32_t fileMaxLen = 128;
-			char fileNameFull[fileMaxLen] = { 0 };
-
-			physx::shdfnd::snprintf(fileNameFull, fileMaxLen, "%s.%s", fileNameOnly.c_str(), ext);
-			if(findFileInDir(fileNameFull, searchDir.path.c_str(), searchDir.recursive, foundPath))
-				return true;
-		}
-
-		if (findFileInDir(fileNameOnly.c_str(), searchDir.path.c_str(), searchDir.recursive, foundPath))
-			return true;
-	}
-	return false;
-}
-
-bool ResourceManager::findFile(std::string fileName, std::string& foundPath)
-{
-	std::vector<const char*> exts;
-	char path[PATH_MAX_LEN];
-	if (findFile(fileName, exts, path))
-	{
-		foundPath = path;
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ResourceManager.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ResourceManager.h
deleted file mode 100644
index 697b16b..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ResourceManager.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef RESOURCE_MANAGER_H
-#define RESOURCE_MANAGER_H
-
-#include <vector>
-#include <string>
-#include <map>
-#include <memory>
-#include "DirectXTex.h"
-
-
-struct Resource
-{
-private:
-	Resource& operator = (const Resource&);
-};
-
-
-struct ShaderFileResource : public Resource
-{
-	ShaderFileResource(const std::string& p) : path(p) {}
-	std::string path;
-};
-
-
-struct TextureResource : public Resource
-{
-	DirectX::TexMetadata metaData;
-	DirectX::ScratchImage image;
-};
-
-
-/**
-ResourceManager used to look for files in provided dirs (see addSearchDir). Also it loads resources and caches them.
-*/
-class ResourceManager
-{
-public:
-	//////// ctor ////////
-
-	ResourceManager();
-	~ResourceManager();
-
-// Add By Lixu Begin
-	static ResourceManager* ins();
-// Add By Lixu End
-
-	//////// public API ////////
-
-	bool addSearchDir(const char* dir, bool recursive = true);
-
-	const ShaderFileResource* requestShaderFile(const char* name);
-
-	const TextureResource* requestTexture(const char* name);
-
-	void releaseTexture(const char* name);
-
-	bool findFile(std::string fileName, std::string& foundPath);
-
-	bool findFile(std::string fileName, const std::vector<const char*>& exts, char* foundPath);
-
-
-private:
-	//////// internal methods ////////
-
-	enum ResourceType
-	{
-		eSHADER_FILE,
-		eTEXTURE
-	};
-
-	const Resource* requestResource(ResourceType type, const char* name);
-
-	bool findFileInDir(std::string fileNameFull, const char* path, bool recursive, char* foundPath);
-
-	struct SearchDir
-	{
-		SearchDir(std::string path_, bool recursive_) : path(path_), recursive(recursive_) {}
-
-		std::string path;
-		bool recursive;
-	};
-
-
-	//////// internal data ////////
-
-	std::vector<SearchDir> m_searchDirs;
-	std::map<std::pair<ResourceType, std::string>, Resource*> m_loadedResources;
-};
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ShaderUtils.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ShaderUtils.h
deleted file mode 100644
index da9caa0..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/ShaderUtils.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SHADER_UTILS_H
-#define SHADER_UTILS_H
-
-#include "Utils.h"
-#include <d3dcompiler.h>
-
-
-static HRESULT CompileShaderFromFile(const char* szFileName, LPCSTR szEntryPoint, LPCSTR szShaderModel,
-                                     ID3DBlob** ppBlobOut)
-{
-	HRESULT hr = S_OK;
-	ID3DBlob* pErrorBlob = NULL;
-
-	WCHAR wFileName[MAX_PATH];
-	MultiByteToWideChar(CP_ACP, 0, szFileName, -1, wFileName, MAX_PATH);
-	wFileName[MAX_PATH - 1] = 0;
-	hr = D3DCompileFromFile(wFileName, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, szEntryPoint, szShaderModel, D3D10_SHADER_ENABLE_STRICTNESS, 0,
-	                        ppBlobOut, &pErrorBlob);
-	if(FAILED(hr))
-	{
-		OutputDebugStringA((char*)pErrorBlob->GetBufferPointer());
-		SAFE_RELEASE(pErrorBlob);
-		return hr;
-	}
-	SAFE_RELEASE(pErrorBlob);
-
-	return S_OK;
-}
-
-static HRESULT createShader(ID3D11Device* pDev, const void* pData, size_t len, ID3D11VertexShader** ppShd, bool)
-{
-	return pDev->CreateVertexShader(pData, len, nullptr, ppShd);
-}
-
-static HRESULT createShader(ID3D11Device* pDev, const void* pData, size_t len, ID3D11GeometryShader** ppShd,
-                            bool forceFast)
-{
-	PX_UNUSED(forceFast);
-	return pDev->CreateGeometryShader(pData, len, nullptr, ppShd);
-}
-
-static HRESULT createShader(ID3D11Device* pDev, const void* pData, size_t len, ID3D11PixelShader** ppShd, bool)
-{
-	return pDev->CreatePixelShader(pData, len, nullptr, ppShd);
-}
-
-static const char* shaderModel(ID3D11VertexShader**)
-{
-	return "vs_5_0";
-}
-
-static const char* shaderModel(ID3D11GeometryShader**)
-{
-	return "gs_5_0";
-}
-
-static const char* shaderModel(ID3D11PixelShader**)
-{
-	return "ps_5_0";
-}
-
-// Give back the shader buffer blob for use in CreateVertexLayout.  Caller must release the blob.
-template <class S>
-static HRESULT createShaderFromFile(ID3D11Device* pDev, const char* szFileName, LPCSTR szEntryPoint, S** ppShd,
-                                    ID3DBlob*& pShaderBuffer, bool forceFast = false)
-{
-	HRESULT hr = CompileShaderFromFile(szFileName, szEntryPoint, shaderModel(ppShd), &pShaderBuffer);
-	if(SUCCEEDED(hr) && pShaderBuffer)
-	{
-		const void* shaderBufferData = pShaderBuffer->GetBufferPointer();
-		const UINT shaderBufferSize = pShaderBuffer->GetBufferSize();
-		createShader(pDev, shaderBufferData, shaderBufferSize, ppShd, forceFast);
-	}
-	return hr;
-}
-
-// Overloaded, same as above but don't give back the shader buffer blob.
-template <class S>
-static HRESULT createShaderFromFile(ID3D11Device* pDev, const char* szFileName, LPCSTR szEntryPoint, S** ppShd,
-                                    bool forceFast = false)
-{
-	ID3DBlob* pShaderBuffer = NULL;
-	HRESULT hr = createShaderFromFile(pDev, szFileName, szEntryPoint, ppShd, pShaderBuffer, forceFast);
-	SAFE_RELEASE(pShaderBuffer);
-	return hr;
-}
-
-
-#endif //SHADER_UTILS_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/SkinnedRenderMesh.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/SkinnedRenderMesh.cpp
deleted file mode 100644
index ff121d6..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/SkinnedRenderMesh.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "SkinnedRenderMesh.h"
-#include "Renderer.h"
-
-SkinnedRenderMesh::SkinnedRenderMesh(const std::vector<const SimpleMesh*>& meshes)
-{
-	PX_ASSERT_WITH_MESSAGE(meshes.size() <= MeshesCountMax, "meshes.size() have to be <= SkinnedRenderMesh::MeshesCountMax");
-
-	m_device = GetDeviceManager()->GetDevice();
-
-	// input element desc setup
-	m_inputDesc.push_back({ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	m_inputDesc.push_back({ "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	m_inputDesc.push_back({ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-	m_inputDesc.push_back({ "TEXCOORD", 1, DXGI_FORMAT_R32_UINT, 1, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 });
-
-	// reserve VB
-	uint32_t verticesTotal = 0;
-	std::for_each(meshes.begin(), meshes.end(), [&](const SimpleMesh* c) { verticesTotal += (uint32_t)c->vertices.size(); });
-	std::vector<SimpleMesh::Vertex> vertexBuffer;
-	vertexBuffer.reserve(verticesTotal);
-
-	// reserve IB 
-	uint32_t indicesTotal = 0;
-	std::for_each(meshes.begin(), meshes.end(), [&](const SimpleMesh* c) { indicesTotal += (uint32_t)c->indices.size(); });
-	m_indices.reserve(indicesTotal);
-
-	// fill VB, IB, MeshInfo
-	m_meshesInfo.resize(meshes.size());
-	for (uint32_t meshIndex = 0; meshIndex < meshes.size(); ++meshIndex)
-	{
-		const SimpleMesh* mesh = meshes[meshIndex];
-		MeshInfo& meshInfo = m_meshesInfo[meshIndex];
-
-		meshInfo.firstVertex = (uint32_t)vertexBuffer.size();
-		vertexBuffer.insert(vertexBuffer.end(), mesh->vertices.begin(), mesh->vertices.end());
-		meshInfo.verticesCount = (uint32_t)mesh->vertices.size();
-
-		meshInfo.firstIndex = (uint32_t)m_indices.size();
-		uint32_t indexOffset = meshInfo.firstVertex;
-		for (uint32_t index : mesh->indices)
-		{
-			m_indices.push_back((uint32_t)index + indexOffset);
-		}
-		meshInfo.indicesCount = (uint32_t)mesh->indices.size();
-	}
-
-	// vertex buffer
-	{
-		D3D11_SUBRESOURCE_DATA vertexBufferData;
-
-		ZeroMemory(&vertexBufferData, sizeof(vertexBufferData));
-		vertexBufferData.pSysMem = vertexBuffer.data();
-
-		D3D11_BUFFER_DESC bufferDesc;
-
-		memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-		bufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-		bufferDesc.ByteWidth = (uint32_t)(sizeof(SimpleMesh::Vertex) * vertexBuffer.size());
-		bufferDesc.CPUAccessFlags = 0;
-		bufferDesc.MiscFlags = 0;
-		bufferDesc.Usage = D3D11_USAGE_IMMUTABLE;
-
-		V(m_device->CreateBuffer(&bufferDesc, &vertexBufferData, &m_vertexBuffer));
-	}
-
-	// bone index buffer
-	{
-		D3D11_BUFFER_DESC bufferDesc;
-
-		memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-		bufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-		bufferDesc.ByteWidth = (uint32_t)(sizeof(uint32_t) * vertexBuffer.size());
-		bufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-		bufferDesc.MiscFlags = 0;
-		bufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-
-		V(m_device->CreateBuffer(&bufferDesc, nullptr, &m_boneIndexBuffer));
-	}
-
-	// index buffer
-	{
-		D3D11_BUFFER_DESC bufferDesc;
-
-		memset(&bufferDesc, 0, sizeof(D3D11_BUFFER_DESC));
-		bufferDesc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-		bufferDesc.ByteWidth = (uint32_t)(sizeof(uint32_t) * m_indices.size());
-		bufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-		bufferDesc.MiscFlags = 0;
-		bufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-
-		V(m_device->CreateBuffer(&bufferDesc, nullptr, &m_indexBuffer));
-	}
-
-	// bone texture
-	{
-		D3D11_TEXTURE2D_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Width = 4;
-		desc.Height = (uint32_t)meshes.size();
-		desc.MipLevels = 1;
-		desc.ArraySize = 1;
-		desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
-		desc.SampleDesc.Count = 1;
-		desc.SampleDesc.Quality = 0;
-		desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-		desc.Usage = D3D11_USAGE_DYNAMIC;
-		desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-
-		V(m_device->CreateTexture2D(&desc, nullptr, &m_boneTexture));
-	}
-
-	// bone texture SRV
-	{
-		D3D11_SHADER_RESOURCE_VIEW_DESC desc;
-		ZeroMemory(&desc, sizeof(desc));
-		desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
-		desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-		desc.Texture2D.MipLevels = 1;
-		desc.Texture2D.MostDetailedMip = 0;
-		V(m_device->CreateShaderResourceView(m_boneTexture, &desc, &m_boneTextureSRV));
-	}
-}
-
-SkinnedRenderMesh::~SkinnedRenderMesh()
-{
-	SAFE_RELEASE(m_vertexBuffer);
-	SAFE_RELEASE(m_boneIndexBuffer);
-	SAFE_RELEASE(m_indexBuffer);
-	SAFE_RELEASE(m_boneTexture);
-	SAFE_RELEASE(m_boneTextureSRV);
-}
-
-void SkinnedRenderMesh::updateVisibleMeshes(const std::vector<uint32_t>& visibleMeshes)
-{
-	ID3D11DeviceContext* context;
-	m_device->GetImmediateContext(&context);
-
-	// update bone index buffer
-	{
-		D3D11_MAPPED_SUBRESOURCE mappedRead;
-		V(context->Map(m_boneIndexBuffer, 0, D3D11_MAP_WRITE_DISCARD, NULL, &mappedRead));
-
-		uint32_t* boneIndexBuffer = (uint32_t*)mappedRead.pData;
-		for (uint32_t i = 0; i < visibleMeshes.size(); ++i)
-		{
-			const MeshInfo& info = m_meshesInfo[visibleMeshes[i]];
-			for (uint32_t v = info.firstVertex; v < info.firstVertex + info.verticesCount; ++v)
-			{
-				boneIndexBuffer[v] = i;
-			}
-		}
-
-		context->Unmap(m_boneIndexBuffer, 0);
-	}
-
-	// update index buffer
-	{
-		D3D11_MAPPED_SUBRESOURCE mappedRead;
-		V(context->Map(m_indexBuffer, 0, D3D11_MAP_WRITE_DISCARD, NULL, &mappedRead));
-
-		uint32_t* indexBuffer = (uint32_t*)mappedRead.pData;
-		uint32_t indexCount = 0;
-		for (uint32_t meshIndex : visibleMeshes)
-		{
-			const MeshInfo& info = m_meshesInfo[meshIndex];
-			memcpy(indexBuffer + indexCount, &m_indices[info.firstIndex], info.indicesCount * sizeof(uint32_t));
-			indexCount += info.indicesCount;
-		}
-		context->Unmap(m_indexBuffer, 0);
-		m_indexCount = indexCount;
-		PX_ASSERT(m_indexCount % 3 == 0);
-	}
-}
-
-void SkinnedRenderMesh::updateVisibleMeshTransforms(std::vector<PxMat44>& transforms)
-{
-	ID3D11DeviceContext* context;
-	m_device->GetImmediateContext(&context);
-
-	// update bone transform texture
-	{
-		D3D11_MAPPED_SUBRESOURCE mappedRead;
-		V(context->Map(m_boneTexture, 0, D3D11_MAP_WRITE_DISCARD, NULL, &mappedRead));
-		for (uint32_t i = 0; i < transforms.size(); ++i)
-		{
-			std::memcpy((uint8_t*)mappedRead.pData + i * mappedRead.RowPitch, &transforms[i], sizeof(PxMat44));
-		}
-		context->Unmap(m_boneTexture, 0);
-	}
-}
-
-void SkinnedRenderMesh::render(ID3D11DeviceContext& context) const
-{
-	context.IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-
-	UINT strides[2] = { sizeof(SimpleMesh::Vertex), sizeof(uint32_t) };
-	UINT offsets[2] = { 0 };
-	ID3D11Buffer* buffers[2] = { m_vertexBuffer, m_boneIndexBuffer };
-	context.IASetVertexBuffers(0, 2, buffers, strides, offsets);
-
-	context.IASetIndexBuffer(m_indexBuffer, DXGI_FORMAT_R32_UINT, 0);
-
-	context.VSSetShaderResources(1, 1, &m_boneTextureSRV);
-
-	context.DrawIndexed(m_indexCount, 0, 0);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/SkinnedRenderMesh.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/SkinnedRenderMesh.h
deleted file mode 100644
index f3643d8..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/renderer/SkinnedRenderMesh.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SKINNED_RENDER_MESH_H
-#define SKINNED_RENDER_MESH_H
-
-#include "Utils.h"
-#include <DirectXMath.h>
-
-#include <vector>
-#include "Renderable.h"
-#include "Mesh.h"
-
-/**
-SkinnedRenderMesh:
-	bonde indices are passed as vertex input,
-	bone transforms are stored in texture
-	max bone meshes count: SkinnedRenderMesh::MeshesCountMax
-*/
-class SkinnedRenderMesh : public IRenderMesh
-{
-public:
-	//////// ctor ////////
-
-	SkinnedRenderMesh(const std::vector<const SimpleMesh*>& meshes);
-	~SkinnedRenderMesh();
-
-
-	//////// const ////////
-
-	static const uint32_t MeshesCountMax = D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION;
-
-
-	//////// public API ////////
-
-	void updateVisibleMeshes(const std::vector<uint32_t>& visibleMeshes);
-	void updateVisibleMeshTransforms(std::vector<PxMat44>& transforms);
-
-
-	//////// IRenderMesh implementation ////////
-
-	virtual const std::vector<D3D11_INPUT_ELEMENT_DESC>& getInputElementDesc() const { return m_inputDesc; }
-	virtual void render(ID3D11DeviceContext& context) const;
-
-private:
-	//////// internal data ////////
-
-	struct MeshInfo
-	{
-		uint32_t firstIndex;
-		uint32_t indicesCount;
-
-		uint32_t firstVertex;
-		uint32_t verticesCount;
-	};
-
-	std::vector<D3D11_INPUT_ELEMENT_DESC> m_inputDesc;
-
-	ID3D11Device* m_device;
-
-	ID3D11Buffer* m_vertexBuffer;
-	ID3D11Buffer* m_boneIndexBuffer;
-	ID3D11Buffer* m_indexBuffer;
-	ID3D11Texture2D* m_boneTexture;
-	ID3D11ShaderResourceView* m_boneTextureSRV;
-
-	uint32_t m_indexCount;
-
-	std::vector<MeshInfo> m_meshesInfo;
-	std::vector<uint32_t> m_indices;
-};
-
-
-
-#endif //SKINNED_RENDER_MESH_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SampleAssetListParser.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SampleAssetListParser.cpp
deleted file mode 100644
index b58f9f1..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SampleAssetListParser.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "SampleAssetListParser.h"
-#include <PsFastXml.h>
-#include "Sample.h"
-#include "PxVec4.h"
-#include "PxInputDataFromPxFileBuf.h"
-#include <bitset>
-
-
-using namespace physx;
-
-
-const float DEGREE_TO_RAD = acos(-1.0) / 180.0;
-
-class AssetListParser : public physx::shdfnd::FastXml::Callback
-{
-public:
-	AssetListParser(AssetList& assetList): m_assetList(assetList){}
-protected:
-
-	// encountered a comment in the XML
-	virtual bool processComment(const char* /*comment*/)
-	{
-		return true;
-	}
-
-	virtual bool processClose(const char* elementName, unsigned int /*depth*/, bool& /*isError*/)
-	{
-		if (::strcmp(elementName, "Box") == 0)
-		{
-			m_assetList.boxes.push_back(m_boxTemp);
-			m_boxTemp = AssetList::BoxAsset();
-		}
-		else if (::strcmp(elementName, "Composite") == 0)
-		{
-			m_assetList.composites.push_back(m_compositeTemp);
-			m_compositeTemp = AssetList::CompositeAsset();
-		}
-		return true;
-	}
-
-	// return true to continue processing the XML document, false to skip.
-	virtual bool processElement(const char* elementName, // name of the element
-		const char* elementData, // element data, null if none
-		const physx::shdfnd::FastXml::AttributePairs& attr,
-		int /*lineno*/) // line number in the source XML file
-	{
-		if (::strcmp(elementName, "Model") == 0)
-		{
-			m_assetList.models.resize(m_assetList.models.size() + 1);
-			auto& model = m_assetList.models.back();
-			for (int i = 0; i < attr.getNbAttr(); ++i)
-			{
-				if (::strcmp(attr.getKey(i), "id") == 0)
-				{
-					model.id = std::string(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "file") == 0)
-				{
-					model.file = std::string(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "name") == 0)
-				{
-					model.name = std::string(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "isSkinned") == 0)
-				{
-					std::string str = attr.getValue(i);
-					if (::strcmp(&str[0], "true") == 0)
-					{
-						model.isSkinned = true;
-					}
-				}
-			}
-
-			model.transform = parseTransform(attr);
-
-			if (model.name.empty())
-			{
-				model.name = model.file;
-			}
-			if (model.id.empty())
-			{
-				model.id = model.name;
-			}
-		}
-		else if (::strcmp(elementName, "Box") == 0)
-		{
-			for (int i = 0; i < attr.getNbAttr(); ++i)
-			{
-				if (::strcmp(attr.getKey(i), "id") == 0)
-				{
-					m_boxTemp.id = std::string(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "name") == 0)
-				{
-					m_boxTemp.name = std::string(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "jointAllBonds") == 0)
-				{
-					std::string str = attr.getValue(i);
-					if (::strcmp(&str[0], "true") == 0)
-					{
-						m_boxTemp.jointAllBonds = true;
-					}
-				}
-				else if (::strcmp(attr.getKey(i), "extents") == 0)
-				{
-					std::string str = attr.getValue(i);
-					sscanf(&str[0], "%f %f %f", &m_boxTemp.extents.x, &m_boxTemp.extents.y, &m_boxTemp.extents.z);
-				}
-				else if (::strcmp(attr.getKey(i), "bondFlagsMask") == 0)
-				{
-					std::string str = attr.getValue(i);
-					std::bitset<8> bondFlags(str);
-					m_boxTemp.bondFlags = static_cast<uint32_t>(bondFlags.to_ulong());
-				}
-			}
-
-			if (m_boxTemp.id.empty())
-			{
-				m_boxTemp.id = m_boxTemp.name;
-			}
-		}
-		else if (::strcmp(elementName, "Level") == 0)
-		{
-			m_boxTemp.levels.push_back(AssetList::BoxAsset::Level());
-			auto& level = m_boxTemp.levels.back();
-			for (int i = 0; i < attr.getNbAttr(); ++i)
-			{
-				if (::strcmp(attr.getKey(i), "slices") == 0)
-				{
-					std::string str = attr.getValue(i);
-					sscanf(&str[0], "%d %d %d", &level.x, &level.y, &level.z);
-				}
-				if (::strcmp(attr.getKey(i), "isSupport") == 0)
-				{
-					std::string str = attr.getValue(i);
-					if (::strcmp(&str[0], "true") == 0)
-					{
-						level.isSupport = true;
-					}
-				}
-			}
-		}
-		else if (::strcmp(elementName, "Composite") == 0)
-		{
-			for (int i = 0; i < attr.getNbAttr(); ++i)
-			{
-				if (::strcmp(attr.getKey(i), "id") == 0)
-				{
-					m_compositeTemp.id = std::string(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "name") == 0)
-				{
-					m_compositeTemp.name = std::string(attr.getValue(i));
-				}
-			}
-			m_compositeTemp.transform = parseTransform(attr);
-
-			if (m_compositeTemp.id.empty())
-			{
-				m_compositeTemp.id = m_compositeTemp.name;
-			}
-		}
-		else if (::strcmp(elementName, "AssetRef") == 0)
-		{
-			m_compositeTemp.assetRefs.push_back(AssetList::CompositeAsset::AssetRef());
-			AssetList::CompositeAsset::AssetRef& assetRef = m_compositeTemp.assetRefs.back();
-			for (int i = 0; i < attr.getNbAttr(); ++i)
-			{
-				if (::strcmp(attr.getKey(i), "id") == 0)
-				{
-					assetRef.id = attr.getValue(i);
-				}
-			}
-			assetRef.transform = parseTransform(attr);
-		}
-		else if (::strcmp(elementName, "Joint") == 0)
-		{
-			m_compositeTemp.joints.push_back(AssetList::CompositeAsset::Joint());
-			AssetList::CompositeAsset::Joint& joint = m_compositeTemp.joints.back();
-			for (int i = 0; i < attr.getNbAttr(); ++i)
-			{
-				if (::strcmp(attr.getKey(i), "asset0") == 0)
-				{
-					joint.assetIndices[0] = std::stoi(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "asset1") == 0)
-				{
-					joint.assetIndices[1] = std::stoi(attr.getValue(i));
-				}
-				if (::strcmp(attr.getKey(i), "chunk0") == 0)
-				{
-					joint.chunkIndices[0] = std::stoi(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "chunk1") == 0)
-				{
-					joint.chunkIndices[1] = std::stoi(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "position0") == 0)
-				{
-					joint.attachPositions[0] = parsePosition(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "position1") == 0)
-				{
-					joint.attachPositions[1] = parsePosition(attr.getValue(i));
-				}
-			}
-		}
-		return true;
-	}
-
-private:
-	PxTransform parseTransform(const physx::shdfnd::FastXml::AttributePairs& attr)
-	{
-		PxTransform transform(PxIdentity);
-		for (int i = 0; i < attr.getNbAttr(); ++i)
-		{
-			if (::strcmp(attr.getKey(i), "position") == 0)
-			{
-				transform.p = parsePosition(attr.getValue(i));
-			}
-			else if (::strcmp(attr.getKey(i), "rotation") == 0)
-			{
-				transform.q = parseRotation(attr.getValue(i));
-			}
-		}
-		return transform;
-	}
-
-	PxVec3 parsePosition(const char* value)
-	{
-		PxVec3 ps;
-		sscanf(value, "%f %f %f", &ps.x, &ps.y, &ps.z);
-		return ps;
-	}
-
-	PxQuat parseRotation(const char* value)
-	{
-		PxVec4 ps;
-		sscanf(value, "%f %f %f %f", &ps.x, &ps.y, &ps.z, &ps.w);
-		ps.w = ps.w * DEGREE_TO_RAD;
-		return PxQuat(ps.w, PxVec3(ps.x, ps.y, ps.z).getNormalized());;
-	}
-
-	AssetList::BoxAsset			m_boxTemp;
-	AssetList::CompositeAsset	m_compositeTemp;
-	AssetList&					m_assetList;
-};
-
-
-void parseAssetList(AssetList& assetList, std::string filepath)
-{
-	physx::PsFileBuffer fileBuffer(filepath.c_str(), physx::general_PxIOStream2::PxFileBuf::OPEN_READ_ONLY);
-	if (!fileBuffer.isOpen())
-	{
-		return;
-	}
-	PxInputDataFromPxFileBuf inputData(fileBuffer);
-	AssetListParser parser(assetList);
-	physx::shdfnd::FastXml* xml = physx::shdfnd::createFastXml(&parser);
-	xml->processXml(inputData, false);
-	xml->release();
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SampleAssetListParser.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SampleAssetListParser.h
deleted file mode 100644
index 5d22833..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SampleAssetListParser.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SAMPLEASSETLISTPARSER_H
-#define SAMPLEASSETLISTPARSER_H
-
-#include <string>
-
-struct AssetList;
-
-void parseAssetList(AssetList& assetList, std::string filepath);
-
-#endif // SAMPLEASSETLISTPARSER_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SceneController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SceneController.cpp
deleted file mode 100644
index 05681d0..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SceneController.cpp
+++ /dev/null
@@ -1,1736 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "SceneController.h"
-#include "RenderUtils.h"
-#include "Utils.h"
-
-#include "BlastAssetBoxes.h"
-#include "BlastAssetModelSimple.h"
-#include "BlastAssetModelSkinned.h"
-#include "NvBlastExtPxAsset.h"
-#include "NvBlastExtPxFamily.h"
-#include "NvBlastExtPxManager.h"
-
-#include "SampleAssetListParser.h"
-#include "BlastReplay.h"
-#include "Renderer.h"
-
-#include "BlastController.h"
-#include "CommonUIController.h"
-#include "PhysXController.h"
-
-#include "PxRigidDynamic.h"
-#include <PsFastXml.h>
-#include "PxInputDataFromPxFileBuf.h"
-
-#include <algorithm>
-#include <imgui.h>
-#include <sstream>
-#include <tuple>
-#include <map>
-
-#include "BlastSceneTree.h"
-#include "SimpleScene.h"
-#include "SampleManager.h"
-// Add By Lixu Begin
-#include "ProjectParams.h"
-// Add By Lixu End
-
-//////// Simple hash function ////////
-static NvBlastID generateIDFromString(const char* str)
-{
-	uint32_t h[4] = { 5381, 5381, 5381, 5381 };
-	int i = 0;
-	for (const char* ptr = str; *ptr; i = ((i + 1) & 3), ++ptr)
-	{
-		h[i] = ((h[i] << 5) + h[i]) ^ static_cast<uint32_t>(*ptr);
-	}
-	return *reinterpret_cast<NvBlastID*>(h);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												Scenes Setup
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const DirectX::XMFLOAT4 PICK_POINTER_ACTIVE_COLOR(1.0f, 0.f, 0.f, 0.6f);
-const float RIGIDBODY_DENSITY = 2000.0f;
-
-
-class SingleSceneAsset;
-
-class SceneAsset
-{
-public:
-	SceneAsset() : spawnCount(0) {}
-	virtual ~SceneAsset() {}
-
-	void initialize(Scene* scene)
-	{
-		m_scene = scene;
-	}
-
-	virtual const char* getID() const = 0;
-	virtual const char* getName() const = 0;
-
-	virtual void load() = 0;
-	virtual void unload() = 0;
-	virtual bool isLoaded() const = 0;
-	virtual void spawn(PxTransform transform) = 0;
-
-	virtual ImVec4 getUIColor() const
-	{
-		return ImGui::GetStyle().Colors[ImGuiCol_Text];
-	}
-
-	uint32_t spawnCount;
-protected:
-	Scene*	m_scene;
-};
-
-
-class SceneActor
-{
-public:
-	SceneActor() : removeOnReload(false) {}
-
-	virtual ~SceneActor() {}
-	virtual const char* getName() const = 0;
-	virtual const char* getSubname(int subindex) const { return nullptr; }
-	virtual ImVec4 getUIColor() const = 0;
-	virtual void drawUI(int subindex) {}
-	virtual void drawStatsUI(int subindex) {}
-	virtual uint32_t getSubactorCount() const { return 0; }
-	virtual PxVec3 getSpawnShift() const { return PxVec3(PxZero); }
-	virtual void reload() {}
-	virtual void removeSubactor(int subindex) {}
-
-	bool	removeOnReload;
-};
-
-
-class Scene
-{
-public:
-	struct ActorIndex
-	{
-		int		index;
-		int		subindex;
-
-		ActorIndex() { reset(); }
-		ActorIndex(int i, int s = -1) : index(i), subindex(s) {}
-
-		bool operator==(const ActorIndex& other) const
-		{
-			return index == other.index && subindex == other.subindex;
-		}
-
-		void reset()
-		{
-			index = -1;
-			subindex = -1;
-		}
-	};
-
-	Scene(Renderer& renderer, PhysXController& physXController, BlastController& blastController, CommonUIController& commonUIController) :
-		m_renderer(renderer), m_physXController(physXController), m_blastController(blastController), m_commonUIController(commonUIController)
-	{
-	}
-
-	~Scene()
-	{
-		removeAllSceneActors();
-
-		for (uint32_t i = 0; i < m_assets.size(); i++)
-		{
-			SAFE_DELETE(m_assets[i]);
-		}
-		m_assets.clear();
-		m_assetsByID.clear();
-		m_tkAssetMap.clear();
-	}
-
-	void addAsset(SceneAsset* asset)
-	{
-		m_assets.push_back(asset);
-		asset->initialize(this);
-		std::string id = asset->getID();
-		m_assetsByID[id] = asset;
-	}
-
-// Add By Lixu Begin
-	void removeAsset(SceneAsset* asset)
-	{
-		std::string id = asset->getID();
-		m_assetsByID.erase(m_assetsByID.find(id));
-
-		std::vector<SceneAsset*>::iterator it;
-		for (it = m_assets.begin(); it != m_assets.end(); it++)
-		{
-			if (*it == asset)
-			{
-				m_assets.erase(it);
-				break;
-			}
-		}		
-	}
-
-	std::vector<SceneAsset*>& getAssets()
-	{
-		return m_assets;
-	}
-
-	std::vector<SceneActor*>& getActors()
-	{
-		return m_sceneActors;
-	}
-// Add By Lixu End
-
-	void drawUI()
-	{
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Assets Selection
-		///////////////////////////////////////////////////////////////////////////////////////////
-		{
-			static int mode = 0;
-			ImGui::RadioButton("Replace", &mode, 0); ImGui::SameLine();
-			ImGui::RadioButton("Append", &mode, 1);
-
-			ImGui::ListBoxHeader("Assets", (int)m_assets.size());
-			for (uint32_t i = 0; i < m_assets.size(); ++i)
-			{
-				ImVec4 color = m_assets[i]->getUIColor();
-				color.w = color.w * (m_assets[i]->isLoaded() ? 1.0f : 0.5f);
-				ImGui::PushStyleColor(ImGuiCol_Text, color);
-				if (ImGui::Selectable(m_assets[i]->getName(), m_lastSpawnedAsset == i))
-				{
-					m_lastSpawnedAsset = i;
-					if (mode == 0)
-					{
-						removeAllSceneActors();
-					}
-					m_commonUIController.addDelayedCall([=]() { spawnAsset(m_lastSpawnedAsset); }, "Loading Asset");
-				}
-				ImGui::PopStyleColor();
-			}
-			ImGui::ListBoxFooter();
-		}
-
-		ImGui::Spacing();
-		ImGui::Separator();
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Actors Selection
-		///////////////////////////////////////////////////////////////////////////////////////////
-		{
-			// actor's list
-			{
-				int itemCount = 0;
-				for (size_t i = 0; i < m_sceneActors.size(); ++i)
-				{
-					itemCount += 1 + m_sceneActors[i]->getSubactorCount();
-				}
-
-				ImGui::ListBoxHeader("Scene Actors", itemCount);
-				for (int i = 0; i < (int)m_sceneActors.size(); ++i)
-				{
-					ImVec4 color = m_sceneActors[i]->getUIColor();
-					ImGui::PushStyleColor(ImGuiCol_Text, color);
-
-					const bool isSelected = (m_selectedActor.index == i);
-
-					ImGui::PushID(i);
-					if (ImGui::Selectable(m_sceneActors[i]->getName(), isSelected && m_selectedActor.subindex == -1))
-					{
-						setSelectedActor(i);
-					}
-
-					for (int s = 0; s < (int)m_sceneActors[i]->getSubactorCount(); ++s)
-					{
-						ImGui::PushID(s);
-						if (ImGui::Selectable(m_sceneActors[i]->getSubname(s), isSelected && m_selectedActor.subindex == s))
-						{
-							setSelectedActor(i, s);
-						}
-						ImGui::PopID();
-					}
-
-					ImGui::PopID();
-					ImGui::PopStyleColor();
-				}
-				ImGui::ListBoxFooter();
-			}
-
-			SceneActor* selectedActor = getSelectedActor();
-			if (selectedActor)
-			{
-				if (ImGui::Button("Remove"))
-				{
-					removeSceneActor(m_selectedActor);
-				}
-
-				ImGui::SameLine();
-
-				if (ImGui::Button("Reload"))
-				{
-					selectedActor->reload();
-				}
-
-				ImGui::SameLine();
-			}
-
-			if (ImGui::Button("Remove All"))
-			{
-				removeAllSceneActors();
-			}
-			ImGui::SameLine();
-			if (ImGui::Button("Reload All (R)"))
-			{
-				reloadAllActors();
-			}
-		}
-
-		ImGui::Spacing();
-		ImGui::Spacing();
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Selected Actor
-		///////////////////////////////////////////////////////////////////////////////////////////
-		{
-			SceneActor* selectedActor = getSelectedActor();
-			if (selectedActor)
-			{
-				ImGui::Text("Selected Actor: ");
-				ImGui::SameLine();
-				ImGui::PushStyleColor(ImGuiCol_Text, ImColor(40, 200, 80, 255));
-				ImGui::Text(m_selectedActor.subindex >= 0 ? selectedActor->getSubname(m_selectedActor.subindex) : selectedActor->getName());
-				ImGui::PopStyleColor();
-
-				ImGui::Spacing();
-
-				selectedActor->drawUI(m_selectedActor.subindex);
-			}
-			else
-			{
-				ImGui::Text("No Selected Actor");
-			}
-		}
-	}
-
-	void drawStatsUI()
-	{
-		SceneActor* selectedActor = getSelectedActor();
-		if (selectedActor)
-		{
-			selectedActor->drawStatsUI(m_selectedActor.subindex);
-		}
-	}
-
-	void spawnAsset(int32_t num)
-	{
-		m_lastSpawnedAsset = physx::PxClamp<int32_t>(num, -1, (uint32_t)m_assets.size() - 1);
-
-		if (m_lastSpawnedAsset < 0)
-		{
-			return;
-		}
-
-		PxTransform transform(PxIdentity);
-// Add By Lixu Begin
-		/*
-		for (SceneActor* a : m_sceneActors)
-		{
-			shift += a->getSpawnShift();
-		}
-		*/
-// Add By Lixu End
-
-		SceneAsset* asset = m_assets[m_lastSpawnedAsset];
-		asset->spawn(transform);
-	}
-
-	void addSceneActor(SceneActor* actor)
-	{
-		m_sceneActors.push_back(actor);
-		if (!getSelectedActor())
-		{
-			setSelectedActor((uint32_t)m_sceneActors.size() - 1);
-		}
-	}
-
-// Add By Lixu Begin
-	void removeSceneActor(SceneActor* actor)
-	{
-		std::vector<SceneActor*>::iterator itActors;
-		for (itActors = m_sceneActors.begin(); itActors != m_sceneActors.end(); itActors++)
-		{
-			if (*itActors == actor)
-			{
-				m_sceneActors.erase(itActors);
-				break;
-			}
-		}
-	}
-// Add By Lixu End
-
-	void removeSceneActor(ActorIndex actorIndex)
-	{
-		SceneActor* actor = getActorByIndex(actorIndex.index);
-		if (actorIndex.subindex < 0)
-		{
-			delete actor;
-			m_sceneActors.erase(std::remove(m_sceneActors.begin(), m_sceneActors.end(), actor));
-		}
-		else
-		{
-			actor->removeSubactor(actorIndex.subindex);
-
-			if (actor->getSubactorCount() == 0)
-			{
-				removeSceneActor(ActorIndex(actorIndex.index, -1));
-				return;
-			}
-		}
-
-		SceneActor* selectedActor = getActorByIndex(m_selectedActor.index);
-		if (selectedActor == nullptr)
-		{
-			if (!m_sceneActors.empty())
-			{
-				setSelectedActor((uint32_t)m_sceneActors.size() - 1);
-			}
-		}
-		else
-		{
-			int subactorCount = selectedActor->getSubactorCount();
-			if (m_selectedActor.subindex >= subactorCount || (m_selectedActor.subindex < 0 && subactorCount > 0))
-			{
-				setSelectedActor(m_selectedActor.index, subactorCount - 1);
-			}
-		}
-	}
-
-	void removeAllSceneActors()
-	{
-		for (SceneActor* a : m_sceneActors)
-		{
-			delete a;
-		}
-		m_sceneActors.clear();
-		setSelectedActor(-1);
-	}
-
-	void setSelectedActor(int index, int subindex = -1)
-	{
-		m_selectedActor.index = physx::PxClamp<int32_t>(index, -1, (uint32_t)m_sceneActors.size() - 1);
-		m_selectedActor.subindex = subindex;
-	}
-
-	SceneActor* getSelectedActor() const
-	{
-		return getActorByIndex(m_selectedActor.index);
-	}
-
-	SceneActor* getActorByIndex(int index) const
-	{
-		return (index >= 0 && index < (int)m_sceneActors.size()) ? m_sceneActors[index] : nullptr;
-	}
-
-	int releaseAll()
-	{
-		removeAllSceneActors();
-
-		for (size_t i = 0; i < m_assets.size(); ++i)
-		{
-			m_assets[i]->unload();
-		}
-
-		m_assets.clear();
-		const int currentAsset = m_lastSpawnedAsset;
-		m_lastSpawnedAsset = -1;
-		return currentAsset;
-	}
-
-	void reloadAllActors()
-	{
-		SceneActor* selectedActor = getSelectedActor();
-		ActorIndex selectIndex(0);
-
-		for (uint32_t i = 0; i < m_sceneActors.size(); i++)
-		{
-			if (m_sceneActors[i]->removeOnReload)
-			{
-				removeSceneActor(ActorIndex(i));
-				i--;
-			}
-		}
-
-		for (uint32_t i = 0; i < m_sceneActors.size(); i++)
-		{
-			if (m_sceneActors[i] == selectedActor)
-			{
-				selectIndex.index = i;
-			}
-			m_sceneActors[i]->reload();
-		}
-
-		setSelectedActor(selectIndex.index, selectIndex.subindex);
-	}
-
-	void registerTkAsset(const TkAsset& tkAsset, SingleSceneAsset* asset)
-	{
-		m_tkAssetMap[&tkAsset] = asset;
-	}
-
-	void unregisterTkAsset(const TkAsset& tkAsset)
-	{
-		m_tkAssetMap.erase(&tkAsset);
-	}
-
-	SingleSceneAsset* findSingleSceneAsset(const TkAsset& tkAsset)
-	{
-		auto entry = m_tkAssetMap.find(&tkAsset);
-		return entry != m_tkAssetMap.end() ? entry->second : nullptr;
-	}
-
-	SceneAsset* findSceneAsset(const std::string& id)
-	{
-		auto entry = m_assetsByID.find(id);
-		return entry != m_assetsByID.end() ? entry->second : nullptr;
-	}
-
-
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return m_renderer;
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return m_physXController;
-	}
-
-	BlastController& getBlastController() const
-	{
-		return m_blastController;
-	}
-
-	CommonUIController& getCommonUIController() const
-	{
-		return m_commonUIController;
-	}
-
-private:
-
-	Renderer&			                              m_renderer;
-	PhysXController&	                              m_physXController;
-	BlastController&	                              m_blastController;
-	CommonUIController&                               m_commonUIController;
-
-	std::vector<SceneAsset*>                          m_assets;
-	std::vector<SceneActor*>                          m_sceneActors;
-	std::map<const TkAsset*, SingleSceneAsset*>		  m_tkAssetMap;
-	std::map<std::string, SceneAsset*>				  m_assetsByID;
-
-	int                                               m_lastSpawnedAsset;
-
-	ActorIndex										  m_selectedActor;
-};
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Assets
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class SingleSceneActor;
-
-class SingleSceneAsset : public SceneAsset
-{
-public:
-	SingleSceneAsset(BlastAsset* pBlastAsset) : m_asset(pBlastAsset) {}
-	virtual ~SingleSceneAsset() { unload(); }
-
-	virtual void spawn(PxTransform transform) override;
-
-	virtual void load() override
-	{
-		if (!m_asset)
-		{
-			m_asset = createAsset();
-		}
-
-		m_scene->registerTkAsset(m_asset->getPxAsset()->getTkAsset(), this);
-	}
-
-	virtual void unload() override
-	{
-		if (m_asset)
-		{
-			m_scene->unregisterTkAsset(m_asset->getPxAsset()->getTkAsset());
-			delete m_asset;
-			m_asset = nullptr;
-		}
-	}
-
-	virtual bool isLoaded() const override
-	{
-		return m_asset != nullptr;
-	}
-
-	BlastAsset* getAsset() const
-	{
-		return m_asset;
-	}
-
-	virtual PxTransform getInitialTransform() = 0;
-
-protected:
-	virtual BlastAsset* createAsset() = 0;
-
-private:
-	BlastAsset* m_asset;
-};
-
-
-class ModelSceneAsset : public SingleSceneAsset
-{
-public:
-	ModelSceneAsset(BlastAsset* pBlastAsset) : SingleSceneAsset(pBlastAsset) {}
-
-	virtual const char* getID() const override{ return desc.id.c_str(); }
-	virtual const char* getName() const override { return desc.name.c_str(); }
-
-	AssetList::ModelAsset desc;
-
-	virtual PxTransform getInitialTransform() { return desc.transform; }
-};
-
-
-class SimpleModelSceneAsset : public ModelSceneAsset
-{
-public:
-	SimpleModelSceneAsset(BlastAsset* pBlastAsset) : ModelSceneAsset(pBlastAsset) {}
-
-	virtual BlastAsset* createAsset() 
-	{ 
-		return new BlastAssetModelSimple(m_scene->getBlastController().getTkFramework(), m_scene->getPhysXController().getPhysics(),
-			m_scene->getPhysXController().getCooking(), *m_scene->getBlastController().getExtSerialization(), m_scene->getRenderer(), desc.file.c_str());
-	}
-
-	virtual ImVec4 getUIColor() const override
-	{
-		return ImColor(255, 255, 200, 255);
-	}
-};
-
-
-class SkinnedModelSceneAsset : public ModelSceneAsset
-{
-public:
-	SkinnedModelSceneAsset(BlastAsset* pBlastAsset) : ModelSceneAsset(pBlastAsset) {}
-
-	virtual BlastAsset* createAsset() 
-	{ 
-		return new BlastAssetModelSkinned(m_scene->getBlastController().getTkFramework(), m_scene->getPhysXController().getPhysics(),
-			m_scene->getPhysXController().getCooking(), *m_scene->getBlastController().getExtSerialization(), m_scene->getRenderer(), desc.file.c_str());
-	}
-
-	virtual ImVec4 getUIColor() const override
-	{
-		return ImColor(255, 200, 255, 255);
-	}
-};
-
-
-class BoxesSceneAsset : public SingleSceneAsset
-{
-public:
-	BoxesSceneAsset(const AssetList::BoxAsset& d) : SingleSceneAsset(nullptr)
-	{
-		desc = d;
-
-		for (uint32_t lv = 0; lv < desc.levels.size(); ++lv)
-		{
-			const AssetList::BoxAsset::Level& level = desc.levels[lv];
-			NvBlastChunkDesc::Flags fl = (level.isSupport) ? NvBlastChunkDesc::Flags::SupportFlag : NvBlastChunkDesc::Flags::NoFlags;
-			assetDesc.generatorSettings.depths.push_back({ GeneratorAsset::Vec3(level.x, level.y, level.z), fl });
-		}
-		assetDesc.generatorSettings.extents = GeneratorAsset::Vec3(desc.extents.x, desc.extents.y, desc.extents.z);
-		assetDesc.staticHeight = desc.staticHeight;
-		assetDesc.jointAllBonds = desc.jointAllBonds;
-		assetDesc.generatorSettings.bondFlags = (CubeAssetGenerator::BondFlags)desc.bondFlags;
-	}
-
-	virtual ImVec4 getUIColor() const override
-	{
-		return ImColor(255, 200, 200, 255);
-	}
-
-	virtual const char* getID() const override { return desc.id.c_str(); }
-	virtual const char* getName() const override { return desc.name.c_str(); }
-
-
-	AssetList::BoxAsset desc;
-	BlastAssetBoxes::Desc assetDesc;
-
-	virtual BlastAsset* createAsset() 
-	{ 
-		return new BlastAssetBoxes(m_scene->getBlastController().getTkFramework(), m_scene->getPhysXController().getPhysics(),
-			m_scene->getPhysXController().getCooking(), m_scene->getRenderer(), assetDesc);
-	}
-
-	virtual PxTransform getInitialTransform() { return PxTransform(PxVec3(0, assetDesc.generatorSettings.extents.y / 2, 0)); }
-};
-
-
-class CompositeSceneAsset : public SceneAsset
-{
-public:
-	CompositeSceneAsset(const AssetList::CompositeAsset& desc) 
-		: m_desc(desc)
-	{
-	}
-
-	virtual ~CompositeSceneAsset() { unload(); }
-
-	virtual ImVec4 getUIColor() const override
-	{
-		return ImColor(200, 255, 255, 255);
-	}
-
-	virtual const char* getID() const override { return m_desc.id.c_str(); }
-	virtual const char* getName() const override { return m_desc.name.c_str(); }
-
-	virtual void spawn(PxTransform transform) override;
-
-	virtual void load() override
-	{
-		if (!isLoaded())
-		{
-			// load dependent assets
-			for (const auto& assetRef : m_desc.assetRefs)
-			{
-				SceneAsset* asset = m_scene->findSceneAsset(assetRef.id);
-				if (asset)
-				{
-					asset->load();
-					m_sceneAssets.push_back(static_cast<SingleSceneAsset*>(asset));
-				}
-				else
-				{
-					m_scene->getCommonUIController().addPopupMessage("Error", "Wrong asset dependency on composite");
-					m_sceneAssets.clear();
-					return;
-				}
-			}
-
-			// check joints
-			for (const auto& joint : m_desc.joints)
-			{
-				bool ok = (joint.assetIndices[0] >= 0 || joint.assetIndices[1] >= 0);
-				for (char k = 0; k < 2 && ok; ++k)
-				{
-					if (joint.assetIndices[k] < 0)
-						continue;
-					ok &= (joint.assetIndices[k] < (int32_t)m_sceneAssets.size());
-					if (!ok)
-						break;
-					ok &= joint.chunkIndices[k] < m_sceneAssets[joint.assetIndices[k]]->getAsset()->getPxAsset()->getTkAsset().getChunkCount();
-				}
-				if (!ok)
-				{
-					m_scene->getCommonUIController().addPopupMessage("Error", "Wrong joint on composite");
-					m_sceneAssets.clear();
-					return;
-				}
-			}
-		}
-	}
-
-	virtual void unload() override
-	{
-		m_sceneAssets.clear();
-	}
-
-	virtual bool isLoaded() const override
-	{
-		return !m_sceneAssets.empty();
-	}
-
-	virtual PxTransform getInitialTransform()
-	{
-		return m_desc.transform;
-	}
-
-	const AssetList::CompositeAsset& getDesc() const
-	{
-		return m_desc;
-	}
-
-	const std::vector<SingleSceneAsset*>& getSceneAssets() const
-	{
-		return m_sceneAssets;
-	}
-
-private:
-	AssetList::CompositeAsset		m_desc;
-	std::vector<SingleSceneAsset*>	m_sceneAssets;
-};
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Scene Actors
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class SingleSceneActor : public SceneActor
-{
-public:
-	SingleSceneActor(Scene& scene, SingleSceneAsset* asset, PxTransform transform)
-		: m_scene(scene)
-		, m_asset(asset)
-		, m_transform(transform)
-	{
-		m_index = m_asset->spawnCount++;
-		spawn();
-	}
-
-	SingleSceneActor::~SingleSceneActor()
-	{
-		remove();
-	}
-
-// Add By Lixu Begin
-	SingleSceneAsset* getSceneAsset()
-	{
-		return m_asset;
-	}
-// Add By Lixu End
-
-	virtual const char* getName() const override
-	{
-		return m_name.c_str();
-	}
-
-	virtual const char* getSubname(int) const override
-	{
-		return nullptr;
-	}
-
-	virtual ImVec4 getUIColor() const override
-	{
-		return m_asset->getUIColor();
-	}
-
-	virtual void drawUI(int) override
-	{
-		m_actor->drawUI();
-	}
-
-	virtual void drawStatsUI(int) override
-	{
-		m_actor->drawStatsUI();
-	}
-
-	virtual PxVec3 getSpawnShift() const override
-	{ 
-		return PxVec3(-20, 0, 0); 
-	}
-
-	virtual void reload() override
-	{
-		BlastFamilyPtr oldFamily = m_actor;
-		auto settings = m_actor->getSettings();
-
-		RenderMaterial* pRenderMaterial[2];
-		m_actor->getMaterial(&pRenderMaterial[0], true);
-		m_actor->getMaterial(&pRenderMaterial[1], false);
-
-		m_transform = settings.transform;
-		remove();
-		spawn();
-
-		m_actor->setMaterial(pRenderMaterial[0], true);
-		m_actor->setMaterial(pRenderMaterial[1], false);
-
-		m_actor->setSettings(settings);
-		SampleManager::ins()->updateFamily(oldFamily, m_actor);
-	}
-
-	BlastFamily* getFamily() { return m_actor; }
-
-private:
-	void remove()
-	{
-		m_scene.getBlastController().removeFamily(m_actor);
-		m_actor = nullptr;
-	}
-
-	void spawn()
-	{
-		std::ostringstream str;
-		str << m_asset->getName();
-		if (m_index)
-			str << " (" << m_index << ")";
-		m_name = str.str();
-
-		PxTransform pose = m_transform;
-
-		BlastAsset::ActorDesc actorDesc = {
-			actorDesc.id = generateIDFromString(m_name.c_str()),
-			pose,
-			m_scene.getBlastController().getTkGroup()
-		};
-
-		m_actor = m_scene.getBlastController().spawnFamily(m_asset->getAsset(), actorDesc);
-		// Add By Lixu Begin
-		BlastFamily::Settings settings = m_actor->getSettings();
-		std::map<BlastAsset*, AssetList::ModelAsset>& assetDescMap = SampleManager::ins()->getAssetDescMap();
-		AssetList::ModelAsset& assetDesc = assetDescMap[m_asset->getAsset()];
-		BPPAsset* bppAsset = BlastProject::ins().getAsset(assetDesc.name.c_str());
-		if (nullptr != bppAsset)
-		{
-			BPPStressSolver& stressSolver = bppAsset->stressSolver;
-			ExtStressSolverSettings & stressSolverSettings = settings.stressSolverSettings;
-			stressSolverSettings.hardness = stressSolver.hardness;
-			stressSolverSettings.stressLinearFactor = stressSolver.linearFactor;
-			stressSolverSettings.stressAngularFactor = stressSolver.angularFactor;
-			stressSolverSettings.bondIterationsPerFrame = stressSolver.bondIterationsPerFrame;
-			stressSolverSettings.graphReductionLevel = stressSolver.graphReductionLevel;
-			m_actor->setSettings(settings);
-		}
-		// Add By Lixu End
-	}
-
-	Scene&					m_scene;
-	BlastFamilyPtr			m_actor;
-	SingleSceneAsset*		m_asset;
-	PxTransform				m_transform;
-	uint32_t				m_index;
-	std::string				m_name;
-};
-
-class CompositeSceneActor : public SceneActor
-{
-public:
-	CompositeSceneActor(Scene& scene, CompositeSceneAsset* asset, PxTransform transform)
-		: m_scene(scene)
-		, m_asset(asset)
-		, m_transform(transform)
-	{
-		m_index = m_asset->spawnCount++;
-		spawn();
-	}
-
-	CompositeSceneActor::~CompositeSceneActor()
-	{
-		remove();
-	}
-
-	virtual uint32_t getSubactorCount() const
-	{
-		return (uint32_t)m_actors.size();
-	}
-
-	virtual const char* getName() const override
-	{
-		return m_name.c_str();
-	}
-
-	virtual const char* getSubname(int subindex) const override
-	{
-		return m_actors[subindex].name.c_str();
-	}
-
-	virtual ImVec4 getUIColor() const override
-	{
-		return m_asset->getUIColor();
-	}
-
-	virtual void drawUI(int subindex) override
-	{
-		if (subindex >= 0)
-		{
-			m_actors[subindex].actor->drawUI();
-		}
-		else
-		{
-			ImGui::Text("Select subactor to edit settings.");
-		}
-	}
-
-	virtual void drawStatsUI(int subindex) override
-	{
-		if (subindex >= 0)
-		{
-			m_actors[subindex].actor->drawStatsUI();
-		}
-	}
-
-	virtual PxVec3 getSpawnShift() const override
-	{
-		return PxVec3(-20, 0, 0);
-	}
-
-	virtual void reload() override
-	{
-		std::map<uint32_t, BlastFamily::Settings> settings;
-		for (uint32_t i = 0; i < m_actors.size(); ++i)
-		{
-			settings[m_actors[i].initialIndex] = m_actors[i].actor->getSettings();
-		}
-		remove();
-		spawn();
-		for (uint32_t i = 0; i < m_actors.size(); ++i)
-		{
-			if (settings.find(i) != settings.end())
-			{
-				m_actors[i].actor->setSettings(settings[i]);
-			}
-		}
-	}
-
-	virtual void removeSubactor(int subindex)
-	{
-		if (subindex >= 0 && subindex < (int)m_actors.size())
-		{
-			m_scene.getBlastController().removeFamily(m_actors[subindex].actor);
-			m_actors[subindex] = m_actors.back();
-			m_actors.resize(m_actors.size() - 1);
-		}
-	}
-
-private:
-	void remove()
-	{
-		for (uint32_t i = 0; i < m_actors.size(); ++i)
-		{
-			m_scene.getBlastController().removeFamily(m_actors[i].actor);
-		}
-		m_actors.clear();
-	}
-
-	void spawn()
-	{
-		std::ostringstream str;
-		str << m_asset->getName();
-		if (m_index)
-			str << " (" << m_index << ")";
-		m_name = str.str();
-
-		const AssetList::CompositeAsset& assetDesc = m_asset->getDesc();
-		const std::vector<SingleSceneAsset*>& sceneAssets = m_asset->getSceneAssets();
-		
-		const uint32_t actorCount = (uint32_t)sceneAssets.size();
-		m_actors.resize(actorCount);
-
-		for (uint32_t i = 0; i < actorCount; ++i)
-		{
-			std::ostringstream str;
-			str << "  -> " << i << "." << sceneAssets[i]->getName();
-			m_actors[i].name = str.str();
-		}
-
-		ExtPxManager& pxManager = m_scene.getBlastController().getExtPxManager();
-		for (uint32_t i = 0; i < actorCount; ++i)
-		{
-			PxTransform pose = m_transform;
-			pose = assetDesc.assetRefs[i].transform.transform(pose);
-
-			BlastAsset::ActorDesc actorDesc = {
-				generateIDFromString(m_actors[i].name.c_str()),
-				pose,
-				m_scene.getBlastController().getTkGroup()
-			};
-			m_actors[i].actor = m_scene.getBlastController().spawnFamily(sceneAssets[i]->getAsset(), actorDesc);
-			m_actors[i].initialIndex = i;
-		}
-
-		for (const auto& joint : assetDesc.joints)
-		{
-			TkJointDesc jointDesc;
-			for (char k = 0; k < 2; ++k)
-			{
-				jointDesc.attachPositions[k] = joint.attachPositions[k];
-				jointDesc.chunkIndices[k] = joint.chunkIndices[k];
-				jointDesc.families[k] = (joint.assetIndices[k] < 0) ? nullptr :  &m_actors[joint.assetIndices[k]].actor->getFamily()->getTkFamily();
-			}
-			TkJoint* joint = pxManager.getFramework().createJoint(jointDesc);
-			if (joint)
-			{
-				pxManager.createJoint(*joint);
-			}
-			else
-			{
-				m_scene.getCommonUIController().addPopupMessage("Error", "Some joints can't be created");
-			}
-		}
-	}
-
-	struct Subactor
-	{
-		BlastFamilyPtr			actor;
-		uint32_t				initialIndex;
-		std::string				name;
-	};
-
-	Scene&                             m_scene;
-	std::vector<Subactor>			   m_actors;
-	CompositeSceneAsset*               m_asset;
-	PxTransform						   m_transform;
-	uint32_t                           m_index;
-	std::string                        m_name;
-};
-
-class PhysXSceneActor : public SceneActor
-{
-public:
-	PhysXSceneActor(PhysXController& physXController, PhysXController::Actor* actor, const char* name)
-	: m_physXController(physXController)
-	, m_actor(actor)
-	, m_name(name)
-	{
-	}
-
-	PhysXSceneActor::~PhysXSceneActor()
-	{
-		m_physXController.removePhysXPrimitive(m_actor);
-	}
-
-	virtual const char* getName() const override
-	{
-		// Add By Lixu Begin
-		return m_name.c_str();
-		// Add By Lixu End
-	}
-
-	virtual ImVec4 getUIColor() const override
-	{
-		return ImColor(255, 100, 100, 255);
-	}
-
-	// Add By Lixu Begin
-	PhysXController::Actor* getActor() { return m_actor; }
-	// Add By Lixu End
-
-private:
-	PhysXController& m_physXController;
-	PhysXController::Actor* m_actor;
-	// Add By Lixu Begin
-	std::string				m_name;
-	// Add By Lixu End
-	
-};
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												Assets Implementation
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SingleSceneAsset::spawn(PxTransform transform)
-{
-	load();
-	SingleSceneActor* actor = new SingleSceneActor(*m_scene, this, transform);
-	m_scene->addSceneActor(actor);
-}
-
-void CompositeSceneAsset::spawn(PxTransform transform)
-{
-	load();
-	if (isLoaded())
-	{
-		CompositeSceneActor* actor = new CompositeSceneActor(*m_scene, this, transform);
-		m_scene->addSceneActor(actor);
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//												PackmanConfigParser
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class PackmanConfigParser : public physx::shdfnd::FastXml::Callback
-{
-public:
-	std::vector<std::pair<std::string, std::string>> dependencies;
-
-protected:
-
-	// encountered a comment in the XML
-	virtual bool processComment(const char* /*comment*/)
-	{
-		return true;
-	}
-
-	virtual bool processClose(const char* elementName, unsigned int /*depth*/, bool& /*isError*/)
-	{
-		return true;
-	}
-
-	// return true to continue processing the XML document, false to skip.
-	virtual bool processElement(const char* elementName, // name of the element
-		const char* elementData, // element data, null if none
-		const physx::shdfnd::FastXml::AttributePairs& attr,
-		int /*lineno*/) // line number in the source XML file
-	{
-		if (::strcmp(elementName, "dependency") == 0)
-		{
-			dependencies.resize(dependencies.size() + 1);
-			for (int i = 0; i < attr.getNbAttr(); ++i)
-			{
-				if (::strcmp(attr.getKey(i), "name") == 0)
-				{
-					dependencies.back().first = std::string(attr.getValue(i));
-				}
-				else if (::strcmp(attr.getKey(i), "version") == 0)
-				{
-					dependencies.back().second = std::string(attr.getValue(i));
-				}
-			}
-		}
-		return true;
-	}
-};
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Controller
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-SceneController::SceneController() : m_cubeScale(1.0f), m_cubeThrowDownTime(-1.f)
-{
-	m_scene = NULL;
-	BlastToSceneMap.clear();
-}
-
-SceneController::~SceneController()
-{
-}
-
-void SceneController::onSampleStart()
-{
-	// setup camera
-	CFirstPersonCamera* camera = &getRenderer().getCamera();
-	Camera* pCamera = SimpleScene::Inst()->m_pCamera;
-	DirectX::XMVECTORF32 eyePt = { pCamera->_eye.x, pCamera->_eye.y, pCamera->_eye.z, 0 };
-	DirectX::XMVECTORF32 lookAtPt = { pCamera->_at.x, pCamera->_at.y, pCamera->_at.z, 0 };
-	camera->SetViewParams(eyePt, lookAtPt);
-	camera->SetRotateButtons(false, false, false, false);
-	camera->SetEnablePositionMovement(true);
-
-	// setup scene
-	m_scene = new Scene(getRenderer(), getPhysXController(), getBlastController(), getCommonUIController());
-
-	// commented by Jun Ma to prevent a crash. We do not need those demo resources. We only need shaders.
-	//// add packman repo to search dirs
-	//bool packmanResourcesAdded = false;
-	//if (const char* packmanPath = std::getenv("PM_PACKAGES_ROOT"))
-	//{
-	//	const char* RESOURCES_CONFIG_FILE = "resources.xml";
-
-	//	std::string path;
-	//	if (getRenderer().getResourceManager().findFile(RESOURCES_CONFIG_FILE, path))
-	//	{
-	//		physx::PsFileBuffer fileBuffer(path.c_str(), physx::general_PxIOStream2::PxFileBuf::OPEN_READ_ONLY);
-	//		if (fileBuffer.isOpen())
-	//		{
-	//			PxInputDataFromPxFileBuf inputData(fileBuffer);
-	//			PackmanConfigParser parser;
-	//			physx::shdfnd::FastXml* xml = physx::shdfnd::createFastXml(&parser);
-	//			xml->processXml(inputData, false);
-	//			xml->release();
-	//			for (auto& dep : parser.dependencies)
-	//			{
-	//				std::stringstream ss;
-	//				ss << packmanPath << "\\" << dep.first << "\\" << dep.second;
-	//				if (getRenderer().getResourceManager().addSearchDir(ss.str().c_str()))
-	//				{
-	//					packmanResourcesAdded = true;
-	//				}
-	//			}
-	//		}
-	//	}
-	//}
-	//if (!packmanResourcesAdded)
-	//{
-	//	getManager()->getCommonUIController().addPopupMessage("Error", "BlastSampleResources package wasn't found. Consider running download_sample_resources.bat in root folder.", 5.0f);
-	//}
-}
-
-void SceneController::addAssets(const AssetList& assetList, bool loadModels)
-{
-	if (loadModels)
-	{
-		for (const auto& model : assetList.models)
-		{
-			ModelSceneAsset* asset;
-			if (!model.isSkinned)
-			{
-				asset = new SimpleModelSceneAsset(nullptr);
-			}
-			else
-			{
-				asset = new SkinnedModelSceneAsset(nullptr);
-			}
-			asset->desc = model;
-			m_scene->addAsset(asset);
-		}
-
-		for (const auto& composite : assetList.composites)
-		{
-			m_scene->addAsset(new CompositeSceneAsset(composite));
-		}
-	}
-
-	for (const auto& box : assetList.boxes)
-	{
-		BoxesSceneAsset* asset = new BoxesSceneAsset(box);
-		m_scene->addAsset(asset);
-	}
-}
-
-void SceneController::addBlastAsset(BlastAssetModelSimple* pBlastAsset, AssetList::ModelAsset modelAsset)
-{
-	// 1
-	ModelSceneAsset* asset = new SimpleModelSceneAsset(pBlastAsset);
-	asset->desc = modelAsset;
-	BlastToSceneMap[pBlastAsset] = asset;
-
-	// 2
-	m_scene->addAsset(asset);
-
-	// 3
-	asset->load();
-}
-
-void deleteSceneActors(Scene* scene, SceneAsset* asset)
-{
-	std::vector<SceneActor*> deleteActors;
-
-	std::vector<SceneActor*>& Actors = scene->getActors();
-	std::vector<SceneActor*>::iterator itActors;
-	for (itActors = Actors.begin(); itActors != Actors.end(); )
-	{
-		SingleSceneActor* pSceneActor = (SingleSceneActor*)*itActors;
-		SingleSceneAsset* pSingleSceneAsset = pSceneActor->getSceneAsset();
-		if (pSingleSceneAsset == asset)
-		{
-			deleteActors.push_back(pSceneActor);
-			itActors = Actors.erase(itActors);
-		}
-		else
-		{
-			itActors++;
-		}
-	}
-
-	for (itActors = deleteActors.begin(); itActors != deleteActors.end(); itActors++)
-	{
-		delete *itActors;
-		*itActors = nullptr;
-	}
-	deleteActors.clear();
-}
-
-void SceneController::removeBlastAsset(BlastAssetModelSimple* pBlastAsset)
-{
-	std::vector<SceneAsset*>& Assets = m_scene->getAssets();
-	std::vector<SceneAsset*>::iterator itAssets;
-	for (itAssets = Assets.begin(); itAssets != Assets.end(); itAssets++)
-	{
-		ModelSceneAsset* pSceneAsset = (ModelSceneAsset*)*itAssets;
-		BlastAsset* pAsset = pSceneAsset->getAsset();
-		if (pAsset == pBlastAsset)
-		{
-			deleteSceneActors(m_scene, pSceneAsset);
-			
-			// 3
-			pSceneAsset->unload();
-
-			// 2
-			m_scene->removeAsset(pSceneAsset);
-
-			// 1
-			delete pSceneAsset;
-			std::map<BlastAsset*, ModelSceneAsset*>::iterator itBSM;
-			itBSM = BlastToSceneMap.find(pBlastAsset);
-			BlastToSceneMap.erase(itBSM);
-			break;
-		}
-	}
-}
-
-BlastFamily* SceneController::addBlastFamily(BlastAsset* pBlastAsset, physx::PxTransform transform)
-{
-	if (pBlastAsset == nullptr)
-	{
-		return nullptr;
-	}
-
-	std::map<BlastAsset*, ModelSceneAsset*>::iterator itBSM;
-	itBSM = BlastToSceneMap.find(pBlastAsset);
-	if (itBSM == BlastToSceneMap.end())
-	{
-		return nullptr;
-	}
-
-	ModelSceneAsset* asset = itBSM->second;
-	if (asset == nullptr)
-	{
-		return nullptr;
-	}
-
-	SingleSceneActor* actor = new SingleSceneActor(*m_scene, asset, transform);
-	m_scene->addSceneActor(actor);
-
-	BlastFamily* pBlastFamily = actor->getFamily();
-	if (pBlastFamily != nullptr)
-	{
-		pBlastFamily->updatePreSplit(0);
-		pBlastFamily->clearVisibleChangedChunks();
-	}
-	return pBlastFamily;
-}
-
-void SceneController::removeBlastFamily(BlastAsset* pBlastAsset, int nFamilyIndex)
-{
-	if (pBlastAsset == nullptr)
-	{
-		return;
-	}
-
-	std::map<BlastAsset*, ModelSceneAsset*>::iterator itBSM;
-	itBSM = BlastToSceneMap.find(pBlastAsset);
-	if (itBSM == BlastToSceneMap.end())
-	{
-		return;
-	}
-
-	ModelSceneAsset* asset = itBSM->second;
-	if (asset == nullptr)
-	{
-		return;
-	}
-
-	SceneActor* pSceneActor = m_scene->getActorByIndex(nFamilyIndex);
-	if (pSceneActor == nullptr)
-	{
-		return;
-	}
-
-	m_scene->removeSceneActor(pSceneActor);
-
-	delete pSceneActor;
-	pSceneActor = nullptr;
-}
-
-void SceneController::onInitialize()
-{
-
-}
-
-void SceneController::onSampleStop()
-{
-	if (NULL != m_scene)
-	{
-		delete m_scene;
-		m_scene = nullptr;
-	}
-}
-
-void SceneController::onTerminate() 
-{
-}
-
-void SceneController::Animate(double dt)
-{
-}
-
-LRESULT SceneController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	if (uMsg == WM_KEYDOWN)
-	{
-		int iKeyPressed = static_cast<int>(wParam);
-		switch (iKeyPressed)
-		{
-		case 'R':
-			m_scene->reloadAllActors();
-			return 0;
-		case 'F':
-			if (m_cubeThrowDownTime == -1.f)
-			{
-				m_cubeThrowDownTime = ImGui::GetTime();
-			}
-			return 0;
-		default:
-			break; 
-		}
-	}
-	else if (uMsg == WM_KEYUP)
-	{
-		int iKeyPressed = static_cast<int>(wParam);
-		switch (iKeyPressed)
-		{
-		case 'F':
-			throwCube();
-			m_cubeThrowDownTime = -1.f;
-			return 0;
-		default:
-			break;
-		}
-	}
-
-	return 1;
-}
-
-void SceneController::drawUI()
-{
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// Scene UI
-	///////////////////////////////////////////////////////////////////////////////////////////
-
-	m_scene->drawUI();
-
-
-	ImGui::Spacing();
-	ImGui::Spacing();
-	ImGui::Separator();
-	ImGui::Spacing();
-	ImGui::Spacing();
-
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// Replay
-	///////////////////////////////////////////////////////////////////////////////////////////
-	{
-		ImGui::Text("Replay Control:");
-
-		BlastReplay* replay = getBlastController().getReplay();
-		if (replay->isRecording())
-		{
-			auto getAnimStr = []()
-			{
-				const uint32_t count = 5;
-				const uint64_t periodMS = 150;
-				static char str[count + 1] = "";
-				for (uint32_t i = 0; i < count; i++)
-				{
-					uint64_t ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now().time_since_epoch()).count();
-					str[i] = (i == (ts % (periodMS * count)) / periodMS) ? '*' : ' ';
-				}
-				return str;
-			};
-			ImGui::Text("State: Recording [%s] | Events: %d", getAnimStr(), replay->getEventCount());
-
-			if (ImGui::Button("Stop Recording"))
-			{
-				replay->stopRecording();
-			}
-		}
-		else if (replay->isPlaying())
-		{
-			ImGui::Text("State: Playing | Events: %d / %d", replay->getCurrentEventIndex(), replay->getEventCount());
-
-			if (ImGui::Button("Stop Playing"))
-			{
-				replay->stopPlayback();
-			}
-		}
-		else
-		{
-			ImGui::Text("State: Idle | Events: %d", replay->getEventCount());
-
-			static bool syncFamilies = true;
-			static bool syncPhysics = true;
-			
-			ImGui::Checkbox("Sync Initial Actors", &syncFamilies);
-			if (ImGui::Checkbox("Sync Initial Transforms", &syncPhysics))
-			{
-				syncFamilies = syncPhysics;
-			}
-
-			if (ImGui::Button("Start Recording"))
-			{
-				replay->startRecording(getBlastController().getExtPxManager(), syncFamilies, syncPhysics);
-			}
-
-			if (replay->hasRecord())
-			{
-				static bool reload = false;
-				if (ImGui::Button("Start Playback"))
-				{
-					if (reload)
-						m_scene->reloadAllActors();
-					replay->startPlayback(getBlastController().getExtPxManager(), getBlastController().getTkGroup());
-				}
-				ImGui::SameLine();
-				ImGui::Checkbox("Reload Scene On Playback", &reload);
-			}
-		}
-	}
-
-	ImGui::Spacing();
-	ImGui::Spacing();
-	ImGui::Separator();
-
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// Cube
-	///////////////////////////////////////////////////////////////////////////////////////////
-	{
-		ImGui::Text("Thrown Cube Params (F)");
-		ImGui::DragFloat("Cube Size", &m_cubeScale, 1.0f, 0.0f, 100.0f);
-		ImGui::Text("Cube Speed (hold F): %1.f", getCubeSpeed());
-	}
-
-}
-
-void SceneController::drawStatsUI()
-{
-	m_scene->drawStatsUI();
-}
-
-float SceneController::getCubeSpeed()
-{
-	const float CUBE_VELOCITY_SPEED_MIN = 70;
-	const float CUBE_VELOCITY_CHARGE_PER_SECOND = 300;
-	return m_cubeThrowDownTime > 0 ? CUBE_VELOCITY_SPEED_MIN + (ImGui::GetTime() - m_cubeThrowDownTime) * CUBE_VELOCITY_CHARGE_PER_SECOND : 0.f;
-}
-
-void SceneController::throwCube()
-{
-	const float CUBE_VELOCITY = 400;
-	const float CUBE_DENSITY = 20000.0f;
-
-	CFirstPersonCamera* camera = &getRenderer().getCamera();
-	PxVec3 eyePos = XMVECTORToPxVec4(SimpleScene::Inst()->GetEyePt()).getXYZ();
-	PxVec3 lookAtPos = XMVECTORToPxVec4(SimpleScene::Inst()->GetLookAtPt()).getXYZ();
-	PhysXController::Actor* cube = getPhysXController().spawnPhysXPrimitiveBox(PxTransform(eyePos), PxVec3(m_cubeScale, m_cubeScale, m_cubeScale), CUBE_DENSITY);
-	PxRigidDynamic* rigidDynamic = cube->getActor()->is<PxRigidDynamic>();
-	cube->setColor(DirectX::XMFLOAT4(1, 0, 0, 1));
-
-	PxVec3 dir = (lookAtPos - eyePos).getNormalized();
-	rigidDynamic->setLinearVelocity(dir * CUBE_VELOCITY);
-
-// Add By Lixu Begin
-	std::string validname = "";
-	if (m_ReusedNames.size() > 0)
-	{
-		validname = m_ReusedNames.back();
-		m_ReusedNames.pop_back();
-	}
-	else
-	{
-		int projectilesSize = m_Projectiles.size();
-		char cubename[10];
-		sprintf(cubename, "Cube_%d", projectilesSize);
-		validname = cubename;
-	}
-	cube->setColor(DirectX::XMFLOAT4(1, 1, 1, 1));
-	PhysXSceneActor* p = new PhysXSceneActor(getPhysXController(), cube, validname.c_str());
-	m_UsedNames.push_back(validname);
-	m_Projectiles.push_back(p);
-	m_scene->addSceneActor(p);
-
-//	BlastSceneTree::ins()->addProjectile(p);
-	SampleManager::ins()->m_bNeedRefreshTree = true;
-// Add By Lixu End
-}
-
-void SceneController::spawnAsset(int32_t num)
-{
-	m_scene->spawnAsset(num);
-}
-
-int SceneController::releaseAll()
-{
-	return m_scene->releaseAll();
-}
-
-// Add By Lixu Begin
-void SceneController::addProjectile()
-{
-	throwCube();
-}
-
-void SceneController::clearProjectile()
-{
-	std::vector<PhysXSceneActor*>::iterator it;
-	for (it = m_Projectiles.begin(); it != m_Projectiles.end(); it++)
-	{
-		std::vector<SceneActor*>& actors = m_scene->getActors();
-		std::map<SceneActor*, int> ActorIndexMap;
-		int actorSize = actors.size();
-		for (int i = 0; i < actorSize; i++)
-		{
-			ActorIndexMap[actors[i]] = i;
-		}
-
-		m_scene->removeSceneActor(Scene::ActorIndex(ActorIndexMap[*it], -1));
-	}
-	m_Projectiles.clear();
-	m_UsedNames.clear();
-	m_ReusedNames.clear();
-
-//	BlastSceneTree::ins()->clearProjectile();
-	SampleManager::ins()->m_bNeedRefreshTree = true;
-}
-
-std::string SceneController::getProjectileName(PhysXSceneActor* projectile)
-{
-	return projectile->getName();
-}
-
-bool SceneController::getProjectileVisible(PhysXSceneActor* projectile)
-{
-	return !(projectile->getActor()->isHidden());
-}
-
-void SceneController::setProjectileVisible(PhysXSceneActor* projectile, bool val)
-{
-	projectile->getActor()->setHidden(!val);
-}
-
-void SceneController::ResetScene()
-{
-	clearProjectile();
-//	BlastSceneTree::ins()->clearProjectile();
-	m_scene->reloadAllActors();
-	SampleManager::ins()->m_bNeedRefreshTree = true;
-}
-
-void SceneController::ClearScene()
-{
-	clearProjectile();
-//	BlastSceneTree::ins()->clearProjectile();
-	m_scene->releaseAll();
-	PhysXController& pc = getPhysXController();
-	pc.ClearOldCOllisions();
-	SampleManager::ins()->m_bNeedRefreshTree = true;
-}
-// Add By Lixu End
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SceneController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SceneController.h
deleted file mode 100644
index 669ca40..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/scene/SceneController.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SCENE_CONTROLLER_H
-#define SCENE_CONTROLLER_H
-
-#include "SampleManager.h"
-#include <map>
-
-
-class CFirstPersonCamera;
-class BlastAssetBoxes;
-class SceneActor;
-class BlastAsset;
-class SingleSceneAsset;
-class Scene;
-// Add By Lixu Begin
-class PhysXSceneActor;
-class BlastAssetModelSimple;
-class ModelSceneAsset;
-// Add By Lixu End
-class SceneController : public ISampleController
-{
-public:
-
-	SceneController();
-	virtual ~SceneController();
-
-	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	virtual void Animate(double dt);
-	void drawUI();
-	void drawStatsUI();
-
-	virtual void onInitialize();
-	virtual void onSampleStart();
-	virtual void onSampleStop();
-	virtual void onTerminate();
-
-	// commands
-	int releaseAll();
-	void spawnAsset(int32_t);
-
-// Add By Lixu Begin
-	void addProjectile();
-	void clearProjectile();
-	std::vector<PhysXSceneActor*> getPrejectiles() { return m_Projectiles; }
-	std::string getProjectileName(PhysXSceneActor* projectile);
-	bool getProjectileVisible(PhysXSceneActor* projectile);
-	void setProjectileVisible(PhysXSceneActor* projectile, bool val);
-	void ResetScene();
-	void ClearScene();
-	void addBlastAsset(BlastAssetModelSimple* pBlastAsset, AssetList::ModelAsset modelAsset);
-	void removeBlastAsset(BlastAssetModelSimple* pBlastAsset);
-	BlastFamily* addBlastFamily(BlastAsset* pBlastAsset, physx::PxTransform transform);
-	void removeBlastFamily(BlastAsset* pBlastAsset, int nFamilyIndex);
-// Add By Lixu End
-
-private:
-	void addAssets(const AssetList& assetList, bool loadModels = true);
-	void throwCube();
-	float getCubeSpeed();
-
-	SceneController& operator= (SceneController&);
-
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-	BlastController& getBlastController() const
-	{
-		return getManager()->getBlastController();
-	}
-
-	CommonUIController& getCommonUIController() const
-	{
-		return getManager()->getCommonUIController();
-	}
-
-
-	//////// internal data ////////
-
-	Scene* m_scene;
-
-	float m_cubeScale;
-	float m_cubeThrowDownTime;
-
-// Add By Lixu Begin
-	std::vector<std::string> m_UsedNames;
-	std::vector<std::string> m_ReusedNames;
-	std::vector<PhysXSceneActor*> m_Projectiles;
-
-	std::map<BlastAsset*, ModelSceneAsset*> BlastToSceneMap;
-// Add By Lixu End
-};
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/CommonUIController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/CommonUIController.cpp
deleted file mode 100644
index f9e218b..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/CommonUIController.cpp
+++ /dev/null
@@ -1,639 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "CommonUIController.h"
-
-#include "Renderer.h"
-#include "BlastController.h"
-#include "DamageToolController.h"
-#include "SceneController.h"
-#include "SampleController.h"
-#include "PhysXController.h"
-#include "SampleProfiler.h"
-
-#include "PxVisualizationParameter.h"
-#include "PxScene.h"
-
-#include <imgui.h>
-#include "imgui_impl_dx11.h"
-#include "UIHelpers.h"
-
-#include <cstdio>
-#include <inttypes.h>
-
-
-inline float memorySizeOutput(const char*& prefix, float value)
-{
-	for (prefix = "\0\0k\0M\0G\0T\0P\0E"; value >= 1024 && *prefix != 'E'; value /= 1024, prefix += 2);
-	return value;
-}
-
-CommonUIController::CommonUIController()
-{
-}
-
-HRESULT CommonUIController::DeviceCreated(ID3D11Device* pDevice)
-{
-	DeviceManager* manager = GetDeviceManager();
-	ID3D11DeviceContext* pd3dDeviceContext;
-	pDevice->GetImmediateContext(&pd3dDeviceContext);
-	ImGui_ImplDX11_Init(manager->GetHWND(), pDevice, pd3dDeviceContext);
-	
-	ImGuiStyle& style = ImGui::GetStyle();
-	style.WindowRounding = 8.0f;
-	style.ScrollbarRounding = 8.0f;
-	style.FrameRounding = 8.0f;
-	//style.IndentSpacing = 20;
-	int mainColor[3] = { 110, 110, 110 }; // previous green one { 50, 110, 30 }
-	style.Colors[ImGuiCol_TitleBg]              = ImColor(mainColor[0], mainColor[1], mainColor[2], 62);
-	style.Colors[ImGuiCol_TitleBgCollapsed]     = ImColor(mainColor[0], mainColor[1], mainColor[2], 52);
-	style.Colors[ImGuiCol_TitleBgActive]        = ImColor(mainColor[0], mainColor[1], mainColor[2], 87);
-	style.Colors[ImGuiCol_Header]               = ImColor(mainColor[0], mainColor[1], mainColor[2], 52);
-	style.Colors[ImGuiCol_HeaderHovered]        = ImColor(mainColor[0], mainColor[1], mainColor[2], 92);
-	style.Colors[ImGuiCol_HeaderActive]         = ImColor(mainColor[0], mainColor[1], mainColor[2], 72);
-	style.Colors[ImGuiCol_ScrollbarBg]          = ImColor(mainColor[0], mainColor[1], mainColor[2], 12);
-	style.Colors[ImGuiCol_ScrollbarGrab]        = ImColor(mainColor[0], mainColor[1], mainColor[2], 52);
-	style.Colors[ImGuiCol_ScrollbarGrabHovered] = ImColor(mainColor[0], mainColor[1], mainColor[2], 92);
-	style.Colors[ImGuiCol_ScrollbarGrabActive]  = ImColor(mainColor[0], mainColor[1], mainColor[2], 72);
-	style.Colors[ImGuiCol_Button]               = ImColor(40, 100, 80, 30);
-	style.Colors[ImGuiCol_ButtonHovered]        = ImColor(40, 100, 80, 100);
-	style.Colors[ImGuiCol_ButtonActive]         = ImColor(40, 100, 80, 70);
-	style.Colors[ImGuiCol_PopupBg]				= ImColor(10, 23, 18, 230);
-	style.Colors[ImGuiCol_TextSelectedBg]		= ImColor(10, 23, 18, 180);
-	style.Colors[ImGuiCol_FrameBg]				= ImColor(70, 70, 70, 30);
-	style.Colors[ImGuiCol_FrameBgHovered]		= ImColor(70, 70, 70, 70);
-	style.Colors[ImGuiCol_FrameBgActive]		= ImColor(70, 70, 70, 50);
-	style.Colors[ImGuiCol_ComboBg]				= ImColor(20, 20, 20, 252);
-
-	return S_OK;
-}
-
-void CommonUIController::DeviceDestroyed()
-{
-	ImGui_ImplDX11_Shutdown();
-}
-
-extern LRESULT ImGui_ImplDX11_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-
-LRESULT CommonUIController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	PX_UNUSED(hWnd);
-	PX_UNUSED(wParam);
-	PX_UNUSED(lParam);
-
-	ImGui_ImplDX11_WndProcHandler(hWnd, uMsg, wParam, lParam);
-
-	if (uMsg == WM_KEYDOWN && !ImGui::GetIO().WantCaptureKeyboard)
-	{
-		int iKeyPressed = static_cast<int>(wParam);
-		switch (iKeyPressed)
-		{
-			case 'P':
-			{
-				getPhysXController().setPaused(!getPhysXController().isPaused());
-				break;
-			}
-			case 'O':
-			{
-				getRenderer().setWireframeMode(!getRenderer().getWireframeMode());
-				break;
-			}
-			case 'I':
-			{
-				getBlastController().debugRenderMode = (BlastFamily::DebugRenderMode)(((int)getBlastController().debugRenderMode + 1) % BlastFamily::DebugRenderMode::DEBUG_RENDER_MODES_COUNT);
-				break;
-			}
-			case VK_F5:
-			{
-				getRenderer().reloadShaders();
-				break;
-			}
-			default:
-				break;
-		}
-	}
-
-	if (ImGui::GetIO().WantCaptureMouse)
-		return 0;
-
-	return 1;
-}
-
-void CommonUIController::Animate(double fElapsedTimeSeconds)
-{
-	m_dt = (float)fElapsedTimeSeconds;
-}
-
-void CommonUIController::Render(ID3D11Device*, ID3D11DeviceContext*, ID3D11RenderTargetView*, ID3D11DepthStencilView*)
-{
-	ImGui_ImplDX11_NewFrame();
-	drawUI();
-	ImGui::Render();
-}
-
-void CommonUIController::addDelayedCall(const char* title, const char* message, std::function<void()> func, float delay)
-{
-	DelayedCall call = { func, title, message, delay, delay };
-	m_delayedCalls.emplace(call);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													IMGUI UI
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-void CommonUIController::drawUI()
-{
-	const float padding = 8.0f;
-	ImGui::SetNextWindowPos(ImVec2(padding, padding), ImGuiSetCond_Once/*ImGuiSetCond_FirstUseEver*/);
-	ImGui::SetNextWindowSize(ImVec2(420, getRenderer().getScreenHeight() - 2 * padding), ImGuiSetCond_Once/*ImGuiSetCond_FirstUseEver*/);
-	ImGui::SetNextWindowCollapsed(false, ImGuiSetCond_Once);
-	ImGui::Begin("New Shiny UI", 0, ImGuiWindowFlags_NoTitleBar);
-	{
-		ImGui::PushItemWidth(ImGui::GetWindowSize().x * 0.5f);
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Scene
-		///////////////////////////////////////////////////////////////////////////////////////////
-		if (ImGui::CollapsingHeader("Scene"))
-		{
-			getSceneController().drawUI();
-		}
-
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Blast
-		///////////////////////////////////////////////////////////////////////////////////////////
-		if (ImGui::CollapsingHeader("Blast"))
-		{
-			getBlastController().drawUI();
-		}
-
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Damage Tool
-		///////////////////////////////////////////////////////////////////////////////////////////
-		if (ImGui::CollapsingHeader("Damage Tool"))
-		{
-			getDamageToolController().drawUI();
-		}
-
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Stats
-		///////////////////////////////////////////////////////////////////////////////////////////
-		if (ImGui::CollapsingHeader("Stats"))
-		{
-			BlastController& blastController = getBlastController();
-
-			const char* prefix;
-			float sizeVal;
-
-			// FPS
-			double averageTime = GetDeviceManager()->GetAverageFrameTime();
-			float fps = (averageTime > 0) ? 1.0 / averageTime : 0.0;
-			float frameMs = 1000.0f / fps;
-			ImGui::Text("Frame Time %.3f ms (%.1f FPS)", frameMs, fps);
-
-			static PlotLinesInstance<> fpsPlot;
-			fpsPlot.plot("FPS", frameMs, "ms/frame", 0.0f, 100.0f);
-
-			// Render stats
-			ImGui::PushStyleColor(ImGuiCol_Text, ImColor(0xFF, 0x3B, 0xD8, 0xFF));
-			ImGui::Text("Draw Calls (Opaque/Transparent): %d/%d", getRenderer().getVisibleOpaqueRenderablesCount(), getRenderer().getVisibleTransparentRenderablesCount());
-			ImGui::PopStyleColor();
-
-			// Blast stats
-			const BlastTimers& timers = blastController.getLastBlastTimers();
-
-			ImGui::Text("Simulation Time:                 %.2f ms ", getPhysXController().getLastSimulationTime() * 1000);
-			ImGui::Text("Actor Count:                     %d", blastController.getActorCount());
-			ImGui::Text("Visible Chunk Count:             %d", blastController.getTotalVisibleChunkCount());
-
-			getManager()->getSceneController().drawStatsUI();
-
-			sizeVal = memorySizeOutput(prefix, (float)blastController.getFamilySize());
-			ImGui::Text("Family Size:             %.3g %sB", sizeVal, prefix);
-			sizeVal = memorySizeOutput(prefix, (float)blastController.getBlastAssetsSize());
-			ImGui::Text("Blast asset Data size:           %.3g %sB", sizeVal, prefix);
-
-			//ImGui::Text("  Last Blast Extern Time:            %8.3f ms", timers.mLastExternalTime * 1000);
-//			ImGui::Text(" Last Damage Time:                %8.3f ms", timers.blastDamage * 1000);
-#if NV_PROFILE
-			ImGui::Text("Last Material Time:           %8.3f ms", timers.blastDamageMaterial * 1000);
-			ImGui::Text("Last Fracture Time:           %8.3f ms", timers.blastDamageFracture * 1000);
-#endif
-//			ImGui::Text("Last Physics Split Time:         %.3f ms", timers.physicsSplit * 1000);
-#if NV_PROFILE
-			ImGui::Text("Last Island Time:             %8.3f ms", timers.blastSplitIsland * 1000);
-			ImGui::Text("Last Partition Time:          %8.3f ms", timers.blastSplitPartition * 1000);
-			ImGui::Text("Last Visibility Time:         %8.3f ms", timers.blastSplitVisibility * 1000);
-#endif
-
-#if NV_PROFILE
-			// Sample Profiler
-			static bool s_showProfilerWindow = false;
-			if (ImGui::Button("Code Profiler"))
-			{
-				s_showProfilerWindow = !s_showProfilerWindow;
-			}
-			if (s_showProfilerWindow)
-			{
-				drawCodeProfiler(&s_showProfilerWindow);
-			}
-#endif
-		}
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Application
-		///////////////////////////////////////////////////////////////////////////////////////////
-		if (ImGui::CollapsingHeader("Application"))
-		{
-			// Paused
-			bool isPaused = getPhysXController().isPaused();
-			if (ImGui::Checkbox("Pause (P)", &isPaused))
-			{
-				getPhysXController().setPaused(isPaused);
-			}
-
-			// Reload Shaders
-			if (ImGui::Button("Reload Shaders (F5)"))
-			{
-				getRenderer().reloadShaders();
-			}
-
-			// ImGui Test Window (just in case)
-			static bool s_showTestWindow = false;
-			if (ImGui::Button("ImGui Test Window"))
-			{
-				s_showTestWindow = !s_showTestWindow;
-			}
-			if (s_showTestWindow)
-			{
-				ImGui::ShowTestWindow();
-			}
-		}
-
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Debug Render
-		///////////////////////////////////////////////////////////////////////////////////////////
-		if (ImGui::CollapsingHeader("Debug Render"))
-		{
-			// WireFrame
-			bool wireFrameEnabled = getRenderer().getWireframeMode();
-			if (ImGui::Checkbox("WireFrame (O)", &wireFrameEnabled))
-			{
-				getRenderer().setWireframeMode(wireFrameEnabled);
-			}
-
-			// - - - - - - - -
-			ImGui::Spacing();
-
-			// Blast Debug Render Mode
-			const char* debugRenderItems[] =
-			{
-				"Disabled",                      // DEBUG_RENDER_DISABLED
-				"Health Graph",                  // DEBUG_RENDER_HEALTH_GRAPH
-				"Centroids",                     // DEBUG_RENDER_CENTROIDS
-				"Health Graph + Centroids",      // DEBUG_RENDER_HEALTH_GRAPH_CENTROIDS
-				"Joints",						 // DEBUG_RENDER_JOINTS
-				"Stress Graph",                  // DEBUG_RENDER_STRESS_GRAPH
-				"Stress Graph + Nodes Impulses", // DEBUG_RENDER_STRESS_GRAPH_NODES_IMPULSES 
-				"Stress Graph + Bonds Impulses"  // DEBUG_RENDER_STRESS_GRAPH_BONDS_IMPULSES
-			};
-			ImGui::Combo("Blast Debug Render Mode (I)", (int*)&getBlastController().debugRenderMode, debugRenderItems, IM_ARRAYSIZE(debugRenderItems), -1);
-
-			// Blast Debug Render Scale
-			ImGui::DragFloat("Blast Debug Render Scale", &getBlastController().debugRenderScale, 0.01f, 0.0f, 10.0f, "%.3f", 4.0f);
-
-			// - - - - - - - -
-			ImGui::Spacing();
-
-			// PhysX Debug Render
-			if (ImGui::TreeNode("PhysX Debug Render"))
-			{
-				auto addParam = [&](physx::PxVisualizationParameter::Enum param, const char* uiName)
-				{
-					bool enabled = getPhysXController().getPhysXScene().getVisualizationParameter(param) != 0;
-					if (ImGui::Checkbox(uiName, &enabled))
-					{
-						getPhysXController().getPhysXScene().setVisualizationParameter(param, enabled ? 1.0f : 0.0f);
-					}
-				};
-
-				addParam(PxVisualizationParameter::eSCALE, "Scale");
-				addParam(PxVisualizationParameter::eBODY_AXES, "Body Axes");
-				addParam(PxVisualizationParameter::eWORLD_AXES, "World Axes");
-				addParam(PxVisualizationParameter::eBODY_MASS_AXES, "Body Mass Axes");
-				addParam(PxVisualizationParameter::eBODY_LIN_VELOCITY, "Body Lin Velocity");
-				addParam(PxVisualizationParameter::eBODY_ANG_VELOCITY, "Body Ang Velocity");
-				addParam(PxVisualizationParameter::eBODY_JOINT_GROUPS, "Body Joint");
-				addParam(PxVisualizationParameter::eCONTACT_POINT, "Contact Point");
-				addParam(PxVisualizationParameter::eCONTACT_NORMAL, "Contact Normal");
-				addParam(PxVisualizationParameter::eCONTACT_ERROR, "Contact Error");
-				addParam(PxVisualizationParameter::eCONTACT_FORCE, "Contact Force");
-				addParam(PxVisualizationParameter::eACTOR_AXES, "Actor Axes");
-				addParam(PxVisualizationParameter::eCOLLISION_AABBS, "Collision AABBs");
-				addParam(PxVisualizationParameter::eCOLLISION_SHAPES, "Collision Shapes");
-				addParam(PxVisualizationParameter::eCOLLISION_AXES, "Collision Axes");
-				addParam(PxVisualizationParameter::eCOLLISION_COMPOUNDS, "Collision Compounds");
-				addParam(PxVisualizationParameter::eCOLLISION_FNORMALS, "Collision FNormals");
-				addParam(PxVisualizationParameter::eCOLLISION_EDGES, "Collision Edges");
-				addParam(PxVisualizationParameter::eCOLLISION_STATIC, "Collision Static");
-				addParam(PxVisualizationParameter::eCOLLISION_DYNAMIC, "Collision Dynamic");
-				//addParam(PxVisualizationParameter::eDEPRECATED_COLLISION_PAIRS, "Collision Pairs");
-				addParam(PxVisualizationParameter::eJOINT_LOCAL_FRAMES, "Joint Local Frames");
-				addParam(PxVisualizationParameter::eJOINT_LIMITS, "Joint Limits");
-				//addParam(PxVisualizationParameter::ePARTICLE_SYSTEM_POSITION, "PS Position");
-				//addParam(PxVisualizationParameter::ePARTICLE_SYSTEM_VELOCITY, "PS Velocity");
-				//addParam(PxVisualizationParameter::ePARTICLE_SYSTEM_COLLISION_NORMAL, "PS Collision Normal");
-				//addParam(PxVisualizationParameter::ePARTICLE_SYSTEM_BOUNDS, "PS Bounds");
-				//addParam(PxVisualizationParameter::ePARTICLE_SYSTEM_GRID, "PS Grid");
-				//addParam(PxVisualizationParameter::ePARTICLE_SYSTEM_BROADPHASE_BOUNDS, "PS Broadphase Bounds");
-				//addParam(PxVisualizationParameter::ePARTICLE_SYSTEM_MAX_MOTION_DISTANCE, "PS Max Motion Distance");
-				addParam(PxVisualizationParameter::eCULL_BOX, "Cull Box");
-				//addParam(PxVisualizationParameter::eCLOTH_VERTICAL, "Cloth Vertical");
-				//addParam(PxVisualizationParameter::eCLOTH_HORIZONTAL, "Cloth Horizontal");
-				//addParam(PxVisualizationParameter::eCLOTH_BENDING, "Cloth Bending");
-				//addParam(PxVisualizationParameter::eCLOTH_SHEARING, "Cloth Shearing");
-				//addParam(PxVisualizationParameter::eCLOTH_VIRTUAL_PARTICLES, "Cloth Virtual Particles");
-				addParam(PxVisualizationParameter::eMBP_REGIONS, "MBP Regions");
-
-				ImGui::TreePop();
-			}
-		}
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// PhysX
-		///////////////////////////////////////////////////////////////////////////////////////////
-		if (ImGui::CollapsingHeader("PhysX"))
-		{
-			// PhysX
-			getPhysXController().drawUI();
-
-			// GPU
-			getSampleController().drawPhysXGpuUI();
-		}
-
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Renderer
-		///////////////////////////////////////////////////////////////////////////////////////////
-		if (ImGui::CollapsingHeader("Renderer"))
-		{
-			getRenderer().drawUI();
-		}
-
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-		// Hints
-		///////////////////////////////////////////////////////////////////////////////////////////
-		if (ImGui::CollapsingHeader("Hints / Help"))
-		{
-			ImGui::BulletText("Rotate camera - RMB");
-			ImGui::BulletText("Move camera - WASDQE(SHIFT)");
-			ImGui::BulletText("Play/Pause - P");
-			ImGui::BulletText("Reload shaders - F5");
-			ImGui::BulletText("Wireframe - O");
-			ImGui::BulletText("Blast Debug Render - I");
-			ImGui::BulletText("Apply damage - LMB");
-			ImGui::BulletText("Damage radius - +/-/wheel");
-			ImGui::BulletText("Damage profile - 1-9");
-			ImGui::BulletText("Explosive - X");
-			ImGui::BulletText("Throw cube - F");
-			ImGui::BulletText("Restart - R");
-		}
-
-		ImGui::PopItemWidth();
-	}
-	ImGui::End();
-
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// Mode Text
-	///////////////////////////////////////////////////////////////////////////////////////////
-	{
-		ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4());
-		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0,0));
-
-		const char* text = getDamageToolController().isDamageMode() ? "DAMAGE MODE (PRESS SPACE)" : "DRAG MODE (PRESS SPACE)";
-		ImVec2 size = ImGui::CalcTextSize(text);
-		ImGui::SetNextWindowPos(ImVec2((getRenderer().getScreenWidth() - size.x) / 2, 0));
-		ImGui::Begin("Mode Text", 0, ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar);
-		ImGui::Text(text);
-		ImGui::End();
-
-		ImGui::PopStyleVar();
-		ImGui::PopStyleColor();
-	}
-
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// FPS
-	///////////////////////////////////////////////////////////////////////////////////////////
-	{
-		ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4());
-		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
-
-		double averageTime = GetDeviceManager()->GetAverageFrameTime();
-		float fps = (averageTime > 0) ? 1.0 / averageTime : 0.0;
-		static char buf[32];
-		std::sprintf(buf, "%.1f FPS", fps);
-		ImVec2 size = ImGui::CalcTextSize(buf);
-
-		size.x += 20.0;
-		ImGui::SetNextWindowSize(size);
-		ImGui::SetNextWindowPos(ImVec2(getRenderer().getScreenWidth() - size.x, 0));
-		ImGui::Begin("FPS", 0, ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar);
-		ImGui::Text(buf);
-		ImGui::End();
-
-		ImGui::PopStyleVar();
-		ImGui::PopStyleColor();
-	}
-
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// Loading overlay
-	///////////////////////////////////////////////////////////////////////////////////////////
-	if (!m_delayedCalls.empty())
-	{
-		DelayedCall& call = m_delayedCalls.front();
-		if (call.delay > 0)
-		{
-			const int height = 50;
-			const char* message = call.message;
-			const float alpha =  PxClamp(lerp(0.0f, 1.0f, (call.delayTotal - call.delay) * 10.0f), 0.0f, 1.0f);
-
-			ImGui::PushStyleColor(ImGuiCol_WindowBg, ImColor(0, 0, 0, 200));
-			ImGui::PushStyleVar(ImGuiStyleVar_Alpha, alpha);
-			ImGui::SetNextWindowPosCenter();
-			ImVec2 size = ImGui::CalcTextSize(message);
-			int width = std::max<float>(200, size.x) + 50;
-			ImGui::SetNextWindowSize(ImVec2(width, height));
-			ImGui::Begin(call.title, 0, ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar);
-			ImGui::SetCursorPos(ImVec2((width - size.x) * 0.5f, (height - size.y) * 0.5f));
-			ImGui::Text(message);
-			ImGui::End();
-			ImGui::PopStyleVar();
-			ImGui::PopStyleColor();
-
-			call.delay -= PxClamp(m_dt, 0.0f, 0.1f);
-		}
-		else
-		{
-			call.func();
-			m_delayedCalls.pop();
-		}
-	}
-}
-
-
-void CommonUIController::drawCodeProfiler(bool* open)
-{
-	ImGuiWindowFlags window_flags = 0;
-	const float padding = 8.0f;
-	const float width = 550;
-	const float height = 580;
-	ImGui::SetNextWindowPos(ImVec2(getRenderer().getScreenWidth() - width - padding, padding), ImGuiSetCond_Once/*ImGuiSetCond_FirstUseEver*/);
-	ImGui::SetNextWindowSize(ImVec2(width, height), ImGuiSetCond_Once);
-	if (!ImGui::Begin("Code Profiler", open, window_flags))
-	{
-		// Early out if the window is collapsed, as an optimization.
-		ImGui::End();
-		return;
-	}
-
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// Control/Main Bar
-	///////////////////////////////////////////////////////////////////////////////////////////
-	{
-		if (ImGui::Button("Reset"))
-		{
-			PROFILER_INIT();
-		}
-		ImGui::SameLine();
-		if (ImGui::Button("Dump To File (profile.txt)"))
-		{
-			SampleProfilerDumpToFile("profile.txt");
-		}
-		ImGui::SameLine();
-		ImGui::Text("Profiler overhead: %2.3f ms", SampleProfilerGetOverhead().count() * 0.001f);
-	}
-
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// Legend
-	///////////////////////////////////////////////////////////////////////////////////////////
-	{
-		ImGui::Spacing(); ImGui::Separator(); ImGui::Spacing();
-		ImGui::Text("Legend: name | calls | time | max time");
-		ImGui::Spacing(); ImGui::Separator(); ImGui::Spacing();
-	}
-
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// Stats Tree
-	///////////////////////////////////////////////////////////////////////////////////////////
-	ImGui::SetNextTreeNodeOpen(true, ImGuiSetCond_Once);
-	float plotMS = 0.0f;
-	float plotMaxMS = 0.0f;
-	const char* plotName = nullptr;
-	if (ImGui::TreeNode("Root"))
-	{
-		auto treeIt = SampleProfilerCreateTreeIterator();
-		if (treeIt)
-		{
-			uint32_t depth = 1;
-			uint32_t openeDepth = 1;
-			while (!treeIt->isDone())
-			{
-				const auto data = treeIt->data();
-
-				while (data->depth < depth)
-				{
-					ImGui::TreePop();
-					depth--;
-				}
-
-				const uint32_t maxLen = 30;
-				auto hash = data->hash;
-				static uint64_t selectedNodeHash = 0;
-				if (selectedNodeHash == hash)
-				{
-					plotMS = data->time.count() * 0.001f;
-					plotMaxMS = data->maxTime.count() * 0.001f;
-					plotName = data->name;
-				}
-				if (ImGui::TreeNodeEx(data->name, data->hasChilds ? 0 : ImGuiTreeNodeFlags_Leaf, "%-*.*s | %d | %2.3f ms | %2.3f ms",
-					maxLen, maxLen, data->name, data->calls, data->time.count() * 0.001f, data->maxTime.count() * 0.001f))
-				{
-					depth++;
-					treeIt->next();
-				}
-				else
-				{
-					treeIt->next();
-					while (!treeIt->isDone() && treeIt->data()->depth > depth)
-						treeIt->next();
-				}
-
-				if (ImGui::IsItemClicked())
-				{
-					selectedNodeHash = hash;
-				}
-			}
-
-			while (depth > 0)
-			{
-				ImGui::TreePop();
-				depth--;
-			}
-
-			treeIt->release();
-		}
-		else
-		{
-			ImGui::Text("Profiler Is Broken. Begin/End Mismatch.");
-		}
-	}
-
-	///////////////////////////////////////////////////////////////////////////////////////////
-	// Selected Item Plot
-	///////////////////////////////////////////////////////////////////////////////////////////
-	{
-		ImGui::Spacing(); ImGui::Separator(); ImGui::Spacing();
-		if (plotName)
-		{
-			static PlotLinesInstance<> selectedNodePlot;
-			selectedNodePlot.plot("", plotMS, plotName, 0.0f, plotMaxMS);
-		}
-		else
-		{
-			ImGui::Text("Select item to plot.");
-		}
-	}
-
-	ImGui::End();
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/CommonUIController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/CommonUIController.h
deleted file mode 100644
index 4656203..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/CommonUIController.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef COMMON_UI_CONTROLLER_H
-#define COMMON_UI_CONTROLLER_H
-
-#include "SampleManager.h"
-#include <DirectXMath.h>
-#include <string>
-#include <list>
-#include <queue>
-#include <functional>
-
-
-class Renderer;
-class PhysXController;
-class BlastController;
-
-
-class CommonUIController : public ISampleController
-{
-  public:
-	CommonUIController();
-	virtual ~CommonUIController() {};
-
-	virtual HRESULT DeviceCreated(ID3D11Device* pDevice);
-	virtual void DeviceDestroyed();
-	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	virtual void Animate(double fElapsedTimeSeconds);
-	virtual void Render(ID3D11Device*, ID3D11DeviceContext*, ID3D11RenderTargetView*, ID3D11DepthStencilView*);
-
-	void addDelayedCall(std::function<void()> func, const char* message)
-	{
-		addDelayedCall("PLEASE WAIT...", message, func);
-	}
-
-	void addPopupMessage(const char* title, const char* message, float duration = 2.f)
-	{
-		addDelayedCall(title, message, [] {}, duration);
-	}
-
-  private:
-	void addDelayedCall(const char* title, const char* message, std::function<void()> func, float delay = 0.1f);
-
-	void drawUI();
-	void drawCodeProfiler(bool*);
-
-
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-	BlastController&getBlastController() const
-	{
-		return getManager()->getBlastController();
-	}
-
-	DamageToolController& getDamageToolController() const
-	{
-		return getManager()->getDamageToolController();
-	}
-
-	SceneController& getSceneController() const
-	{
-		return getManager()->getSceneController();
-	}
-
-	SampleController& getSampleController() const
-	{
-		return getManager()->getSampleController();
-	}
-
-
-	//////// internal data ////////
-
-	struct DelayedCall
-	{
-		std::function<void()>	func;
-		const char*				title;
-		const char*				message;
-		float					delay;
-		float					delayTotal;
-	};
-
-	std::queue<DelayedCall>		m_delayedCalls;
-
-	float m_dt;
-
-};
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/DamageToolController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/DamageToolController.cpp
deleted file mode 100644
index ecc3cb9..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/DamageToolController.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "DamageToolController.h"
-#include "RenderUtils.h"
-#include "BlastController.h"
-#include "Renderer.h"
-#include "PhysXController.h"
-#include "SampleProfiler.h"
-
-#include <imgui.h>
-
-#include "NvBlastTkActor.h"
-#include "NvBlastTkFamily.h"
-#include "NvBlastExtDamageShaders.h"
-#include "NvBlastExtPxActor.h"
-
-#include "PxRigidDynamic.h"
-#include "PxScene.h"
-#include "SimpleScene.h"
-#include "BlastSceneTree.h"
-#include "DefaultDamagePanel.h"
-#include "ViewerOutput.h"
-
-
-using namespace Nv::Blast;
-using namespace physx;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Setup
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const DirectX::XMFLOAT4 PICK_POINTER_ACTIVE_COLOR(1.0f, 0.f, 0.f, 0.6f);
-static const PxVec3 WEAPON_POSITION_IN_VIEW(0, -7, 23);
-static const float SEGMENT_DAMAGE_MAX_DISTANCE = 100.0f;
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-DamageToolController* gDamageToolController = nullptr;
-DamageToolController* DamageToolController::ins()
-{
-	return gDamageToolController;
-}
-void DamageToolController::setDamageAmount(float value)
-{
-	m_damage = value;
-}
-void DamageToolController::setExplosiveImpulse(float value)
-{
-	m_explosiveImpulse = value;
-}
-void DamageToolController::setStressForceFactor(float value)
-{
-	m_stressForceFactor = value;
-}
-void DamageToolController::setDamagerIndex(int index)
-{
-	m_damagerIndex = index;
-}
-void DamageToolController::setRadius(float value)
-{
-	m_damagers[m_damagerIndex].radius = value;
-}
-void DamageToolController::setDamageWhilePressed(bool value)
-{
-	m_damagers[m_damagerIndex].damageWhilePressed = value;
-}
-
-DamageToolController::DamageToolController()
-	: m_damage(100.0f), m_toolColor(1.0f, 1.0f, 1.0f, 0.4f), 
-	m_toolRenderMaterial(nullptr), m_sphereToolRenderable(nullptr), m_lineToolRenderable(nullptr), 
-	m_explosiveImpulse(100), m_damagerIndex(0), m_stressForceFactor(1.0f), m_isMousePressed(false), m_damageCountWhilePressed(0)
-{
-	// damage amount calc using NvBlastExtMaterial
-	auto getDamageAmountFn = [](const float damage, ExtPxActor* actor)
-	{
-		const void* material = actor->getTkActor().getFamily().getMaterial();
-		return material ? reinterpret_cast<const NvBlastExtMaterial*>(material)->getNormalizedDamage(damage) : 0.f;
-	};
-
-	// Damage functions
-	auto radialDamageExecute = [&](const Damager* damager, ExtPxActor* actor, PxVec3 origin, PxVec3 position, PxVec3 normal)
-	{
-		const float damage = getDamageAmountFn(m_damage, actor);
-		if (damage > 0.f)
-		{
-			NvBlastExtRadialDamageDesc desc =
-			{
-				damage,
-				{ position.x, position.y, position.z },
-				damager->radius,
-				damager->radius * 1.6f
-			};
-
-			actor->getTkActor().damage(damager->program, &desc, sizeof(desc));
-		}
-	};
-	auto lineSegmentDamageExecute = [&](const Damager* damager, ExtPxActor* actor, PxVec3 origin, PxVec3 position, PxVec3 normal)
-	{
-		const float damage = getDamageAmountFn(m_damage, actor);
-		if (damage > 0.f)
-		{
-			PxVec3 dir = (position - origin).getNormalized();
-			PxVec3 farEnd = origin + dir * 10000.0f;
-
-			NvBlastExtSegmentRadialDamageDesc desc =
-			{
-				damage,
-				{ origin.x, origin.y, origin.z },
-				{ farEnd.x, farEnd.y, farEnd.z },
-				damager->radius,
-				damager->radius * 1.6f
-			};
-
-			actor->getTkActor().damage(damager->program, &desc, sizeof(desc));
-		}
-	};
-	auto shearDamageExecute = [&](const Damager* damager, ExtPxActor* actor, PxVec3 origin, PxVec3 position, PxVec3 normal)
-	{
-		const float damage = getDamageAmountFn(m_damage, actor);
-		if (damage > 0.f)
-		{
-			PxVec3 impactNormal = -normal;
-
-			NvBlastExtShearDamageDesc desc =
-			{
-				damage,
-				{ impactNormal.x, impactNormal.y, impactNormal.z },
-				{ position.x, position.y, position.z },
-				damager->radius,
-				damager->radius * 1.6f
-			};
-
-			actor->getTkActor().damage(damager->program, &desc, sizeof(desc));
-		}
-	};
-	auto stressDamageExecute = [&](const Damager* damager, ExtPxActor* actor, PxVec3 origin, PxVec3 position, PxVec3 normal)
-	{
-		PxVec3 force = -m_stressForceFactor * normal * actor->getPhysXActor().getMass();
-
-		getBlastController().stressDamage(actor, position, force);
-	};
-
-	// Damage Tools:
-	{
-		Damager dam;
-		dam.uiName = "Radial Damage (Falloff)";
-		dam.program = NvBlastDamageProgram { NvBlastExtFalloffGraphShader, NvBlastExtFalloffSubgraphShader };
-		dam.pointerType = Damager::PointerType::Sphere;
-		dam.pointerColor = DirectX::XMFLOAT4(1.0f, 1.0f, 1.0f, 0.4f);
-		dam.executeFunction = radialDamageExecute;
-		m_damagers.push_back(dam);
-	}
-	{
-		Damager dam;
-		dam.uiName = "Radial Damage (Cutter)";
-		dam.program = NvBlastDamageProgram { NvBlastExtCutterGraphShader, NvBlastExtCutterSubgraphShader };
-		dam.pointerType = Damager::PointerType::Sphere;
-		dam.pointerColor = DirectX::XMFLOAT4(0.5f, 0.5f, 1.0f, 0.4f);
-		dam.executeFunction = radialDamageExecute;
-		m_damagers.push_back(dam);
-	}
-
-	{
-		Damager dam;
-		dam.uiName = "Segment Damage (Falloff)";
-		dam.program = NvBlastDamageProgram{ NvBlastExtSegmentFalloffGraphShader, NvBlastExtSegmentFalloffSubgraphShader };
-		dam.pointerType = Damager::PointerType::Line;
-		dam.pointerColor = DirectX::XMFLOAT4(0.1f, 1.0f, 0.1f, 0.4f);
-		dam.executeFunction = lineSegmentDamageExecute;
-		dam.damageWhilePressed = true;
-		dam.radius = .2f;
-		dam.radiusLimit = 20.0f;
-		m_damagers.push_back(dam);
-	}
-
-	{
-		Damager dam;
-		dam.uiName = "Shear Damage";
-		dam.program = NvBlastDamageProgram { NvBlastExtShearGraphShader, NvBlastExtShearSubgraphShader };
-		dam.pointerType = Damager::PointerType::Sphere;
-		dam.pointerColor = DirectX::XMFLOAT4(0.5f, 1.0f, 0.5f, 0.4f);
-		dam.executeFunction = shearDamageExecute;
-		m_damagers.push_back(dam);
-	}
-
-	{
-		Damager dam;
-		dam.uiName = "Stress Damage";
-		dam.program = { nullptr, nullptr };
-		dam.pointerType = Damager::PointerType::Sphere;
-		dam.pointerColor = DirectX::XMFLOAT4(0.5f, 0.5f, 1.0f, 0.4f);
-		dam.executeFunction = stressDamageExecute;
-		m_damagers.push_back(dam);
-	}
-
-	// UI
-	DefaultDamagePanel* pDefaultDamagePanel = DefaultDamagePanel::ins();
-	pDefaultDamagePanel->setUpdateData(false);
-	QComboBox* comboBoxDamageProfile = pDefaultDamagePanel->getDamageProfile();
-	comboBoxDamageProfile->clear();
-
-	// project
-	BPPDefaultDamage& damage = BlastProject::ins().getParams().defaultDamage;
-	damage.damageAmount = m_damage;
-	damage.explosiveImpulse = m_explosiveImpulse;
-	damage.stressDamageForce = m_stressForceFactor;
-	int count = m_damagers.size();
-	if (damage.damageStructs.buf != nullptr && damage.damageStructs.arraySizes[0] != count)
-	{
-		delete[] damage.damageStructs.buf;
-		damage.damageStructs.buf = nullptr;
-		damage.damageStructs.arraySizes[0] = 0;
-	}
-	if (damage.damageStructs.buf == nullptr)
-	{
-		damage.damageStructs.buf = new BPPDamageStruct[count];
-		damage.damageStructs.arraySizes[0] = count;
-	}
-	damage.damageProfile = 0;
-	int damageIndex = 0;
-
-	for (const Damager& d : m_damagers)
-	{
-		m_damagerNames.push_back(d.uiName);
-
-		// UI
-		comboBoxDamageProfile->addItem(d.uiName);
-
-		// project
-		BPPDamageStruct& damageStruct = damage.damageStructs.buf[damageIndex++];
-		damageStruct.damageRadius = d.radius;
-		damageStruct.continuously = d.damageWhilePressed;
-	}
-
-	pDefaultDamagePanel->updateValues();
-
-	gDamageToolController = this;
-}
-
-DamageToolController::~DamageToolController()
-{
-}
-
-void DamageToolController::onSampleStart()
-{
-	// damage tool pointer
-	m_toolRenderMaterial = new RenderMaterial("", getRenderer().getResourceManager(), "physx_primitive_transparent", "", RenderMaterial::BLEND_ALPHA_BLENDING);
-	{
-		IRenderMesh* mesh = getRenderer().getPrimitiveRenderMesh(PrimitiveRenderMeshType::Sphere);
-		m_sphereToolRenderable = getRenderer().createRenderable(*mesh, *m_toolRenderMaterial);
-	}
-	{
-		IRenderMesh* mesh = getRenderer().getPrimitiveRenderMesh(PrimitiveRenderMeshType::Box);
-		m_lineToolRenderable = getRenderer().createRenderable(*mesh, *m_toolRenderMaterial);
-	}
-
-	// default tool
-	m_damagerIndex = 0;
-
-	// start with damage mode by default
-	setDamageMode(false);
-}
-
-void DamageToolController::onInitialize()
-{
-}
-
-
-void DamageToolController::onSampleStop() 
-{
-	getRenderer().removeRenderable(m_sphereToolRenderable);
-	getRenderer().removeRenderable(m_lineToolRenderable);
-	SAFE_DELETE(m_toolRenderMaterial);
-}
-
-
-void DamageToolController::Animate(double dt)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	m_toolColor = XMFLOAT4Lerp(m_toolColor, m_damagers[m_damagerIndex].pointerColor, dt * 5.0f);
-
-	m_sphereToolRenderable->setHidden(true);
-	m_lineToolRenderable->setHidden(true);
-
-	// damage mode
-	if (m_damageMode)
-	{
-		// ray cast according to camera + mouse ray
-		PxVec3 eyePos, pickDir;
-		getPhysXController().getEyePoseAndPickDir(m_lastMousePos.x, m_lastMousePos.y, eyePos, pickDir);
-		pickDir = pickDir.getNormalized();
-
-		PxRaycastHit hit; hit.shape = NULL;
-		PxRaycastBuffer hit1;
-		getPhysXController().getPhysXScene().raycast(eyePos, pickDir, PX_MAX_F32, hit1, PxHitFlag::ePOSITION | PxHitFlag::eNORMAL);
-		hit = hit1.block;
-
-		if (hit.shape)
-		{
-			PxMat44 cameraViewInv = XMMATRIXToPxMat44(getRenderer().getCamera().GetViewMatrix()).inverseRT();
-			PxVec3 weaponOrigin = eyePos + cameraViewInv.rotate(WEAPON_POSITION_IN_VIEW);
-
-			// damage function
-			const Damager& damager = m_damagers[m_damagerIndex];
-			auto damageFunction = [&](ExtPxActor* actor)
-			{
-				auto t0 = actor->getPhysXActor().getGlobalPose();
-				PxTransform t(t0.getInverse());
-				PxVec3 localNormal = t.rotate(hit.normal);
-				PxVec3 localPosition = t.transform(hit.position);
-				PxVec3 localOrigin = t.transform(weaponOrigin);
-				damager.executeFunction(&damager, actor, localOrigin, localPosition, localNormal);
-			};
-
-			// should damage? 
-			bool shouldDamage = false;
-			if (m_isMousePressed)
-			{
-				shouldDamage = damager.damageWhilePressed || m_damageCountWhilePressed == 0;
-				m_damageCountWhilePressed++;
-			}
-			else
-			{
-				m_damageCountWhilePressed = 0;
-			}
-
-			// Update tool pointer and do damage with specific overlap
-			if (damager.pointerType == Damager::Sphere)
-			{
-				m_sphereToolRenderable->setHidden(false);
-				m_sphereToolRenderable->setColor(m_toolColor);
-				m_sphereToolRenderable->setScale(PxVec3(damager.radius));
-				m_sphereToolRenderable->setTransform(PxTransform(hit.position));
-
-				if (shouldDamage)
-				{
-					if (getBlastController().overlap(PxSphereGeometry(damager.radius), PxTransform(hit.position), damageFunction))
-					{
-						m_toolColor = PICK_POINTER_ACTIVE_COLOR;
-					}
-					getPhysXController().explodeDelayed(hit.position, damager.radius, m_explosiveImpulse);
-				}
-			}
-			else if (damager.pointerType == Damager::Line)
-			{
-				m_lineToolRenderable->setHidden(false);
-				m_lineToolRenderable->setColor(m_toolColor);
-
-				PxVec3 scale(damager.radius, damager.radius, SEGMENT_DAMAGE_MAX_DISTANCE);
-				PxVec3 direction = (hit.position - weaponOrigin).getNormalized();
-				PxVec3 position = weaponOrigin + direction * SEGMENT_DAMAGE_MAX_DISTANCE;
-
-				m_lineToolRenderable->setScale(scale);
-				PxTransform t(position, quatLookAt(direction));
-				m_lineToolRenderable->setTransform(t);
-
-				if (shouldDamage)
-				{
-					if (this->getBlastController().overlap(PxBoxGeometry(scale), t, damageFunction))
-					{
-						m_toolColor = PICK_POINTER_ACTIVE_COLOR;
-					}
-				}
-			}
-			else
-			{
-				PX_ASSERT(false);
-			}
-		}
-	}
-}
-
-
-LRESULT DamageToolController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	if (uMsg == WM_LBUTTONDOWN || uMsg == WM_MOUSEMOVE || uMsg == WM_LBUTTONUP)
-	{
-		m_lastMousePos.x = (float)LOWORD(lParam);
-		m_lastMousePos.y = (float)HIWORD(lParam);
-	}
-
-	if (uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONUP)
-	{
-		m_isMousePressed = (uMsg == WM_LBUTTONDOWN);
-		if (m_isMousePressed && !m_damageMode)
-		{
-			viewer_warn("damage mode is disable, please enable it first !");
-		}
-	}
-
-	if (uMsg == WM_MOUSEWHEEL)
-	{
-		/*
-		int delta = int((short)HIWORD(wParam)) / WHEEL_DELTA;
-		changeDamageRadius(delta * 0.3f);
-		*/
-	}
-
-	if (uMsg == WM_KEYDOWN)
-	{
-		int iKeyPressed = static_cast<int>(wParam);
-		if (iKeyPressed == VK_OEM_PLUS)
-		{
-			changeDamageRadius(0.2f);
-		}
-		else if (iKeyPressed == VK_OEM_MINUS)
-		{
-			changeDamageRadius(-0.2f);
-		}
-		else if (iKeyPressed >= '1' && iKeyPressed <= '9')
-		{
-			m_damagerIndex = PxClamp<uint32_t>(iKeyPressed - '1', 0, (uint32_t)m_damagers.size() - 1);
-		}
-		else if (iKeyPressed == VK_SPACE)
-		{
-			//setDamageMode(!isDamageMode());
-		}
-	}
-
-	return 1;
-}
-
-void DamageToolController::drawUI()
-{
-	ImGui::DragFloat("Damage Amount", &m_damage, 1.0f);
-	ImGui::DragFloat("Explosive Impulse", &m_explosiveImpulse);
-	ImGui::DragFloat("Stress Damage Force", &m_stressForceFactor);
-
-	// - - - - - - - -
-	ImGui::Spacing();
-
-	// Armory
-	ImGui::Combo("Damage Profile", (int*)&m_damagerIndex, m_damagerNames.data(), (int)m_damagerNames.size(), -1);
-	Damager& damager = m_damagers[m_damagerIndex];
-	ImGui::DragFloat("Damage Radius (Mouse WH)", &damager.radius);
-	ImGui::Checkbox("Damage Continuously", &damager.damageWhilePressed);
-}
-
-void DamageToolController::setDamageMode(bool enabled)
-{
-	m_damageMode = enabled;
-
-	//getPhysXController().setDraggingEnabled(!m_damageMode);
-
-	if (!m_damageMode)
-	{
-		m_sphereToolRenderable->setHidden(true);
-		m_lineToolRenderable->setHidden(true);
-	}
-}
-
-void DamageToolController::changeDamageRadius(float dr)
-{
-	Damager& damager = m_damagers[m_damagerIndex];
-	damager.radius += dr;
-	damager.radius = PxClamp<float>(damager.radius, 0.05f, damager.radiusLimit);
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/DamageToolController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/DamageToolController.h
deleted file mode 100644
index 0aeb0d7..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/DamageToolController.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef DAMAGE_TOOL_CONTROLLER_H
-#define DAMAGE_TOOL_CONTROLLER_H
-
-#include "SampleManager.h"
-#include "NvBlastTypes.h"
-#include <DirectXMath.h>
-#include <functional>
-#include "PxVec2.h"
-#include "PxVec3.h"
-
-
-class Renderable;
-class RenderMaterial;
-
-namespace Nv
-{
-namespace Blast
-{
-class ExtPxActor;
-}
-}
-
-
-
-class DamageToolController : public ISampleController
-{
-public:
-	DamageToolController();
-	virtual ~DamageToolController();
-
-	static DamageToolController* ins();
-	void setDamageAmount(float value);
-	void setExplosiveImpulse(float value);
-	void setStressForceFactor(float value);
-	void setDamagerIndex(int index);
-	void setRadius(float value);
-	void setDamageWhilePressed(bool value);
-
-	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	virtual void Animate(double dt);
-	void drawUI();
-
-
-	virtual void onInitialize();
-	virtual void onSampleStart();
-	virtual void onSampleStop();
-
-	bool isDamageMode() const
-	{
-		return m_damageMode;
-	}
-
-// Add By Lixu Begin
-	Renderable* getPickPointer()
-	{
-		return m_sphereToolRenderable;
-	}
-
-	void setDamageMode(bool enabled);
-// Add By Lixu End
-
-private:
-	DamageToolController& operator= (DamageToolController&);
-
-
-	//////// private methods ////////
-
-	void changeDamageRadius(float dr);
-
-	
-
-
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-	BlastController& getBlastController() const
-	{
-		return getManager()->getBlastController();
-	}
-
-
-	//////// internal data ////////
-
-	RenderMaterial*   m_toolRenderMaterial;
-	Renderable*       m_sphereToolRenderable;
-	DirectX::XMFLOAT4 m_toolColor;
-	Renderable*       m_lineToolRenderable;
-
-	float             m_damage;
-	float             m_explosiveImpulse;
-	float             m_stressForceFactor;
-
-	struct Damager
-	{
-		Damager() : damageWhilePressed(false), radius(5.0f), radiusLimit(1000.0f)
-		{
-		}
-
-		enum PointerType
-		{
-			Sphere,
-			Line
-		};
-
-		typedef std::function<void(const Damager* damager, Nv::Blast::ExtPxActor* actor, physx::PxVec3 origin, physx::PxVec3 position, physx::PxVec3 normal)> ExecuteFn;
-
-		const char*				uiName;
-		NvBlastDamageProgram	program;
-		PointerType				pointerType;
-		DirectX::XMFLOAT4		pointerColor;
-		float					radius;
-		float					radiusLimit;
-		bool					damageWhilePressed;
-		ExecuteFn				executeFunction;
-	};
-
-	std::vector<Damager>     m_damagers;
-	std::vector<const char*> m_damagerNames;
-	uint32_t				 m_damagerIndex;
-
-	bool                     m_damageMode;
-
-	physx::PxVec2            m_lastMousePos;
-	bool                     m_isMousePressed;
-	uint32_t                 m_damageCountWhilePressed;
-};
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.cpp
deleted file mode 100644
index a3a6dd1..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "EditionToolController.h"
-#include "BlastController.h"
-#include "Renderer.h"
-#include "PhysXController.h"
-#include "SampleProfiler.h"
-#include "PxRigidDynamic.h"
-#include "PxScene.h"
-#include "NvBlastExtPxManager.h"
-#include "SceneController.h"
-#include "NvBlastExtPxActor.h"
-#include "GlobalSettings.h"
-using namespace Nv::Blast;
-using namespace physx;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Setup
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-EditionToolController::EditionToolController()
-{
-}
-
-EditionToolController::~EditionToolController()
-{
-}
-
-void EditionToolController::onSampleStart()
-{
-}
-
-void EditionToolController::onInitialize()
-{
-}
-
-
-void EditionToolController::onSampleStop() 
-{
-}
-
-void EditionToolController::Animate(double dt)
-{
-	PROFILER_SCOPED_FUNCTION();
-}
-
-
-LRESULT EditionToolController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	if (uMsg == WM_LBUTTONDOWN || uMsg == WM_MOUSEMOVE || uMsg == WM_LBUTTONUP)
-	{
-		float mouseX = (float)LOWORD(lParam);
-		float mouseY = (float)HIWORD(lParam);
-		bool press = uMsg == WM_LBUTTONDOWN;
-
-		if (uMsg == WM_LBUTTONUP)
-		{
-			PxVec3 eyePos, pickDir;
-			getPhysXController().getEyePoseAndPickDir(mouseX, mouseY, eyePos, pickDir);
-			pickDir = pickDir.getNormalized();
-
-			PxRaycastHit hit; hit.shape = NULL;
-			PxRaycastBuffer hit1;
-			getPhysXController().getEditPhysXScene().raycast(eyePos, pickDir, PX_MAX_F32, hit1, PxHitFlag::ePOSITION | PxHitFlag::eNORMAL);
-			hit = hit1.block;
-
-			PxRigidActor* actor = NULL;
-			if (hit.shape)
-			{
-				actor = hit.actor;
-			}
-			fracture(actor);
-		}
-	}
-
-	return 1;
-}
-
-void EditionToolController::drawUI()
-{
-}
-
-void EditionToolController::fracture(PxActor* actor)
-{
-	if (NULL == actor)
-	{
-		return;
-	}
-
-	BlastController& blastController = getBlastController();
-	std::vector<BlastFamilyPtr>& families = blastController.getFamilies();
-	if (families.size() == 0)
-	{
-		return;
-	}
-
-	PxRigidDynamic* rigidDynamic = actor->is<PxRigidDynamic>();
-	if (NULL == rigidDynamic)
-	{
-		return;
-	}
-
-	BlastFamilyPtr pBlastFamily = NULL;
-	std::vector<BlastFamilyPtr>::iterator it = families.begin();
-	for (; it != families.end(); it++)
-	{
-		BlastFamilyPtr f = *it;
-		if (f->find(*actor))
-		{
-			pBlastFamily = f;
-			break;
-		}
-	}
-	if (NULL == pBlastFamily)
-	{
-		return;
-	}
-
-	const uint32_t chunkIndex = pBlastFamily->getChunkIndexByPxActor(*actor);
-
-	const BlastAsset& blastAsset = pBlastFamily->getBlastAsset();
-	BlastAsset* pBlastAsset = (BlastAsset*)&blastAsset;
-
-	VoronoiFractureExecutor executor;
-	executor.setSourceAsset(pBlastAsset);
-	executor.setTargetChunk(chunkIndex);
-	executor.execute();
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.h
deleted file mode 100644
index 5f71b58..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef EDITION_TOOL_CONTROLLER_H
-#define EDITION_TOOL_CONTROLLER_H
-
-#include "SampleManager.h"
-
-namespace physx
-{
-	class PxActor;
-}
-
-class EditionToolController : public ISampleController
-{
-public:
-	EditionToolController();
-	virtual ~EditionToolController();
-
-	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	virtual void Animate(double dt);
-	void drawUI();
-
-	virtual void onInitialize();
-	virtual void onSampleStart();
-	virtual void onSampleStop();
-
-	void fracture(physx::PxActor* actor);
-
-private:
-	EditionToolController& operator= (EditionToolController&);
-
-	//////// private methods ////////
-
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-	BlastController& getBlastController() const
-	{
-		return getManager()->getBlastController();
-	}
-
-	//////// internal data ////////
-};
-
-#endif // EDITION_TOOL_CONTROLLER_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/ExplodeToolController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/ExplodeToolController.cpp
deleted file mode 100644
index 28ac182..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/ExplodeToolController.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "ExplodeToolController.h"
-#include "RenderUtils.h"
-#include "BlastController.h"
-#include "Renderer.h"
-#include "PhysXController.h"
-#include "SampleProfiler.h"
-#include "GizmoToolController.h"
-
-#include <imgui.h>
-
-#include "NvBlastTkActor.h"
-#include "NvBlastExtDamageShaders.h"
-
-#include "PxRigidDynamic.h"
-#include "PxScene.h"
-#include "BlastSceneTree.h"
-#include "SimpleScene.h"
-#include "ViewerOutput.h"
-
-using namespace Nv::Blast;
-using namespace physx;
-
-const float EXPLODE_MIN = 0.0f;
-const float EXPLODE_MAX = 2.0f;
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Setup
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-ExplodeToolController::ExplodeToolController()
-	: m_previousExplodeValue(0.0f)
-	, m_starDrag(false)
-{
-}
-
-ExplodeToolController::~ExplodeToolController()
-{
-}
-
-void ExplodeToolController::onSampleStart()
-{
-}
-
-void ExplodeToolController::onInitialize()
-{
-	m_previousExplodeValue = 0.0f;
-}
-
-
-void ExplodeToolController::onSampleStop() 
-{
-}
-
-void ExplodeToolController::Animate(double dt)
-{
-	PROFILER_SCOPED_FUNCTION();
-}
-
-
-LRESULT ExplodeToolController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (pSampleManager->IsSimulating())
-	{
-		return 1;
-	}
-
-	if (uMsg == WM_LBUTTONDOWN)
-	{
-		m_mouseStartPoint.x = (short)LOWORD(lParam);
-		m_mouseStartPoint.y = (short)HIWORD(lParam);
-		m_starDrag = true;
-	}
-	else if (uMsg == WM_MOUSEMOVE)
-	{
-		if (!m_starDrag)
-			return 1;
-
-		float theDragDistance = (short)LOWORD(lParam) - m_mouseStartPoint.x;
-		// ignore shorter mouse move
-		if (fabs(theDragDistance) <= 3.0)
-			return 1;
-
-		theDragDistance /= getRenderer().getScreenWidth();
-		theDragDistance *= EXPLODE_MAX;
-		float theNewExplodeValue = m_previousExplodeValue + (float)theDragDistance;
-
-		if (theNewExplodeValue < 0)
-			theNewExplodeValue = 0;
-		else if (theNewExplodeValue > EXPLODE_MAX)
-			theNewExplodeValue = EXPLODE_MAX;
-
-		_explode(theNewExplodeValue);
-	}
-	else if (uMsg == WM_LBUTTONUP)
-	{
-		m_previousExplodeValue = 0.0f;
-		m_starDrag = false;
-	}
-	return 1;
-}
-
-void ExplodeToolController::drawUI()
-{
-}
-
-void ExplodeToolController::_explode(float value)
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-
-	BlastAsset* pBlastAsset = nullptr;
-	int nFamilyIndex = -1;
-	pSampleManager->getCurrentSelectedInstance(&pBlastAsset, nFamilyIndex);
-	if (pBlastAsset == nullptr)
-	{
-		std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-		if (AssetDescMap.size() == 1)
-		{
-			std::map<BlastAsset*, AssetList::ModelAsset>::iterator itAssetDescMap = AssetDescMap.begin();
-			pSampleManager->setCurrentSelectedInstance(itAssetDescMap->first, -1);
-			pBlastAsset = pSampleManager->getCurBlastAsset();
-			viewer_msg("no asset selected, use the only one in current scene.");
-		}
-	}
-	if (pBlastAsset == nullptr)
-	{
-		viewer_msg("please select one asset before explode.");
-		return;
-	}
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = pSampleManager->getAssetFamiliesMap();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itAFM = AssetFamiliesMap.find(pBlastAsset);
-	if (itAFM == AssetFamiliesMap.end())
-	{
-		return;
-	}
-
-	std::vector<BlastFamily*> families = itAFM->second;
-	int familySize = families.size();
-	if (familySize == 0)
-	{
-		viewer_msg("no instance for current asset.");
-		return;
-	}
-
-	if (nFamilyIndex == -1 || nFamilyIndex >= familySize)
-	{
-		nFamilyIndex = 0;
-		viewer_msg("no instance selected, use the first one of current asset.");
-	}
-
-	BlastFamily* pFamily = families[nFamilyIndex];
-
-	PxScene& scene = pSampleManager->getPhysXController().getEditPhysXScene();
-	const PxU32 actorsCountTotal = scene.getNbActors(PxActorTypeFlag::eRIGID_DYNAMIC);
-	if (actorsCountTotal == 0)
-	{
-		return;
-	}
-
-	std::vector<PxActor*> actorsTotal(actorsCountTotal);
-	PxU32 nbActors = scene.getActors(PxActorTypeFlag::eRIGID_DYNAMIC, &actorsTotal[0], actorsCountTotal, 0);
-	PX_ASSERT(actorsCountTotal == nbActors);
-
-	std::vector<PxActor*> actors;
-	PxActor* pRootActor = nullptr;
-	for (int act = 0; act < actorsCountTotal; act++)
-	{
-		if (pFamily->find(*actorsTotal[act]))
-		{
-			if (pRootActor == nullptr)
-			{
-				uint32_t chunkIndex = pFamily->getChunkIndexByPxActor(*actorsTotal[act]);
-				std::vector<uint32_t> chunkIndexes;
-				chunkIndexes.push_back(chunkIndex);
-				std::vector<BlastChunkNode*> chunkNodes = BlastTreeData::ins().getChunkNodeByBlastChunk(pBlastAsset, chunkIndexes);
-				if (chunkNodes.size() > 0 && BlastTreeData::isRoot(chunkNodes[0]))
-				{
-					pRootActor = actorsTotal[act];
-				}
-				else
-				{
-					actors.push_back(actorsTotal[act]);
-				}
-			}
-			else
-			{
-				actors.push_back(actorsTotal[act]);
-			}
-		}
-	}
-
-	if (pRootActor == nullptr)
-	{
-		return;
-	}
-
-	BlastController& blastController = pSampleManager->getBlastController();
-
-	PxVec3 origin = pRootActor->getWorldBounds().getCenter();
-
-	int actorsCount = actors.size();
-	for (int ac = 0; ac < actorsCount; ac++)
-	{
-		PxActor* actor = actors[ac];
-		PxRigidDynamic* dynamic = actor->is<PxRigidDynamic>();
-		PX_ASSERT(dynamic != nullptr);
-		PxTransform transformOld = dynamic->getGlobalPose();
-		PxTransform transformNew = transformOld;
-
-		PxBounds3 bound = actor->getWorldBounds();
-		PxVec3 target = bound.getCenter();
-
-		//PxVec3 tChange = (target - origin) * value;
-		//PxVec3 newTarget = target + tChange;
-		//transformNew.p = transformOld.p + tChange;
-		transformNew.p = (target - origin) * value;
-
-		dynamic->setGlobalPose(transformNew);
-		blastController.updateActorRenderableTransform(*actor, transformNew, false);
-	}
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/ExplodeToolController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/ExplodeToolController.h
deleted file mode 100644
index 9a417ca..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/ExplodeToolController.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef EXPLODE_TOOL_CONTROLLER_H
-#define EXPLODE_TOOL_CONTROLLER_H
-
-#include "SampleManager.h"
-#include "PxVec2.h"
-#include "PxVec3.h"
-#include "DebugRenderBuffer.h"
-#include "BlastFamily.h"
-#include "NvBlastExtPxManager.h"
-#include "BlastSceneTree.h"
-
-class Renderable;
-class RenderMaterial;
-
-namespace Nv
-{
-namespace Blast
-{
-class ExtPxActor;
-}
-}
-
-namespace physx
-{
-	class PxScene;
-}
-
-class ExplodeToolController : public ISampleController
-{
-public:
-	ExplodeToolController();
-	virtual ~ExplodeToolController();
-
-	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	virtual void Animate(double dt);
-	void drawUI();
-
-	virtual void onInitialize();
-	virtual void onSampleStart();
-	virtual void onSampleStop();
-
-private:
-	ExplodeToolController& operator= (ExplodeToolController&);
-
-	//////// private methods ////////
-
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-	BlastController& getBlastController() const
-	{
-		return getManager()->getBlastController();
-	}
-
-	void _explode(float value);
-	//////// internal data ////////
-
-	float m_previousExplodeValue;
-	PxVec2 m_mouseStartPoint;
-	bool m_starDrag;
-};
-
-#endif // EXPLODE_TOOL_CONTROLLER_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/GizmoToolController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/GizmoToolController.cpp
deleted file mode 100644
index 5942b45..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/GizmoToolController.cpp
+++ /dev/null
@@ -1,1311 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "GizmoToolController.h"
-#include "RenderUtils.h"
-#include "BlastController.h"
-#include "SelectionToolController.h"
-#include "Renderer.h"
-#include "PhysXController.h"
-#include "SampleProfiler.h"
-#include "ViewerOutput.h"
-
-#include <imgui.h>
-
-#include "NvBlastTkActor.h"
-#include "NvBlastExtDamageShaders.h"
-
-#include "PxRigidDynamic.h"
-#include "PxScene.h"
-#include "PxPhysics.h"
-#include "cooking/PxCooking.h"
-#include "NvBlastExtPxActor.h"
-#include <AppMainWindow.h>
-#include "BlastSceneTree.h"
-#include "SimpleScene.h"
-using namespace Nv::Blast;
-using namespace physx;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Setup
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const DirectX::XMFLOAT4 X_DIRECTION_COLOR_F = DirectX::XMFLOAT4(1, 0, 0, 1);
-const DirectX::XMFLOAT4 Y_DIRECTION_COLOR_F = DirectX::XMFLOAT4(0, 1, 0, 1);
-const DirectX::XMFLOAT4 Z_DIRECTION_COLOR_F = DirectX::XMFLOAT4(0, 0, 1, 1);
-const DirectX::XMFLOAT4 HIGHLIGHT_COLOR_F = DirectX::XMFLOAT4(1, 1, 0, 1);
-
-const physx::PxU32 X_DIRECTION_COLOR_U = XMFLOAT4ToU32Color(X_DIRECTION_COLOR_F);
-const physx::PxU32 Y_DIRECTION_COLOR_U = XMFLOAT4ToU32Color(Y_DIRECTION_COLOR_F);
-const physx::PxU32 Z_DIRECTION_COLOR_U = XMFLOAT4ToU32Color(Z_DIRECTION_COLOR_F);
-const physx::PxU32 HIGHLIGHT_COLOR_U = XMFLOAT4ToU32Color(HIGHLIGHT_COLOR_F);
-
-float defaultAxisLength = 10.0;
-const float defaultAxisModifier = -1.0;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void modifyPxActorByLocalWay(PxScene& pxScene, PxRigidDynamic& actor, PxTransform& gp_old, PxTransform& gp_new)
-{
-	uint32_t shapesCount = actor.getNbShapes();
-	if (shapesCount > 0)
-	{
-		PxTransform gp_newInv = gp_new.getInverse();
-
-		PxTransform lp_old;
-		PxTransform lp_new;
-
-		std::vector<PxShape*> shapes(shapesCount);
-		actor.getShapes(&shapes[0], shapesCount);
-
-		pxScene.removeActor(actor);
-		for (uint32_t i = 0; i < shapesCount; i++)
-		{
-			PxShape* shape = shapes[i];
-
-			actor.detachShape(*shape);
-
-			lp_old = shape->getLocalPose();
-			lp_new = gp_newInv * gp_old * lp_old;
-			shape->setLocalPose(lp_new);
-
-			actor.attachShape(*shape);
-		}
-		pxScene.addActor(actor);
-	}
-}
-
-void scalePxActor(PxScene& pxScene, PxRigidDynamic& actor, PxMat44& scale)
-{
-	uint32_t shapesCount = actor.getNbShapes();
-	if (shapesCount == 0)
-	{
-		return;
-	}
-
-	std::vector<PxShape*> shapes(shapesCount);
-	actor.getShapes(&shapes[0], shapesCount);
-
-	pxScene.removeActor(actor);
-
-	for (uint32_t i = 0; i < shapesCount; i++)
-	{
-		PxShape* shape = shapes[i];
-
-		PxConvexMeshGeometry mesh;
-		bool valid = shape->getConvexMeshGeometry(mesh);
-		if (!valid)
-		{
-			continue;
-		}
-
-		PxConvexMesh* pMesh = mesh.convexMesh;
-		if (NULL == pMesh)
-		{
-			continue;
-		}
-
-		PxU32 numVertex = pMesh->getNbVertices();
-		if (numVertex == 0)
-		{
-			continue;
-		}
-
-		const PxVec3* pVertex = pMesh->getVertices();
-		PxVec3* pVertexNew = new PxVec3[numVertex];
-		for (PxU32 v = 0; v < numVertex; v++)
-		{
-			pVertexNew[v] = scale.transform(pVertex[v]);
-		}
-
-		PxConvexMeshDesc convexMeshDesc;
-		convexMeshDesc.points.count = numVertex;
-		convexMeshDesc.points.data = pVertexNew;
-		convexMeshDesc.points.stride = sizeof(PxVec3);
-		convexMeshDesc.flags = PxConvexFlag::eCOMPUTE_CONVEX;
-		SampleManager* manager = SampleManager::ins();
-		PxPhysics& physics = manager->getPhysXController().getPhysics();
-		PxCooking& cooking = manager->getPhysXController().getCooking();
-		PxConvexMesh* convexMesh = cooking.createConvexMesh(convexMeshDesc, physics.getPhysicsInsertionCallback());
-		if (NULL == convexMesh)
-		{
-			delete[] pVertexNew;
-			continue;
-		}
-
-		mesh.convexMesh = convexMesh;
-
-		actor.detachShape(*shape);
-		shape->setGeometry(mesh);
-		actor.attachShape(*shape);
-
-		pMesh->release();
-		delete[] pVertexNew;
-	}
-
-	pxScene.addActor(actor);
-}
-
-GizmoToolController::GizmoToolController()
-{
-	m_bGizmoFollowed = false;
-
-	UpdateCircleRenderData(defaultAxisLength);
-
-	resetPos();
-
-	BlastSceneTree::ins()->addObserver(this);
-}
-
-GizmoToolController::~GizmoToolController()
-{
-}
-
-void GizmoToolController::onSampleStart()
-{
-	m_AxisRenderMaterial = new RenderMaterial("", getRenderer().getResourceManager(), "physx_primitive_transparent");
-
-	IRenderMesh* coneMesh = getRenderer().getPrimitiveRenderMesh(PrimitiveRenderMeshType::Cone);
-	m_AxisConeRenderable[AT_X] = getRenderer().createRenderable(*coneMesh, *m_AxisRenderMaterial);
-	m_AxisConeRenderable[AT_Y] = getRenderer().createRenderable(*coneMesh, *m_AxisRenderMaterial);
-	m_AxisConeRenderable[AT_Z] = getRenderer().createRenderable(*coneMesh, *m_AxisRenderMaterial);
-	m_AxisConeRenderable[AT_X]->setColor(X_DIRECTION_COLOR_F);
-	m_AxisConeRenderable[AT_Y]->setColor(Y_DIRECTION_COLOR_F);
-	m_AxisConeRenderable[AT_Z]->setColor(Z_DIRECTION_COLOR_F);
-	m_AxisConeRenderable[AT_X]->setScale(PxVec3(0.5, 1, 0.5));
-	m_AxisConeRenderable[AT_Y]->setScale(PxVec3(0.5, 1, 0.5));
-	m_AxisConeRenderable[AT_Z]->setScale(PxVec3(0.5, 1, 0.5));
-	m_AxisConeRenderable[AT_X]->setHidden(true);
-	m_AxisConeRenderable[AT_Y]->setHidden(true);
-	m_AxisConeRenderable[AT_Z]->setHidden(true);
-
-	IRenderMesh* boxMesh = getRenderer().getPrimitiveRenderMesh(PrimitiveRenderMeshType::Box);
-	m_AxisBoxRenderable[AT_X] = getRenderer().createRenderable(*boxMesh, *m_AxisRenderMaterial);
-	m_AxisBoxRenderable[AT_Y] = getRenderer().createRenderable(*boxMesh, *m_AxisRenderMaterial);
-	m_AxisBoxRenderable[AT_Z] = getRenderer().createRenderable(*boxMesh, *m_AxisRenderMaterial);
-	m_AxisBoxRenderable[AT_X]->setColor(X_DIRECTION_COLOR_F);
-	m_AxisBoxRenderable[AT_Y]->setColor(Y_DIRECTION_COLOR_F);
-	m_AxisBoxRenderable[AT_Z]->setColor(Z_DIRECTION_COLOR_F);
-	m_AxisBoxRenderable[AT_X]->setScale(PxVec3(0.5, 0.5, 0.5));
-	m_AxisBoxRenderable[AT_Y]->setScale(PxVec3(0.5, 0.5, 0.5));
-	m_AxisBoxRenderable[AT_Z]->setScale(PxVec3(0.5, 0.5, 0.5));
-	m_AxisBoxRenderable[AT_X]->setHidden(true);
-	m_AxisBoxRenderable[AT_Y]->setHidden(true);
-	m_AxisBoxRenderable[AT_Z]->setHidden(true);
-
-	m_Axis[AT_X] = PxVec3(defaultAxisLength, 0.0, 0.0);
-	m_Axis[AT_Y] = PxVec3(0.0, defaultAxisLength, 0.0);
-	m_Axis[AT_Z] = PxVec3(0.0, 0.0, defaultAxisLength);
-}
-
-void GizmoToolController::onInitialize()
-{
-}
-
-
-void GizmoToolController::onSampleStop() 
-{
-}
-
-void GizmoToolController::dataSelected(std::vector<BlastNode*> selections)
-{
-	if (!IsEnabled())
-		return;
-
-	BlastController& blastController = getBlastController();
-	std::vector<BlastFamilyPtr>& families = blastController.getFamilies();
-
-	std::set<PxActor*> selectedActors;
-	PxActor* targetActor = nullptr;
-	for (BlastFamily* family : families)
-	{
-		std::vector<uint32_t> selectedChunks = family->getSelectedChunks();
-		for (uint32_t chunkIndex : selectedChunks)
-		{
-			PxActor* actor = nullptr;
-			family->getPxActorByChunkIndex(chunkIndex, &actor);
-
-			if (actor)
-			{
-				selectedActors.insert(actor);
-				targetActor = actor;
-			}
-		}
-	}
-
-	if (targetActor)
-		setTargetActor(targetActor);
-	getSelectionToolController().setTargetActors(selectedActors);
-}
-
-void GizmoToolController::Animate(double dt)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	if (NULL == m_CurrentActor)
-	{
-		m_AxisConeRenderable[AT_X]->setHidden(true);
-		m_AxisConeRenderable[AT_Y]->setHidden(true);
-		m_AxisConeRenderable[AT_Z]->setHidden(true);
-		m_AxisBoxRenderable[AT_X]->setHidden(true);
-		m_AxisBoxRenderable[AT_Y]->setHidden(true);
-		m_AxisBoxRenderable[AT_Z]->setHidden(true);
-
-		return;
-	}
-
-	m_TargetPos = m_CurrentActor->getGlobalPose().p;
-	m_bNeedResetPos = true;
-
-	bool isTranslation = m_GizmoToolMode == GTM_Translate;
-	bool isScale = m_GizmoToolMode == GTM_Scale;
-	bool isRotation = m_GizmoToolMode == GTM_Rotation;
-	bool isLocal = AppMainWindow::Inst().m_bGizmoWithLocal;
-
-	bool showLine = isTranslation || isScale || (isRotation && isLocal);
-	bool showCone = isTranslation || (isRotation && isLocal);
-	bool showBox = isScale;
-	bool showCircle = isRotation;
-
-	m_AxisConeRenderable[AT_X]->setHidden(!isTranslation);
-	m_AxisConeRenderable[AT_Y]->setHidden(!isTranslation);
-	m_AxisConeRenderable[AT_Z]->setHidden(!isTranslation);
-	m_AxisBoxRenderable[AT_X]->setHidden(!isScale);
-	m_AxisBoxRenderable[AT_Y]->setHidden(!isScale);
-	m_AxisBoxRenderable[AT_Z]->setHidden(!isScale);
-
-	syncRenderableState();
-
-	if (showLine)
-	{
-		if (m_bNeedResetPos)
-		{
-			m_AxisRenderBuffer.clear();
-			m_AxisRenderBuffer.m_lines.push_back(PxDebugLine(m_TargetPos, m_TargetPos + m_Axis[AT_X] * defaultAxisModifier, X_DIRECTION_COLOR_U));
-			m_AxisRenderBuffer.m_lines.push_back(PxDebugLine(m_TargetPos, m_TargetPos + m_Axis[AT_Y], Y_DIRECTION_COLOR_U));
-			m_AxisRenderBuffer.m_lines.push_back(PxDebugLine(m_TargetPos, m_TargetPos + m_Axis[AT_Z], Z_DIRECTION_COLOR_U));
-		}
-
-		if (m_bNeedResetColor)
-		{
-			if (m_AxisSelected == AT_X)
-			{
-				m_AxisRenderBuffer.m_lines[0].color0 = HIGHLIGHT_COLOR_U;
-				m_AxisRenderBuffer.m_lines[0].color1 = HIGHLIGHT_COLOR_U;
-			}
-			else
-			{
-				m_AxisRenderBuffer.m_lines[0].color0 = X_DIRECTION_COLOR_U;
-				m_AxisRenderBuffer.m_lines[0].color1 = X_DIRECTION_COLOR_U;
-			}
-			if (m_AxisSelected == AT_Y)
-			{
-				m_AxisRenderBuffer.m_lines[1].color0 = HIGHLIGHT_COLOR_U;
-				m_AxisRenderBuffer.m_lines[1].color1 = HIGHLIGHT_COLOR_U;
-			}
-			else
-			{
-				m_AxisRenderBuffer.m_lines[1].color0 = Y_DIRECTION_COLOR_U;
-				m_AxisRenderBuffer.m_lines[1].color1 = Y_DIRECTION_COLOR_U;
-			}
-			if (m_AxisSelected == AT_Z)
-			{
-				m_AxisRenderBuffer.m_lines[2].color0 = HIGHLIGHT_COLOR_U;
-				m_AxisRenderBuffer.m_lines[2].color1 = HIGHLIGHT_COLOR_U;
-			}
-			else
-			{
-				m_AxisRenderBuffer.m_lines[2].color0 = Z_DIRECTION_COLOR_U;
-				m_AxisRenderBuffer.m_lines[2].color1 = Z_DIRECTION_COLOR_U;
-			}
-		}
-
-		getRenderer().queueRenderBuffer(&m_AxisRenderBuffer);
-	}
-
-	if (showCone)
-	{
-		if (m_bNeedResetPos)
-		{
-			PxTransform transform;
-
-			transform.p = m_TargetPos + m_Axis[AT_X] * defaultAxisModifier;
-			transform.q = CalDirectionQuat(AT_X);
-			m_AxisConeRenderable[AT_X]->setTransform(transform);
-
-			transform.p = m_TargetPos + m_Axis[AT_Y];
-			transform.q = CalDirectionQuat(AT_Y);
-			m_AxisConeRenderable[AT_Y]->setTransform(transform);
-
-			transform.p = m_TargetPos + m_Axis[AT_Z];
-			transform.q = CalDirectionQuat(AT_Z);
-			m_AxisConeRenderable[AT_Z]->setTransform(transform);
-		}
-
-		if (m_bNeedResetColor)
-		{
-			if (m_AxisSelected == AT_X)
-			{
-				m_AxisConeRenderable[AT_X]->setColor(HIGHLIGHT_COLOR_F);
-			}
-			else
-			{
-				m_AxisConeRenderable[AT_X]->setColor(X_DIRECTION_COLOR_F);
-			}
-			if (m_AxisSelected == AT_Y)
-			{
-				m_AxisConeRenderable[AT_Y]->setColor(HIGHLIGHT_COLOR_F);
-			}
-			else
-			{
-				m_AxisConeRenderable[AT_Y]->setColor(Y_DIRECTION_COLOR_F);
-			}
-			if (m_AxisSelected == AT_Z)
-			{
-				m_AxisConeRenderable[AT_Z]->setColor(HIGHLIGHT_COLOR_F);
-			}
-			else
-			{
-				m_AxisConeRenderable[AT_Z]->setColor(Z_DIRECTION_COLOR_F);
-			}
-		}
-	}
-
-	if (showBox)
-	{
-		if (m_bNeedResetPos)
-		{
-			PxTransform transform;
-
-			transform.p = m_TargetPos + m_Axis[AT_X] * defaultAxisModifier;
-			transform.q = CalDirectionQuat(AT_X);
-			m_AxisBoxRenderable[AT_X]->setTransform(transform);
-
-			transform.p = m_TargetPos + m_Axis[AT_Y];
-			transform.q = CalDirectionQuat(AT_Y);
-			m_AxisBoxRenderable[AT_Y]->setTransform(transform);
-
-			transform.p = m_TargetPos + m_Axis[AT_Z];
-			transform.q = CalDirectionQuat(AT_Z);
-			m_AxisBoxRenderable[AT_Z]->setTransform(transform);
-		}
-
-		if (m_bNeedResetColor)
-		{
-			if (m_AxisSelected == AT_X)
-			{
-				m_AxisBoxRenderable[AT_X]->setColor(HIGHLIGHT_COLOR_F);
-			}
-			else
-			{
-				m_AxisBoxRenderable[AT_X]->setColor(X_DIRECTION_COLOR_F);
-			}
-			if (m_AxisSelected == AT_Y)
-			{
-				m_AxisBoxRenderable[AT_Y]->setColor(HIGHLIGHT_COLOR_F);
-			}
-			else
-			{
-				m_AxisBoxRenderable[AT_Y]->setColor(Y_DIRECTION_COLOR_F);
-			}
-			if (m_AxisSelected == AT_Z)
-			{
-				m_AxisBoxRenderable[AT_Z]->setColor(HIGHLIGHT_COLOR_F);
-			}
-			else
-			{
-				m_AxisBoxRenderable[AT_Z]->setColor(Z_DIRECTION_COLOR_F);
-			}
-		}
-	}
-
-	if (showCircle)
-	{
-		if (m_bNeedResetPos)
-		{
-			PxQuat q = CalConvertQuat();
-
-			m_CircleRenderBuffer.clear();
-			std::vector<PxDebugLine>::iterator it;
-			for (it = m_CircleRenderData.begin(); it != m_CircleRenderData.end(); it++)
-			{
-				PxDebugLine line = (*it);
-
-				line.pos0 = q.rotate(line.pos0);
-				line.pos1 = q.rotate(line.pos1);
-
-				line.pos0 += m_TargetPos;
-				line.pos1 += m_TargetPos;
-
-				m_CircleRenderBuffer.m_lines.push_back(line);
-			}
-		}
-
-		if (m_bNeedResetColor)
-		{
-			std::vector<PxDebugLine>& datas = m_CircleRenderData;
-			std::vector<PxDebugLine>& lines = m_CircleRenderBuffer.m_lines;
-			int linesize = lines.size();
-			int linesize_per_axis = linesize / 3;
-			float multiply;
-			physx::PxU32 color;
-
-			if (m_AxisSelected == AT_X)
-			{
-				for (int l = 0; l < linesize_per_axis; l++)
-				{
-					multiply = 1.0 * (l + 1) / linesize_per_axis;
-					color = XMFLOAT4ToU32Color(DirectX::XMFLOAT4(multiply, multiply, 0, 1));
-					lines[l].color0 = color;
-					lines[l].color1 = color;
-				}
-			}
-			else
-			{
-				for (int l = 0; l < linesize_per_axis; l++)
-				{
-					multiply = 1.0 * (l + 1) / linesize_per_axis;
-					color = XMFLOAT4ToU32Color(DirectX::XMFLOAT4(multiply, 0, 0, 1));
-					lines[l].color0 = color;
-					lines[l].color1 = color;
-				}
-			}
-			if (m_AxisSelected == AT_Y)
-			{
-				for (int l = linesize_per_axis; l < linesize_per_axis * 2; l++)
-				{
-					multiply = 1.0 * (l + 1 - linesize_per_axis) / linesize_per_axis;
-					color = XMFLOAT4ToU32Color(DirectX::XMFLOAT4(multiply, multiply, 0, 1));
-					lines[l].color0 = color;
-					lines[l].color1 = color;
-				}
-			}
-			else
-			{
-				for (int l = linesize_per_axis; l < linesize_per_axis * 2; l++)
-				{
-					multiply = 1.0 * (l + 1 - linesize_per_axis) / linesize_per_axis;
-					color = XMFLOAT4ToU32Color(DirectX::XMFLOAT4(0, multiply, 0, 1));
-					lines[l].color0 = color;
-					lines[l].color1 = color;
-				}
-			}
-			if (m_AxisSelected == AT_Z)
-			{
-				for (int l = linesize_per_axis * 2; l < linesize; l++)
-				{
-					multiply = 1.0 * (l + 1 - linesize_per_axis * 2) / linesize_per_axis;
-					color = XMFLOAT4ToU32Color(DirectX::XMFLOAT4(multiply, multiply, 0, 1));
-					lines[l].color0 = color;
-					lines[l].color1 = color;
-				}
-			}
-			else
-			{
-				for (int l = linesize_per_axis * 2; l < linesize; l++)
-				{
-					multiply = 1.0 * (l + 1 - linesize_per_axis * 2) / linesize_per_axis;
-					color = XMFLOAT4ToU32Color(DirectX::XMFLOAT4(0, 0, multiply, 1));
-					lines[l].color0 = color;
-					lines[l].color1 = color;
-				}
-			}
-		}
-
-		getRenderer().queueRenderBuffer(&m_CircleRenderBuffer);
-	}
-
-	m_bNeedResetPos = false;
-	m_bNeedResetColor = false;
-}
-
-LRESULT GizmoToolController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	if (uMsg == WM_LBUTTONDOWN || uMsg == WM_MOUSEMOVE || uMsg == WM_LBUTTONUP)
-	{
-		float mouseX = (float)LOWORD(lParam);
-		float mouseY = (float)HIWORD(lParam);
-
-		PxVec3 eyePos, pickDir;
-		getPhysXController().getEyePoseAndPickDir(mouseX, mouseY, eyePos, pickDir);
-		pickDir = pickDir.getNormalized();
-
-		if (uMsg == WM_LBUTTONDOWN)
-		{
-			if (m_AxisSelected == AT_Num)
-			{
-				PxRaycastBufferN<32> hits;
-				GetPhysXScene().raycast(eyePos, pickDir, PX_MAX_F32, hits, PxHitFlag::ePOSITION | PxHitFlag::eMESH_MULTIPLE);
-
-				PxU32 nbThouches = hits.getNbTouches();
-				const PxRaycastHit* touches = hits.getTouches();
-
-				PxRigidActor* actor = NULL;
-				for (PxU32 u = 0; u < nbThouches; ++u)
-				{
-					const PxRaycastHit& t = touches[u];
-					if (t.shape && getBlastController().isActorVisible(*(t.actor)))
-					{
-						actor = t.actor;
-					}
-				}
-
-				if (actor)
-				{
-					PxRigidDynamic* rigidDynamic = actor->is<PxRigidDynamic>();
-					if (NULL != rigidDynamic)
-					{
-						m_CurrentActor = rigidDynamic;
-						getSelectionToolController().pointSelect(m_CurrentActor);
-
-						PxTransform gp = m_CurrentActor->getGlobalPose();
-
-						m_TargetPos = gp.p;
-						m_Axis[AT_X] = gp.q.rotate(PxVec3(defaultAxisLength, 0, 0));
-						m_Axis[AT_Y] = gp.q.rotate(PxVec3(0, defaultAxisLength, 0));
-						m_Axis[AT_Z] = gp.q.rotate(PxVec3(0, 0, defaultAxisLength));
-
-						m_bNeedResetPos = true;
-					}
-					else
-					{
-						m_CurrentActor = NULL;
-						getSelectionToolController().clearSelect();
-					}
-				}
-			}
-			else
-			{
-				m_bGizmoFollowed = (m_CurrentActor != NULL);
-
-				if (m_GizmoToolMode == GTM_Scale)
-				{
-					m_LastAxis[AT_X] = m_Axis[AT_X].getNormalized();
-					m_LastAxis[AT_Y] = m_Axis[AT_Y].getNormalized();
-					m_LastAxis[AT_Z] = m_Axis[AT_Z].getNormalized();
-				}
-			}
-		}
-		else if (uMsg == WM_MOUSEMOVE)
-		{
-			if (m_bGizmoFollowed)
-			{
-				switch (m_GizmoToolMode)
-				{
-				case GTM_Translate:
-					{
-						if (AppMainWindow::Inst().m_bGizmoWithLocal && !CanModifyLocal(m_CurrentActor))
-						{
-							char message[1024];
-							sprintf(message, "Only unfractured model can be modify in local way in edit mode!");
-							viewer_warn(message);
-							return 1;
-						}
-
-						PxVec3 axis = m_Axis[m_AxisSelected];
-						axis = axis.getNormalized();
-						PxVec3 samplepoint = eyePos + pickDir;
-						PxVec3 normal = m_LastEyeRay.cross(axis);
-						normal = normal.getNormalized();
-						PxVec3 foot;
-						GetFootFromPointToPlane(samplepoint, eyePos, normal, foot);
-						PxVec3 direction = foot - eyePos;
-						direction = direction.getNormalized();
-						PxVec3 target;
-						GetIntersectBetweenLines(m_LastFoot, axis, eyePos, direction, target);
-						PxVec3 delta = target - m_LastFoot;
-
-						m_LastEyeRay = direction;
-						m_LastFoot = target;
-
-						PxTransform gp_old = m_CurrentActor->getGlobalPose();
-						PxTransform gp_new(gp_old.p + delta, gp_old.q);
-						m_CurrentActor->setGlobalPose(gp_new);
-
-						bool modifyLocal = AppMainWindow::Inst().m_bGizmoWithLocal && CanModifyLocal(m_CurrentActor);
-
-						if (!SampleManager::ins()->IsSimulating())
-						{
-							getBlastController().updateActorRenderableTransform(*m_CurrentActor, gp_new, modifyLocal);
-							if (CanMapToRootChunk(m_CurrentActor) && !modifyLocal)
-								UpdateAssetInstanceTransform(gp_new);
-						}
-
-						m_TargetPos = gp_new.p;
-
-						if (modifyLocal)
-						{
-							modifyPxActorByLocalWay(GetPhysXScene(), *m_CurrentActor, gp_old, gp_new);
-						}
-
-						m_bNeedResetPos = true;
-						m_bNeedResetColor = true;
-					}
-					break;
-				case GTM_Scale:
-					{
-						if (AppMainWindow::Inst().m_bGizmoWithLocal && !CanModifyLocal(m_CurrentActor))
-						{
-							char message[1024];
-							sprintf(message, "Only unfractured model can be modify in local way in edit mode!");
-							viewer_warn(message);
-							return 1;
-						}
-
-						PxVec3 axis = m_LastAxis[m_AxisSelected];
-						PxVec3 samplepoint = eyePos + pickDir;
-						PxVec3 normal = m_LastEyeRay.cross(axis);
-						normal = normal.getNormalized();
-						PxVec3 foot;
-						GetFootFromPointToPlane(samplepoint, eyePos, normal, foot);
-						PxVec3 direction = foot - eyePos;
-						direction = direction.getNormalized();
-						PxVec3 target;
-						GetIntersectBetweenLines(m_LastFoot, axis, eyePos, direction, target);
-						PxVec3 delta = target - m_LastFoot;
-
-						if (m_AxisSelected == AT_X)
-						{
-							delta *= defaultAxisModifier;
-						}
-						m_Axis[m_AxisSelected] = m_LastAxis[m_AxisSelected] * defaultAxisLength + delta;
-
-						bool isShift = (GetAsyncKeyState(VK_SHIFT) && 0x8000);
-						if (isShift)
-						{
-							float length = m_Axis[m_AxisSelected].magnitude();
-							m_Axis[AT_X] = m_LastAxis[AT_X] * length;
-							m_Axis[AT_Y] = m_LastAxis[AT_Y] * length;
-							m_Axis[AT_Z] = m_LastAxis[AT_Z] * length;
-						}
-
-						ScaleActor(false);
-
-						m_bNeedResetPos = true;
-						m_bNeedResetColor = true;
-					}
-					break;
-
-				case GTM_Rotation:
-					{
-						if (AppMainWindow::Inst().m_bGizmoWithLocal && !CanModifyLocal(m_CurrentActor))
-						{
-							char message[1024];
-							sprintf(message, "Only unfractured model can be modify in local way in edit mode!");
-							viewer_warn(message);
-							return 1;
-						}
-
-						PxVec3 planenormal = m_Axis[m_AxisSelected];
-						planenormal = planenormal.getNormalized();
-
-						PxVec3 from, to;
-						CalPlaneLineIntersectPoint(from, planenormal, m_TargetPos, m_LastEyeRay, eyePos);
-						CalPlaneLineIntersectPoint(to, planenormal, m_TargetPos, pickDir, eyePos);
-						from = from - m_TargetPos;
-						to = to - m_TargetPos;
-						from = from.getNormalized();
-						to = to.getNormalized();
-						float cosangle = from.dot(to);
-						float angle = PxAcos(cosangle);
-						PxVec3 cross = from.cross(to);
-						cross = cross.getNormalized();
-
-						PxQuat q(angle, cross);
-						if (m_AxisSelected == AT_X)
-						{
-							m_Axis[AT_Y] = q.rotate(m_Axis[AT_Y]);
-							m_Axis[AT_Z] = q.rotate(m_Axis[AT_Z]);
-						}
-						else if (m_AxisSelected == AT_Y)
-						{
-							m_Axis[AT_X] = q.rotate(m_Axis[AT_X]);
-							m_Axis[AT_Z] = q.rotate(m_Axis[AT_Z]);
-						}
-						else if (m_AxisSelected == AT_Z)
-						{
-							m_Axis[AT_X] = q.rotate(m_Axis[AT_X]);
-							m_Axis[AT_Y] = q.rotate(m_Axis[AT_Y]);
-						}
-
-						m_LastEyeRay = pickDir;
-
-						PxTransform gp_old = m_CurrentActor->getGlobalPose();
-						PxTransform gp_new = PxTransform(gp_old.p, CalConvertQuat());
-						m_CurrentActor->setGlobalPose(gp_new);
-						bool modifyLocal = AppMainWindow::Inst().m_bGizmoWithLocal && CanModifyLocal(m_CurrentActor);
-
-						if (!SampleManager::ins()->IsSimulating())
-						{
-							getBlastController().updateActorRenderableTransform(*m_CurrentActor, gp_new, modifyLocal);
-							if (CanMapToRootChunk(m_CurrentActor))
-								UpdateAssetInstanceTransform(gp_new);
-						}
-
-						if (modifyLocal)
-						{
-							modifyPxActorByLocalWay(GetPhysXScene(), *m_CurrentActor, gp_old, gp_new);
-						}
-
-						m_bNeedResetPos = true;
-						m_bNeedResetColor = true;
-					}
-					break;
-				}
-			}
-			else if(m_CurrentActor != NULL)
-			{
-				m_LastEyeRay = pickDir;
-
-				// get axis which intersect with this eye ray
-				AxisType as = AT_Num;
-				{
-					double distanceMin = PX_MAX_F32;
-					double tolerance = defaultAxisLength / 20.0f;
-					int line_index = -1;
-					PxVec3 foot;
-					switch (m_GizmoToolMode)
-					{
-					case GTM_Translate:
-						{
-							std::vector<PxDebugLine>& lines = m_AxisRenderBuffer.m_lines;
-							int linesize = lines.size();
-							for (int l = 0; l < linesize; l++)
-							{
-								PxVec3 start = lines[l].pos0;
-								PxVec3 end = lines[l].pos1;
-								PxVec3 dir = end - start;
-
-								// separate the line to 10 segment
-								for (int segment = 0; segment <= 10; segment++)
-								{
-									PxVec3 vertex = start + 0.1 * segment * dir;
-									double distance = DistanceFromPointToLine(vertex, eyePos, pickDir, foot);
-
-									if (distance < distanceMin)
-									{
-										distanceMin = distance;
-										line_index = l;
-										m_LastFoot = foot;
-									}
-								}
-							}
-							if (distanceMin < tolerance)
-							{
-								int axis_index = line_index * 3 / linesize;
-								as = (AxisType)axis_index;
-							}
-						}
-						break;
-					case GTM_Scale:
-						{
-							std::vector<PxDebugLine>& lines = m_AxisRenderBuffer.m_lines;
-							int linesize = lines.size();
-							for (int l = 0; l < linesize; l++)
-							{
-								PxVec3 vertex = lines[l].pos1;
-								double distance = DistanceFromPointToLine(vertex, eyePos, pickDir, foot);
-
-								if (distance < distanceMin)
-								{
-									distanceMin = distance;
-									line_index = l;
-									m_LastFoot = foot;
-								}
-							}
-							if (distanceMin < tolerance)
-							{
-								as = (AxisType)line_index;
-							}
-						}
-						break;
-					case GTM_Rotation:
-						{
-							std::vector<PxDebugLine>& lines = m_CircleRenderBuffer.m_lines;
-							int linesize = lines.size();
-							for (int l = 0; l < linesize; l++)
-							{
-								PxVec3 vertex = lines[l].pos0;
-								double distance = DistanceFromPointToLine(vertex, eyePos, pickDir, foot);
-
-								if (distance < distanceMin)
-								{
-									distanceMin = distance;
-									line_index = l;
-									m_LastFoot = foot;
-								}
-							}
-							if (distanceMin < tolerance)
-							{
-								int axis_index = line_index * 3 / linesize;
-								as = (AxisType)axis_index;
-							}
-						}
-						break;
-					default:
-						break;
-					}
-				}
-				setAxisSelected(as);
-			}
-		}
-		else if (uMsg == WM_LBUTTONUP)
-		{
-			if (m_GizmoToolMode == GTM_Scale)
-			{
-				if (m_AxisSelected != AT_Num)
-				{
-					if (NULL != m_CurrentActor)
-					{
-						ScaleActor(true);
-					}
-
-					m_Axis[AT_X] = m_LastAxis[AT_X] * defaultAxisLength;
-					m_Axis[AT_Y] = m_LastAxis[AT_Y] * defaultAxisLength;
-					m_Axis[AT_Z] = m_LastAxis[AT_Z] * defaultAxisLength;
-				}
-			}
-
-			if (m_AxisSelected != AT_Num && AppMainWindow::Inst().m_bGizmoWithLocal)
-			{
-				getBlastController().updateModelMeshToProjectParam(*m_CurrentActor);
-			}
-
-			m_bNeedResetPos = true;
-			m_bNeedResetColor = true;
-			m_bGizmoFollowed = false;
-		}
-	}
-
-	return 1;
-}
-
-void GizmoToolController::drawUI()
-{
-}
-
-void GizmoToolController::setGizmoToolMode(GizmoToolMode mode)
-{
-	if (mode == m_GizmoToolMode)
-	{
-		return;
-	}
-
-	m_GizmoToolMode = mode;
-
-	m_bNeedResetPos = true;
-	m_bNeedResetColor = true;
-
-	showAxisRenderables(true);
-}
-
-void GizmoToolController::setAxisSelected(AxisType type)
-{
-	if (type == m_AxisSelected)
-	{
-		return;
-	}
-
-	m_AxisSelected = type;
-	m_bNeedResetColor = true;
-}
-
-void GizmoToolController::setAxisLength(float axisLength)
-{
-	defaultAxisLength = axisLength;
-	UpdateCircleRenderData(axisLength);
-
-	float scale = axisLength / 10.f * 0.2f;
-	m_AxisConeRenderable[AT_X]->setScale(PxVec3(scale, 2 * scale, scale));
-	m_AxisConeRenderable[AT_Y]->setScale(PxVec3(scale, 2 * scale, scale));
-	m_AxisConeRenderable[AT_Z]->setScale(PxVec3(scale, 2 * scale, scale));
-
-	m_AxisBoxRenderable[AT_X]->setScale(PxVec3(scale, scale, scale));
-	m_AxisBoxRenderable[AT_Y]->setScale(PxVec3(scale, scale, scale));
-	m_AxisBoxRenderable[AT_Z]->setScale(PxVec3(scale, scale, scale));
-
-	m_bNeedResetPos = true;
-}
-
-void GizmoToolController::showAxisRenderables(bool show)
-{
-	bool isTranslate = m_GizmoToolMode == GTM_Translate;
-	bool isScale = m_GizmoToolMode == GTM_Scale;
-
-	m_AxisConeRenderable[AT_X]->setHidden(!show || !isTranslate);
-	m_AxisConeRenderable[AT_Y]->setHidden(!show || !isTranslate);
-	m_AxisConeRenderable[AT_Z]->setHidden(!show || !isTranslate);
-	m_AxisBoxRenderable[AT_X]->setHidden(!show || !isScale);
-	m_AxisBoxRenderable[AT_Y]->setHidden(!show || !isScale);
-	m_AxisBoxRenderable[AT_Z]->setHidden(!show || !isScale);
-}
-
-void GizmoToolController::resetPos()
-{
-	m_TargetPos = PxVec3(-100, -100, -100);
-	m_bNeedResetPos = true;
-
-	m_AxisSelected = AT_Num;
-	m_bNeedResetColor = true;
-
-	m_CurrentActor = NULL;
-}
-
-void GizmoToolController::setTargetActor(PxActor* actor)
-{
-	m_bNeedResetPos = true;
-	m_CurrentActor = nullptr;
-	if (actor == nullptr)
-	{
-		return;
-	}
-	PxRigidDynamic* rigidDynamic = actor->is<PxRigidDynamic>();
-	if (rigidDynamic == nullptr)
-	{
-		return;
-	}
-
-	m_CurrentActor = rigidDynamic;
-	getSelectionToolController().pointSelect(m_CurrentActor);
-
-	PxTransform gp = m_CurrentActor->getGlobalPose();
-
-	m_TargetPos = gp.p;
-	m_Axis[AT_X] = gp.q.rotate(PxVec3(defaultAxisLength, 0, 0));
-	m_Axis[AT_Y] = gp.q.rotate(PxVec3(0, defaultAxisLength, 0));
-	m_Axis[AT_Z] = gp.q.rotate(PxVec3(0, 0, defaultAxisLength));
-}
-
-PxActor* GizmoToolController::getTargetActor()
-{
-	return m_CurrentActor;
-}
-
-physx::PxScene& GizmoToolController::GetPhysXScene()
-{
-	if (getManager()->IsSimulating())
-	{
-		return getPhysXController().getPhysXScene();
-	}
-	else
-	{
-		return getPhysXController().getEditPhysXScene();
-	}
-}
-
-void GizmoToolController::UpdateCircleRenderData(float axisLength)
-{
-	int segment = 36;
-	double span = PxTwoPi / segment;
-	PxVec3* vertex = new PxVec3[segment];
-	m_CircleRenderData.clear();
-
-	for (int i = 0; i < segment; i++)
-	{
-		vertex[i].x = 0;
-		vertex[i].y = axisLength * PxSin(i * span);
-		vertex[i].z = axisLength * PxCos(i * span);
-	}
-	// x
-	for (int i = 0; i < segment - 1; i++)
-	{
-		m_CircleRenderData.push_back(PxDebugLine(vertex[i], vertex[i + 1], X_DIRECTION_COLOR_U));
-	}
-	m_CircleRenderData.push_back(PxDebugLine(vertex[segment - 1], vertex[0], X_DIRECTION_COLOR_U));
-
-	for (int i = 0; i < segment; i++)
-	{
-		vertex[i].x = axisLength * PxCos(i * span);
-		vertex[i].y = 0;
-		vertex[i].z = axisLength * PxSin(i * span);
-	}
-	// y
-	for (int i = 0; i < segment - 1; i++)
-	{
-		m_CircleRenderData.push_back(PxDebugLine(vertex[i], vertex[i + 1], Y_DIRECTION_COLOR_U));
-	}
-	m_CircleRenderData.push_back(PxDebugLine(vertex[segment - 1], vertex[0], Y_DIRECTION_COLOR_U));
-
-	for (int i = 0; i < segment; i++)
-	{
-		vertex[i].x = axisLength * PxCos(i * span);
-		vertex[i].y = axisLength * PxSin(i * span);
-		vertex[i].z = 0;
-	}
-	// z
-	for (int i = 0; i < segment - 1; i++)
-	{
-		m_CircleRenderData.push_back(PxDebugLine(vertex[i], vertex[i + 1], Z_DIRECTION_COLOR_U));
-	}
-	m_CircleRenderData.push_back(PxDebugLine(vertex[segment - 1], vertex[0], Z_DIRECTION_COLOR_U));
-
-	delete[] vertex;
-	vertex = NULL;
-}
-
-bool GizmoToolController::CalPlaneLineIntersectPoint(PxVec3& result, PxVec3 planeNormal, PxVec3 planePoint, PxVec3 linedirection, PxVec3 linePoint)
-{
-	float dot = planeNormal.dot(linedirection);
-	if (dot == 0)
-	{
-		return false;
-	}
-	else
-	{
-		float t = ((planePoint[0] - linePoint[0]) * planeNormal[0] +
-			(planePoint[1] - linePoint[1]) * planeNormal[1] +
-			(planePoint[2] - linePoint[2]) * planeNormal[2]) / dot;
-		result = linePoint + linedirection * t;
-	}
-	return true;
-}
-
-float GizmoToolController::DistanceFromPointToLine(PxVec3& point, PxVec3& origin, PxVec3& direction, PxVec3& foot)
-{
-	direction = direction.getNormalized();
-	PxVec3 sub = point - origin;
-	float t = direction.dot(sub);
-	foot = origin + direction * t;
-	PxVec3 dis = point - foot;
-	return dis.magnitude();
-}
-
-bool GizmoToolController::GetFootFromPointToPlane(PxVec3& point, PxVec3& origin, PxVec3& normal, PxVec3& foot)
-{
-	return CalPlaneLineIntersectPoint(foot, normal, origin, normal, point);
-}
-
-bool GizmoToolController::GetIntersectBetweenLines(PxVec3& origin1, PxVec3& direction1, PxVec3& origin2, PxVec3& direction2, PxVec3& intersect)
-{
-	float test = ((origin2 - origin1).getNormalized()).dot(direction1.cross(direction2));
-	if (direction1.cross(direction2).isZero())
-	{// if two lines are parallel
-		return false;
-	}
-	else if (abs(test) >= 0.001)
-	{// if two lines aren't in the same plane
-		return false;
-	}
-
-	PxVec3 normal1 = direction1.cross(direction2);
-	PxVec3 normal2 = normal1.cross(direction1);
-	normal2 = normal2.getNormalized();
-	return CalPlaneLineIntersectPoint(intersect, normal2, origin1, direction2, origin2);
-}
-
-PxQuat GizmoToolController::CalDirectionQuat(AxisType type)
-{
-	PxVec3 origin(0, 1, 0);
-	PxVec3 target = m_Axis[type];
-	if (type == AT_X)
-	{
-		target *= defaultAxisModifier;
-	}
-	target = target.getNormalized();
-	PxVec3 cross = origin.cross(target);
-	cross = cross.getNormalized();
-	float cos = origin.dot(target);
-	float angle = PxAcos(cos);
-	PxQuat q(angle, cross);
-	return q;
-}
-
-PxQuat GizmoToolController::CalConvertQuat()
-{
-	PxVec3 x_origin(1, 0, 0);
-	PxVec3 y_origin(0, 1, 0);
-	PxVec3 z_origin(0, 0, 1);
-
-	PxVec3 x_target = m_Axis[AT_X];
-	PxVec3 y_target = m_Axis[AT_Y];
-	x_target = x_target.getNormalized();
-	y_target = y_target.getNormalized();
-
-	PxVec3 x_cross = x_origin.cross(x_target);
-	x_cross = x_cross.getNormalized();
-	float x_cos = x_origin.dot(x_target);
-	float x_angle = PxAcos(x_cos);
-	PxQuat x_quat(x_angle, x_cross);
-
-	PxVec3 y_interval = x_quat.rotate(y_origin);
-
-	PxVec3 y_cross = y_interval.cross(y_target);
-	y_cross = y_cross.getNormalized();
-	float y_cos = y_interval.dot(y_target);
-	float y_angle = PxAcos(y_cos);
-	PxQuat y_quat(y_angle, y_cross);
-
-	PxQuat q = y_quat * x_quat;
-	return q;
-}
-
-void GizmoToolController::ScaleActor(bool replace)
-{
-	if (nullptr == m_CurrentActor)
-	{
-		return;
-	}
-
-	bool isLocal = AppMainWindow::Inst().m_bGizmoWithLocal;
-
-	if (isLocal && !CanModifyLocal(m_CurrentActor))
-	{
-		char message[1024];
-		sprintf(message, "Only unfractured model can be modify in local way in edit mode!");
-		viewer_warn(message);
-		return;
-	}
-
-	BlastFamilyPtr pBlastFamily = getBlastController().getFamilyByPxActor(*m_CurrentActor);
-	if (NULL == pBlastFamily)
-	{
-		return;
-	}
-
-	float multiply = m_Axis[m_AxisSelected].magnitude() / defaultAxisLength;
-	if (m_Axis[m_AxisSelected].dot(m_LastAxis[m_AxisSelected]) < 0)
-	{
-		multiply = -multiply;
-	}
-	PxVec3 delta(1, 1, 1);
-	bool isShift = (GetAsyncKeyState(VK_SHIFT) && 0x8000);
-	if (isShift)
-	{
-		delta *= multiply;
-	}
-	else
-	{
-		delta[m_AxisSelected] = multiply;
-	}
-	PxMat44 scale = PxMat44(PxVec4(delta, 1));
-
-	if (!isLocal)
-	{
-		PxTransform gp = m_CurrentActor->getGlobalPose();
-		uint32_t shapesCount = m_CurrentActor->getNbShapes();
-		if (shapesCount > 0)
-		{
-			std::vector<PxShape*> shapes(shapesCount);
-			m_CurrentActor->getShapes(&shapes[0], shapesCount);
-			PxShape* shape = shapes[0];
-			PxTransform lp = shape->getLocalPose();
-			gp = gp * lp;
-		}
-		PxMat44 world = PxMat44(gp);
-		PxMat44 worldInv = world.inverseRT();
-		scale = world * scale * worldInv;
-	}
-
-	pBlastFamily->setActorScale(*m_CurrentActor, scale, replace);
-
-	if (!replace)
-	{
-		return;
-	}
-
-	scalePxActor(GetPhysXScene(), *m_CurrentActor, scale);
-}
-
-bool GizmoToolController::CanMapToRootChunk(PxActor* actor)
-{
-	if (actor)
-	{
-		BlastFamily* family = getBlastController().getFamilyByPxActor(*actor);
-		if (family == nullptr)
-			return false;
-
-		const BlastAsset& asset = family->getBlastAsset();
-		uint32_t chunkIndex = family->getChunkIndexByPxActor(*actor);
-
-		std::vector<uint32_t> chunkIndexes;
-		chunkIndexes.push_back(chunkIndex);
-		std::vector<BlastChunkNode*> chunkNodes = BlastTreeData::ins().getChunkNodeByBlastChunk(&asset, chunkIndexes);
-		if (chunkNodes.size() > 0)
-			return BlastTreeData::isRoot(chunkNodes[0]);
-	}
-	return false;
-}
-
-bool GizmoToolController::CanModifyLocal(PxActor* actor)
-{
-	if (nullptr != actor 
-		&& !SampleManager::ins()->IsSimulating()
-		&& !getBlastController().isAssetFractrued(*actor))
-	{
-		return true;
-	}
-
-	return false;
-}
-
-void GizmoToolController::UpdateAssetInstanceTransform(const PxTransform& position)
-{
-	if (!m_CurrentActor)
-		return;
-
-	BlastFamily* family = getBlastController().getFamilyByPxActor(*m_CurrentActor);
-	if (family)
-	{
-		BPPAssetInstance* bppInstance = SampleManager::ins()->getInstanceByFamily(family);
-
-		if (bppInstance)
-		{
-			bppInstance->transform.position = *((nvidia::NvVec3*)(&position.p));
-			bppInstance->transform.rotation = *((nvidia::NvVec4*)(&position.q));
-
-			family->initTransform(position);
-			// modify corresponding asset's transform, it's need to modify in future
-			{
-				const BlastAsset& asset = family->getBlastAsset();
-				SampleManager* sampleManager = SampleManager::ins();
-				std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = sampleManager->getAssetFamiliesMap();
-				std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = sampleManager->getAssetDescMap();
-
-				BlastAsset* pBlastAsset = (BlastAsset*)&asset;
-
-				AssetList::ModelAsset& m = AssetDescMap[pBlastAsset];
-				m.transform = position;
-			}
-		}
-	}
-}
-
-void GizmoToolController::syncRenderableState()
-{
-	bool depthTest = AppMainWindow::Inst().m_bGizmoWithDepthTest;
-	m_AxisConeRenderable[AT_X]->setDepthTest(depthTest);
-	m_AxisConeRenderable[AT_Y]->setDepthTest(depthTest);
-	m_AxisConeRenderable[AT_Z]->setDepthTest(depthTest);
-	m_AxisBoxRenderable[AT_X]->setDepthTest(depthTest);
-	m_AxisBoxRenderable[AT_Y]->setDepthTest(depthTest);
-	m_AxisBoxRenderable[AT_Z]->setDepthTest(depthTest);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/GizmoToolController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/GizmoToolController.h
deleted file mode 100644
index 8586ad3..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/GizmoToolController.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef GIZMO_TOOL_CONTROLLER_H
-#define GIZMO_TOOL_CONTROLLER_H
-
-#include "SampleManager.h"
-#include "DebugRenderBuffer.h"
-#include "NvBlastExtPxManager.h"
-#include "BlastSceneTree.h"
-
-class Renderable;
-class RenderMaterial;
-
-namespace Nv
-{
-namespace Blast
-{
-class ExtPhysicsActor;
-}
-}
-
-namespace physx
-{
-	class PxScene;
-}
-
-enum AxisType
-{
-	AT_X = 0,
-	AT_Y = 1,
-	AT_Z = 2,
-	AT_Num
-};
-
-enum GizmoToolMode
-{
-	GTM_Translate = 0,
-	GTM_Scale,
-	GTM_Rotation
-};
-
-void modifyPxActorByLocalWay(PxScene& pxScene, PxRigidDynamic& actor, PxTransform& gp_old, PxTransform& gp_new);
-void scalePxActor(PxScene& pxScene, PxRigidDynamic& actor, PxMat44& scale);
-
-class GizmoToolController : public ISampleController, public ISceneObserver
-{
-public:
-	GizmoToolController();
-	virtual ~GizmoToolController();
-
-	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	virtual void Animate(double dt);
-	void drawUI();
-
-	virtual void onInitialize();
-	virtual void onSampleStart();
-	virtual void onSampleStop();
-
-	virtual void dataSelected(std::vector<BlastNode*> selections);
-
-	void setGizmoToolMode(GizmoToolMode mode);
-	GizmoToolMode getGizmoToolMode() { return m_GizmoToolMode; }
-	void setAxisSelected(AxisType type);
-	void setAxisLength(float axisLength);
-	void showAxisRenderables(bool show);
-	void resetPos();
-	void setTargetActor(PxActor* actor);
-	PxActor* getTargetActor();
-	void syncRenderableState();
-	bool CanMapToRootChunk(PxActor* actor);
-
-private:
-	GizmoToolController& operator= (GizmoToolController&);
-
-	//////// private methods ////////
-
-	physx::PxScene& GetPhysXScene();
-	void UpdateCircleRenderData(float axisLength);
-	bool CalPlaneLineIntersectPoint(PxVec3& result, PxVec3 planeNormal, PxVec3 planePoint, PxVec3 linedirection, PxVec3 linePoint);
-	float DistanceFromPointToLine(PxVec3& point, PxVec3& origin, PxVec3& direction, PxVec3& foot);
-	bool GetFootFromPointToPlane(PxVec3& point, PxVec3& origin, PxVec3& normal, PxVec3& foot);
-	bool GetIntersectBetweenLines(PxVec3& origin1, PxVec3& direction1, PxVec3& origin2, PxVec3& direction2, PxVec3& intersect);
-	PxQuat CalDirectionQuat(AxisType type);
-	PxQuat CalConvertQuat();
-	void ScaleActor(bool replace);
-	
-	bool CanModifyLocal(PxActor* actor);
-	void UpdateAssetInstanceTransform(const PxTransform& position);
-
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-	BlastController& getBlastController() const
-	{
-		return getManager()->getBlastController();
-	}
-
-	SelectionToolController& getSelectionToolController() const
-	{
-		return getManager()->getSelectionToolController();
-	}
-
-	//////// internal data ////////
-
-	GizmoToolMode m_GizmoToolMode;
-
-	bool m_bGizmoFollowed;
-	PxVec3 m_LastEyeRay;
-	PxVec3 m_LastFoot;
-	PxVec3 m_LastAxis[AT_Num];
-
-	PxRigidDynamic* m_CurrentActor;
-
-	bool m_bNeedResetPos;
-	bool m_bNeedResetColor;
-
-	PxVec3 m_TargetPos;
-	PxVec3 m_Axis[AT_Num];
-	AxisType m_AxisSelected;
-	Renderable* m_AxisConeRenderable[AT_Num];
-	Renderable* m_AxisBoxRenderable[AT_Num];
-
-	RenderMaterial* m_AxisRenderMaterial;
-	DebugRenderBuffer m_AxisRenderBuffer;
-
-	std::vector<PxDebugLine> m_CircleRenderData;
-	DebugRenderBuffer m_CircleRenderBuffer;
-
-	std::vector<BlastAssetInstanceNode*> m_assetInstances;
-};
-
-#endif // GIZMO_TOOL_CONTROLLER_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/SelectionToolController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/SelectionToolController.cpp
deleted file mode 100644
index 4232fe4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/SelectionToolController.cpp
+++ /dev/null
@@ -1,493 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "SelectionToolController.h"
-#include "RenderUtils.h"
-#include "BlastController.h"
-#include "Renderer.h"
-#include "PhysXController.h"
-#include "SampleProfiler.h"
-#include "GizmoToolController.h"
-
-#include <imgui.h>
-
-#include "NvBlastTkActor.h"
-#include "NvBlastExtDamageShaders.h"
-
-#include "PxRigidDynamic.h"
-#include "PxScene.h"
-#include "BlastSceneTree.h"
-#include "SimpleScene.h"
-using namespace Nv::Blast;
-using namespace physx;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//													Setup
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-SelectionToolController::SelectionToolController()
-{
-	m_bRectSelecting = false;
-	m_bDrawSelecting = false;
-	m_bSelecting = false;
-	m_ScreenRenderBuffer.clear();
-	m_DrawSelectScreenPos.clear();
-
-	BlastSceneTree::ins()->addObserver(this);
-}
-
-SelectionToolController::~SelectionToolController()
-{
-}
-
-void SelectionToolController::onSampleStart()
-{
-}
-
-void SelectionToolController::onInitialize()
-{
-}
-
-
-void SelectionToolController::onSampleStop() 
-{
-}
-
-void SelectionToolController::dataSelected(std::vector<BlastNode*> selections)
-{
-	m_actorsSelected.clear();
-
-	BlastController& blastController = getBlastController();
-	std::vector<BlastFamilyPtr>& families = blastController.getFamilies();
-
-	for (BlastFamily* family : families)
-	{
-		std::vector<uint32_t> selectedChunks = family->getSelectedChunks();
-		for (uint32_t chunkIndex : selectedChunks)
-		{
-			PxActor* actor = nullptr;
-			family->getPxActorByChunkIndex(chunkIndex, &actor);
-
-			if (actor)
-			{
-				m_actorsSelected.emplace(actor);
-			}
-		}
-	}
-}
-
-void SelectionToolController::Animate(double dt)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	if (m_ScreenRenderBuffer.getNbLines() > 0)
-	{		
-		getRenderer().queueRenderBuffer(&m_ScreenRenderBuffer, true);
-	}
-}
-
-
-LRESULT SelectionToolController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-	if (uMsg == WM_LBUTTONDOWN || uMsg == WM_RBUTTONDOWN || uMsg == WM_MOUSEMOVE || uMsg == WM_LBUTTONUP || uMsg == WM_RBUTTONUP)
-	{
-		float mouseX = (short)LOWORD(lParam) / getRenderer().getScreenWidth();
-		float mouseY = (short)HIWORD(lParam) / getRenderer().getScreenHeight();
-
-		if (uMsg == WM_LBUTTONDOWN || uMsg == WM_RBUTTONDOWN)
-		{
-			m_ScreenRenderBuffer.clear();
-
-			bool isCtrl = (GetAsyncKeyState(VK_CONTROL) && 0x8000);
-			bool isAlt = (GetAsyncKeyState(VK_MENU) && 0x8000);
-			bool isLight = (GetAsyncKeyState('L') && 0x8000);
-			// ctrl+leftbutton is used for light changing
-			// alt+leftbutton is used for camera rotate movement in AppMainWindow.cpp
-			// so, we use rect select when ctrl and alt off
-			bool Selecting = !(isAlt || isLight);// !(isCtrl || isAlt);
-			
-			if (uMsg == WM_LBUTTONDOWN && !m_bDrawSelecting)
-			{
-				m_RectSelectScreenPos.x = mouseX;
-				m_RectSelectScreenPos.y = mouseY;
-
-				m_bRectSelecting = Selecting;
-			}
-			else // uMsg == WM_RBUTTONDOWN
-			{
-				m_DrawSelectScreenPos.push_back(PxVec2(mouseX, mouseY));
-
-				m_bDrawSelecting = Selecting;
-			}
-
-			m_bSelecting = m_bRectSelecting || m_bDrawSelecting;
-		}
-		else if (uMsg == WM_MOUSEMOVE)
-		{
-			if (m_bRectSelecting)
-			{
-				float left, right, top, bottom;
-				left = right = mouseX;
-				top = bottom = mouseY;
-				if (mouseX > m_RectSelectScreenPos.x)
-				{
-					left = m_RectSelectScreenPos.x;
-				}
-				else
-				{
-					right = m_RectSelectScreenPos.x;
-				}
-				if (mouseY > m_RectSelectScreenPos.y)
-				{
-					top = m_RectSelectScreenPos.y;
-				}
-				else
-				{
-					bottom = m_RectSelectScreenPos.y;
-				}
-
-				m_ScreenRenderBuffer.clear();
-
-				PxVec3 left_top(left, top, 0);
-				PxVec3 left_bottom(left, bottom, 0);
-				PxVec3 right_bottom(right, bottom, 0);
-				PxVec3 right_top(right, top, 0);
-				DirectX::XMFLOAT4 LINE_COLOR(1.0f, 0.0f, 0.0f, 1.0f);
-				m_ScreenRenderBuffer.m_lines.push_back(PxDebugLine(left_top, left_bottom, XMFLOAT4ToU32Color(LINE_COLOR)));
-				m_ScreenRenderBuffer.m_lines.push_back(PxDebugLine(left_bottom, right_bottom, XMFLOAT4ToU32Color(LINE_COLOR)));
-				m_ScreenRenderBuffer.m_lines.push_back(PxDebugLine(right_bottom, right_top, XMFLOAT4ToU32Color(LINE_COLOR)));
-				m_ScreenRenderBuffer.m_lines.push_back(PxDebugLine(right_top, left_top, XMFLOAT4ToU32Color(LINE_COLOR)));
-			}
-		}
-		else if (uMsg == WM_LBUTTONUP)
-		{
-			bool isAlt = (GetAsyncKeyState(VK_MENU) && 0x8000);
-			bool isLight = (GetAsyncKeyState('L') && 0x8000);
-			if (m_bSelecting && !(isAlt || isLight))
-			{
-				bool isShift = (GetAsyncKeyState(VK_SHIFT) && 0x8000);
-				bool isCtrl = (GetAsyncKeyState(VK_CONTROL) && 0x8000);
-
-				SelectMode selectMode = SM_RESET;
-				if (isShift && isCtrl)
-				{
-					selectMode = SM_REMAIN;
-				}
-				else if (isShift)
-				{
-					selectMode = SM_ADD;
-				}
-				else if (isCtrl)
-				{
-					selectMode = SM_SUB;
-				}
-				
-				Renderer* pRenderer = Renderer::Inst();
-				std::vector<PxVec2> screenPoints;
-				std::map<int, std::set<int>> selection;
-
-				if (m_bRectSelecting)
-				{
-					int width = getRenderer().getScreenWidth();
-					int height = getRenderer().getScreenHeight();
-					int deltaX = (mouseX - m_RectSelectScreenPos.x) * width;
-					int deltaY = (mouseY - m_RectSelectScreenPos.y) * height;
-					float distance = deltaX * deltaX + deltaY * deltaY;
-					if (distance < 1)
-					{
-						// point select
-						screenPoints.push_back(m_RectSelectScreenPos);
-					}
-					else
-					{
-						// rect select	
-						float left, right, top, bottom;
-						left = right = mouseX;
-						top = bottom = mouseY;
-						if (mouseX > m_RectSelectScreenPos.x)
-						{
-							left = m_RectSelectScreenPos.x;
-						}
-						else
-						{
-							right = m_RectSelectScreenPos.x;
-						}
-						if (mouseY > m_RectSelectScreenPos.y)
-						{
-							top = m_RectSelectScreenPos.y;
-						}
-						else
-						{
-							bottom = m_RectSelectScreenPos.y;
-						}
-
-						screenPoints.push_back(PxVec2(left, top));
-						screenPoints.push_back(PxVec2(right, bottom));
-					}
-				}
-				else if(m_bDrawSelecting)
-				{
-					// draw select
-					if (m_DrawSelectScreenPos.size() > 2)
-					{
-						screenPoints.swap(m_DrawSelectScreenPos);
-					}
-				}
-
-				pRenderer->fetchSelection(screenPoints, selection);
-
-				std::set<PxActor*> actors;
-				PxActor* pActor;
-				BlastController& blastController = getBlastController();
-				for (std::pair<int, std::set<int>> familychunksId : selection)
-				{
-					BlastFamily* pBlastFamily = blastController.getFamilyById(familychunksId.first);
-					std::set<int>& chunkIds = familychunksId.second;
-					for (int chunkId : chunkIds)
-					{						
-						pBlastFamily->getPxActorByChunkIndex(chunkId, &pActor);
-						if (pActor != nullptr)
-						{
-							actors.emplace(pActor);
-						}
-					}
-				}
-				rangeSelect(actors, selectMode);
-			}
-
-			m_DrawSelectScreenPos.clear();
-			m_ScreenRenderBuffer.clear();
-			m_bRectSelecting = false;
-			m_bDrawSelecting = false;
-			m_bSelecting = false;
-		}
-		else if (uMsg == WM_RBUTTONUP)
-		{
-			/*
-			if (m_actorsSelected.size() > 1)
-			{
-				return 1;
-			}
-			*/
-			if (m_bDrawSelecting)
-			{
-				m_ScreenRenderBuffer.clear();
-
-				DirectX::XMFLOAT4 LINE_COLOR(1.0f, 0.0f, 0.0f, 1.0f);
-
-				int size = m_DrawSelectScreenPos.size() - 1;
-				if (size == 0)
-				{
-					return 1;
-				}
-
-				PxVec3 from(0, 0, 0);
-				PxVec3 to(0, 0, 0);
-				for (int i = 0; i < size; i++)
-				{
-					from.x = m_DrawSelectScreenPos[i].x;
-					from.y = m_DrawSelectScreenPos[i].y;
-					to.x = m_DrawSelectScreenPos[i + 1].x;
-					to.y = m_DrawSelectScreenPos[i + 1].y;
-					m_ScreenRenderBuffer.m_lines.push_back(
-						PxDebugLine(from, to, XMFLOAT4ToU32Color(LINE_COLOR)));
-				}
-				// connect tail and head to close
-				from.x = m_DrawSelectScreenPos[0].x;
-				from.y = m_DrawSelectScreenPos[0].y;
-				m_ScreenRenderBuffer.m_lines.push_back(
-					PxDebugLine(to, from, XMFLOAT4ToU32Color(LINE_COLOR)));
-			}
-		}
-	}
-
-	return 1;
-}
-
-void SelectionToolController::drawUI()
-{
-}
-
-void SelectionToolController::pointSelect(PxActor* actor, SelectMode selectMode)
-{
-	std::set<PxActor*> actors;
-	actors.emplace(actor);
-	rangeSelect(actors, selectMode);
-}
-
-void SelectionToolController::rangeSelect(std::set<PxActor*>& actorsToSelect, SelectMode selectMode)
-{
-	if (selectMode == SM_RESET)
-	{
-		clearSelect();
-
-		for (PxActor* actor : actorsToSelect)
-		{
-			if (getBlastController().isActorVisible(*actor))
-			{
-				setActorSelected(*actor, true);
-				m_actorsSelected.emplace(actor);
-			}
-		}
-	}
-	else if (selectMode == SM_ADD)
-	{
-		for (PxActor* actor : actorsToSelect)
-		{
-			if (getBlastController().isActorVisible(*actor))
-			{
-				setActorSelected(*actor, true);
-				m_actorsSelected.emplace(actor);
-			}
-		}
-	}
-	else if (selectMode == SM_SUB)
-	{
-		for (PxActor* actor : actorsToSelect)
-		{
-			setActorSelected(*actor, false);
-			m_actorsSelected.erase(actor);
-		}
-	}
-
-	BlastSceneTree::ins()->updateChunkItemSelection();
-	trySelectAssetInstanceNode(m_actorsSelected);
-}
-
-void SelectionToolController::clearSelect()
-{
-	for (PxActor* actor : m_actorsSelected)
-	{
-		setActorSelected(*actor, false);
-	}
-
-	m_actorsSelected.clear();
-	SampleManager::ins()->clearChunksSelected();
-}
-
-void SelectionToolController::setTargetActor(PxActor* actor)
-{
-	if (actor == nullptr)
-	{
-		return;
-	}
-
-	setActorSelected(*actor, true);
-	m_actorsSelected.emplace(actor);
-
-	BlastSceneTree::ins()->updateChunkItemSelection();
-	trySelectAssetInstanceNode(m_actorsSelected);
-}
-
-PxActor* SelectionToolController::getTargetActor()
-{
-	PxActor* targetActor = nullptr;
-	if (m_actorsSelected.size() > 0)
-	{
-		targetActor = *m_actorsSelected.begin();
-	}
-	return targetActor;
-}
-
-void SelectionToolController::setTargetActors(std::set<PxActor*>& actors)
-{
-	for (PxActor* actor : actors)
-	{
-		setActorSelected(*actor, true);
-		m_actorsSelected.emplace(actor);
-	}
-
-	BlastSceneTree::ins()->updateChunkItemSelection();
-	trySelectAssetInstanceNode(m_actorsSelected);
-}
-
-std::set<PxActor*> SelectionToolController::getTargetActors()
-{
-	return m_actorsSelected;
-}
-
-void SelectionToolController::trySelectAssetInstanceNode(std::set<PxActor*>& selectedActors)
-{
-	BlastController& blastController = getBlastController();
-	GizmoToolController& gizmoToolController = getManager()->getGizmoToolController();
-
-	for (PxActor* actor : selectedActors)
-	{
-		if (gizmoToolController.CanMapToRootChunk(actor))
-		{
-			BlastFamily* family = getBlastController().getFamilyByPxActor(*actor);
-			BlastSceneTree::ins()->selectTreeItem(family);
-		}
-	}
-}
-
-physx::PxScene& SelectionToolController::GetPhysXScene()
-{
-	if (getManager()->IsSimulating())
-	{
-		return getPhysXController().getPhysXScene();
-	}
-	else
-	{
-		return getPhysXController().getEditPhysXScene();
-	}
-}
-
-void SelectionToolController::setActorSelected(const PxActor& actor, bool selected)
-{
-	std::vector<BlastFamilyPtr>& families = getBlastController().getFamilies();
-	if (families.size() == 0)
-	{
-		return;
-	}
-
-	BlastFamilyPtr pBlastFamily = NULL;
-	std::vector<BlastFamilyPtr>::iterator it = families.begin();
-	for (; it != families.end(); it++)
-	{
-		BlastFamilyPtr f = *it;
-		if (f->find(actor))
-		{
-			pBlastFamily = f;
-			break;
-		}
-	}
-	if (NULL == pBlastFamily)
-	{
-		return;
-	}
-
-	pBlastFamily->setActorSelected(actor, selected);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/SelectionToolController.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/SelectionToolController.h
deleted file mode 100644
index d90ae36..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/SelectionToolController.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SELECTION_TOOL_CONTROLLER_H
-#define SELECTION_TOOL_CONTROLLER_H
-
-#include "SampleManager.h"
-#include "PxVec2.h"
-#include "PxVec3.h"
-#include "DebugRenderBuffer.h"
-#include "BlastFamily.h"
-#include "NvBlastExtPxManager.h"
-#include "BlastSceneTree.h"
-
-class Renderable;
-class RenderMaterial;
-
-namespace Nv
-{
-namespace Blast
-{
-class ExtPxActor;
-}
-}
-
-namespace physx
-{
-	class PxScene;
-}
-
-class SelectionToolController : public ISampleController, public ISceneObserver
-{
-public:
-	SelectionToolController();
-	virtual ~SelectionToolController();
-
-	virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	virtual void Animate(double dt);
-	void drawUI();
-
-	virtual void onInitialize();
-	virtual void onSampleStart();
-	virtual void onSampleStop();
-
-	virtual void dataSelected(std::vector<BlastNode*> selections);
-
-	void pointSelect(PxActor* actor, SelectMode selectMode = SM_RESET);
-	void rangeSelect(std::set<PxActor*>& actors, SelectMode selectMode = SM_RESET);
-	void clearSelect();
-
-	void setTargetActor(PxActor* actor);
-	PxActor* getTargetActor();
-
-	void setTargetActors(std::set<PxActor*>& actors);
-	std::set<PxActor*> getTargetActors();
-
-	void trySelectAssetInstanceNode(std::set<PxActor*>& selectedActors);
-
-private:
-	SelectionToolController& operator= (SelectionToolController&);
-
-	//////// private methods ////////
-
-	physx::PxScene& GetPhysXScene();
-
-	//////// used controllers ////////
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-	BlastController& getBlastController() const
-	{
-		return getManager()->getBlastController();
-	}
-
-	//////// internal data ////////
-
-	PxVec2 m_RectSelectScreenPos;
-	bool m_bRectSelecting;
-	std::vector<PxVec2> m_DrawSelectScreenPos;
-	bool m_bDrawSelecting;
-	DebugRenderBuffer m_ScreenRenderBuffer;
-	bool m_bSelecting;
-
-	void setActorSelected(const PxActor& actor, bool selected);
-	std::set<PxActor*> m_actorsSelected;
-};
-
-#endif // SELECTION_TOOL_CONTROLLER_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/imgui_impl_dx11.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/imgui_impl_dx11.cpp
deleted file mode 100644
index 11f66f0..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/imgui_impl_dx11.cpp
+++ /dev/null
@@ -1,583 +0,0 @@
-// ImGui Win32 + DirectX11 binding
-// In this binding, ImTextureID is used to store a 'ID3D11ShaderResourceView*' texture identifier. Read the FAQ about ImTextureID in imgui.cpp.
-
-// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this.
-// If you use this binding you'll need to call 4 functions: ImGui_ImplXXXX_Init(), ImGui_ImplXXXX_NewFrame(), ImGui::Render() and ImGui_ImplXXXX_Shutdown().
-// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
-// https://github.com/ocornut/imgui
-
-#include <imgui.h>
-#include "imgui_impl_dx11.h"
-
-// DirectX
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#define DIRECTINPUT_VERSION 0x0800
-#include <dinput.h>
-
-// Data
-static INT64                    g_Time = 0;
-static INT64                    g_TicksPerSecond = 0;
-
-static HWND                     g_hWnd = 0;
-static ID3D11Device*            g_pd3dDevice = NULL;
-static ID3D11DeviceContext*     g_pd3dDeviceContext = NULL;
-static ID3D11Buffer*            g_pVB = NULL;
-static ID3D11Buffer*            g_pIB = NULL;
-static ID3D10Blob *             g_pVertexShaderBlob = NULL;
-static ID3D11VertexShader*      g_pVertexShader = NULL;
-static ID3D11InputLayout*       g_pInputLayout = NULL;
-static ID3D11Buffer*            g_pVertexConstantBuffer = NULL;
-static ID3D10Blob *             g_pPixelShaderBlob = NULL;
-static ID3D11PixelShader*       g_pPixelShader = NULL;
-static ID3D11SamplerState*      g_pFontSampler = NULL;
-static ID3D11ShaderResourceView*g_pFontTextureView = NULL;
-static ID3D11RasterizerState*   g_pRasterizerState = NULL;
-static ID3D11BlendState*        g_pBlendState = NULL;
-static ID3D11DepthStencilState* g_pDepthStencilState = NULL;
-static int                      g_VertexBufferSize = 5000, g_IndexBufferSize = 10000;
-
-struct VERTEX_CONSTANT_BUFFER
-{
-    float        mvp[4][4];
-};
-
-// This is the main rendering function that you have to implement and provide to ImGui (via setting up 'RenderDrawListsFn' in the ImGuiIO structure)
-// If text or lines are blurry when integrating ImGui in your engine:
-// - in your Render function, try translating your projection matrix by (0.5f,0.5f) or (0.375f,0.375f)
-void ImGui_ImplDX11_RenderDrawLists(ImDrawData* draw_data)
-{
-    ID3D11DeviceContext* ctx = g_pd3dDeviceContext;
-
-    // Create and grow vertex/index buffers if needed
-    if (!g_pVB || g_VertexBufferSize < draw_data->TotalVtxCount)
-    {
-        if (g_pVB) { g_pVB->Release(); g_pVB = NULL; }
-        g_VertexBufferSize = draw_data->TotalVtxCount + 5000;
-        D3D11_BUFFER_DESC desc;
-        memset(&desc, 0, sizeof(D3D11_BUFFER_DESC));
-        desc.Usage = D3D11_USAGE_DYNAMIC;
-        desc.ByteWidth = g_VertexBufferSize * sizeof(ImDrawVert);
-        desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-        desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-        desc.MiscFlags = 0;
-        if (g_pd3dDevice->CreateBuffer(&desc, NULL, &g_pVB) < 0)
-            return;
-    }
-    if (!g_pIB || g_IndexBufferSize < draw_data->TotalIdxCount)
-    {
-        if (g_pIB) { g_pIB->Release(); g_pIB = NULL; }
-        g_IndexBufferSize = draw_data->TotalIdxCount + 10000;
-        D3D11_BUFFER_DESC desc;
-        memset(&desc, 0, sizeof(D3D11_BUFFER_DESC));
-        desc.Usage = D3D11_USAGE_DYNAMIC;
-        desc.ByteWidth = g_IndexBufferSize * sizeof(ImDrawIdx);
-        desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-        desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-        if (g_pd3dDevice->CreateBuffer(&desc, NULL, &g_pIB) < 0)
-            return;
-    }
-
-    // Copy and convert all vertices into a single contiguous buffer
-    D3D11_MAPPED_SUBRESOURCE vtx_resource, idx_resource;
-    if (ctx->Map(g_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &vtx_resource) != S_OK)
-        return;
-    if (ctx->Map(g_pIB, 0, D3D11_MAP_WRITE_DISCARD, 0, &idx_resource) != S_OK)
-        return;
-    ImDrawVert* vtx_dst = (ImDrawVert*)vtx_resource.pData;
-    ImDrawIdx* idx_dst = (ImDrawIdx*)idx_resource.pData;
-    for (int n = 0; n < draw_data->CmdListsCount; n++)
-    {
-        const ImDrawList* cmd_list = draw_data->CmdLists[n];
-        memcpy(vtx_dst, &cmd_list->VtxBuffer[0], cmd_list->VtxBuffer.size() * sizeof(ImDrawVert));
-        memcpy(idx_dst, &cmd_list->IdxBuffer[0], cmd_list->IdxBuffer.size() * sizeof(ImDrawIdx));
-        vtx_dst += cmd_list->VtxBuffer.size();
-        idx_dst += cmd_list->IdxBuffer.size();
-    }
-    ctx->Unmap(g_pVB, 0);
-    ctx->Unmap(g_pIB, 0);
-
-    // Setup orthographic projection matrix into our constant buffer
-    {
-        D3D11_MAPPED_SUBRESOURCE mapped_resource;
-        if (ctx->Map(g_pVertexConstantBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped_resource) != S_OK)
-            return;
-        VERTEX_CONSTANT_BUFFER* constant_buffer = (VERTEX_CONSTANT_BUFFER*)mapped_resource.pData;
-        float L = 0.0f;
-        float R = ImGui::GetIO().DisplaySize.x;
-        float B = ImGui::GetIO().DisplaySize.y;
-        float T = 0.0f;
-        float mvp[4][4] =
-        {
-            { 2.0f/(R-L),   0.0f,           0.0f,       0.0f },
-            { 0.0f,         2.0f/(T-B),     0.0f,       0.0f },
-            { 0.0f,         0.0f,           0.5f,       0.0f },
-            { (R+L)/(L-R),  (T+B)/(B-T),    0.5f,       1.0f },
-        };
-        memcpy(&constant_buffer->mvp, mvp, sizeof(mvp));
-        ctx->Unmap(g_pVertexConstantBuffer, 0);
-    }
-
-    // Backup DX state that will be modified to restore it afterwards (unfortunately this is very ugly looking and verbose. Close your eyes!)
-    struct BACKUP_DX11_STATE
-    {
-        UINT                        ScissorRectsCount, ViewportsCount;
-        D3D11_RECT                  ScissorRects[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
-        D3D11_VIEWPORT              Viewports[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
-        ID3D11RasterizerState*      RS;
-        ID3D11BlendState*           BlendState;
-        FLOAT                       BlendFactor[4];
-        UINT                        SampleMask;
-        UINT                        StencilRef;
-        ID3D11DepthStencilState*    DepthStencilState;
-        ID3D11ShaderResourceView*   PSShaderResource;
-        ID3D11SamplerState*         PSSampler;
-        ID3D11PixelShader*          PS;
-        ID3D11VertexShader*         VS;
-        UINT                        PSInstancesCount, VSInstancesCount;
-        ID3D11ClassInstance*        PSInstances[256], *VSInstances[256];   // 256 is max according to PSSetShader documentation
-        D3D11_PRIMITIVE_TOPOLOGY    PrimitiveTopology;
-        ID3D11Buffer*               IndexBuffer, *VertexBuffer, *VSConstantBuffer;
-        UINT                        IndexBufferOffset, VertexBufferStride, VertexBufferOffset;
-        DXGI_FORMAT                 IndexBufferFormat;
-        ID3D11InputLayout*          InputLayout;
-    };
-    BACKUP_DX11_STATE old;
-    old.ScissorRectsCount = old.ViewportsCount = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE;
-    ctx->RSGetScissorRects(&old.ScissorRectsCount, old.ScissorRects);
-    ctx->RSGetViewports(&old.ViewportsCount, old.Viewports);
-    ctx->RSGetState(&old.RS);
-    ctx->OMGetBlendState(&old.BlendState, old.BlendFactor, &old.SampleMask);
-    ctx->OMGetDepthStencilState(&old.DepthStencilState, &old.StencilRef);
-    ctx->PSGetShaderResources(0, 1, &old.PSShaderResource);
-    ctx->PSGetSamplers(0, 1, &old.PSSampler);
-    old.PSInstancesCount = old.VSInstancesCount = 256;
-    ctx->PSGetShader(&old.PS, old.PSInstances, &old.PSInstancesCount);
-    ctx->VSGetShader(&old.VS, old.VSInstances, &old.VSInstancesCount);
-    ctx->VSGetConstantBuffers(0, 1, &old.VSConstantBuffer);
-    ctx->IAGetPrimitiveTopology(&old.PrimitiveTopology);
-    ctx->IAGetIndexBuffer(&old.IndexBuffer, &old.IndexBufferFormat, &old.IndexBufferOffset);
-    ctx->IAGetVertexBuffers(0, 1, &old.VertexBuffer, &old.VertexBufferStride, &old.VertexBufferOffset);
-    ctx->IAGetInputLayout(&old.InputLayout);
-
-    // Setup viewport
-    D3D11_VIEWPORT vp;
-    memset(&vp, 0, sizeof(D3D11_VIEWPORT));
-    vp.Width = ImGui::GetIO().DisplaySize.x;
-    vp.Height = ImGui::GetIO().DisplaySize.y;
-    vp.MinDepth = 0.0f;
-    vp.MaxDepth = 1.0f;
-    vp.TopLeftX = vp.TopLeftY = 0.0f;
-    ctx->RSSetViewports(1, &vp);
-
-    // Bind shader and vertex buffers
-    unsigned int stride = sizeof(ImDrawVert);
-    unsigned int offset = 0;
-    ctx->IASetInputLayout(g_pInputLayout);
-    ctx->IASetVertexBuffers(0, 1, &g_pVB, &stride, &offset);
-    ctx->IASetIndexBuffer(g_pIB, sizeof(ImDrawIdx) == 2 ? DXGI_FORMAT_R16_UINT : DXGI_FORMAT_R32_UINT, 0);
-    ctx->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-    ctx->VSSetShader(g_pVertexShader, NULL, 0);
-    ctx->VSSetConstantBuffers(0, 1, &g_pVertexConstantBuffer);
-    ctx->PSSetShader(g_pPixelShader, NULL, 0);
-    ctx->PSSetSamplers(0, 1, &g_pFontSampler);
-
-    // Setup render state
-    const float blend_factor[4] = { 0.f, 0.f, 0.f, 0.f };
-    ctx->OMSetBlendState(g_pBlendState, blend_factor, 0xffffffff);
-    ctx->OMSetDepthStencilState(g_pDepthStencilState, 0);
-    ctx->RSSetState(g_pRasterizerState);
-
-    // Render command lists
-    int vtx_offset = 0;
-    int idx_offset = 0;
-    for (int n = 0; n < draw_data->CmdListsCount; n++)
-    {
-        const ImDrawList* cmd_list = draw_data->CmdLists[n];
-        for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.size(); cmd_i++)
-        {
-            const ImDrawCmd* pcmd = &cmd_list->CmdBuffer[cmd_i];
-            if (pcmd->UserCallback)
-            {
-                pcmd->UserCallback(cmd_list, pcmd);
-            }
-            else
-            {
-                const D3D11_RECT r = { (LONG)pcmd->ClipRect.x, (LONG)pcmd->ClipRect.y, (LONG)pcmd->ClipRect.z, (LONG)pcmd->ClipRect.w };
-                ctx->PSSetShaderResources(0, 1, (ID3D11ShaderResourceView**)&pcmd->TextureId);
-                ctx->RSSetScissorRects(1, &r);
-                ctx->DrawIndexed(pcmd->ElemCount, idx_offset, vtx_offset);
-            }
-            idx_offset += pcmd->ElemCount;
-        }
-        vtx_offset += cmd_list->VtxBuffer.size();
-    }
-
-    // Restore modified DX state
-    ctx->RSSetScissorRects(old.ScissorRectsCount, old.ScissorRects);
-    ctx->RSSetViewports(old.ViewportsCount, old.Viewports);
-    ctx->RSSetState(old.RS); if (old.RS) old.RS->Release();
-    ctx->OMSetBlendState(old.BlendState, old.BlendFactor, old.SampleMask); if (old.BlendState) old.BlendState->Release();
-    ctx->OMSetDepthStencilState(old.DepthStencilState, old.StencilRef); if (old.DepthStencilState) old.DepthStencilState->Release();
-    ctx->PSSetShaderResources(0, 1, &old.PSShaderResource); if (old.PSShaderResource) old.PSShaderResource->Release();
-    ctx->PSSetSamplers(0, 1, &old.PSSampler); if (old.PSSampler) old.PSSampler->Release();
-    ctx->PSSetShader(old.PS, old.PSInstances, old.PSInstancesCount); if (old.PS) old.PS->Release();
-    for (UINT i = 0; i < old.PSInstancesCount; i++) if (old.PSInstances[i]) old.PSInstances[i]->Release();
-    ctx->VSSetShader(old.VS, old.VSInstances, old.VSInstancesCount); if (old.VS) old.VS->Release();
-    ctx->VSSetConstantBuffers(0, 1, &old.VSConstantBuffer); if (old.VSConstantBuffer) old.VSConstantBuffer->Release();
-    for (UINT i = 0; i < old.VSInstancesCount; i++) if (old.VSInstances[i]) old.VSInstances[i]->Release();
-    ctx->IASetPrimitiveTopology(old.PrimitiveTopology);
-    ctx->IASetIndexBuffer(old.IndexBuffer, old.IndexBufferFormat, old.IndexBufferOffset); if (old.IndexBuffer) old.IndexBuffer->Release();
-    ctx->IASetVertexBuffers(0, 1, &old.VertexBuffer, &old.VertexBufferStride, &old.VertexBufferOffset); if (old.VertexBuffer) old.VertexBuffer->Release();
-    ctx->IASetInputLayout(old.InputLayout); if (old.InputLayout) old.InputLayout->Release();
-}
-
-IMGUI_API LRESULT ImGui_ImplDX11_WndProcHandler(HWND, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-    ImGuiIO& io = ImGui::GetIO();
-    switch (msg)
-    {
-    case WM_LBUTTONDOWN:
-        io.MouseDown[0] = true;
-        return true;
-    case WM_LBUTTONUP:
-        io.MouseDown[0] = false;
-        return true;
-    case WM_RBUTTONDOWN:
-        io.MouseDown[1] = true;
-        return true;
-    case WM_RBUTTONUP:
-        io.MouseDown[1] = false;
-        return true;
-    case WM_MBUTTONDOWN:
-        io.MouseDown[2] = true;
-        return true;
-    case WM_MBUTTONUP:
-        io.MouseDown[2] = false;
-        return true;
-    case WM_MOUSEWHEEL:
-        io.MouseWheel += GET_WHEEL_DELTA_WPARAM(wParam) > 0 ? +1.0f : -1.0f;
-        return true;
-    case WM_MOUSEMOVE:
-        io.MousePos.x = (signed short)(lParam);
-        io.MousePos.y = (signed short)(lParam >> 16);
-        return true;
-    case WM_KEYDOWN:
-        if (wParam < 256)
-            io.KeysDown[wParam] = 1;
-        return true;
-    case WM_KEYUP:
-        if (wParam < 256)
-            io.KeysDown[wParam] = 0;
-        return true;
-    case WM_CHAR:
-        // You can also use ToAscii()+GetKeyboardState() to retrieve characters.
-        if (wParam > 0 && wParam < 0x10000)
-            io.AddInputCharacter((unsigned short)wParam);
-        return true;
-    }
-    return 0;
-}
-
-static void ImGui_ImplDX11_CreateFontsTexture()
-{
-    // Build texture atlas
-    ImGuiIO& io = ImGui::GetIO();
-    unsigned char* pixels;
-    int width, height;
-    io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);
-
-    // Upload texture to graphics system
-    {
-        D3D11_TEXTURE2D_DESC desc;
-        ZeroMemory(&desc, sizeof(desc));
-        desc.Width = width;
-        desc.Height = height;
-        desc.MipLevels = 1;
-        desc.ArraySize = 1;
-        desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-        desc.SampleDesc.Count = 1;
-        desc.Usage = D3D11_USAGE_DEFAULT;
-        desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-        desc.CPUAccessFlags = 0;
-
-        ID3D11Texture2D *pTexture = NULL;
-        D3D11_SUBRESOURCE_DATA subResource;
-        subResource.pSysMem = pixels;
-        subResource.SysMemPitch = desc.Width * 4;
-        subResource.SysMemSlicePitch = 0;
-        g_pd3dDevice->CreateTexture2D(&desc, &subResource, &pTexture);
-
-        // Create texture view
-        D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
-        ZeroMemory(&srvDesc, sizeof(srvDesc));
-        srvDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-        srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-        srvDesc.Texture2D.MipLevels = desc.MipLevels;
-        srvDesc.Texture2D.MostDetailedMip = 0;
-        g_pd3dDevice->CreateShaderResourceView(pTexture, &srvDesc, &g_pFontTextureView);
-        pTexture->Release();
-    }
-
-    // Store our identifier
-    io.Fonts->TexID = (void *)g_pFontTextureView;
-
-    // Create texture sampler
-    {
-        D3D11_SAMPLER_DESC desc;
-        ZeroMemory(&desc, sizeof(desc));
-        desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-        desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP;
-        desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP;
-        desc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP;
-        desc.MipLODBias = 0.f;
-        desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
-        desc.MinLOD = 0.f;
-        desc.MaxLOD = 0.f;
-        g_pd3dDevice->CreateSamplerState(&desc, &g_pFontSampler);
-    }
-}
-
-bool    ImGui_ImplDX11_CreateDeviceObjects()
-{
-    if (!g_pd3dDevice)
-        return false;
-    if (g_pFontSampler)
-        ImGui_ImplDX11_InvalidateDeviceObjects();
-
-    // By using D3DCompile() from <d3dcompiler.h> / d3dcompiler.lib, we introduce a dependency to a given version of d3dcompiler_XX.dll (see D3DCOMPILER_DLL_A)
-    // If you would like to use this DX11 sample code but remove this dependency you can: 
-    //  1) compile once, save the compiled shader blobs into a file or source code and pass them to CreateVertexShader()/CreatePixelShader() [prefered solution]
-    //  2) use code to detect any version of the DLL and grab a pointer to D3DCompile from the DLL. 
-    // See https://github.com/ocornut/imgui/pull/638 for sources and details.
-
-    // Create the vertex shader
-    {
-        static const char* vertexShader =
-            "cbuffer vertexBuffer : register(b0) \
-            {\
-            float4x4 ProjectionMatrix; \
-            };\
-            struct VS_INPUT\
-            {\
-            float2 pos : POSITION;\
-            float4 col : COLOR0;\
-            float2 uv  : TEXCOORD0;\
-            };\
-            \
-            struct PS_INPUT\
-            {\
-            float4 pos : SV_POSITION;\
-            float4 col : COLOR0;\
-            float2 uv  : TEXCOORD0;\
-            };\
-            \
-            PS_INPUT main(VS_INPUT input)\
-            {\
-            PS_INPUT output;\
-            output.pos = mul( ProjectionMatrix, float4(input.pos.xy, 0.f, 1.f));\
-            output.col = input.col;\
-            output.uv  = input.uv;\
-            return output;\
-            }";
-
-        D3DCompile(vertexShader, strlen(vertexShader), NULL, NULL, NULL, "main", "vs_4_0", 0, 0, &g_pVertexShaderBlob, NULL);
-        if (g_pVertexShaderBlob == NULL) // NB: Pass ID3D10Blob* pErrorBlob to D3DCompile() to get error showing in (const char*)pErrorBlob->GetBufferPointer(). Make sure to Release() the blob!
-            return false;
-        if (g_pd3dDevice->CreateVertexShader((DWORD*)g_pVertexShaderBlob->GetBufferPointer(), g_pVertexShaderBlob->GetBufferSize(), NULL, &g_pVertexShader) != S_OK)
-            return false;
-
-        // Create the input layout
-        D3D11_INPUT_ELEMENT_DESC local_layout[] = {
-            { "POSITION", 0, DXGI_FORMAT_R32G32_FLOAT,   0, (size_t)(&((ImDrawVert*)0)->pos), D3D11_INPUT_PER_VERTEX_DATA, 0 },
-            { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT,   0, (size_t)(&((ImDrawVert*)0)->uv),  D3D11_INPUT_PER_VERTEX_DATA, 0 },
-            { "COLOR",    0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, (size_t)(&((ImDrawVert*)0)->col), D3D11_INPUT_PER_VERTEX_DATA, 0 },
-        };
-        if (g_pd3dDevice->CreateInputLayout(local_layout, 3, g_pVertexShaderBlob->GetBufferPointer(), g_pVertexShaderBlob->GetBufferSize(), &g_pInputLayout) != S_OK)
-            return false;
-
-        // Create the constant buffer
-        {
-            D3D11_BUFFER_DESC desc;
-            desc.ByteWidth = sizeof(VERTEX_CONSTANT_BUFFER);
-            desc.Usage = D3D11_USAGE_DYNAMIC;
-            desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-            desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-            desc.MiscFlags = 0;
-            g_pd3dDevice->CreateBuffer(&desc, NULL, &g_pVertexConstantBuffer);
-        }
-    }
-
-    // Create the pixel shader
-    {
-        static const char* pixelShader =
-            "struct PS_INPUT\
-            {\
-            float4 pos : SV_POSITION;\
-            float4 col : COLOR0;\
-            float2 uv  : TEXCOORD0;\
-            };\
-            sampler sampler0;\
-            Texture2D texture0;\
-            \
-            float4 main(PS_INPUT input) : SV_Target\
-            {\
-            float4 out_col = input.col * texture0.Sample(sampler0, input.uv); \
-            return out_col; \
-            }";
-
-        D3DCompile(pixelShader, strlen(pixelShader), NULL, NULL, NULL, "main", "ps_4_0", 0, 0, &g_pPixelShaderBlob, NULL);
-        if (g_pPixelShaderBlob == NULL)  // NB: Pass ID3D10Blob* pErrorBlob to D3DCompile() to get error showing in (const char*)pErrorBlob->GetBufferPointer(). Make sure to Release() the blob!
-            return false;
-        if (g_pd3dDevice->CreatePixelShader((DWORD*)g_pPixelShaderBlob->GetBufferPointer(), g_pPixelShaderBlob->GetBufferSize(), NULL, &g_pPixelShader) != S_OK)
-            return false;
-    }
-
-    // Create the blending setup
-    {
-        D3D11_BLEND_DESC desc;
-        ZeroMemory(&desc, sizeof(desc));
-        desc.AlphaToCoverageEnable = false;
-        desc.RenderTarget[0].BlendEnable = true;
-        desc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA;
-        desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
-        desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
-        desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
-        desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
-        desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-        desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
-        g_pd3dDevice->CreateBlendState(&desc, &g_pBlendState);
-    }
-
-    // Create the rasterizer state
-    {
-        D3D11_RASTERIZER_DESC desc;
-        ZeroMemory(&desc, sizeof(desc));
-        desc.FillMode = D3D11_FILL_SOLID;
-        desc.CullMode = D3D11_CULL_NONE;
-        desc.ScissorEnable = true;
-        desc.DepthClipEnable = true;
-        g_pd3dDevice->CreateRasterizerState(&desc, &g_pRasterizerState);
-    }
-
-    // Create depth-stencil State
-    {
-        D3D11_DEPTH_STENCIL_DESC desc;
-        ZeroMemory(&desc, sizeof(desc));
-        desc.DepthEnable = false;
-        desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
-        desc.DepthFunc = D3D11_COMPARISON_ALWAYS;
-        desc.StencilEnable = false;
-        desc.FrontFace.StencilFailOp = desc.FrontFace.StencilDepthFailOp = desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_KEEP;
-        desc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS;
-        desc.BackFace = desc.FrontFace;
-        g_pd3dDevice->CreateDepthStencilState(&desc, &g_pDepthStencilState);
-    }
-
-    ImGui_ImplDX11_CreateFontsTexture();
-
-    return true;
-}
-
-void    ImGui_ImplDX11_InvalidateDeviceObjects()
-{
-    if (!g_pd3dDevice)
-        return;
-
-    if (g_pFontSampler) { g_pFontSampler->Release(); g_pFontSampler = NULL; }
-    if (g_pFontTextureView) { g_pFontTextureView->Release(); g_pFontTextureView = NULL; ImGui::GetIO().Fonts->TexID = 0; }
-    if (g_pIB) { g_pIB->Release(); g_pIB = NULL; }
-    if (g_pVB) { g_pVB->Release(); g_pVB = NULL; }
-
-    if (g_pBlendState) { g_pBlendState->Release(); g_pBlendState = NULL; }
-    if (g_pDepthStencilState) { g_pDepthStencilState->Release(); g_pDepthStencilState = NULL; }
-    if (g_pRasterizerState) { g_pRasterizerState->Release(); g_pRasterizerState = NULL; }
-    if (g_pPixelShader) { g_pPixelShader->Release(); g_pPixelShader = NULL; }
-    if (g_pPixelShaderBlob) { g_pPixelShaderBlob->Release(); g_pPixelShaderBlob = NULL; }
-    if (g_pVertexConstantBuffer) { g_pVertexConstantBuffer->Release(); g_pVertexConstantBuffer = NULL; }
-    if (g_pInputLayout) { g_pInputLayout->Release(); g_pInputLayout = NULL; }
-    if (g_pVertexShader) { g_pVertexShader->Release(); g_pVertexShader = NULL; }
-    if (g_pVertexShaderBlob) { g_pVertexShaderBlob->Release(); g_pVertexShaderBlob = NULL; }
-}
-
-bool    ImGui_ImplDX11_Init(void* hwnd, ID3D11Device* device, ID3D11DeviceContext* device_context)
-{
-    g_hWnd = (HWND)hwnd;
-    g_pd3dDevice = device;
-    g_pd3dDeviceContext = device_context;
-
-    if (!QueryPerformanceFrequency((LARGE_INTEGER *)&g_TicksPerSecond))
-        return false;
-    if (!QueryPerformanceCounter((LARGE_INTEGER *)&g_Time))
-        return false;
-
-    ImGuiIO& io = ImGui::GetIO();
-    io.KeyMap[ImGuiKey_Tab] = VK_TAB;                       // Keyboard mapping. ImGui will use those indices to peek into the io.KeyDown[] array that we will update during the application lifetime.
-    io.KeyMap[ImGuiKey_LeftArrow] = VK_LEFT;
-    io.KeyMap[ImGuiKey_RightArrow] = VK_RIGHT;
-    io.KeyMap[ImGuiKey_UpArrow] = VK_UP;
-    io.KeyMap[ImGuiKey_DownArrow] = VK_DOWN;
-    io.KeyMap[ImGuiKey_PageUp] = VK_PRIOR;
-    io.KeyMap[ImGuiKey_PageDown] = VK_NEXT;
-    io.KeyMap[ImGuiKey_Home] = VK_HOME;
-    io.KeyMap[ImGuiKey_End] = VK_END;
-    io.KeyMap[ImGuiKey_Delete] = VK_DELETE;
-    io.KeyMap[ImGuiKey_Backspace] = VK_BACK;
-    io.KeyMap[ImGuiKey_Enter] = VK_RETURN;
-    io.KeyMap[ImGuiKey_Escape] = VK_ESCAPE;
-    io.KeyMap[ImGuiKey_A] = 'A';
-    io.KeyMap[ImGuiKey_C] = 'C';
-    io.KeyMap[ImGuiKey_V] = 'V';
-    io.KeyMap[ImGuiKey_X] = 'X';
-    io.KeyMap[ImGuiKey_Y] = 'Y';
-    io.KeyMap[ImGuiKey_Z] = 'Z';
-
-    io.RenderDrawListsFn = ImGui_ImplDX11_RenderDrawLists;  // Alternatively you can set this to NULL and call ImGui::GetDrawData() after ImGui::Render() to get the same ImDrawData pointer.
-    io.ImeWindowHandle = g_hWnd;
-
-    return true;
-}
-
-void ImGui_ImplDX11_Shutdown()
-{
-    ImGui_ImplDX11_InvalidateDeviceObjects();
-    ImGui::Shutdown();
-    g_pd3dDevice = NULL;
-    g_pd3dDeviceContext = NULL;
-    g_hWnd = (HWND)0;
-}
-
-void ImGui_ImplDX11_NewFrame()
-{
-    if (!g_pFontSampler)
-        ImGui_ImplDX11_CreateDeviceObjects();
-
-    ImGuiIO& io = ImGui::GetIO();
-
-    // Setup display size (every frame to accommodate for window resizing)
-    RECT rect;
-    GetClientRect(g_hWnd, &rect);
-    io.DisplaySize = ImVec2((float)(rect.right - rect.left), (float)(rect.bottom - rect.top));
-
-    // Setup time step
-    INT64 current_time;
-    QueryPerformanceCounter((LARGE_INTEGER *)&current_time);
-    io.DeltaTime = (float)(current_time - g_Time) / g_TicksPerSecond;
-    g_Time = current_time;
-
-    // Read keyboard modifiers inputs
-    io.KeyCtrl = (GetKeyState(VK_CONTROL) & 0x8000) != 0;
-    io.KeyShift = (GetKeyState(VK_SHIFT) & 0x8000) != 0;
-    io.KeyAlt = (GetKeyState(VK_MENU) & 0x8000) != 0;
-    io.KeySuper = false;
-    // io.KeysDown : filled by WM_KEYDOWN/WM_KEYUP events
-    // io.MousePos : filled by WM_MOUSEMOVE events
-    // io.MouseDown : filled by WM_*BUTTON* events
-    // io.MouseWheel : filled by WM_MOUSEWHEEL events
-
-    // Hide OS mouse cursor if ImGui is drawing it
-    SetCursor(io.MouseDrawCursor ? NULL : LoadCursor(NULL, IDC_ARROW));
-
-    // Start the frame
-    ImGui::NewFrame();
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/imgui_impl_dx11.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/imgui_impl_dx11.h
deleted file mode 100644
index 7d6f710..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/imgui_impl_dx11.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// ImGui Win32 + DirectX11 binding
-// In this binding, ImTextureID is used to store a 'ID3D11ShaderResourceView*' texture identifier. Read the FAQ about ImTextureID in imgui.cpp.
-
-// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this.
-// If you use this binding you'll need to call 4 functions: ImGui_ImplXXXX_Init(), ImGui_ImplXXXX_NewFrame(), ImGui::Render() and ImGui_ImplXXXX_Shutdown().
-// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
-// https://github.com/ocornut/imgui
-
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-
-IMGUI_API bool        ImGui_ImplDX11_Init(void* hwnd, ID3D11Device* device, ID3D11DeviceContext* device_context);
-IMGUI_API void        ImGui_ImplDX11_Shutdown();
-IMGUI_API void        ImGui_ImplDX11_NewFrame();
-
-// Use if you want to reset your rendering device without losing ImGui state.
-IMGUI_API void        ImGui_ImplDX11_InvalidateDeviceObjects();
-IMGUI_API bool        ImGui_ImplDX11_CreateDeviceObjects();
-
-// Handler for Win32 messages, update mouse/keyboard data.
-// You may or not need this for your implementation, but it can serve as reference for handling inputs.
-// Commented out to avoid dragging dependencies on <windows.h> types. You can copy the extern declaration in your code.
-/*
-IMGUI_API LRESULT   ImGui_ImplDX11_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-*/
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/PxInputDataFromPxFileBuf.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/PxInputDataFromPxFileBuf.h
deleted file mode 100644
index e309abd..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/PxInputDataFromPxFileBuf.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef PXINPUTDATAFROMPXFILEBUF_H
-#define PXINPUTDATAFROMPXFILEBUF_H
-
-#include <PsFileBuffer.h>
-
-
-// Copied from APEX 
-class PxInputDataFromPxFileBuf : public physx::PxInputData
-{
-public:
-	PxInputDataFromPxFileBuf(physx::PxFileBuf& fileBuf) : mFileBuf(fileBuf) {}
-
-	// physx::PxInputData interface
-	virtual uint32_t	getLength() const
-	{
-		return mFileBuf.getFileLength();
-	}
-
-	virtual void	seek(uint32_t offset)
-	{
-		mFileBuf.seekRead(offset);
-	}
-
-	virtual uint32_t	tell() const
-	{
-		return mFileBuf.tellRead();
-	}
-
-	// physx::PxInputStream interface
-	virtual uint32_t read(void* dest, uint32_t count)
-	{
-		return mFileBuf.read(dest, count);
-	}
-
-	PX_NOCOPY(PxInputDataFromPxFileBuf)
-private:
-	physx::PxFileBuf& mFileBuf;
-};
-
-
-#endif //PXINPUTDATAFROMPXFILEBUF_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/SampleProfiler.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/SampleProfiler.cpp
deleted file mode 100644
index cb63eeb..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/SampleProfiler.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "SampleProfiler.h"
-#include <map>
-#include <iostream>
-#include <fstream>
-#include <stack>
-
-using namespace std::chrono;
-
-struct ProfileData
-{
-	steady_clock::time_point start;
-
-	microseconds time;
-	microseconds prevTime;
-	microseconds maxTime;
-	uint32_t calls;
-	uint32_t prevCalls;
-
-	ProfileData() : time(0), prevTime(0), maxTime(0), calls(0), prevCalls(0)
-	{}
-};
-
-struct Node
-{
-	ProfileData					data;
-	std::map<const char*, Node>	childs;
-	Node*						parent;
-};
-
-static std::map<const char*, Node> s_roots;
-static Node*                       s_currentNode;
-static bool                        s_beginEndMismatch;
-static microseconds                s_overhead;
-static microseconds                s_prevOverhead;
-
-void SampleProfilerInit()
-{
-	s_roots.clear();
-	s_currentNode = nullptr;
-	s_beginEndMismatch = false;
-	s_overhead = microseconds();
-}
-
-void SampleProfilerBegin(const char* name)
-{
-	auto start = steady_clock::now();
-	{
-		Node* parent = s_currentNode;
-		if (s_currentNode == nullptr)
-		{
-			s_currentNode = &s_roots[name];
-		}
-		else
-		{
-			s_currentNode = &s_currentNode->childs[name];
-		}
-		s_currentNode->parent = parent;
-		s_currentNode->data.calls++;
-		s_currentNode->data.start = steady_clock::now();
-	}
-	s_overhead += duration_cast<microseconds>(steady_clock::now() - start);
-}
-
-void SampleProfilerEnd()
-{
-	auto start = steady_clock::now();
-	{
-		if (s_currentNode)
-		{
-			auto& data = s_currentNode->data;
-			data.time += duration_cast<microseconds>(steady_clock::now() - data.start);
-			data.maxTime = data.time > data.maxTime ? data.time : data.maxTime;
-			s_currentNode = s_currentNode->parent;
-		}
-		else
-		{
-			s_beginEndMismatch = true;
-		}
-	}
-	s_overhead += duration_cast<microseconds>(steady_clock::now() - start);
-}
-
-struct SampleProfilerTreeIteratorImpl final : public SampleProfilerTreeIterator
-{
-	struct StackNode 
-	{
-		Node* node;
-		const char* name;
-	};
-
-	SampleProfilerTreeIteratorImpl(std::map<const char*, Node>& roots)
-	{
-		for (auto& root : roots)
-		{
-			m_stack.emplace(StackNode { &root.second, root.first });
-		}
-		
-		next();
-	}
-
-	virtual const Data* data() const override
-	{
-		return m_valid ? &m_data : nullptr;
-	}
-
-	Node* node()
-	{
-		return m_node;
-	}
-	
-	virtual bool isDone() const
-	{
-		return !m_valid;
-	}
-
-	virtual void next()
-	{
-		if (!m_stack.empty())
-		{
-			auto& e = m_stack.top();
-			m_stack.pop();
-			m_node = e.node;
-			m_data.depth = 0;
-			m_data.hash = (uint64_t)m_node;
-			for (const Node* p = m_node; p != nullptr; p = p->parent)
-			{
-				m_data.depth++;
-			}
-			m_data.name = e.name;
-			m_data.calls = m_node->data.prevCalls;
-			m_data.time = m_node->data.prevTime;
-			m_data.maxTime = m_node->data.maxTime;
-			m_data.hasChilds = !m_node->childs.empty();
-
-			for (auto it = m_node->childs.rbegin(); it != m_node->childs.rend(); ++it)
-			{
-				m_stack.emplace(StackNode { &(*it).second, (*it).first });
-			}
-			m_valid = true;
-		}
-		else
-		{
-			m_valid = false;
-		}
-	}
-	
-	virtual void release()
-	{
-		delete this;
-	}
-
-	bool m_valid;
-	Data m_data;
-	Node* m_node;
-	std::stack<StackNode > m_stack;
-};
-
-void SampleProfilerReset()
-{
-	for (SampleProfilerTreeIteratorImpl it(s_roots); !it.isDone(); it.next())
-	{
-		auto& data = it.node()->data;
-		data.prevTime = data.time;
-		data.prevCalls = data.calls;
-		data.time = microseconds();
-		data.calls = 0;
-	}
-	s_currentNode = nullptr;
-	s_beginEndMismatch = false;
-	s_prevOverhead = s_overhead;
-	s_overhead = microseconds();
-}
-
-bool SampleProfilerIsValid()
-{
-	return !s_beginEndMismatch;
-}
-
-microseconds SampleProfilerGetOverhead()
-{
-	return s_prevOverhead;
-}
-
-SampleProfilerTreeIterator* SampleProfilerCreateTreeIterator()
-{
-	return SampleProfilerIsValid() ? new SampleProfilerTreeIteratorImpl(s_roots) : nullptr;
-}
-
-void SampleProfilerDumpToFile(const char* path)
-{
-	std::ofstream myfile(path, std::ios_base::out);
-	if (myfile.is_open())
-	{
-		if (s_beginEndMismatch)
-		{
-			myfile << "Error: Begin/End Mismatch.\n";
-		}
-		else
-		{
-			myfile << "[Root]\n";
-			for(SampleProfilerTreeIteratorImpl it(s_roots); !it.isDone(); it.next())
-			{
-				auto data = it.data();
-				for (uint32_t i = 0; i < data->depth; ++i)
-					myfile << "\t";
-				myfile << data->name << " --> calls: " << data->calls << ", total: " << data->time.count() * 0.001 << "ms\n";
-			}
-		}
-
-		myfile.close();
-	}
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/SampleProfiler.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/SampleProfiler.h
deleted file mode 100644
index 5f8a326..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/SampleProfiler.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SAMPLEPROFILER_H
-#define SAMPLEPROFILER_H
-
-#include <chrono>
-
-#if NV_PROFILE
-
-void SampleProfilerInit();
-void SampleProfilerBegin(const char* name);
-void SampleProfilerEnd();
-void SampleProfilerReset();
-
-struct SampleProfilerScoped
-{
-	SampleProfilerScoped(const char* name)
-	{
-		SampleProfilerBegin(name);
-	}
-
-	~SampleProfilerScoped()
-	{
-		SampleProfilerEnd();
-	}
-};
-
-#define PROFILER_INIT() SampleProfilerInit()
-#define PROFILER_BEGIN(x) SampleProfilerBegin(x)
-#define PROFILER_END() SampleProfilerEnd()
-#define PROFILER_SCOPED(x) SampleProfilerScoped __scopedProfiler__(x)
-#define PROFILER_SCOPED_FUNCTION() SampleProfilerScoped __scopedProfiler__(__FUNCTION__)
-#define PROFILER_RESET() SampleProfilerReset()
-
-#else
-
-#define PROFILER_INIT()
-#define PROFILER_BEGIN(x)
-#define PROFILER_END()
-#define PROFILER_SCOPED(x)
-#define PROFILER_SCOPED_FUNCTION()
-#define PROFILER_RESET()
-
-#endif
-
-void SampleProfilerDumpToFile(const char* path);
-bool SampleProfilerIsValid();
-std::chrono::microseconds SampleProfilerGetOverhead();
-
-struct SampleProfilerTreeIterator
-{
-	struct Data
-	{
-		uint64_t					hash;
-		const char*					name;
-		bool						hasChilds;
-		uint32_t					depth;
-		std::chrono::microseconds	time;
-		std::chrono::microseconds	maxTime;
-		uint32_t					calls;
-	};
-
-	virtual const Data* data() const = 0;
-	virtual bool isDone() const = 0;
-	virtual void next() = 0;
-	virtual void release() = 0;
-};
-
-SampleProfilerTreeIterator* SampleProfilerCreateTreeIterator();
-
-#endif //SAMPLEPROFILER_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/SampleTime.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/SampleTime.h
deleted file mode 100644
index 8226cd4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/SampleTime.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SAMPLE_TIME_H
-#define SAMPLE_TIME_H
-
-#include <stdint.h>
-
-class Time
-{
-public:
-	Time() : m_lastTickCount(getTimeTicks()) {}
-
-	double Time::getElapsedSeconds()
-	{
-		const int64_t lastTickCount = m_lastTickCount;
-		m_lastTickCount = getTimeTicks();
-		return (m_lastTickCount - lastTickCount) * s_secondsPerTick;
-	}
-
-	double Time::peekElapsedSeconds() const
-	{
-		return (getTimeTicks() - m_lastTickCount) * s_secondsPerTick;
-	}
-
-	double Time::getLastTime() const
-	{
-		return m_lastTickCount * s_secondsPerTick;
-	}
-
-private:
-	static double	getTickDuration()
-	{
-		LARGE_INTEGER a;
-		QueryPerformanceFrequency(&a);
-		return 1.0 / (double)a.QuadPart;
-	}
-
-	int64_t getTimeTicks() const
-	{
-		LARGE_INTEGER a;
-		QueryPerformanceCounter(&a);
-		return a.QuadPart;
-	}
-
-	int64_t				m_lastTickCount;
-	static const double	s_secondsPerTick;
-};
-
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/UIHelpers.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/UIHelpers.h
deleted file mode 100644
index cdd50ff..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/UIHelpers.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef UI_HELPERS_H
-#define UI_HELPERS_H
-
-#include "imgui.h"
-#include "PxVec3.h"
-
-
-static void ImGui_DragFloat3Dir(const char* label, float v[3])
-{
-	if (ImGui::Button("Normalize"))
-	{
-		((physx::PxVec3*)v)->normalize();
-	}
-	ImGui::SameLine();
-	ImGui::DragFloat3(label, v);
-};
-
-
-#define IM_ARRAYSIZE(_ARR)  ((int)(sizeof(_ARR)/sizeof(*_ARR)))
-
-template<int valuesCount = 90>
-class PlotLinesInstance
-{
-public:
-	PlotLinesInstance()
-	{
-		memset(m_values, 0, sizeof(float) * valuesCount);
-	}
-
-	void plot(const char* label, float newValue, const char* overlay_text, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 80))
-	{
-		for (; ImGui::GetTime() > m_time + 1.0f / 60.0f; m_time += 1.0f / 60.0f)
-		{
-			m_values[m_offset] = newValue;
-			m_offset = (m_offset + 1) % valuesCount;
-		}
-		ImGui::PlotLines(label, m_values, valuesCount, m_offset, overlay_text, scale_min, scale_max, graph_size);
-	}
-
-private:
-	float m_values[valuesCount];
-	int m_offset;
-	float m_time = ImGui::GetTime();
-};
-
-#endif //UI_HELPERS_H
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/Utils.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/Utils.cpp
deleted file mode 100644
index 9eafabc..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/Utils.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#include "Utils.h"
-
-#include <string>
-#include <cstdarg>
-
-HRESULT messagebox_printf(const char* caption, UINT mb_type, const char* format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	char formatted_text[512];
-	_vsnprintf(formatted_text, 512, format, args);
-	return MessageBoxA(nullptr, formatted_text, caption, mb_type);
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/Utils.h b/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/Utils.h
deleted file mode 100644
index 42bf713..0000000
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/utils/Utils.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// 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-2017 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef UTILS_H
-#define UTILS_H
-
-#include <DeviceManager.h>
-#include <assert.h>
-
-#include "PxPreprocessor.h"
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//														MACROS
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifndef V_RETURN
-#define V_RETURN(x)                                                                                                    \
-	{                                                                                                                  \
-		hr = (x);                                                                                                      \
-		if(FAILED(hr))                                                                                                 \
-		{                                                                                                              \
-			return hr;                                                                                                 \
-		}                                                                                                              \
-	}
-#endif
-
-#ifndef V
-#define V(x)                                                                                                           \
-	{                                                                                                                  \
-		HRESULT hr = (x);                                                                                              \
-		_ASSERT(SUCCEEDED(hr));                                                                                        \
-	}
-#endif
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p)                                                                                                \
-	{                                                                                                                  \
-		if(p)                                                                                                          \
-		{                                                                                                              \
-			(p)->Release();                                                                                            \
-			(p) = NULL;                                                                                                \
-		}                                                                                                              \
-	}
-#endif
-
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(p)                                                                                                 \
-	{                                                                                                                  \
-		if(p)                                                                                                          \
-		{                                                                                                              \
-			delete (p);                                                                                                \
-			(p) = NULL;                                                                                                \
-		}                                                                                                              \
-	}
-#endif
-
-#define ASSERT_PRINT(cond, format, ...)                                                                                \
-	if(!(cond))                                                                                                        \
-	{                                                                                                                  \
-		messagebox_printf("Assertion Failed!", MB_OK | MB_ICONERROR, #cond "\n" format, __VA_ARGS__);                  \
-		assert(cond);                                                                                                  \
-	}
-
-HRESULT messagebox_printf(const char* caption, UINT mb_type, const char* format, ...);
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-static const char* strext(const char* str)
-{
-	const char* ext = NULL; // by default no extension found!
-	while (str)
-	{
-		str = strchr(str, '.');
-		if (str)
-		{
-			str++;
-			ext = str;
-		}
-	}
-	return ext;
-}
-
-static inline float  lerp(float a, float b, float t)                          { return a + (b - a) * t; }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Shaders/common_buffers_ex.hlsl b/tools/ArtistTools/source/BlastPlugin/Shaders/common_buffers_ex.hlsl
deleted file mode 100644
index d6a37b0..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Shaders/common_buffers_ex.hlsl
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef COMMON_BUFFERS_HLSL
-#define COMMON_BUFFERS_HLSL
-
-cbuffer Camera : register(b0)
-{
-	row_major matrix viewProjection;
-	row_major matrix projectionInv;
-	float3 viewPos;
-};
-
-struct Light 
-{
-	int				m_enable;
-	float3			m_dir;
-
-	int				m_useShadows;
-	float3			m_color;
-
-	float3			m_ambientColor;
-	int				m_isEnvLight;
-
-	int				m_lhs;
-	int				_reserved1;
-	int				_reserved2;
-	int				_reserved3;
-
-	float			m_depthBias;
-	float			m_depthGain;
-	int				m_useEnvMap;
-	float			m_intensity;
-
-	row_major float4x4	m_viewMatrix;
-	row_major float4x4	m_lightMatrix;
-};
-
-cbuffer World : register(b1)
-{
-	float3 ambientColor;
-	float3 pointLightPos;
-	float3 pointLightColor;
-	float3 dirLightDir;
-	float specularPower;
-	float3 dirLightColor;
-	float specularIntensity;
-	float g_flatNormal;
-	float g_wireFrameOver;
-	float g_useLighting;
-	Light g_Light[4];
-};
-
-cbuffer Object : register(b2)
-{
-	row_major matrix worldMatrix;
-	float4 m_diffuseColor;
-	float4 m_specularColor;
-	float m_useDiffuseTexture;
-	float m_useSpecularTexture;
-	float m_useNormalTexture;
-	float m_specularShininess;
-	float selected;
-};
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Shaders/lighting_ex.hlsl b/tools/ArtistTools/source/BlastPlugin/Shaders/lighting_ex.hlsl
deleted file mode 100644
index 6878e23..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Shaders/lighting_ex.hlsl
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "common_buffers_ex.hlsl"
-
-static const float att_c = 1.0f;
-static const float att_l = 0.014f;
-static const float att_q = 0.0007f;
-
-
-float CalcAttenuation(float distance)
-{
-	return 1 / (att_c + att_l * distance + att_q * distance * distance);
-};
-
-
-float3 CalcLight(float3 textureColor, float3 lightDir, float3 viewDir, float3 normal, float3 lightColor, float specPower, float specIntensity, float attenuation)
-{
-	normal = normalize(normal);
-
-	// diffuse
-	float3 dirToLight = normalize(-lightDir);
-	float diffuseFactor = max(dot(normal, dirToLight), 0.0);
-	float3 diffuse = lightColor * textureColor * diffuseFactor * attenuation;
-
-	// specular (Blinn-Phong)
-	float3 halfwayDir = normalize(dirToLight + viewDir);
-	float specFactor = pow(max(dot(viewDir, halfwayDir), 0.0), specPower);
-	float3 spec = lightColor * specFactor * attenuation * specIntensity;
-	
-	return diffuse + spec;
-};
-
-float3 CalcPixelLight(float3 diffuseColor, float3 worldPos, float3 normal)
-{
-	float3 viewDir = normalize(viewPos - worldPos);
-
-	// ambient
-	float3 ambient = ambientColor * diffuseColor;
-
-	// dir light
-	float3 dirLight = CalcLight(diffuseColor, dirLightDir, viewDir, normal, dirLightColor, specularPower, specularIntensity, 1);
-
-	// point light
-	float3 pointLightDir = worldPos - pointLightPos;
-	float distance = length(pointLightDir);
-    float attenuation = CalcAttenuation(distance);
-	float3 pointLight = CalcLight(diffuseColor, pointLightDir, viewDir, normal, pointLightColor, specularPower, specularIntensity, attenuation);
-	
-	// hacky hack: ambient attenuates within point light distance
-	ambient *= attenuation;
-
-	return ambient + dirLight + pointLight;
-};
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Shaders/model_simple_ex.hlsl b/tools/ArtistTools/source/BlastPlugin/Shaders/model_simple_ex.hlsl
deleted file mode 100644
index 409054c..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Shaders/model_simple_ex.hlsl
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "common_buffers_ex.hlsl"
-#include "lighting.hlsl"
-
-struct VS_INPUT
-{
-	float3 position : POSITION0;
-	float3 normal : NORMAL0;
-	float health : TEXCOORD1;
-};
-
-struct VS_OUTPUT
-{
-	float4 position : SV_POSITION;
-	float4 worldPos : POSITION0;
-	float3 normal : NORMAL0;
-	float health : TEXCOORD1;
-};
-
-VS_OUTPUT VS(VS_INPUT iV)
-{
-	VS_OUTPUT oV;
-
-	float4 worldSpacePos = mul(float4(iV.position, 1.0f), model);
-	oV.position = mul(worldSpacePos, viewProjection);
-
-	oV.worldPos = worldSpacePos;
-
-	// normals
-	float3 worldNormal = mul(iV.normal,  (float3x3)model);
-	oV.normal = worldNormal;
-
-	oV.health = iV.health;
-
-	return oV;
-}
-
-float4 PS(VS_OUTPUT iV) : SV_Target0
-{
-	float3 lightColor = CalcPixelLight(defaultColor.xyz, iV.worldPos.xyz, iV.normal);	
-	lightColor.r = 1.0f - iV.health; // hack for health
-	float4 color = float4(lightColor, 1);
-	
-	if(selected > 0)
-	{
-		if(color.r > 0.5)
-		{
-			color.r = 0.5;
-		}
-		else
-		{
-			color.r += 0.5;
-		}
-	}
-	
-	return color;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Shaders/model_simple_id_ex.hlsl b/tools/ArtistTools/source/BlastPlugin/Shaders/model_simple_id_ex.hlsl
deleted file mode 100644
index 2c5ec44..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Shaders/model_simple_id_ex.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "common_buffers_ex.hlsl"
-
-struct VS_INPUT
-{
-	float3 position : POSITION0;
-	float3 normal : VERTEX_NORMAL;
-	float3 faceNormal : FACE_NORMAL;
-	float3 tangent : TANGENT;
-	float2 uv : TEXCOORD0;
-	float health : TEXCOORD1;
-};
-
-struct VS_OUTPUT
-{
-	float4 position : SV_POSITION;
-};
-
-struct PSOut
-{
-	float vertexid: SV_Target0;
-};
-
-VS_OUTPUT VS(VS_INPUT iV)
-{
-	VS_OUTPUT oV;
-	float4 worldSpacePos = mul(float4(iV.position, 1.0f), worldMatrix);
-	oV.position = mul(worldSpacePos, viewProjection);
-	return oV;
-}
-
-PSOut PS(VS_OUTPUT oV) : SV_Target0
-{
-	PSOut output;
-	output.vertexid = selected;
-	return output;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Shaders/model_simple_textured_ex.hlsl b/tools/ArtistTools/source/BlastPlugin/Shaders/model_simple_textured_ex.hlsl
deleted file mode 100644
index 6d8e819..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Shaders/model_simple_textured_ex.hlsl
+++ /dev/null
@@ -1,184 +0,0 @@
-#include "common_buffers_ex.hlsl"
-#include "lighting_ex.hlsl"
-
-SamplerState defaultSampler : register(s0);
-Texture2D diffuseTexture : register(t0);
-Texture2D specularTexture : register(t1);
-Texture2D normalTexture : register(t2);
-Texture2D envTexture : register(t3);
-
-struct VS_INPUT
-{
-	float3 position : POSITION0;
-	float3 normal : VERTEX_NORMAL;
-	float3 faceNormal : FACE_NORMAL;
-	float3 tangent : TANGENT;
-	float2 uv : TEXCOORD0;
-	float health : TEXCOORD1;
-};
-
-struct VS_OUTPUT
-{
-	float4 position : SV_POSITION;
-	float4 worldPos : POSITION0;
-	float3 normal : NORMAL0;
-	float3 tangent : TANGENT0;
-	float2 uv : TEXCOORD0;
-	float health : TEXCOORD1;
-};
-
-VS_OUTPUT VS(VS_INPUT iV)
-{
-	VS_OUTPUT oV;
-
-	float4 worldSpacePos = mul(float4(iV.position, 1.0f), worldMatrix);
-	oV.position = mul(worldSpacePos, viewProjection);
-
-	oV.worldPos = worldSpacePos;
-
-	// normals
-	float3 normal = (g_flatNormal > 0) ? normalize(iV.faceNormal) : normalize(iV.normal);
-	normal = mul(float4(normal, 0.0f), worldMatrix);
-	oV.normal = normal;
-	
-	oV.tangent = normalize(iV.tangent);
-
-	oV.uv = iV.uv;
-	oV.health = iV.health;
-
-	return oV;
-}
-
-inline float2 GetLightTexCoord(float3 lightdirection)
-{
-	const float M_PI = 3.1415923;
-	float u = 0.5f + 0.5f * atan2(lightdirection.y, lightdirection.x) / M_PI;
-	float v = 0.5f - 0.5f * lightdirection.z;
-	return float2(u,v);
-}
-
-inline float3 computeDiffuseLighting( 
-	float3 diffuse, float3 lightdirection, float3 surfacenormal )
-{
-	float ratio = max(0, dot(surfacenormal, lightdirection));
-	return diffuse * ratio;
-}
-
-inline float3 computeSpecularLighting( 
-	float3 lightcolor, float3 lightdirection, float3 surfacenormal, 
-	float3 viewvector, float3 specularity, float shininess)
-{
-	float3 H = normalize(viewvector + surfacenormal);
-	float NdotH = max(0, dot(H, surfacenormal));
-	float specular	= pow(NdotH, shininess);
-	float3 output = specular * lightcolor * specularity;
-	return output;
-}
-
-float4 PS(VS_OUTPUT iV) : SV_Target0
-{
-	if(g_wireFrameOver > 0)
-		return float4(0,0,0,1);
-	
-	float3 diffuseColor = m_diffuseColor.xyz;
-	if(m_useDiffuseTexture > 0)
-	{
-		diffuseColor = diffuseTexture.Sample(defaultSampler, iV.uv).xyz;
-	}
-	
-	if(selected > 0)
-	{
-		if(diffuseColor.r > 0.5)
-		{
-			diffuseColor.r = 0.5;
-		}
-		else
-		{
-			diffuseColor.r += 0.5;
-		}
-		return float4(diffuseColor, 1.0f);
-	}
-	
-	if (g_useLighting < 0)
-	{
-		if(selected > 0)
-		{
-			if(diffuseColor.r > 0.5)
-			{
-				diffuseColor.r = 0.5;
-			}
-			else
-			{
-				diffuseColor.r += 0.5;
-			}
-		}
-		return float4(diffuseColor, 1.0f);
-	}		
-		
-	float3 specularColor = m_specularColor.xyz;
-	if(m_useSpecularTexture > 0)
-	{
-		specularColor = specularTexture.Sample(defaultSampler, iV.uv).xyz;
-	}	
-	float3 N = normalize(iV.normal.xyz);
-	if (m_useNormalTexture > 0)
-	{
-		float3 normalColor = normalTexture.Sample(defaultSampler, iV.uv).xyz;
-		normalColor = (normalColor - 0.5) * 2.0f;
-		float3 T = normalize(iV.tangent.xyz);
-		float3 B = normalize(cross(T, N));
-		float3 PN = N;	
-		PN += normalColor.x * T;
-		PN += normalColor.y * B;
-		PN += normalColor.z * N;
-		N = normalize(PN);
-	}
-	
-	float4 color = float4(0,0,0,1);
-	
-	float3 P = iV.worldPos.xyz;
-	float3 E = normalize(viewPos.xyz - P);
-	float shininess = m_specularShininess;
-
-	float3 albedo = diffuseColor.rgb;
-	float3 specularity = specularColor.rgb;
-
-	float3 diffuse = 0;
-	float3 specular = 0;
-	float3 ambient = 0;
-
-	[unroll]
-	for (int i = 0; i < 4; i++)
-	{
-		Light L = g_Light[i];
-
-		if (L.m_enable)
-		{
-			float3 Ldiffuse = 0;
-			float3 Lspecular = 0;
-			float3 Ldir = 0;
-
-			if (L.m_isEnvLight)
-			{
-				Ldir = N;
-				float2 texcoords = GetLightTexCoord(Ldir);
-				float3 Lcolor = (L.m_useEnvMap) ? envTexture.Sample(defaultSampler,texcoords.xy).rgb : L.m_color;
-				Lcolor *= L.m_intensity;
-				Ldiffuse = Lspecular = Lcolor;
-			}
-			else
-			{
-				Ldir = L.m_dir;
-				Ldiffuse = Lspecular = L.m_intensity * L.m_color;
-			}
-
-			diffuse += computeDiffuseLighting( Ldiffuse, Ldir, N);
-			specular += computeSpecularLighting( Lspecular, Ldir, N, E, specularity, shininess);
-			ambient += L.m_ambientColor;
-		}
-	}
-
-	color.rgb = (ambient + diffuse) * albedo + specular;
-	
-	return color;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Shaders/screen_primitive_ex.hlsl b/tools/ArtistTools/source/BlastPlugin/Shaders/screen_primitive_ex.hlsl
deleted file mode 100644
index 3da7007..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Shaders/screen_primitive_ex.hlsl
+++ /dev/null
@@ -1,26 +0,0 @@
-struct VS_INPUT
-{
-	float3 position : POSITION0;
-	float3 color : COLOR0;
-};
-
-struct VS_OUTPUT
-{
-	float4 position : SV_POSITION;
-	float3 color : COLOR0;
-};
-
-VS_OUTPUT VS(VS_INPUT iV)
-{
-	VS_OUTPUT oV;
-
-	oV.position = float4(iV.position.x * 2.0 - 1.0, 1.0 - iV.position.y * 2.0, 0.0, 1.0);
-	oV.color = iV.color;
-
-	return oV;
-}
-
-float4 PS(VS_OUTPUT iV) : SV_Target0
-{
-	return float4(iV.color, 1.0);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/BlastSceneTree.ui b/tools/ArtistTools/source/BlastPlugin/UI/BlastSceneTree.ui
deleted file mode 100644
index 52e80f7..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/BlastSceneTree.ui
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>BlastSceneTree</class>
- <widget class="QDockWidget" name="BlastSceneTree">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>300</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="features">
-   <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
-  </property>
-  <property name="windowTitle">
-   <string>BlastSceneTree</string>
-  </property>
-  <widget class="QWidget" name="widget">
-   <layout class="QVBoxLayout" name="verticalLayout_2">
-    <property name="spacing">
-     <number>0</number>
-    </property>
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
-     <number>0</number>
-    </property>
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="spacing">
-       <number>2</number>
-      </property>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <property name="spacing">
-         <number>4</number>
-        </property>
-        <item>
-         <widget class="QPushButton" name="btnAsset">
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/Asset.png</normaloff>:/AppMainWindow/images/Asset.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="assetComposite">
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/AssetComposite.png</normaloff>:/AppMainWindow/images/AssetComposite.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnChunk">
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/Chunk_Support_Unstatic.png</normaloff>:/AppMainWindow/images/Chunk_Support_Unstatic.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnBond">
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/Bond.png</normaloff>:/AppMainWindow/images/Bond.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnProjectile">
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/Projectile.png</normaloff>:/AppMainWindow/images/Projectile.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnExpandCollapse">
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/ExpanCollapse.png</normaloff>:/AppMainWindow/images/ExpanCollapse.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QTreeView" name="blastSceneTree">
-        <property name="selectionMode">
-         <enum>QAbstractItemView::ExtendedSelection</enum>
-        </property>
-        <attribute name="headerVisible">
-         <bool>false</bool>
-        </attribute>
-       </widget>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources>
-  <include location="BlastToolBar.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/BlastToolBar.qrc b/tools/ArtistTools/source/BlastPlugin/UI/BlastToolBar.qrc
deleted file mode 100644
index ae61540..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/BlastToolBar.qrc
+++ /dev/null
@@ -1,66 +0,0 @@
-<RCC>
-    <qresource prefix="AppMainWindow">
-      <file>images/TextureBox.bmp</file>
-      <file>images/CheckBox.png</file>
-      <file>images/ArrowUp.png</file>
-      <file>images/ArrowDown.png</file>
-      <file>images/transportLoop.png</file>
-      <file>images/transportPlay.png</file>
-      <file>images/transportRewind.png</file>
-      <file>images/transportStepForward.png</file>
-      <file>images/transportStop.png</file>
-      <file>images/simulationPlay.png</file>
-      <file>images/simulationStop.png</file>
-      <file>images/simulationStep.png</file>
-      <file>images/DarkBorder.png</file>
-      <file>images/openFile.png</file>
-      <file>images/importFile.png</file>
-      <file>images/saveDisc.png</file>
-      <file>images/refreshReload.png</file>
-      <file>images/TextureEnabled_icon.png</file>
-      <file>images/TextureDisabled_icon.png</file>
-      <file>images/TextureIsUsed_icon.png</file>
-      <file>images/Remove_icon.png</file>
-      <file>images/Refresh_icon.png</file>
-      <file>images/CurveEditor.png</file>
-      <file>images/Add.png</file>
-      <file>images/Up.png</file>
-      <file>images/Down.png</file>
-      <file>images/EditWrench.png</file>
-      <file>images/playlist.png</file>
-      <file>images/visibilityToggle_notVisible.png</file>
-      <file>images/visibilityToggle_visible.png</file>
-      <file>ThemeDark.qss</file>
-      <file>images/Blast_ToolBar_btnExportFilepath.png</file>
-      <file>images/Blast_ToolBar_btnSelectTool.png</file>
-      <file>images/Blast_ToolBar_btnTranslate.png</file>
-      <file>images/Blast_ToolBar_btnRotate.png</file>
-      <file>images/Blast_ToolBar_btnScale.png</file>
-      <file>images/Blast_ToolBar_btnGizmoWithGlobal.png</file>
-      <file>images/Blast_ToolBar_btnGizmoWithLocal.png</file>
-      <file>images/Blast_ToolBar_btnPaintbrush.png</file>
-      <file>images/Blast_ToolBar_btnExplodedViewTool.png</file>
-      <file>images/Blast_ToolBar_btnJointsTool.png</file>
-      <file>images/Blast_ToolBar_btnFuseSelectedChunks.png</file>
-      <file>images/Blast_ToolBar_btnReset.png</file>
-      <file>images/Blast_ToolBar_btnSimulatePlay.png</file>
-      <file>images/Blast_ToolBar_btnFrameStepForward.png</file>
-      <file>images/Blast_ToolBar_btnBomb.png</file>
-      <file>images/Blast_ToolBar_btnDamage.png</file>
-      <file>images/Blast_ToolBar_btnProjectile.png</file>
-      <file>images/Blast_ToolBar_btnDropObject.png</file>
-      <file>images/Blast_ToolBar_btnPreferences.png</file>
-      <file>images/Asset.png</file>
-      <file>images/AssetComposite.png</file>
-      <file>images/Chunk_Unsupport_Unstatic.png</file>
-      <file>images/Chunk_Support_Unstatic.png</file>
-      <file>images/Chunk_Support_Static.png</file>
-      <file>images/Bond.png</file>
-      <file>images/Projectile.png</file>
-      <file>images/Pen.png</file>
-      <file>images/Select.png</file>
-      <file>images/ExpanCollapse.png</file>
-      <file>ThemeDark.qss</file>
-    </qresource>
-</RCC>
-  
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/CollisionToolsDlg.ui b/tools/ArtistTools/source/BlastPlugin/UI/CollisionToolsDlg.ui
deleted file mode 100644
index 012c082..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/CollisionToolsDlg.ui
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CollisionToolsDlg</class>
- <widget class="QDialog" name="CollisionToolsDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>368</width>
-    <height>220</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="1">
-    <widget class="QComboBox" name="comboBoxCollisionShape">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="labelCollisionShape">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Collision Shape</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QSpinBox" name="spinBoxQuality">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="labelQuality">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Quality</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="labelApplyFilter">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Apply Filter</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="comboBoxApplyFilter">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="QComboBox" name="comboBoxTargetPlatform">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="labelTargetPlatform">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Target Platform</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QSpinBox" name="spinBoxMaxHulls">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="labelMaxHulls">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Max Hulls</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="labelTrimHulls">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Trim Hulls %</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QSpinBox" name="spinBoxTrimHulls">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="btnReset">
-       <property name="minimumSize">
-        <size>
-         <width>100</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>100</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Reset</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnApply">
-       <property name="minimumSize">
-        <size>
-         <width>100</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>100</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Apply</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>comboBoxApplyFilter</tabstop>
-  <tabstop>comboBoxCollisionShape</tabstop>
-  <tabstop>spinBoxQuality</tabstop>
-  <tabstop>spinBoxMaxHulls</tabstop>
-  <tabstop>spinBoxTrimHulls</tabstop>
-  <tabstop>comboBoxTargetPlatform</tabstop>
-  <tabstop>btnReset</tabstop>
-  <tabstop>btnApply</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/DefaultDamagePanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/DefaultDamagePanel.ui
deleted file mode 100644
index 651cd83..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/DefaultDamagePanel.ui
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DefaultDamagePanel</class>
- <widget class="QWidget" name="DefaultDamagePanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>176</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>340</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>340</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>4</number>
-   </property>
-   <property name="topMargin">
-    <number>9</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing">
-    <number>2</number>
-   </property>
-   <item row="0" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxDamageAmount">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="decimals">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="labelDamageAmount">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>155</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>155</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Damage Amount</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxStressDamageForce">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="decimals">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxDamageRadius">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="decimals">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="labelDamageRadius">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>155</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>155</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Damage Radius (Mouse WH)</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="labelStressDamageForce">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>155</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>155</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Stress Damage Force</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="labelDamageProfile">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>155</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>155</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Damage Profile</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="labelExplosiveImpulse">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>155</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>155</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Explosive Impulse</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QComboBox" name="comboBoxDamageProfile">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxExplosiveImpulse">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="decimals">
-      <number>3</number>
-     </property>
-     <property name="maximum">
-      <double>999.990000000000009</double>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="labelDamageContinuously">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>155</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>155</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Damage Continuously</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="QCheckBox" name="checkBoxDamageContinuously">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>spinBoxDamageAmount</tabstop>
-  <tabstop>spinBoxExplosiveImpulse</tabstop>
-  <tabstop>spinBoxStressDamageForce</tabstop>
-  <tabstop>comboBoxDamageProfile</tabstop>
-  <tabstop>spinBoxDamageRadius</tabstop>
-  <tabstop>checkBoxDamageContinuously</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/FileReferencesPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/FileReferencesPanel.ui
deleted file mode 100644
index bde4935..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/FileReferencesPanel.ui
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FileReferencesPanel</class>
- <widget class="QWidget" name="FileReferencesPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>277</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>340</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>340</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="labelFBXSourceAsset">
-     <property name="text">
-      <string>FBX Source Asset</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLineEdit" name="lineEditFBXSourceAsset"/>
-   </item>
-   <item row="1" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>4</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="btnOpenFile">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/openFile.png</normaloff>:/AppMainWindow/images/openFile.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnReload">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/refreshReload.png</normaloff>:/AppMainWindow/images/refreshReload.png</iconset>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnRemove">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/Remove_icon.png</normaloff>:/AppMainWindow/images/Remove_icon.png</iconset>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Export Assets</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="lineEditObj"/>
-      </item>
-      <item row="2" column="2">
-       <widget class="QCheckBox" name="checkBoxObj">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="lineEditLLAsset"/>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="labelLLAsset">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>LLAsset</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QCheckBox" name="checkBoxFBX">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="labelObj">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Obj</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="lineEditFBX"/>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="labelFBX">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>FBX</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2">
-       <widget class="QCheckBox" name="checkBoxLLAsset">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="labelTKAsset">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>TKAsset</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QLineEdit" name="lineEditTKAsset"/>
-      </item>
-      <item row="4" column="2">
-       <widget class="QCheckBox" name="checkBoxTKAsset">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="labelBPXA">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>BPXA</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="QLineEdit" name="lineEditBPXA"/>
-      </item>
-      <item row="5" column="2">
-       <widget class="QCheckBox" name="checkBoxBPXA">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelEmbedFBXCollision">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Embed collision in FBX</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QCheckBox" name="checkBoxEmbedFBXCollision">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QPushButton" name="btnSave">
-     <property name="minimumSize">
-      <size>
-       <width>32</width>
-       <height>32</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>32</width>
-       <height>32</height>
-      </size>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="icon">
-      <iconset resource="BlastToolBar.qrc">
-       <normaloff>:/AppMainWindow/images/saveDisc.png</normaloff>:/AppMainWindow/images/saveDisc.png</iconset>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>32</width>
-       <height>32</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>lineEditFBXSourceAsset</tabstop>
-  <tabstop>btnOpenFile</tabstop>
-  <tabstop>btnReload</tabstop>
-  <tabstop>btnRemove</tabstop>
-  <tabstop>lineEditFBX</tabstop>
-  <tabstop>checkBoxFBX</tabstop>
-  <tabstop>lineEditObj</tabstop>
-  <tabstop>checkBoxObj</tabstop>
-  <tabstop>lineEditLLAsset</tabstop>
-  <tabstop>checkBoxLLAsset</tabstop>
-  <tabstop>lineEditTKAsset</tabstop>
-  <tabstop>checkBoxTKAsset</tabstop>
-  <tabstop>lineEditBPXA</tabstop>
-  <tabstop>checkBoxBPXA</tabstop>
-  <tabstop>btnSave</tabstop>
- </tabstops>
- <resources>
-  <include location="BlastToolBar.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/FiltersDockWidget.ui b/tools/ArtistTools/source/BlastPlugin/UI/FiltersDockWidget.ui
deleted file mode 100644
index e8b8522..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/FiltersDockWidget.ui
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FiltersDockWidget</class>
- <widget class="QDockWidget" name="FiltersDockWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>375</width>
-    <height>233</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>375</width>
-    <height>233</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>524287</width>
-    <height>524287</height>
-   </size>
-  </property>
-  <property name="features">
-   <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
-  </property>
-  <property name="allowedAreas">
-   <set>Qt::LeftDockWidgetArea</set>
-  </property>
-  <property name="windowTitle">
-   <string>Filters</string>
-  </property>
-  <widget class="QWidget" name="widget">
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="spacing">
-     <number>0</number>
-    </property>
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
-     <number>0</number>
-    </property>
-    <item>
-     <layout class="QGridLayout" name="gridLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="1" column="3">
-       <widget class="QPushButton" name="btnModifyFilterPreset">
-        <property name="minimumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="BlastToolBar.qrc">
-          <normaloff>:/AppMainWindow/images/EditWrench.png</normaloff>:/AppMainWindow/images/EditWrench.png</iconset>
-        </property>
-        <property name="checkable">
-         <bool>false</bool>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelFilterPreset">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>60</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Filter Preset</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="btnAddFilterPrest">
-        <property name="minimumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="BlastToolBar.qrc">
-          <normaloff>:/AppMainWindow/images/Add.png</normaloff>:/AppMainWindow/images/Add.png</iconset>
-        </property>
-        <property name="checkable">
-         <bool>false</bool>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <widget class="QPushButton" name="btnRemoveFilterPreset">
-        <property name="minimumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="BlastToolBar.qrc">
-          <normaloff>:/AppMainWindow/images/Remove_icon.png</normaloff>:/AppMainWindow/images/Remove_icon.png</iconset>
-        </property>
-        <property name="checkable">
-         <bool>false</bool>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="5">
-       <widget class="QPushButton" name="btnSaveFilterPreset">
-        <property name="minimumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="BlastToolBar.qrc">
-          <normaloff>:/AppMainWindow/images/saveDisc.png</normaloff>:/AppMainWindow/images/saveDisc.png</iconset>
-        </property>
-        <property name="checkable">
-         <bool>false</bool>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="comboBoxFilterPreset">
-        <property name="minimumSize">
-         <size>
-          <width>150</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>150</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="6">
-       <widget class="QMenuBar" name="menuBar">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>20</height>
-         </size>
-        </property>
-        <widget class="QMenu" name="menuRule">
-         <property name="title">
-          <string>Rule</string>
-         </property>
-         <addaction name="actionAllDescendants"/>
-         <addaction name="actionAllParents"/>
-        </widget>
-        <widget class="QMenu" name="menuDepth">
-         <property name="title">
-          <string>Depth</string>
-         </property>
-         <addaction name="actionDepthAll"/>
-         <addaction name="actionDepth0"/>
-         <addaction name="actionDepth1"/>
-         <addaction name="actionDepth2"/>
-         <addaction name="actionDepth3"/>
-         <addaction name="actionDepth4"/>
-         <addaction name="actionDepth5"/>
-        </widget>
-        <widget class="QMenu" name="menuItem_Type">
-         <property name="title">
-          <string>Item Type</string>
-         </property>
-         <addaction name="actionItemTypeAll"/>
-         <addaction name="actionChunk"/>
-         <addaction name="actionSupportChunk"/>
-         <addaction name="actionStaticSupportChunk"/>
-         <addaction name="actionBond"/>
-         <addaction name="actionWorldBond"/>
-        </widget>
-        <widget class="QMenu" name="menuOperator">
-         <property name="title">
-          <string>Operator</string>
-         </property>
-         <addaction name="actionEqualTo"/>
-         <addaction name="actionNotEquaTo"/>
-        </widget>
-        <addaction name="menuRule"/>
-        <addaction name="menuDepth"/>
-        <addaction name="menuItem_Type"/>
-        <addaction name="menuOperator"/>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="topMargin">
-       <number>6</number>
-      </property>
-      <item row="2" column="0" colspan="3">
-       <widget class="QListWidget" name="listWidget">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="3">
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <property name="spacing">
-         <number>4</number>
-        </property>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnSelect">
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/Select.png</normaloff>:/AppMainWindow/images/Select.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>false</bool>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnVisible">
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/visibilityToggle_visible.png</normaloff>:/AppMainWindow/images/visibilityToggle_visible.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>false</bool>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnInVisible">
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/visibilityToggle_notVisible.png</normaloff>:/AppMainWindow/images/visibilityToggle_notVisible.png</iconset>
-          </property>
-          <property name="checkable">
-           <bool>false</bool>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
-  <action name="actionAllDescendants">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>All Descendants</string>
-   </property>
-  </action>
-  <action name="actionAllParents">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>All Parents</string>
-   </property>
-  </action>
-  <action name="actionDepthAll">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>All</string>
-   </property>
-  </action>
-  <action name="actionDepth0">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Depth 0</string>
-   </property>
-  </action>
-  <action name="actionDepth1">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Depth 1</string>
-   </property>
-  </action>
-  <action name="actionDepth2">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Depth 2</string>
-   </property>
-  </action>
-  <action name="actionDepth3">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Depth 3</string>
-   </property>
-  </action>
-  <action name="actionDepth4">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Depth 4</string>
-   </property>
-  </action>
-  <action name="actionDepth5">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Depth 5</string>
-   </property>
-  </action>
-  <action name="actionItemTypeAll">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>All</string>
-   </property>
-  </action>
-  <action name="actionChunk">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Chunk</string>
-   </property>
-  </action>
-  <action name="actionSupportChunk">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Support Chunk</string>
-   </property>
-  </action>
-  <action name="actionStaticSupportChunk">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Static Support Chunk</string>
-   </property>
-  </action>
-  <action name="actionBond">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Bond</string>
-   </property>
-  </action>
-  <action name="actionWorldBond">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>World Bond</string>
-   </property>
-  </action>
-  <action name="actionEqualTo">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Equal To</string>
-   </property>
-  </action>
-  <action name="actionNotEquaTo">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Not Equal To</string>
-   </property>
-  </action>
- </widget>
- <tabstops>
-  <tabstop>comboBoxFilterPreset</tabstop>
-  <tabstop>btnAddFilterPrest</tabstop>
-  <tabstop>btnModifyFilterPreset</tabstop>
-  <tabstop>btnRemoveFilterPreset</tabstop>
-  <tabstop>btnSaveFilterPreset</tabstop>
-  <tabstop>listWidget</tabstop>
-  <tabstop>btnSelect</tabstop>
-  <tabstop>btnVisible</tabstop>
-  <tabstop>btnInVisible</tabstop>
- </tabstops>
- <resources>
-  <include location="BlastToolBar.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/FractureGeneralPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/FractureGeneralPanel.ui
deleted file mode 100644
index 627ad58..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/FractureGeneralPanel.ui
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FractureGeneralPanel</class>
- <widget class="QWidget" name="FractureGeneralPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>157</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>340</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>340</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>2</number>
-   </property>
-   <property name="bottomMargin">
-    <number>6</number>
-   </property>
-   <property name="horizontalSpacing">
-    <number>2</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="labelFracturePreset">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Fracture Preset</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>4</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="btnAddPreset">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/Add.png</normaloff>:/AppMainWindow/images/Add.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnModifyPreset">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/EditWrench.png</normaloff>:/AppMainWindow/images/EditWrench.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnSavePreset">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/saveDisc.png</normaloff>:/AppMainWindow/images/saveDisc.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="labelFractureType">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Fracture Type</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="comboBoxFractureType">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="comboBoxFracturePreset">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="3">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Internal Material</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="labelApplyMaterial">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Apply Material</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboBoxApplyMaterial">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>150</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>150</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QLabel" name="labelAutoSelectNewChunks">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>240</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>240</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Auto-Select New Chunks</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2">
-    <widget class="QCheckBox" name="checkBoxAutoSelectNewChunks"/>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>comboBoxFracturePreset</tabstop>
-  <tabstop>btnAddPreset</tabstop>
-  <tabstop>btnModifyPreset</tabstop>
-  <tabstop>btnSavePreset</tabstop>
-  <tabstop>comboBoxFractureType</tabstop>
-  <tabstop>comboBoxApplyMaterial</tabstop>
-  <tabstop>checkBoxAutoSelectNewChunks</tabstop>
- </tabstops>
- <resources>
-  <include location="BlastToolBar.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/FractureSliceSettingsPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/FractureSliceSettingsPanel.ui
deleted file mode 100644
index aa95fee..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/FractureSliceSettingsPanel.ui
+++ /dev/null
@@ -1,486 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FractureSliceSettingsPanel</class>
- <widget class="QWidget" name="FractureSliceSettingsPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>276</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>340</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>340</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0">
-    <widget class="QLabel" name="labelRotationVariation">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Rotation Variation</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="labelNumSlices">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Num Slices (x/y/z)</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="labelOffsetVariation">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Offset Variation</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxOffsetVariation">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="decimals">
-      <number>2</number>
-     </property>
-     <property name="maximum">
-      <double>1.000000000000000</double>
-     </property>
-     <property name="singleStep">
-      <double>0.010000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxRotationVariation">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="decimals">
-      <number>2</number>
-     </property>
-     <property name="maximum">
-      <double>1.000000000000000</double>
-     </property>
-     <property name="singleStep">
-      <double>0.010000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="labelNoiseAmplitude">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Noise Amplitude</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxNoiseAmplitude">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="decimals">
-      <number>2</number>
-     </property>
-     <property name="maximum">
-      <double>1.000000000000000</double>
-     </property>
-     <property name="singleStep">
-      <double>0.010000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="labelNoiseFrequency">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Noise Frequency</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxNoiseFrequency">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="decimals">
-      <number>2</number>
-     </property>
-     <property name="maximum">
-      <double>10.000000000000000</double>
-     </property>
-     <property name="singleStep">
-      <double>0.100000000000000</double>
-     </property>
-     <property name="value">
-      <double>1.000000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="labelNoiseSeed">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Noise Seed</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1">
-    <widget class="QSpinBox" name="spinBoxNoiseSeed">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="maximum">
-      <number>2147483647</number>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1">
-    <widget class="QPushButton" name="btnApplyFracture">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>100</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Apply Fracture</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="labelSurfaceResolution">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Surface Resolution</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1">
-    <widget class="QSpinBox" name="spinBoxSurfaceResolution">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="maximum">
-      <number>2147483647</number>
-     </property>
-     <property name="value">
-      <number>1</number>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QSpinBox" name="spinBoxNumSlicesX">
-       <property name="value">
-        <number>1</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="spinBoxNumSlicesY">
-       <property name="value">
-        <number>1</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="spinBoxNumSlicesZ">
-       <property name="value">
-        <number>1</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="labelNoiseOctaveNumber">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Noise Octave Number</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="QSpinBox" name="spinBoxNoiseOctaveNumber">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="minimum">
-      <number>1</number>
-     </property>
-     <property name="maximum">
-      <number>5</number>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>spinBoxNumSlicesX</tabstop>
-  <tabstop>spinBoxNumSlicesY</tabstop>
-  <tabstop>spinBoxNumSlicesZ</tabstop>
-  <tabstop>spinBoxOffsetVariation</tabstop>
-  <tabstop>spinBoxRotationVariation</tabstop>
-  <tabstop>spinBoxNoiseAmplitude</tabstop>
-  <tabstop>spinBoxNoiseFrequency</tabstop>
-  <tabstop>spinBoxNoiseOctaveNumber</tabstop>
-  <tabstop>spinBoxNoiseSeed</tabstop>
-  <tabstop>spinBoxSurfaceResolution</tabstop>
-  <tabstop>btnApplyFracture</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/FractureVisualizersPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/FractureVisualizersPanel.ui
deleted file mode 100644
index a2c0ff6..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/FractureVisualizersPanel.ui
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FractureVisualizersPanel</class>
- <widget class="QWidget" name="FractureVisualizersPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>50</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>340</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>340</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="labelSelectionDepthTest">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>170</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>170</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Selection Depth Test</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QCheckBox" name="checkBoxSelectionDepthTest"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/FractureVoronoiSettingsPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/FractureVoronoiSettingsPanel.ui
deleted file mode 100644
index d69ebf1..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/FractureVoronoiSettingsPanel.ui
+++ /dev/null
@@ -1,500 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FractureVoronoiSettingsPanel</class>
- <widget class="QWidget" name="FractureVoronoiSettingsPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>358</width>
-    <height>319</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>358</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>358</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_5">
-   <item row="4" column="0">
-    <widget class="QLabel" name="labelSiteGeneration">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Site Generation</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="1">
-    <widget class="QPushButton" name="btnApplyFracture">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>100</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Apply Fracture</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QComboBox" name="comboBoxSiteGeneration">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <item>
-      <property name="text">
-       <string>UniformlyGenerateSitesInMesh </string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>ClusteredSitesGeneration</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="4" column="2">
-    <spacer name="horizontalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="0" colspan="3">
-    <widget class="QGroupBox" name="groupBoxVisualizers">
-     <property name="title">
-      <string>Visualizers</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>9</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>9</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="labelGridPreview">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Grid Preview</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="checkBoxGridPreview"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelFracturePreview">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Fracture Preview</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="checkBoxFracturePreview"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="labelCutterMesh">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Cutter Mesh</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="checkBoxCutterMesh"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="5" column="0" rowspan="2" colspan="3">
-    <widget class="QWidget" name="widgetUniform" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_6">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="labeNumberOfSites">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Number of Sites</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QSpinBox" name="spinBoxNumberOfSites">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="8" column="0" colspan="3">
-    <widget class="QWidget" name="widgetClusters" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>80</height>
-      </size>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="1">
-       <widget class="QSpinBox" name="spinBoxNumberOfClusters">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QDoubleSpinBox" name="spinBoxClusterRadius">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="labelNumberOfClusters">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Number Of Clusters</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelSitesPerCluster">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Sites Per Cluster</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="labelClusterRadius">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>ClusterRadius</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QSpinBox" name="spinBoxSitesPerCluster">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-     <zorder>labelNumberOfClusters</zorder>
-     <zorder>spinBoxNumberOfClusters</zorder>
-     <zorder>labelSitesPerCluster</zorder>
-     <zorder>spinBoxSitesPerCluster</zorder>
-     <zorder>labelClusterRadius</zorder>
-     <zorder>spinBoxClusterRadius</zorder>
-     <zorder>horizontalSpacer_2</zorder>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>checkBoxGridPreview</tabstop>
-  <tabstop>checkBoxFracturePreview</tabstop>
-  <tabstop>checkBoxCutterMesh</tabstop>
-  <tabstop>comboBoxSiteGeneration</tabstop>
-  <tabstop>spinBoxNumberOfSites</tabstop>
-  <tabstop>spinBoxNumberOfClusters</tabstop>
-  <tabstop>spinBoxSitesPerCluster</tabstop>
-  <tabstop>spinBoxClusterRadius</tabstop>
-  <tabstop>btnApplyFracture</tabstop>
- </tabstops>
- <resources>
-  <include location="BlastToolBar.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/GeneralPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/GeneralPanel.ui
deleted file mode 100644
index 481bc01..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/GeneralPanel.ui
+++ /dev/null
@@ -1,492 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>GeneralPanel</class>
- <widget class="QWidget" name="GeneralPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>223</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>340</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>340</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="1">
-    <widget class="QComboBox" name="comboBoxUserPreset">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="labelUserPreset">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>User Preset</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>4</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="btnAddUserPreset">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/Add.png</normaloff>:/AppMainWindow/images/Add.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnModifyUserPreset">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/EditWrench.png</normaloff>:/AppMainWindow/images/EditWrench.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnSaveUserPreset">
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/saveDisc.png</normaloff>:/AppMainWindow/images/saveDisc.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0" colspan="3">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Stress Solver</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <item row="6" column="0">
-       <widget class="QLabel" name="labelGraphReductionLevel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>170</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>170</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Graph Reduction Level</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="labelAngularFactor">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>160</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>170</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Angular Factor</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelLinearFactor">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>160</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>170</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Linear Factor</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="QSpinBox" name="spinBoxBondIterations">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="maximum">
-         <number>500000</number>
-        </property>
-        <property name="singleStep">
-         <number>100</number>
-        </property>
-        <property name="value">
-         <number>18000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QDoubleSpinBox" name="spinBoxLinearFactor">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="maximum">
-         <double>100.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>0.010000000000000</double>
-        </property>
-        <property name="value">
-         <double>0.250000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QDoubleSpinBox" name="spinBoxAngularFactor">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="maximum">
-         <double>100.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>0.010000000000000</double>
-        </property>
-        <property name="value">
-         <double>0.750000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <widget class="QSpinBox" name="spinBoxGraphReductionLevel">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="maximum">
-         <number>32</number>
-        </property>
-        <property name="value">
-         <number>3</number>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="labelBondIterations">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>160</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>170</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Bond Iterations Per Frame</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="labelMaterialHardness">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>160</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>170</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Material Hardness</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QDoubleSpinBox" name="spinBoxMaterialHardness">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="minimum">
-         <double>0.010000000000000</double>
-        </property>
-        <property name="maximum">
-         <double>100000.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>10.000000000000000</double>
-        </property>
-        <property name="value">
-         <double>1000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>comboBoxUserPreset</tabstop>
-  <tabstop>btnAddUserPreset</tabstop>
-  <tabstop>btnModifyUserPreset</tabstop>
-  <tabstop>btnSaveUserPreset</tabstop>
-  <tabstop>spinBoxMaterialHardness</tabstop>
-  <tabstop>spinBoxLinearFactor</tabstop>
-  <tabstop>spinBoxAngularFactor</tabstop>
-  <tabstop>spinBoxBondIterations</tabstop>
-  <tabstop>spinBoxGraphReductionLevel</tabstop>
- </tabstops>
- <resources>
-  <include location="BlastToolBar.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/MaterialAssignmentsPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/MaterialAssignmentsPanel.ui
deleted file mode 100644
index 7e87913..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/MaterialAssignmentsPanel.ui
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MaterialAssignmentsPanel</class>
- <widget class="QWidget" name="MaterialAssignmentsPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>135</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>340</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>340</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <widget class="QLabel" name="labelMaterialID1">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::RightToLeft</enum>
-     </property>
-     <property name="text">
-      <string>Material ID 1</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="comboBoxMaterialID1">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="labelMaterialID2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::RightToLeft</enum>
-     </property>
-     <property name="text">
-      <string>Material ID 2</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QComboBox" name="comboBoxMaterialID2">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="labelMaterialID3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::RightToLeft</enum>
-     </property>
-     <property name="text">
-      <string>Material ID 3</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QComboBox" name="comboBoxMaterialID3">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="labelMaterialID4">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::RightToLeft</enum>
-     </property>
-     <property name="text">
-      <string>Material ID 4</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QComboBox" name="comboBoxMaterialID4">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Apply materials to ID's of selected objects</string>
-     </property>
-     <property name="scaledContents">
-      <bool>false</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/MaterialLibraryPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/MaterialLibraryPanel.ui
deleted file mode 100644
index 751a5c8..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/MaterialLibraryPanel.ui
+++ /dev/null
@@ -1,753 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MaterialLibraryPanel</class>
- <widget class="QWidget" name="MaterialLibraryPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>396</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>340</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>340</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>130</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>130</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Materials</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>4</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="btnAddMat">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/Add.png</normaloff>:/AppMainWindow/images/Add.png</iconset>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnModifyMat">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/EditWrench.png</normaloff>:/AppMainWindow/images/EditWrench.png</iconset>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnRemoveMat">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="BlastToolBar.qrc">
-         <normaloff>:/AppMainWindow/images/Remove_icon.png</normaloff>:/AppMainWindow/images/Remove_icon.png</iconset>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QListWidget" name="listWidget"/>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Render Attributes</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Diffuse Color</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <property name="spacing">
-         <number>4</number>
-        </property>
-        <item>
-         <widget class="QPushButton" name="btnSpecularColor">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="flat">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnSpecularColorTex">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/TextureEnabled_icon.png</normaloff>:/AppMainWindow/images/TextureEnabled_icon.png</iconset>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnSpecularColorTexReload">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/refreshReload.png</normaloff>:/AppMainWindow/images/refreshReload.png</iconset>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnSpecularColorTexClear">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/Remove_icon.png</normaloff>:/AppMainWindow/images/Remove_icon.png</iconset>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <property name="spacing">
-         <number>4</number>
-        </property>
-        <item>
-         <widget class="QPushButton" name="btnDiffuseColor">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="flat">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnDiffuseColorTex">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/TextureEnabled_icon.png</normaloff>:/AppMainWindow/images/TextureEnabled_icon.png</iconset>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnDiffuseColorTexReload">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/refreshReload.png</normaloff>:/AppMainWindow/images/refreshReload.png</iconset>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnDiffuseColorTexClear">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/Remove_icon.png</normaloff>:/AppMainWindow/images/Remove_icon.png</iconset>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Specular Shininess</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QDoubleSpinBox" name="spinSpecularShin">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>20</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Specular Color</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Normal Texture</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <property name="spacing">
-         <number>4</number>
-        </property>
-        <item>
-         <widget class="QPushButton" name="btnNormalColorTex">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/TextureEnabled_icon.png</normaloff>:/AppMainWindow/images/TextureEnabled_icon.png</iconset>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnNormalColorTexReload">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/refreshReload.png</normaloff>:/AppMainWindow/images/refreshReload.png</iconset>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnNormalColorTexClear">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="BlastToolBar.qrc">
-            <normaloff>:/AppMainWindow/images/Remove_icon.png</normaloff>:/AppMainWindow/images/Remove_icon.png</iconset>
-          </property>
-          <property name="flat">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_4">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>btnNormalColorTexClear</tabstop>
-  <tabstop>btnModifyMat</tabstop>
-  <tabstop>btnRemoveMat</tabstop>
-  <tabstop>listWidget</tabstop>
-  <tabstop>btnDiffuseColor</tabstop>
-  <tabstop>btnDiffuseColorTex</tabstop>
-  <tabstop>btnDiffuseColorTexReload</tabstop>
-  <tabstop>btnDiffuseColorTexClear</tabstop>
-  <tabstop>btnSpecularColor</tabstop>
-  <tabstop>btnAddMat</tabstop>
-  <tabstop>btnSpecularColorTex</tabstop>
-  <tabstop>btnSpecularColorTexReload</tabstop>
-  <tabstop>btnSpecularColorTexClear</tabstop>
-  <tabstop>spinSpecularShin</tabstop>
-  <tabstop>btnNormalColorTex</tabstop>
-  <tabstop>btnNormalColorTexReload</tabstop>
- </tabstops>
- <resources>
-  <include location="BlastToolBar.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/NoiseToolsDlg.ui b/tools/ArtistTools/source/BlastPlugin/UI/NoiseToolsDlg.ui
deleted file mode 100644
index d843793..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/NoiseToolsDlg.ui
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NoiseToolsDlg</class>
- <widget class="QDialog" name="NoiseToolsDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>333</width>
-    <height>201</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="1">
-    <widget class="QPushButton" name="btnApply">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>100</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Apply</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Interior Faces</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="labelApplyByMateria">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Apply by Material</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelAmplitude">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Amplitude</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QDoubleSpinBox" name="spinBoxAmplitude">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="labelFrequency">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Frequency</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QDoubleSpinBox" name="spinBoxFrequency">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="labelGridScale">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>130</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Grid Scale</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QDoubleSpinBox" name="spinBoxAmplitude_3">
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>80</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboBoxApplyByMaterial">
-        <property name="minimumSize">
-         <size>
-          <width>150</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>150</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>comboBoxApplyByMaterial</tabstop>
-  <tabstop>spinBoxAmplitude</tabstop>
-  <tabstop>spinBoxFrequency</tabstop>
-  <tabstop>spinBoxAmplitude_3</tabstop>
-  <tabstop>btnApply</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/SourceAssetOpenDlg.ui b/tools/ArtistTools/source/BlastPlugin/UI/SourceAssetOpenDlg.ui
deleted file mode 100644
index 78ae7e7..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/SourceAssetOpenDlg.ui
+++ /dev/null
@@ -1,496 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SourceAssetOpenDlg</class>
- <widget class="QDialog" name="SourceAssetOpenDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>458</width>
-    <height>238</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="2">
-    <widget class="QDoubleSpinBox" name="spinBoxYAxis">
-     <property name="minimumSize">
-      <size>
-       <width>89</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>89</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="3">
-    <widget class="QDoubleSpinBox" name="spinBoxZAxis">
-     <property name="minimumSize">
-      <size>
-       <width>89</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>89</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="fileLabel">
-     <property name="minimumSize">
-      <size>
-       <width>90</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>90</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>File</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="skinnedLabel">
-     <property name="minimumSize">
-      <size>
-       <width>90</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>90</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>Skinned</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="positionLabel">
-     <property name="minimumSize">
-      <size>
-       <width>90</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>90</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>Position</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxXAxis">
-     <property name="minimumSize">
-      <size>
-       <width>89</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>89</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxXPosition">
-     <property name="minimumSize">
-      <size>
-       <width>89</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>89</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>89</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Scene Unit</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="QComboBox" name="cbSceneUnit">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>89</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="currentText">
-        <string>Unknown</string>
-       </property>
-       <item>
-        <property name="text">
-         <string>Unknown</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Centimeter</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Meter</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Inch</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="appendLabel">
-     <property name="minimumSize">
-      <size>
-       <width>90</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>90</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>Append</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1">
-    <widget class="QCheckBox" name="checkBoxAppend"/>
-   </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="preFracturedLabel">
-     <property name="minimumSize">
-      <size>
-       <width>90</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>90</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>PreFractured</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1">
-    <widget class="QCheckBox" name="checkBoxPreFractured"/>
-   </item>
-   <item row="7" column="2">
-    <widget class="QLabel" name="autoComputeLabel">
-     <property name="minimumSize">
-      <size>
-       <width>90</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>90</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>AutoCompute</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="3">
-    <widget class="QCheckBox" name="checkBoxAutoCompute"/>
-   </item>
-   <item row="8" column="1" colspan="4">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QCheckBox" name="checkBoxSkinned"/>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="rotationLabel">
-     <property name="minimumSize">
-      <size>
-       <width>90</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>90</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>Rotation Axis</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="4">
-    <widget class="QPushButton" name="btnOpenFile">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>100</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Open File</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxDegree">
-     <property name="minimumSize">
-      <size>
-       <width>89</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>89</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="rotationDegree">
-     <property name="minimumSize">
-      <size>
-       <width>90</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>90</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>Rotation Degree</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QDoubleSpinBox" name="spinBoxYPosition">
-     <property name="minimumSize">
-      <size>
-       <width>89</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>89</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="3">
-    <widget class="QDoubleSpinBox" name="spinBoxZPosition">
-     <property name="minimumSize">
-      <size>
-       <width>89</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>89</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="3">
-    <widget class="QLineEdit" name="lineEditFile">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>lineEditFile</tabstop>
-  <tabstop>btnOpenFile</tabstop>
-  <tabstop>checkBoxSkinned</tabstop>
-  <tabstop>spinBoxXPosition</tabstop>
-  <tabstop>spinBoxYPosition</tabstop>
-  <tabstop>spinBoxZPosition</tabstop>
-  <tabstop>spinBoxXAxis</tabstop>
-  <tabstop>spinBoxYAxis</tabstop>
-  <tabstop>spinBoxZAxis</tabstop>
-  <tabstop>spinBoxDegree</tabstop>
-  <tabstop>checkBoxAppend</tabstop>
-  <tabstop>checkBoxPreFractured</tabstop>
-  <tabstop>checkBoxAutoCompute</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>SourceAssetOpenDlg</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>SourceAssetOpenDlg</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/SupportPanel.ui b/tools/ArtistTools/source/BlastPlugin/UI/SupportPanel.ui
deleted file mode 100644
index 0ea87ce..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/SupportPanel.ui
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SupportPanel</class>
- <widget class="QWidget" name="SupportPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>66</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>340</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>340</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <widget class="QLabel" name="labelEnableJoint">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>170</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>170</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Enable Joint</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QCheckBox" name="checkBoxEnableJoint"/>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="labelBondStrength">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>170</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>170</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Bond Strength</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QDoubleSpinBox" name="spinBoxBondStrength">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>80</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>spinBoxBondStrength</tabstop>
-  <tabstop>checkBoxEnableJoint</tabstop>
- </tabstops>
- <resources>
-  <include location="BlastToolBar.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/ThemeDark.qss b/tools/ArtistTools/source/BlastPlugin/UI/ThemeDark.qss
deleted file mode 100644
index 97e00c0..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/ThemeDark.qss
+++ /dev/null
@@ -1,457 +0,0 @@
-AppMainWindow *
-{
-	background-color:rgb(68,68,68); color:rgb(200,200,200);
-}
-
-AppMainWindow::separator
-{
-	background-color: rgb(68, 68, 68);
-
-	/*trick: qdockwidget stylesheet seems to have bugs, use the separator border*/
-	
-	border-right-width: 2px;
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2; 
-}
-
-AppMainWindow::separator:hover
-{
-	background-color: #666666;
-}
-
-AppMainWindow QDockWidget::title
-{
-	text-align: center;
-	/*
-	border-top-color: rgb(45,45,45);
-	border-top-width: 2px;
-	 border-top-style: groove;
-	*/
-	
-	background-color: rgb(68,68,68);
-	border-width: 2px;
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2; 
-	 
-}
-
-AppMainWindow QTextBrowser
-{
-	/*
-	border-width: 1px;
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2;
-	*/
-	border: 1px solid gray;
-	background-color:rgb(40,40,40);
-}
-
-AppMainWindow QCheckBox::indicator::unchecked
-{
-	background-color:rgb(40,40,40);
-}
-
-AppMainWindow QCheckBox::indicator::checked
-{
-	image:url(:/AppMainWindow/images/CheckBox.png);
-}
-
-AppMainWindow QPushButton 
-{
-	border: 1px solid gray;
-}
-
-AppMainWindow QPushButton:pressed 
-{
-	border: 2px solid rgb(118,185,0);
-	/*background-color: rgb(118,185,0);*/
-}
-
-AppMainWindow QPushButton:checked
-{
-	border: 2px solid rgb(118,185,0); 
-	/*background-color: rgb(118,185,0);*/
-}
-
-/****** QScrollbar Styles ******/
-AppMainWindow QScrollBar:vertical 
-{
-	width: 22px;
-	/*
-	border-width: 2px;
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2;
-	*/
-	border: 1px solid rgb(40,40,40);
-	margin: 20px 1px 20px 0px;
-}
-
-AppMainWindow QScrollBar::handle:vertical 
-{
-	border-top: 1px solid rgb(40,40,40);
-	border-bottom: 1px solid rgb(40,40,40);
-	background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
-                 stop:0 rgb(116,116,116), stop: 1 rgb(95,95,95));
-	min-height: 20px;
-}
-
-AppMainWindow QScrollBar::add-line:vertical 
-{
-	border: 1px solid rgb(40,40,40);
-	background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
-                 stop:0 rgb(116,116,116), stop: 1 rgb(95,95,95));
-
-	margin-right: 1px;
-	margin-bottom: 1px;
-	height: 18px;
-	subcontrol-position: bottom;
-	subcontrol-origin: margin;
-}
-
-AppMainWindow QScrollBar::sub-line:vertical 
-{
-	margin-top: 1px;
-	margin-right: 1px;
-	border: 1px solid rgb(40,40,40);
-	background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
-                 stop:0 rgb(116,116,116), stop: 1 rgb(95,95,95));
-	height: 18px;
-	subcontrol-position: top;
-	subcontrol-origin: margin;
-}
-
-QScrollBar::up-arrow:vertical
-{
-	image: url(:/AppMainWindow/images/ArrowUp.png);
-}
-
-QScrollBar::up-arrow:vertical:pressed
-{
-	top: 1px;
-}
-
-QScrollBar::down-arrow:vertical 
-{
-	image: url(:/AppMainWindow/images/ArrowDown.png);
-}
-
-QScrollBar::down-arrow:vertical:pressed
-{
-	top: 1px;
-}
-
-AppMainWindow QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical 
-{
-    background: none;
-}
-
-/****** ListWidget Styles ******/
-AppMainWindow QListWidget {
-	alternate-background-color: yellow;
-     border: 1px solid gray;
-     border-radius: 0px;
- }
-
-AppMainWindow QListWidget {
-     show-decoration-selected: 1; /* make the selection span the entire width of the view */
- }
-
- AppMainWindow QListWidget::item:alternate {
-     background: #EEEEEE;
- }
-
- AppMainWindow QListWidget::item:selected {
-     border: 1px solid #6a6ea9;
- }
-
- AppMainWindow QListWidget::item:selected:!active {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 #00aa00, stop: 1 #00dd00);
- }
-
- AppMainWindow QListWidget::item:selected:active {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-								stop: 0 #00aa00, stop: 1 #00dd00);
- }
-
- AppMainWindow QListWidget::item:hover {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 #DDFFDD, stop: 1 #CCFFCC);
- }
-
- /****** TreeView Styles ******/
-AppMainWindow QTreeView {
-	alternate-background-color: yellow;
-     border: 1px solid gray;
-     border-radius: 0px;
- }
-
-AppMainWindow QTreeView {
-     show-decoration-selected: 1; /* make the selection span the entire width of the view */
- }
-
- AppMainWindow QTreeView::item:alternate {
-     background: #EEEEEE;
- }
-
- AppMainWindow QTreeView::item:selected {
-     border: 1px solid #6a6ea9;
- }
-
- AppMainWindow QTreeView::item:selected:!active {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 #00aa00, stop: 1 #00dd00);
- }
-
- AppMainWindow QTreeView::item:selected:active {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-								stop: 0 #00aa00, stop: 1 #00dd00);
- }
-
- AppMainWindow QTreeView::item:hover {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 #DDFFDD, stop: 1 #CCFFCC);
- }
- 
-/****** ComboBox Styles ******/
-AppMainWindow QComboBox {
-     border: 1px solid gray;
-     border-radius: 0px;
- }
-
-AppMainWindow QComboBox QAbstractItemView 
-{
-	background-color: rgb(68,68,68);
-    selection-background-color: rgb(118,185,0);
-}
- 
- AppMainWindow QComboBox::drop-down {
-     subcontrol-origin: padding;
-     subcontrol-position: top right;
-     /*width: 15px;*/
-
-     border-left-width: 1px;
-     border-left-color: gray;
-     border-left-style: solid; 
-
- }
-
-AppMainWindow QComboBox::down-arrow {
-     image: url(:/AppMainWindow/images/ArrowDown.png);
- }
-
-AppMainWindow QComboBox::down-arrow:on { 
-     top: 1px;
- 
- }
-
-/****** QTabWidget Styles ******/
-AppMainWindow QTabWidget::pane  
-{ 
-	/* The tab widget frame */
-    border-top: 0px solid transparent;
-	
-}
-
-AppMainWindow QTabWidget::tab-bar  
-{
-    left: 5px;
-}
-
-AppMainWindow QTabBar::tab  {
-	margin-top: 1px;
-    background-color: rgb(68,68,68);
-    border: 1px solid gray;
-    border-bottom-color: rgb(68,68,68); /* same as the pane color */
-    min-width: 10ex;
-    padding: 2px 8px;
-}
-
-AppMainWindow QTabBar::tab:selected  
-{
-    background-color: #666666;
-    border-color: gray;
-    border-bottom-color: transparent;
-}
-
-AppMainWindow QTabBar::tab:!selected  {
-    margin-top: 3px; /* make non-selected tabs look smaller */
-}
-
-/****** Spin And DoubleSpin Styles ******/
-
-AppMainWindow QDoubleSpinBox
- {
-	border: 1px solid gray;
-	background-color: rgb(40,40,40);
- }
-
-AppMainWindow QSpinBox
- {
-	border: 1px solid gray;
-	background-color: rgb(40,40,40);
- }
-
-AppMainWindow QSpinBox::up-button
-{
-	background-color:rgb(68,68,68);
-	border: 1px solid gray;
-	margin-top: 1px;
-	margin-right: 1px;
-}
-
-AppMainWindow QSpinBox::up-button:pressed  {
-    border: 1px solid rgb(118,185,0);
-}
-
-AppMainWindow QSpinBox::down-button
-{
-	background-color:rgb(68,68,68);
-	border: 1px solid gray;
-	margin-bottom: 1px;
-	margin-right: 1px;
-}
-
-AppMainWindow QSpinBox::down-button:pressed  {
-    border: 1px solid rgb(118,185,0);
-}
-
-AppMainWindow QSpinBox::up-arrow
-{
-    image: url(:/AppMainWindow/images/ArrowUp.png);
-    width: 4px;
-}
-AppMainWindow QSpinBox::down-arrow
-{
-    image: url(:/AppMainWindow/images/ArrowDown.png);
-    width: 4px;
-}
-
-AppMainWindow QDoubleSpinBox::up-button
-{
-	background-color:rgb(68,68,68);
-	border: 1px solid gray;
-	margin-top: 1px;
-	margin-right: 1px;
-}
-
-AppMainWindow QDoubleSpinBox::up-button:pressed  {
-    border: 1px solid rgb(118,185,0);
-}
-
-AppMainWindow QDoubleSpinBox::down-button
-{
-	background-color:rgb(68,68,68);
-	border: 1px solid gray;
-	margin-bottom: 1px;
-	margin-right: 1px;
-}
-
-AppMainWindow QDoubleSpinBox::down-button:pressed  {
-    border: 1px solid rgb(118,185,0);
-}
-
-AppMainWindow QDoubleSpinBox::up-arrow
-{
-    image: url(:/AppMainWindow/images/ArrowUp.png);
-    width: 4px;
-}
-
-AppMainWindow QDoubleSpinBox::down-arrow
-{
-    image: url(:/AppMainWindow/images/ArrowDown.png);
-    width: 4px;
-}
-
-AppMainWindow QDoubleSpinBox::disabled
-{
-	background-color:rgb(32,32,32);
-	color:rgb(68,68,68);
-	border: 1px solid rgb(68,68,68);
-}
-
-AppMainWindow QDoubleSpinBox::up-button:disabled  {
-    border: 1px solid rgb(68,68,68);
-}
-
-AppMainWindow QDoubleSpinBox::down-button:disabled  {
-    border: 1px solid rgb(68,68,68);
-}
-
-/****** Menu Styles ******/
-QMenuBar
-{
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2;
-	border-bottom-width: 2px;
-}
-
-AppMainWindow QMenuBar::item  
-{
-    spacing: 3px; /* spacing between menu bar items */
-    padding: 1px 4px;
-	margin-bottom: 2px;
-    background: transparent;
-    border-radius: 0px;
-}
- 
-AppMainWindow QMenuBar::item:selected:enabled  { /* when selected using mouse or keyboard */
-    background: #666666;
-}
- 
-AppMainWindow QMenuBar::item:pressed:enabled  {
-    background: rgb(118,185,0);
-}
-
-AppMainWindow QMenu  {
-	border: 1px solid rgb(50,50,50);
-    
-}
-
-AppMainWindow QMenuBar:disabled
-{
-	color:rgb(0,0,0);
-}
-
-AppMainWindow QMenu:disabled
-{
-	color:rgb(0,0,0);
-}
-
-AppMainWindow QMenu::item  {
-    padding: 2px 25px 2px 20px;
-    border: 1px solid transparent; /* reserve space for selection border */
-}
- 
-AppMainWindow QMenu::item:selected:enabled  {
-    border-color: rgb(70,70,70);
-    background: rgba(118,185,0, 250);
-}
-/****** ExpandablePanel Styles ******/
-
-AppMainWindow QGroupBox 
-{
-	margin-top: 1.5ex; 
-	border: 1px solid gray; 
-	border-radius: 0px;
-}
-		
-AppMainWindow QGroupBox::title 
-{
-	subcontrol-origin: margin; 
-	left: 10px; 
-	padding: 0px 3px;
-}
-	
-/*	
-ExpandablePanel QPushButton[flat="true"] 
-{
-	border-color: rgb(40,40,40);
-	image:url(:/AppMainWindow/images/TextureBox.bmp)
-}
-
-ExpandablePanel QPushButton[flat="true"]:pressed
-{
-	margin: 2px;
-}
-*/
-
-ExpandablePanel TitleLabel
-{
-	background:rgb(78, 78, 78);
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/ThemeDefault.qss b/tools/ArtistTools/source/BlastPlugin/UI/ThemeDefault.qss
deleted file mode 100644
index f59dd25..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/ThemeDefault.qss
+++ /dev/null
@@ -1,76 +0,0 @@
-/****** General Styles ******/
-
-AppMainWindow QPushButton 
-{
-	/*border: 1px solid gray;*/
-	background-color: rgb(230,230,230);
-	border-left: 1px solid rgb(200,200,200);
-	border-top: 1px solid rgb(200,200,200);
-	border-right: 1px solid rgb(60,60,60);
-	border-bottom: 1px solid rgb(60,60,60);
-}
-
-
-AppMainWindow QPushButton:pressed 
-{
-	/*border: 2px solid gray;*/
-	border-left: 1px solid rgb(60,60,60);
-	border-top: 1px solid rgb(60,60,60);
-	border-right: 1px solid rgb(200,200,200);
-	border-bottom: 1px solid rgb(200,200,200);
-}
-
-AppMainWindow QPushButton:checked
-{
-	border: 1px solid gray;
-	border-left: 1px solid rgb(60,60,60);
-	border-top: 1px solid rgb(60,60,60);
-	border-right: 1px solid rgb(200,200,200);
-	border-bottom: 1px solid rgb(200,200,200);
-}
-/****** MainToolbar Styles ******/
-
-MainToolbar QPushButton[flat="true"] 
-{
-	border:0px;
-}
-
-
-/****** ExpandablePanel Styles ******/
-
-ExpandablePanel 
-{
-	background:rgb(240,240,240);
-}
-
-ExpandablePanel QGroupBox 
-{
-	margin-top: 1.5ex; 
-	border: 1px solid gray; 
-	border-radius: 0px;
-}
-		
-ExpandablePanel QGroupBox::title 
-{
-	subcontrol-origin: margin; 
-	left: 10px; 
-	padding: 0px 3px;
-}
-		
-ExpandablePanel QPushButton[flat="true"] 
-{
-	border: 1px solid rgb(60,60,60);
-	image:url(:/AppMainWindow/images/TextureBox.bmp)
-}
-
-ExpandablePanel QPushButton[flat="true"]:pressed
-{
-	border: 2px solid rgb(60,60,60);
-	image:url(:/AppMainWindow/images/TextureBox.bmp)
-}
-
-ExpandablePanel TitleLabel
-{
-	background:rgb(219, 219, 219);
-	border-bottom:1px solid rgb(185,185,185);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Add.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Add.png
deleted file mode 100644
index 35fd8ed..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Add.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/ArrowDown.png b/tools/ArtistTools/source/BlastPlugin/UI/images/ArrowDown.png
deleted file mode 100644
index 9b55420..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/ArrowDown.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/ArrowUp.png b/tools/ArtistTools/source/BlastPlugin/UI/images/ArrowUp.png
deleted file mode 100644
index fea1fbe..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/ArrowUp.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Asset.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Asset.png
deleted file mode 100644
index d44806f..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Asset.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/AssetComposite.png b/tools/ArtistTools/source/BlastPlugin/UI/images/AssetComposite.png
deleted file mode 100644
index 86dd5d2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/AssetComposite.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnBomb.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnBomb.png
deleted file mode 100644
index 354ba1f..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnBomb.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnDamage.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnDamage.png
deleted file mode 100644
index 1fa8e7e..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnDamage.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnDropObject.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnDropObject.png
deleted file mode 100644
index 82e3945..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnDropObject.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnExplodedViewTool.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnExplodedViewTool.png
deleted file mode 100644
index 31a1520..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnExplodedViewTool.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnExportFilepath.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnExportFilepath.png
deleted file mode 100644
index 6f10fc6..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnExportFilepath.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnFrameStepForward.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnFrameStepForward.png
deleted file mode 100644
index e20352e..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnFrameStepForward.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnFuseSelectedChunks.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnFuseSelectedChunks.png
deleted file mode 100644
index c7f35ef..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnFuseSelectedChunks.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnGizmoWithGlobal.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnGizmoWithGlobal.png
deleted file mode 100644
index ba8ccdb..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnGizmoWithGlobal.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnGizmoWithLocal.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnGizmoWithLocal.png
deleted file mode 100644
index 329f02f..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnGizmoWithLocal.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnJointsTool.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnJointsTool.png
deleted file mode 100644
index 63a9bfd..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnJointsTool.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnPaintbrush.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnPaintbrush.png
deleted file mode 100644
index 797dd2c..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnPaintbrush.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnPreferences.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnPreferences.png
deleted file mode 100644
index 6b9bb07..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnPreferences.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnProjectile.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnProjectile.png
deleted file mode 100644
index bd17d36..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnProjectile.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnReset.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnReset.png
deleted file mode 100644
index 52522df..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnReset.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnRotate.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnRotate.png
deleted file mode 100644
index acf2348..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnRotate.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnScale.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnScale.png
deleted file mode 100644
index 773de30..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnScale.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnSelectTool.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnSelectTool.png
deleted file mode 100644
index 07a8489..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnSelectTool.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnSimulatePlay.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnSimulatePlay.png
deleted file mode 100644
index 92269bb..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnSimulatePlay.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnTranslate.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnTranslate.png
deleted file mode 100644
index 3090384..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Blast_ToolBar_btnTranslate.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Bond.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Bond.png
deleted file mode 100644
index 6f632c2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Bond.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/CheckBox.png b/tools/ArtistTools/source/BlastPlugin/UI/images/CheckBox.png
deleted file mode 100644
index ac53487..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/CheckBox.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Chunk_Support_Static.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Chunk_Support_Static.png
deleted file mode 100644
index 6fa5c90..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Chunk_Support_Static.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Chunk_Support_Unstatic.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Chunk_Support_Unstatic.png
deleted file mode 100644
index 819b2f5..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Chunk_Support_Unstatic.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Chunk_UnSupport_UnStatic.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Chunk_UnSupport_UnStatic.png
deleted file mode 100644
index 8530dc1..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Chunk_UnSupport_UnStatic.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/CurveEditor.png b/tools/ArtistTools/source/BlastPlugin/UI/images/CurveEditor.png
deleted file mode 100644
index f92c6e4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/CurveEditor.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/DarkBorder.png b/tools/ArtistTools/source/BlastPlugin/UI/images/DarkBorder.png
deleted file mode 100644
index 9771804..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/DarkBorder.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Down.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Down.png
deleted file mode 100644
index 376a821..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Down.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/EditWrench.png b/tools/ArtistTools/source/BlastPlugin/UI/images/EditWrench.png
deleted file mode 100644
index 563a602..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/EditWrench.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/ExpanCollapse.png b/tools/ArtistTools/source/BlastPlugin/UI/images/ExpanCollapse.png
deleted file mode 100644
index 9edf959..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/ExpanCollapse.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Pen.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Pen.png
deleted file mode 100644
index aaee27d..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Pen.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Projectile.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Projectile.png
deleted file mode 100644
index 859c9f2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Projectile.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Refresh_icon.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Refresh_icon.png
deleted file mode 100644
index c189dd5..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Refresh_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Remove_icon.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Remove_icon.png
deleted file mode 100644
index ebb63d9..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Remove_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Select.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Select.png
deleted file mode 100644
index 8f89717..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Select.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/TextureBox.bmp b/tools/ArtistTools/source/BlastPlugin/UI/images/TextureBox.bmp
deleted file mode 100644
index 43f95b2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/TextureBox.bmp
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/TextureDisabled_icon.png b/tools/ArtistTools/source/BlastPlugin/UI/images/TextureDisabled_icon.png
deleted file mode 100644
index 3a727f4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/TextureDisabled_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/TextureEnabled_icon.png b/tools/ArtistTools/source/BlastPlugin/UI/images/TextureEnabled_icon.png
deleted file mode 100644
index a8f11d5..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/TextureEnabled_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/TextureIsUsed_icon.png b/tools/ArtistTools/source/BlastPlugin/UI/images/TextureIsUsed_icon.png
deleted file mode 100644
index 75d52dc..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/TextureIsUsed_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/Up.png b/tools/ArtistTools/source/BlastPlugin/UI/images/Up.png
deleted file mode 100644
index 6f8903c..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/Up.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/importFile.png b/tools/ArtistTools/source/BlastPlugin/UI/images/importFile.png
deleted file mode 100644
index e4ffc91..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/importFile.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/openFile.png b/tools/ArtistTools/source/BlastPlugin/UI/images/openFile.png
deleted file mode 100644
index b91e69c..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/openFile.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/playlist.png b/tools/ArtistTools/source/BlastPlugin/UI/images/playlist.png
deleted file mode 100644
index 3c6db13..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/playlist.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/refreshReload.png b/tools/ArtistTools/source/BlastPlugin/UI/images/refreshReload.png
deleted file mode 100644
index 745c9cb..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/refreshReload.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/saveDisc.png b/tools/ArtistTools/source/BlastPlugin/UI/images/saveDisc.png
deleted file mode 100644
index c0dc719..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/saveDisc.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/simulationPlay.png b/tools/ArtistTools/source/BlastPlugin/UI/images/simulationPlay.png
deleted file mode 100644
index e5bc551..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/simulationPlay.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/simulationStep.png b/tools/ArtistTools/source/BlastPlugin/UI/images/simulationStep.png
deleted file mode 100644
index 8ab9e49..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/simulationStep.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/simulationStop.png b/tools/ArtistTools/source/BlastPlugin/UI/images/simulationStop.png
deleted file mode 100644
index 8576b5b..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/simulationStop.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/transportLoop.png b/tools/ArtistTools/source/BlastPlugin/UI/images/transportLoop.png
deleted file mode 100644
index 3e13e2f..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/transportLoop.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/transportPlay.png b/tools/ArtistTools/source/BlastPlugin/UI/images/transportPlay.png
deleted file mode 100644
index e5e593e..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/transportPlay.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/transportRewind.png b/tools/ArtistTools/source/BlastPlugin/UI/images/transportRewind.png
deleted file mode 100644
index 95664d2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/transportRewind.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/transportStepForward.png b/tools/ArtistTools/source/BlastPlugin/UI/images/transportStepForward.png
deleted file mode 100644
index 4d35753..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/transportStepForward.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/transportStop.png b/tools/ArtistTools/source/BlastPlugin/UI/images/transportStop.png
deleted file mode 100644
index 27f3cbd..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/transportStop.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/visibilityToggle_notVisible.png b/tools/ArtistTools/source/BlastPlugin/UI/images/visibilityToggle_notVisible.png
deleted file mode 100644
index 56b24fe..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/visibilityToggle_notVisible.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/UI/images/visibilityToggle_visible.png b/tools/ArtistTools/source/BlastPlugin/UI/images/visibilityToggle_visible.png
deleted file mode 100644
index 3e5a88e..0000000
--- a/tools/ArtistTools/source/BlastPlugin/UI/images/visibilityToggle_visible.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/BlastSceneTree.cpp b/tools/ArtistTools/source/BlastPlugin/Window/BlastSceneTree.cpp
deleted file mode 100644
index ab0ca85..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/BlastSceneTree.cpp
+++ /dev/null
@@ -1,2678 +0,0 @@
-#include "BlastSceneTree.h"
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QShortcut>
-#include <QtCore/QFileInfo>
-#include <QtGui/qevent.h>
-#include <QtGui/QPainter>
-#include <assert.h>
-#include "ProjectParams.h"
-#include <SimpleScene.h>
-#include <BlastController.h>
-#include "SelectionToolController.h"
-#include "GizmoToolController.h"
-#include <SceneController.h>
-#include <NvBlastExtPxAsset.h>
-#include <NvBlastTkAsset.h>
-#include <NvBlastAsset.h>
-#include <BlastFamilyModelSimple.h>
-#include "GlobalSettings.h"
-#include <deque>
-#include "ViewerOutput.h"
-
-static QIcon sCompositeIcon;
-static QIcon sAssetIcon;
-static QIcon sChunkUUIcon;
-static QIcon sChunkSUIcon;
-static QIcon sChunkSSIcon;
-static QIcon sBondIcon;
-static QIcon sProjectileIcon;
-
-static QPixmap sVisibleIcon		= QPixmap(":/AppMainWindow/images/visibilityToggle_visible.png").scaled(QSize(24, 24), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-static QPixmap sInVisibleIcon	= QPixmap(":/AppMainWindow/images/visibilityToggle_notVisible.png").scaled(QSize(24, 24), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-
-class BlastSceneTreeDataLock
-{
-public:
-	BlastSceneTreeDataLock()
-	{
-		BlastSceneTree::ins()->_updateData = false;
-	}
-	~BlastSceneTreeDataLock()
-	{
-		BlastSceneTree::ins()->_updateData = true;
-	}
-};
-
-#if 0
-bool isChunkVisible(std::vector<BlastFamily*>& fs, uint32_t chunkIndex)
-{
-	int fsSize = fs.size();
-	if (fsSize == 0)
-	{
-		return false;
-	}
-
-	bool visible = false;
-	for (int i = 0; i < fsSize; i++)
-	{
-		if (fs[i]->isChunkVisible(chunkIndex))
-		{
-			visible = true;
-			break;
-		}
-	}
-	return visible;
-}
-#endif
-
-void setChunkVisible(std::vector<BlastFamily*>& fs, uint32_t chunkIndex, bool visible)
-{
-	int fsSize = fs.size();
-	if (fsSize == 0)
-	{
-		return;
-	}
-
-	for (int i = 0; i < fsSize; i++)
-	{
-		fs[i]->setChunkVisible(chunkIndex, visible);
-	}
-}
-
-void setChunkSelected(std::vector<BlastFamily*>& fs, uint32_t chunkIndex, bool selected)
-{
-	int fsSize = fs.size();
-	if (fsSize == 0)
-	{
-		return;
-	}
-
-	for (int i = 0; i < fsSize; i++)
-	{
-		BlastFamily* bf = fs[i];
-		if(bf)
-			bf->setChunkSelected(chunkIndex, selected);
-	}
-}
-
-void BlastNode::traverse(BlastVisitorBase& visitor)
-{
-	visitor.visit(this);
-
-	for (BlastNode* node : children)
-	{
-		if (!visitor.continueTraversing())
-			break;
-
-		node->traverse(visitor);
-	}
-}
-
-void BlastChunkNode::setVisible(bool val)
-{
-	BPPChunk* pBPPChunk = (BPPChunk*)getData();
-	pBPPChunk->visible = val;
-
-	BlastAsset* pBlastAsset = (BlastAsset*)_assetPtr;
-
-	SampleManager& sampleManager = SimpleScene::Inst()->GetSampleManager();
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = sampleManager.getAssetFamiliesMap();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator it = AssetFamiliesMap.find(pBlastAsset);
-	if (it == AssetFamiliesMap.end())
-	{
-		return;
-	}
-
-	std::vector<BlastFamily*>& fs = it->second;
-	setChunkVisible(fs, pBPPChunk->ID, val);
-}
-
-void BlastChunkNode::setSelected(bool val)
-{
-	BPPChunk* pBPPChunk = (BPPChunk*)getData();
-
-	BlastAsset* pBlastAsset = (BlastAsset*)_assetPtr;
-
-	SampleManager& sampleManager = SimpleScene::Inst()->GetSampleManager();
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = sampleManager.getAssetFamiliesMap();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator it = AssetFamiliesMap.find(pBlastAsset);
-	if (it == AssetFamiliesMap.end())
-	{
-		return;
-	}
-
-	std::vector<BlastFamily*>& fs = it->second;
-	setChunkSelected(fs, pBPPChunk->ID, val);
-}
-
-void BlastAssetNode::setSelected(bool val)
-{
-	BPPAsset* pBPPAsset = (BPPAsset*)getData();
-	std::string strAsset = pBPPAsset->name.buf;
-
-	BlastAsset* pBlastAsset = nullptr;
-	SampleManager& sampleManager = SimpleScene::Inst()->GetSampleManager();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = sampleManager.getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itAssetDescMap;
-	for (itAssetDescMap = AssetDescMap.begin();
-	itAssetDescMap != AssetDescMap.end(); itAssetDescMap++)
-	{
-		AssetList::ModelAsset& model = itAssetDescMap->second;
-		if (model.name == strAsset)
-		{
-			pBlastAsset = itAssetDescMap->first;
-			break;
-		}
-	}
-
-	sampleManager.setCurrentSelectedInstance(pBlastAsset, -1);
-	
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = sampleManager.getAssetFamiliesMap();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itAFM = AssetFamiliesMap.find(pBlastAsset);
-	if (itAFM == AssetFamiliesMap.end())
-	{
-		return;
-	}
-	std::vector<BlastFamily*>& fs = itAFM->second;
-	for (BlastFamily* pBlastFamily : fs)
-	{
-		pBlastFamily->highlightChunks();
-	}
-}
-
-bool BlastProjectileNode::getVisible()
-{
-	return SampleManager::ins()->getSceneController().getProjectileVisible((PhysXSceneActor*)getData());
-}
-
-void BlastProjectileNode::setVisible(bool val)
-{
-	SampleManager::ins()->getSceneController().setProjectileVisible((PhysXSceneActor*)getData(), val);
-}
-
-void BlastAssetInstanceNode::setSelected(bool val)
-{
-	BPPAssetInstance* pBPPAssetInstance = (BPPAssetInstance*)getData();	
-	if (pBPPAssetInstance == nullptr)
-		return;
-	std::string name = pBPPAssetInstance->name.buf;
-
-	std::string strAsset = name.substr(0, name.find_last_of("_"));
-	BlastAsset* pBlastAsset = nullptr;
-	SampleManager& sampleManager = SimpleScene::Inst()->GetSampleManager();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = sampleManager.getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itAssetDescMap;
-	for (itAssetDescMap = AssetDescMap.begin();
-		itAssetDescMap != AssetDescMap.end(); itAssetDescMap++)
-	{
-		AssetList::ModelAsset& model = itAssetDescMap->second;
-		if (model.name == strAsset)
-		{
-			pBlastAsset = itAssetDescMap->first;
-			break;
-		}
-	}
-
-	std::string strIndex = name.substr(name.find_last_of("_") + 1);
-	int nIndex = atoi(strIndex.c_str());	
-
-	sampleManager.setCurrentSelectedInstance(pBlastAsset, nIndex);
-
-	std::vector<BlastFamily*> fs = { SampleManager::ins()->getFamilyByInstance(pBPPAssetInstance) };
-	setChunkSelected(fs, 0, val);
-}
-
-BlastTreeData& BlastTreeData::ins()
-{
-	static BlastTreeData _ins;
-	return _ins;
-}
-
-bool BlastTreeData::isChild(BlastChunkNode* parent, BlastChunkNode* child)
-{
-	if (parent == nullptr || child == nullptr)
-		return false;
-
-	BlastNode* curParent = child->getParent();
-	while (eChunk == curParent->getType() && curParent != nullptr)
-	{
-		if (curParent == parent)
-			return true;
-		curParent = curParent->getParent();
-	}
-
-	return false;
-}
-
-std::vector<BlastChunkNode*> BlastTreeData::getTopChunkNodes(std::vector<BlastChunkNode*>& nodes)
-{
-	std::vector<BlastChunkNode*> result;
-
-	for (size_t i = 0; i < nodes.size(); ++i)
-	{
-		bool isCurNodeTop = true;
-		for (size_t j = 0; j < nodes.size(); ++j)
-		{
-			if (i != j && isChild(nodes[j], nodes[i]))
-			{
-				isCurNodeTop = false;
-				break;
-			}
-		}
-
-		if (isCurNodeTop)
-		{
-			result.push_back(nodes[i]);
-		}
-	}
-
-	return result;
-}
-
-int BlastTreeData::getDepth(BlastNode* node)
-{
-	int depth = -1; // here it's from -1 because it traverse from Blast asset node
-	while (nullptr != node && (eBond == node->getType() || eChunk == node->getType()))
-	{
-		++depth;
-		node = node->getParent();
-	}
-
-	return depth;
-}
-
-bool BlastTreeData::isRoot(BlastChunkNode* node)
-{
-	if (node == nullptr || node->getParent() == nullptr)
-		return false;
-
-	return eAsset == node->getParent()->getType();
-}
-
-bool BlastTreeData::isLeaf(BlastChunkNode* node)
-{
-	if (node == nullptr)
-		return false;
-
-	for (BlastNode* curNode : node->children)
-	{
-		if (eChunk == curNode->getType())
-			return false;
-	}
-
-	return true;
-}
-
-void removeChunkNodeSupport(BlastChunkNode* node)
-{
-	if (node == nullptr)
-		return;
-
-	BPPChunk* chunk = static_cast<BPPChunk*>(node->getData());
-	chunk->support = false;
-	chunk->staticFlag = false;
-
-	for (BlastNode* curNode : node->children)
-	{
-		if (eChunk == curNode->getType())
-		{
-			removeChunkNodeSupport((BlastChunkNode*)curNode);
-		}
-	}
-}
-
-void setAncestorSupportFlag(BlastChunkNode* ancestor, BlastChunkNode* startChild)
-{
-	if (nullptr == ancestor || nullptr == startChild)
-		return;
-
-	{
-		BPPChunk* bppChunk = (BPPChunk*)(ancestor->getData());
-		bppChunk->support = false;
-		bppChunk->staticFlag = false;
-	}
-
-	std::deque<BlastChunkNode*> ancestors;
-	for (BlastNode* node : ancestor->children)
-	{
-		if (eChunk == node->getType())
-		{
-			ancestors.push_back(static_cast<BlastChunkNode*>(node));
-		}
-	}
-
-	while (ancestors.size() > 0)
-	{
-		BlastChunkNode* curAncestor = ancestors.front();
-		ancestors.pop_front();
-
-		bool isChild = BlastTreeData::isChild(curAncestor, startChild);
-		if (isChild)
-		{
-			if (curAncestor != startChild)
-			{
-				for (BlastNode* node : curAncestor->children)
-				{
-					if (eChunk == node->getType())
-					{
-						ancestors.push_back(static_cast<BlastChunkNode*>(node));
-					}
-				}
-			}
-		}
-		else
-		{
-			BPPChunk* bppChunk = (BPPChunk*)(curAncestor->getData());
-			bppChunk->support = true;
-			bppChunk->staticFlag = false;
-		}
-	}
-}
-
-void BlastTreeData::makeSupport(BlastChunkNode* node)
-{
-	if (node == nullptr)
-		return;
-
-	// 1 set flag for current node
-	BPPChunk* chunk = static_cast<BPPChunk*>(node->getData());
-	chunk->staticFlag = false;
-	chunk->support = true;
-
-	// 2 set flag for ancestors
-	BlastChunkNode* supportAncestor = ins().getSupportAncestor(node);
-	if (supportAncestor)
-	{
-		setAncestorSupportFlag(supportAncestor, node);
-	}
-
-	// 3 set flag for children
-	for (BlastNode* curNode : node->children)
-	{
-		if (eChunk == curNode->getType())
-		{
-			removeChunkNodeSupport((BlastChunkNode*)curNode);
-		}
-	}
-}
-
-void BlastTreeData::makeStaticSupport(BlastChunkNode* node)
-{
-	if (node == nullptr)
-		return;
-
-	// 1 set flag for current node
-	BPPChunk* chunk = static_cast<BPPChunk*>(node->getData());
-	chunk->staticFlag = true;
-	chunk->support = true;
-
-	// 2 set flag for ancestors
-	BlastChunkNode* supportAncestor = ins().getSupportAncestor(node);
-	if (supportAncestor)
-	{
-		setAncestorSupportFlag(supportAncestor, node);
-	}
-
-	// 3 set flag for children
-	for (BlastNode* curNode : node->children)
-	{
-		if (eChunk == curNode->getType())
-		{
-			removeChunkNodeSupport((BlastChunkNode*)curNode);
-		}
-	}
-}
-
-void BlastTreeData::removeSupport(BlastChunkNode* node)
-{
-	if (node == nullptr)
-		return;
-
-	if (isLeaf(node))
-		return;
-
-	BPPChunk* chunk = static_cast<BPPChunk*>(node->getData());
-	chunk->support = false;
-	chunk->staticFlag = false;
-
-	for (BlastNode* curNode : node->children)
-	{
-		if (eChunk == curNode->getType())
-		{
-			BPPChunk* curChunk = static_cast<BPPChunk*>(curNode->getData());
-			curChunk->support = true;
-			curChunk->staticFlag = false;
-		}
-	}
-}
-
-std::string BlastTreeData::getAssetName(BlastAsset* asset)
-{
-	std::map<BlastAsset*, AssetList::ModelAsset>& assetDescMap = SampleManager::ins()->getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itrAssetDesc = assetDescMap.find(asset);
-
-	if (itrAssetDesc != assetDescMap.end())
-	{
-		return itrAssetDesc->second.name;
-	}
-
-	return "";
-}
-
-BlastAsset* BlastTreeData::getAsset(std::string assetName)
-{
-	std::map<BlastAsset*, AssetList::ModelAsset>& assetDescMap = SampleManager::ins()->getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itrAssetDesc = assetDescMap.begin();
-	for (; itrAssetDesc != assetDescMap.end(); ++itrAssetDesc)
-	{
-		if (itrAssetDesc->second.name == assetName)
-		{
-			return itrAssetDesc->first;
-		}
-	}
-
-	return nullptr;
-}
-
-BlastNode* BlastTreeData::getBlastNodeByProjectData(void* data)
-{
-	std::map<void*, BlastNode*>::iterator itr = _blastProjectDataToNodeMap.find(data);
-	if (itr != _blastProjectDataToNodeMap.end())
-		return itr->second;
-
-	return nullptr;
-}
-
-struct ChunkSupport
-{
-	ChunkSupport()
-	{
-		m_bSupport = false;
-	}
-
-	bool m_bSupport;
-};
-
-struct BondChunkIndices
-{
-	BondChunkIndices()
-	{
-		chunkIndices[0] = -1;
-		chunkIndices[1] = -1;
-	}
-
-	void SetIndices(uint32_t chunkIndex0, uint32_t chunkIndex1)
-	{
-		if (chunkIndex0 < chunkIndex1)
-		{
-			chunkIndices[0] = chunkIndex0;
-			chunkIndices[1] = chunkIndex1;
-		}
-		else
-		{
-			chunkIndices[0] = chunkIndex1;
-			chunkIndices[1] = chunkIndex0;
-		}
-	}
-
-	uint32_t chunkIndices[2];
-};
-
-BlastAssetNode* BlastTreeData::addAsset(const BlastAsset* asset)
-{
-	//to do
-	return nullptr;
-}
-BlastAssetInstanceNode* BlastTreeData::addAssetInstance(const BlastAsset* asset)
-{
-	//to do
-	return nullptr;
-}
-
-void BlastTreeData::remove(const BlastAssetNode* node)
-{
-	//to do
-}
-
-void BlastTreeData::remove(const BlastAssetInstanceNode* node)
-{
-	//to do
-}
-
-BlastAssetInstanceNode* BlastTreeData::getAssetInstanceNode(BlastFamily* family)
-{
-	BPPAssetInstance* instance = SampleManager::ins()->getInstanceByFamily(family);
-	return getAssetInstanceNode(instance);
-}
-
-BlastAssetInstanceNode* BlastTreeData::getAssetInstanceNode(BPPAssetInstance* instance)
-{
-	if (nullptr == instance)
-		return nullptr;
-
-	for (BlastNode* node : _assetInstancesNode->children)
-	{
-		if ((BPPAssetInstance*)(node->getData()) == instance)
-		{
-			return (BlastAssetInstanceNode*)node;
-		}
-	}
-
-	return nullptr;
-}
-
-std::vector<BlastAssetInstanceNode*> BlastTreeData::getAssetInstanceNodes(BlastChunkNode* chunkNode)
-{
-	std::vector<BlastAssetInstanceNode*> instanceNodes;
-
-	if (nullptr == chunkNode)
-		return instanceNodes;
-
-	BlastAsset* asset = getAsset(chunkNode);
-
-	if (isRoot(chunkNode))
-	{
-		BPPAssetInstance* instance = (BPPAssetInstance*)(chunkNode->getData());
-
-		for (BlastNode* instanceNode : _assetInstancesNode->children)
-		{
-			BPPAssetInstance* instance = (BPPAssetInstance*)(instanceNode->getData());
-			BlastFamily* family = SampleManager::ins()->getFamilyByInstance(instance);
-			if (&(family->getBlastAsset()) == asset)
-				instanceNodes.push_back((BlastAssetInstanceNode*)instanceNode);
-		}
-	}
-
-	return instanceNodes;
-}
-
-void BlastTreeData::update()
-{
-	_freeBlastNode();
-
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-	std::vector<BlastAsset*> BlastAssetVec;
-	{
-		SampleManager& sampleManager = SimpleScene::Inst()->GetSampleManager();
-
-		std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = sampleManager.getAssetFamiliesMap();
-		std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = sampleManager.getAssetDescMap();
-		
-		BlastController& blastController = sampleManager.getBlastController();
-		SceneController& sceneController = sampleManager.getSceneController();
-
-		std::vector<BlastFamilyPtr>& families = blastController.getFamilies();
-		int familiesSize = families.size();
-
-		std::map<BlastAsset*, AssetList::ModelAsset>::iterator it;
-		for (it = AssetDescMap.begin(); it != AssetDescMap.end(); it++)
-		{
-			BlastAssetVec.push_back(it->first);
-		}
-		int modelAssetsSize = AssetDescMap.size();
-
-	}
-
-	BPPAssetArray& assetArray = blast.blastAssets;
-
-	int count = assetArray.arraySizes[0];
-	if (BlastAssetVec.size() != count)
-	{
-		return;
-	}
-	for (int c = 0; c < count; ++c)
-	{
-		BPPAsset& asset = assetArray.buf[c];
-		BlastAssetNode* assetNode = new BlastAssetNode(asset.name.buf, asset);
-		_assets.push_back(assetNode);
-		_blastProjectDataToNodeMap.insert(std::make_pair((void*)&asset, assetNode));
-
-		// get the firlst level chunks whose parentID is -1
-		std::vector<BPPChunk*> childChunks = BlastProject::ins().getChildrenChunks(asset, -1);
-
-		for (size_t i = 0; i < childChunks.size(); ++i)
-		{
-			BPPChunk& chunk = *(childChunks[i]);
-			BlastChunkNode* chunkNode = new BlastChunkNode(chunk.name.buf, chunk, BlastAssetVec[c]);
-			assetNode->children.push_back(chunkNode);
-			chunkNode->setParent(assetNode);
-			_blastProjectDataToNodeMap.insert(std::make_pair((void*)&chunk, chunkNode));
-			_addChunkNode(chunk, asset, chunkNode, BlastAssetVec[c]);
-		}
-	}
-
-	_assetInstancesNode = new BlastAssetInstancesNode("BlastAssetInstances");
-	_blastProjectDataToNodeMap.insert(std::make_pair(nullptr, _assetInstancesNode));
-	BPPAssetInstanceArray& assetInstanceArray = blast.blastAssetInstances;
-	count = assetInstanceArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		BPPAssetInstance& blastAssetInstance = assetInstanceArray.buf[i];
-		BlastAssetInstanceNode* blastAssetInstanceNode = new BlastAssetInstanceNode(blastAssetInstance.name.buf, blastAssetInstance);
-		_assetInstancesNode->children.push_back(blastAssetInstanceNode);
-		blastAssetInstanceNode->setParent(_assetInstancesNode);
-		_blastProjectDataToNodeMap.insert(std::make_pair((void*)&blastAssetInstance, blastAssetInstanceNode));
-	}
-
-	SceneController& sceneController = SampleManager::ins()->getSceneController();
-	std::vector<PhysXSceneActor*> projectiles = sceneController.getPrejectiles();
-	for (PhysXSceneActor* projectile : projectiles)
-	{
-		BlastProjectileNode* projectileNode = new BlastProjectileNode(sceneController.getProjectileName(projectile), projectile);
-		_projectiles.push_back(projectileNode);
-		_blastProjectDataToNodeMap.insert(std::make_pair((void*)&projectile, projectileNode));
-	}
-
-	//BPPGraphicsMeshArray& graphicsMeshArray = blast.graphicsMeshes;
-	//count = graphicsMeshArray.arraySizes[0];
-	//for (int i = 0; i < count; ++i)
-	//{
-	//	BPPGraphicsMesh& graphicsMesh = graphicsMeshArray.buf[i];
-	//	BlastGraphicsMeshNode* graphicsNode = new BlastGraphicsMeshNode(graphicsMesh.name.buf, graphicsMesh);
-	//	_graphicsMeshes.push_back(graphicsNode);
-	//}
-}
-
-BlastNode* BlastTreeData::getNodeByIndex(uint32_t assetIndex, uint32_t chunkIndex)
-{
-	BlastNode* pNode = nullptr;
-	BPPBlast& blast = BlastProject::ins().getParams().blast;
-	BPPAssetArray& assetArray = blast.blastAssets;
-	if (assetIndex < assetArray.arraySizes[0])
-	{
-		BPPAsset& asset = assetArray.buf[assetIndex];
-
-		std::vector<BPPChunk*> childChunks = BlastProject::ins().getChildrenChunks(asset);
-		if (chunkIndex < childChunks.size())
-		{
-			BPPChunk& chunk = *(childChunks[chunkIndex]);	
-			pNode = getBlastNodeByProjectData(&chunk);
-		}
-	}
-	return pNode;
-}
-
-void BlastTreeData::update(const BlastAsset* asset)
-{
-	//to do
-}
-
-BlastChunkNode* findChunkNode(BlastChunkNode* chunkNode, uint32_t chunkIndex)
-{
-	if (chunkNode == nullptr)
-		return nullptr;
-
-	if (((BPPChunk*)chunkNode->getData())->ID == chunkIndex)
-		return chunkNode;
-
-	std::vector<BlastNode*>& children = chunkNode->children;
-	for (size_t i = 0; i < children.size(); ++i)
-	{
-		BlastNode* node = children[i];
-		if (node->getType() == eChunk)
-		{
-			BlastChunkNode* chunkNode = findChunkNode(static_cast<BlastChunkNode*>(node), chunkIndex);
-			if (chunkNode)
-			{
-				return chunkNode;
-			}
-			else
-				continue;
-		}
-			
-		else
-			continue;
-	}
-
-	return nullptr;
-}
-
-BlastAsset* BlastTreeData::getAsset(BlastNode* node)
-{
-	if (nullptr == node)
-		return nullptr;
-
-	BlastNode* parent = node->getParent();
-	while (nullptr != parent)
-	{
-		node = parent;
-		parent = node->getParent();
-	}
-
-	if (eAsset == node->getType())
-	{
-		return getAsset(node->name);
-	}
-
-	return nullptr;
-}
-
-BlastAssetNode* BlastTreeData::getAssetNode(BlastAsset* asset)
-{
-	if (nullptr == asset)
-		return nullptr;
-
-	for (BlastAssetNode* node : _assets)
-	{
-		if (node->name == getAssetName(asset))
-			return node;
-	}
-
-	return nullptr;
-}
-
-std::vector<BlastChunkNode*> BlastTreeData::getChunkNodeByBlastChunk(const BlastAsset* asset, const std::vector<uint32_t>& chunkIndexes)
-{
-	std::vector<BlastChunkNode*> chunkNodes;
-	if (asset == nullptr || chunkIndexes.size() == 0)
-	{
-		return chunkNodes;
-	}
-
-	BlastAssetNode* assetNode = _getAssetNode(asset);
-	if (assetNode)
-	{
-		std::vector<BlastNode*>& children = assetNode->children;
-		for (BlastNode* node : children)
-		{
-			if (node->getType() == eChunk)
-			{
-				for (uint32_t chunkId : chunkIndexes)
-				{
-					BlastChunkNode* chunkNode = findChunkNode(static_cast<BlastChunkNode*>(node), chunkId);
-					if (chunkNode)
-					{
-						chunkNodes.push_back(chunkNode);
-					}
-				}
-			}
-		}
-	}
-
-	return chunkNodes;
-}
-
-std::vector<BlastNode*> _getNodesByDepth(BlastNode* curNode, uint32_t depth, int32_t curDepth)
-{
-	std::vector<BlastNode*> res;
-	if (depth == curDepth && curNode != nullptr)
-	{
-		res.push_back(curNode);
-	}
-	else if (curNode != nullptr)
-	{
-		for (BlastNode* node : curNode->children)
-		{
-			std::vector<BlastNode*> nodes = _getNodesByDepth(node, depth, curDepth + 1);
-			res.insert(res.begin(), nodes.begin(), nodes.end());
-		}
-	}
-
-	return res;
-}
-
-std::vector<BlastChunkNode*> BlastTreeData::getRootChunkNodeByInstance(const BlastAssetInstanceNode* node)
-{
-	std::vector<BlastChunkNode*> chunks;
-	if (nullptr != node)
-	{
-		const BPPAssetInstance* pBPPAssetInstance = (BPPAssetInstance*)(const_cast<BlastAssetInstanceNode*>(node)->getData());
-		BlastFamily* family = SampleManager::ins()->getFamilyByInstance(const_cast<BPPAssetInstance*>(pBPPAssetInstance));
-		if (family)
-		{
-			const BlastAsset& asset = family->getBlastAsset();
-			BlastAssetNode* assetNode = getAssetNode(const_cast<BlastAsset*>(&asset));
-			if (assetNode)
-			{
-				for (BlastNode* curNode : assetNode->children)
-				{
-					if (eChunk == curNode->getType())
-					{
-						chunks.push_back((BlastChunkNode*)curNode);
-					}
-				}
-			}
-		}
-	}
-	return chunks;
-}
-
-std::vector<BlastNode*> BlastTreeData::getNodesByDepth(BlastAssetNode* node, uint32_t depth)
-{
-	return _getNodesByDepth(node, depth, -1); // here it's from -1 because it traverse from Blast asset node
-}
-
-std::vector<BlastNode*> BlastTreeData::getNodesByDepth(uint32_t depth)
-{
-	std::vector<BlastNode*> res;
-	for (BlastAssetNode* node : _assets)
-	{
-		std::vector<BlastNode*> nodes = getNodesByDepth(node, depth);
-		res.insert(res.begin(), nodes.begin(), nodes.end());
-	}
-	return res;
-}
-
-std::vector<BlastNode*> BlastTreeData::getNodesByDepth(std::vector<uint32_t> depths)
-{
-	std::vector<BlastNode*> res;
-	for (uint32_t depth : depths)
-	{
-		std::vector<BlastNode*> nodes = getNodesByDepth(depth);
-		res.insert(res.begin(), nodes.begin(), nodes.end());
-	}
-	return res;
-}
-
-std::vector<BlastChunkNode*> _getSupportChunkNodes(BlastNode* curNode)
-{
-	std::vector<BlastChunkNode*> res;
-	if (nullptr != curNode && eChunk == curNode->getType() && static_cast<BlastChunkNode*>(curNode)->isSupport())
-	{
-		res.push_back(static_cast<BlastChunkNode*>(curNode));
-	}
-	else if (curNode != nullptr)
-	{
-		for (BlastNode* node : curNode->children)
-		{
-			std::vector<BlastChunkNode*> nodes = _getSupportChunkNodes(node);
-			res.insert(res.begin(), nodes.begin(), nodes.end());
-		}
-	}
-
-	return res;
-}
-
-std::vector<BlastChunkNode*> BlastTreeData::getSupportChunkNodes(BlastAssetNode* node)
-{
-	return _getSupportChunkNodes(node);
-}
-
-std::vector<BlastChunkNode*> BlastTreeData::getSupportChunkNodes()
-{
-	std::vector<BlastChunkNode*> res;
-	for (BlastAssetNode* node : _assets)
-	{
-		std::vector<BlastChunkNode*> nodes = getSupportChunkNodes(node);
-		res.insert(res.begin(), nodes.begin(), nodes.end());
-	}
-	return res;
-}
-
-const std::vector<BlastNode*>& _getAllChunkNodes(std::vector<BlastNode*>& res, BlastNode* curNode)
-{
-	if (nullptr == curNode)
-		return res;
-	if (eChunk == curNode->getType())
-	{
-		res.push_back(static_cast<BlastNode*>(curNode));
-	}
-	for (BlastNode* node : curNode->children)
-	{
-		_getAllChunkNodes(res, node);
-	}
-
-	return res;
-}
-
-std::vector<BlastChunkNode*> BlastTreeData::getSiblingChunkNodes(BlastChunkNode* node)
-{
-	std::vector<BlastChunkNode*> res;
-
-	if (nullptr == node)
-		return res;
-
-	BlastNode* parent = node->getParent();
-	if (nullptr == parent || eChunk != parent->getType())
-	{
-		return res;
-	}
-
-	BlastChunkNode* chunkNodeParent = static_cast<BlastChunkNode*>(parent);
-
-	for (BlastNode* child : chunkNodeParent->children)
-	{
-		if (eChunk == child->getType() && child != node)
-			res.push_back(static_cast<BlastChunkNode*>(child));
-	}
-	return res;
-}
-
-BlastChunkNode* BlastTreeData::getSupportAncestor(BlastChunkNode* node)
-{
-	if (nullptr == node)
-		return nullptr;
-
-	BlastNode* parent = node->getParent();
-	while (parent && eChunk == parent->getType())
-	{
-		BlastChunkNode* chunkNodeParent = static_cast<BlastChunkNode*>(parent);
-		BPPChunk* bppChunk = (BPPChunk*)(chunkNodeParent->getData());
-		if (bppChunk->support)
-			return chunkNodeParent;
-		parent = chunkNodeParent->getParent();
-	}
-
-	return nullptr;
-}
-
-const std::vector<BlastNode*>& BlastTreeData::getAllChunkNodes(std::vector<BlastNode*>& res, BlastAssetNode* node)
-{
-	return _getAllChunkNodes(res, node);
-}
-
-const std::vector<BlastNode*>& BlastTreeData::getAllChunkNodes(std::vector<BlastNode*>& res)
-{
-	for (BlastAssetNode* node : _assets)
-	{
-		getAllChunkNodes(res, node);
-	}
-	return res;
-}
-
-const std::vector<BlastNode*>& _getAllLeavesChunkNodes(std::vector<BlastNode*>& res, BlastNode* curNode)
-{
-	if (nullptr == curNode)
-		return res;
-	if (eChunk == curNode->getType())
-	{
-		if (BlastTreeData::isLeaf(dynamic_cast<BlastChunkNode*>(curNode)))
-			res.push_back(curNode);
-	}
-	for (BlastNode* node : curNode->children)
-	{
-		_getAllLeavesChunkNodes(res, node);
-	}
-
-	return res;
-}
-
-const std::vector<BlastNode*>& BlastTreeData::getAllLeavesChunkNodes(std::vector<BlastNode*>& res, BlastAssetNode* node)
-{
-	return _getAllLeavesChunkNodes(res, node);
-}
-
-const std::vector<BlastNode*>& BlastTreeData::getAllLeavesChunkNodes(std::vector<BlastNode*>& res)
-{
-	for (BlastAssetNode* node : _assets)
-	{
-		getAllLeavesChunkNodes(res, node);
-	}
-	return res;
-}
-
-// start from -1 because asset also takes one level.
-const std::vector<BlastNode*>& _getChunkNodesFullCoverage(std::vector<BlastNode*>& res, BlastNode* curNode, int depth, int currDepth = -1)
-{
-	if (nullptr == curNode)
-		return res;
-	if (eChunk == curNode->getType())
-	{
-		if((currDepth == depth) || ((currDepth < depth) && BlastTreeData::isLeaf(dynamic_cast<BlastChunkNode*>(curNode))))
-			res.push_back(curNode);
-	}
-	if (currDepth < depth)
-	{
-		for (BlastNode* node : curNode->children)
-		{
-			_getChunkNodesFullCoverage(res, node, depth, currDepth + 1);
-		}
-	}
-
-	return res;
-}
-
-const std::vector<BlastNode*>& BlastTreeData::getChunkNodesFullCoverage(std::vector<BlastNode*>& res, BlastAssetNode* node, int depth)
-{
-	return _getChunkNodesFullCoverage(res, node, depth);
-}
-
-const std::vector<BlastNode*>& BlastTreeData::getChunkNodesFullCoverage(std::vector<BlastNode*>& res, int depth)
-{
-	for (BlastAssetNode* node : _assets)
-	{
-		getChunkNodesFullCoverage(res, node, depth);
-	}
-	return res;
-}
-
-bool isCompleteSupport(BlastChunkNode* node)
-{
-	if (node == nullptr)
-		return false;
-
-	if (node->isSupport())
-		return true;
-
-	const std::vector<BlastNode*>& children = node->children;
-	for (BlastNode* curNode : children)
-	{
-		if (eChunk == curNode->getType())
-		{
-			BlastChunkNode* chunkNode = (BlastChunkNode*)curNode;
-			if (0 == chunkNode->children.size())
-			{
-				if (!chunkNode->isSupport())
-					return false;
-			}
-
-			if (!isCompleteSupport(chunkNode))
-				return false;
-		}
-	}
-
-	return true;
-}
-
-bool BlastTreeData::isCompleteSupportAsset(const BlastAsset* asset)
-{
-	BlastAssetNode* assetNode = _getAssetNode(asset);
-	return isCompleteSupportAsset(assetNode);
-}
-
-bool BlastTreeData::isCompleteSupportAsset(const BlastAssetNode* node)
-{
-	if (node == nullptr)
-		return false;
-
-	const std::vector<BlastNode*>& children = node->children;
-	for (BlastNode* curNode : children)
-	{
-		if (eChunk == curNode->getType())
-		{
-			BlastChunkNode* chunkNode = (BlastChunkNode*)curNode;
-			if (!isCompleteSupport(chunkNode))
-				return false;
-		}
-	}
-
-	return true;
-}
-
-bool BlastTreeData::isOverlapSupportAsset(const BlastAsset* asset)
-{
-	BlastAssetNode* assetNode = _getAssetNode(asset);
-	return isOverlapSupportAsset(assetNode);
-}
-
-bool isOverlapSupport(BlastChunkNode* node)
-{
-	if (node == nullptr)
-		return false;
-
-	bool isParentSupport = node->isSupport();
-
-	const std::vector<BlastNode*>& children = node->children;
-	for (BlastNode* curNode : children)
-	{
-		if (eChunk == curNode->getType())
-		{
-			BlastChunkNode* chunkNode = (BlastChunkNode*)curNode;
-			if (0 == chunkNode->children.size())
-			{
-				if (isParentSupport && chunkNode->isSupport())
-					return true;
-			}
-
-			if (isParentSupport && isOverlapSupport(chunkNode))
-				return true;
-		}
-	}
-
-	return false;
-}
-
-bool BlastTreeData::isOverlapSupportAsset(const BlastAssetNode* node)
-{
-	if (node == nullptr)
-		return false;
-
-	const std::vector<BlastNode*>& children = node->children;
-	for (BlastNode* curNode : children)
-	{
-		if (eChunk == curNode->getType())
-		{
-			BlastChunkNode* chunkNode = (BlastChunkNode*)curNode;
-			if (isOverlapSupport(chunkNode))
-				return true;
-		}
-	}
-
-	return false;
-}
-
-void BlastTreeData::traverse(BlastVisitorBase& visitor)
-{
-	for (BlastAssetNode* assetNode : _assets)
-	{
-		if (!visitor.continueTraversing())
-			break;
-
-		assetNode->traverse(visitor);
-	}
-}
-
-BlastTreeData::BlastTreeData()
-{
-	_assetInstancesNode = new BlastAssetInstancesNode("BlastAssetInstances");
-
-	_blastProjectDataToNodeMap.clear();
-}
-
-void BlastTreeData::_addChunkNode(BPPChunk& parentData, BPPAsset& asset, BlastChunkNode* parentNode, void* assetPtr)
-{
-	if (parentNode == nullptr)
-	{
-		return;
-	}
-
-	std::vector<BPPBond*> bonds = BlastProject::ins().getBondsByChunk(asset, parentData.ID);
-	for (size_t i = 0; i < bonds.size(); ++i)
-	{
-		BPPBond* bond = bonds[i];
-		BlastBondNode* bondNode = new BlastBondNode(bond->name.buf, *bond);
-		parentNode->children.push_back(bondNode);
-		bondNode->setParent(parentNode);
-		_blastProjectDataToNodeMap.insert(std::make_pair((void*)bond, bondNode));
-	}
-
-	std::vector<BPPChunk*> childChunks = BlastProject::ins().getChildrenChunks(asset, parentData.ID);
-	for (size_t i = 0; i < childChunks.size(); ++i)
-	{
-		BPPChunk& chunk = *(childChunks[i]);
-		BlastChunkNode* chunkNode = new BlastChunkNode(chunk.name.buf, chunk, assetPtr);
-		parentNode->children.push_back(chunkNode);
-		chunkNode->setParent(parentNode);
-		_blastProjectDataToNodeMap.insert(std::make_pair((void*)&chunk, chunkNode));
-		_addChunkNode(chunk, asset, chunkNode, assetPtr);
-	}
-}
-
-void BlastTreeData::_removeChunkNode(BPPAsset& asset)
-{
-	std::vector<BPPChunk*> childChunks = BlastProject::ins().getChildrenChunks(asset);
-	int childChunksSize = childChunks.size();
-	for (size_t i = 0; i < childChunksSize; i++)
-	{
-		std::map<void*, BlastNode*>::iterator it = _blastProjectDataToNodeMap.find(childChunks[i]);
-		if (it == _blastProjectDataToNodeMap.end())
-		{
-			continue;
-		}
-
-		BlastNode* node = it->second;
-		_blastProjectDataToNodeMap.erase(it);
-		delete node;
-	}
-
-	std::vector<BPPBond*> childBonds = BlastProject::ins().getChildrenBonds(asset);
-	int childBondsSize = childBonds.size();
-	for (size_t i = 0; i < childBondsSize; i++)
-	{
-		std::map<void*, BlastNode*>::iterator it = _blastProjectDataToNodeMap.find(childBonds[i]);
-		if (it == _blastProjectDataToNodeMap.end())
-		{
-			continue;
-		}
-
-		BlastNode* node = it->second;
-		_blastProjectDataToNodeMap.erase(it);
-		delete node;
-	}
-}
-
-void freeChunkNode(BlastChunkNode* chunkNode)
-{
-	if (chunkNode == nullptr)
-		return;
-
-	std::vector<BlastNode*>& children = chunkNode->children;
-	for (size_t i = 0; i < children.size(); ++i)
-	{
-		BlastNode* node = children[i];
-		if (node->getType() == eChunk)
-			freeChunkNode(static_cast<BlastChunkNode*>(node));
-		else
-		{
-			delete node;
-			node = nullptr;
-		}
-	}
-
-	delete chunkNode;
-	chunkNode = nullptr;
-}
-
-void BlastTreeData::_freeBlastNode()
-{
-	if (_assetInstancesNode)
-	{
-		size_t count = _assetInstancesNode->children.size();
-		for (size_t i = 0; i < count; ++i)
-		{
-			delete _assetInstancesNode->children[i];
-		}
-		delete _assetInstancesNode;
-		_assetInstancesNode = nullptr;
-	}
-
-	size_t count = _assets.size();
-	for (size_t i = 0; i < count; ++i)
-	{
-		std::vector<BlastNode*>& children = _assets[i]->children;
-		for (size_t j = 0; j < children.size(); ++j)
-		{
-			freeChunkNode(static_cast<BlastChunkNode*>(children[j]));
-		}
-		delete _assets[i];
-	}
-	_assets.clear();
-
-	count = _projectiles.size();
-	for (size_t i = 0; i < count; ++i)
-	{
-		delete _projectiles[i];
-	}
-	_projectiles.clear();
-
-	count = _graphicsMeshes.size();
-	for (size_t i = 0; i < count; ++i)
-	{
-		delete _graphicsMeshes[i];
-	}
-	_graphicsMeshes.clear();
-
-	_blastProjectDataToNodeMap.clear();
-}
-
-BlastAssetNode* BlastTreeData::_getAssetNode(const BlastAsset* asset)
-{
-	std::map<BlastAsset*, AssetList::ModelAsset>& assetDescMap = SampleManager::ins()->getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itrAssetDesc = assetDescMap.find(const_cast<BlastAsset*>(asset));
-
-	BlastAssetNode* foundAssetNode = nullptr;
-	for (BlastAssetNode* assetNode : _assets)
-	{
-		if (itrAssetDesc->second.name == assetNode->name)
-		{
-			foundAssetNode = assetNode;
-			break;
-		}
-	}
-
-	return foundAssetNode;
-}
-
-QRect _getVisualIconArea(const QStyleOptionViewItem &option)
-{
-	int iconLen = option.rect.height() - 2;
-	return QRect(option.rect.right() - iconLen, option.rect.top() + 1, iconLen, iconLen);
-}
-
-BlastTreeViewDelegate::BlastTreeViewDelegate(QObject* parent, QStandardItemModel* model)
-	: QStyledItemDelegate(parent)
-	, _treeModel(model)
-{
-	setObjectName("BlastTreeViewDelegate");
-}
-
-void BlastTreeViewDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-	QStyledItemDelegate::paint(painter, option, index);
-
-	QStandardItem *treeItem = _treeModel->itemFromIndex(index);
-	BlastSceneTree* tree = BlastSceneTree::ins();
-	BlastNode* blastNode = tree->getBlastNodeByItem(treeItem);
-	PhysXSceneActor* projectileActor = tree->getProjectileActorByItem(treeItem);
-
-	if ((nullptr == blastNode && nullptr == projectileActor))
-		return;
-
-	if(nullptr != blastNode && eChunk != blastNode->getType() && eBond != blastNode->getType())
-		return;
-
-	if (nullptr != blastNode)
-		painter->drawPixmap(_getVisualIconArea(option), blastNode->getVisible() ? sVisibleIcon : sInVisibleIcon);
-	else if (nullptr != projectileActor)
-		painter->drawPixmap(_getVisualIconArea(option), SampleManager::ins()->getSceneController().getProjectileVisible(projectileActor) ? sVisibleIcon : sInVisibleIcon);
-}
-
-bool BlastTreeViewDelegate::editorEvent(QEvent* evt, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index)
-{
-	if (evt->type() == QEvent::MouseButtonRelease)
-	{
-		QMouseEvent* mouseEvt = (QMouseEvent*)evt;
-		if (_getVisualIconArea(option).contains(mouseEvt->pos()))
-		{
-			QStandardItem *treeItem = _treeModel->itemFromIndex(index);
-			BlastSceneTree* tree = BlastSceneTree::ins();
-			BlastNode* blastNode = tree->getBlastNodeByItem(treeItem);
-			PhysXSceneActor* projectileActor = tree->getProjectileActorByItem(treeItem);
-
-			if ((nullptr == blastNode && nullptr == projectileActor))
-				return QStyledItemDelegate::editorEvent(evt, model, option, index);
-
-			if (nullptr != blastNode && eChunk != blastNode->getType() && eBond != blastNode->getType())
-				return QStyledItemDelegate::editorEvent(evt, model, option, index);
-
-			if (nullptr != blastNode)
-			{
-				blastNode->setVisible(!blastNode->getVisible());
-			}
-			else if (nullptr != projectileActor)
-			{
-				SceneController& sceneController = SampleManager::ins()->getSceneController();
-				sceneController.setProjectileVisible(projectileActor, !sceneController.getProjectileVisible(projectileActor));
-			}
-
-			BlastSceneTree::ins()->update();
-			return true;
-		}
-	}
-	return QStyledItemDelegate::editorEvent(evt, model, option, index);
-}
-
-bool BlastTreeViewDelegate::eventFilter(QObject* object, QEvent* event)
-{
-	return true;
-}
-
-static BlastSceneTree* sBlastSceneTree = nullptr;
-BlastSceneTree* BlastSceneTree::ins()
-{
-	return sBlastSceneTree;
-}
-
-BlastSceneTree::BlastSceneTree(QWidget *parent)
-	: QDockWidget(parent)
-{
-	ui.setupUi(this);
-	_updateData = true;
-	sBlastSceneTree = this;
-
-	sCompositeIcon		= QIcon(":/AppMainWindow/images/AssetComposite.png");
-	sAssetIcon			= QIcon(":/AppMainWindow/images/Asset.png");
-	sChunkUUIcon		= QIcon(":/AppMainWindow/images/Chunk_Unsupport_Unstatic.png");
-	sChunkSUIcon		= QIcon(":/AppMainWindow/images/Chunk_Support_Unstatic.png");
-	sChunkSSIcon		= QIcon(":/AppMainWindow/images/Chunk_Support_Static.png");
-	sBondIcon			= QIcon(":/AppMainWindow/images/Bond.png");
-	sProjectileIcon		= QIcon(":/AppMainWindow/images/Projectile.png");
-
-	_treeModel = new QStandardItemModel();
-	ui.blastSceneTree->setModel(_treeModel);
-	QItemSelectionModel* selectionModel = ui.blastSceneTree->selectionModel();
-	connect(selectionModel, SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SLOT(on_blastSceneTree_itemSelectionChanged(const QItemSelection&, const QItemSelection&)));
-
-	BlastTreeViewDelegate* itemDelegate = new BlastTreeViewDelegate(ui.blastSceneTree, _treeModel);
-	ui.blastSceneTree->setItemDelegate((QAbstractItemDelegate*)itemDelegate);
-
-	ui.blastSceneTree->setStyleSheet("QTreeView::item{height:24px}");
-	ui.blastSceneTree->setContextMenuPolicy(Qt::CustomContextMenu);
-
-	_treeContextMenu = new QMenu(this);
-	_makeSupportAction = new QAction(tr("Make Support"), this);
-	_treeContextMenu->addAction(_makeSupportAction);
-	connect(_makeSupportAction, SIGNAL(triggered()), this, SLOT(onMakeSupportMenuItemClicked()));
-
-	_makeStaticSupportAction = new QAction(tr("Make Static Support"), this);
-	_treeContextMenu->addAction(_makeStaticSupportAction);
-	connect(_makeStaticSupportAction, SIGNAL(triggered()), this, SLOT(onMakeStaticSupportMenuItemClicked()));
-
-	_removeSupportAction = new QAction(tr("Remove Support"), this);
-	_treeContextMenu->addAction(_removeSupportAction);
-	connect(_removeSupportAction, SIGNAL(triggered()), this, SLOT(onRemoveSupportMenuItemClicked()));
-
-	_makeWorldAction = new QAction(tr("Make World"), this);
-	_treeContextMenu->addAction(_makeWorldAction);
-	connect(_makeWorldAction, SIGNAL(triggered()), this, SLOT(onMakeWorldMenuItemClicked()));
-
-	_removeWorldAction = new QAction(tr("Remove World"), this);
-	_treeContextMenu->addAction(_removeWorldAction);
-	connect(_removeWorldAction, SIGNAL(triggered()), this, SLOT(onRemoveWorldMenuItemClicked()));
-
-	//_bondChunksAction = new QAction(tr("Bond Chunks"), this);
-	//_treeContextMenu->addAction(_bondChunksAction);
-	//connect(_bondChunksAction, SIGNAL(triggered()), this, SLOT(onBondChunksMenuItemClicked()));
-
-
-	//_bondChunksWithJointsAction = new QAction(tr("Bond Chunks With Joints"), this);
-	//_treeContextMenu->addAction(_bondChunksWithJointsAction);
-	//connect(_bondChunksWithJointsAction, SIGNAL(triggered()), this, SLOT(onBondChunksWithJointsMenuItemClicked()));
-
-	//_removeAllBondsAction = new QAction(tr("Remove All Bonds"), this);
-	//_treeContextMenu->addAction(_removeAllBondsAction);
-	//connect(_removeAllBondsAction, SIGNAL(triggered()), this, SLOT(onRemoveAllBondsMenuItemClicked()));
-
-	QShortcut* shortCut;
-	shortCut = new QShortcut(QKeySequence("Alt+C"), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(onCollapseExpandClicked()));
-	/*
-	BlastAssetInstancesNode* assetInstancesNode = BlastTreeData::ins().getBlastAssetInstancesNode();
-	_compositeTreeItem = new QStandardItem();
-	_treeModel->appendRow(_compositeTreeItem);
-	_compositeTreeItem->setText(assetInstancesNode->name.c_str());
-	_compositeTreeItem->setIcon(sCompositeIcon);
-	_treeItemDataMap.insert(_compositeTreeItem, assetInstancesNode);
-	_treeDataItemMap.insert(assetInstancesNode, _compositeTreeItem);
-	*/
-
-	m_pNewBlastAsset = nullptr;
-	m_NewChunkIndexes.clear();
-}
-
-BlastSceneTree::~BlastSceneTree()
-{
-
-}
-
-void BlastSceneTree::updateValues(bool updataData)
-{
-	if (updataData)
-	{
-		BlastTreeData::ins().update();
-	}
-
-	std::map<BPPAssetInstance*, std::set<uint32_t>> selectChunks;
-
-	SelectionToolController* m_selectionToolController = &SampleManager::ins()->getSelectionToolController();
-	GizmoToolController*  m_gizmoToolController = &SampleManager::ins()->getGizmoToolController();
-	BlastController* m_blastController = &SampleManager::ins()->getBlastController();
-
-	if (m_selectionToolController->IsEnabled())
-	{
-		std::set<PxActor*> actors = m_selectionToolController->getTargetActors();
-		for (PxActor* actor : actors)
-		{
-			BlastFamily* pBlastFamily = m_blastController->getFamilyByPxActor(*actor);
-			if (pBlastFamily)
-			{
-				BPPAssetInstance* assetInstance = SampleManager::ins()->getInstanceByFamily(pBlastFamily);
-				uint32_t chunkIndex = pBlastFamily->getChunkIndexByPxActor(*actor);
-				selectChunks[assetInstance].insert(chunkIndex);
-			}
-		}
-	}
-	else if (m_gizmoToolController->IsEnabled())
-	{
-		PxActor* actor = m_gizmoToolController->getTargetActor();
-
-		if (actor)
-		{
-			BlastFamily* pBlastFamily = m_blastController->getFamilyByPxActor(*actor);
-			if (pBlastFamily)
-			{
-				BPPAssetInstance* assetInstance = SampleManager::ins()->getInstanceByFamily(pBlastFamily);
-				uint32_t chunkIndex = pBlastFamily->getChunkIndexByPxActor(*actor);
-				selectChunks[assetInstance].insert(chunkIndex);
-			}
-		}
-	}
-
-	_updateTreeUIs();
-
-	BlastSceneTreeDataLock lock;
-	std::set<PxActor*> actors;
-	for (std::map<BPPAssetInstance*, std::set<uint32_t>>::iterator itr = selectChunks.begin(); itr != selectChunks.end(); ++itr)
-	{
-		BlastFamily* family = SampleManager::ins()->getFamilyByInstance(itr->first);
-		std::set<uint32_t>& chunkIndexes = itr->second;
-
-		if (nullptr != family)
-		{
-			for (uint32_t chunkIndex : chunkIndexes)
-			{
-				PxActor* actor = nullptr;
-				family->getPxActorByChunkIndex(chunkIndex, &actor);
-
-				if (actor)
-					actors.insert(actor);
-			}
-		}
-	}
-
-	if (m_selectionToolController->IsEnabled())
-	{
-		m_selectionToolController->setTargetActors(actors);
-	}
-	else if (m_gizmoToolController->IsEnabled())
-	{
-		if (actors.size() > 0)
-			m_gizmoToolController->setTargetActor(*actors.begin());
-	}
-}
-
-void BlastSceneTree::clear()
-{
-	_treeModel->clear();
-	_treeItemDataMap.clear();
-	_treeDataItemMap.clear();
-
-	// notify no selection
-	std::vector<BlastNode*> nodes;
-	for (size_t i = 0; i < _observers.size(); ++i)
-	{
-		_observers[i]->dataSelected(nodes);
-	}
-}
-
-void BlastSceneTree::dataSelected(std::vector<BlastNode*> selections)
-{
-	for (size_t i = 0; i < selections.size(); ++i)
-	{
-		selectTreeItem(selections[i]);
-	}
-}
-
-void BlastSceneTree::addObserver(ISceneObserver* observer)
-{
-	std::vector<ISceneObserver*>::iterator itr = std::find(_observers.begin(), _observers.end(), observer);
-	if (itr == _observers.end())
-	{
-		_observers.push_back(observer);
-	}
-}
-
-void BlastSceneTree::removeObserver(ISceneObserver* observer)
-{
-	std::vector<ISceneObserver*>::iterator itr = std::find(_observers.begin(), _observers.end(), observer);
-	_observers.erase(itr);
-}
-
-void BlastSceneTree::updateVisible(uint32_t assetIndex, uint32_t chunkIndex, bool visible)
-{
-	BlastNode* node = BlastTreeData::ins().getNodeByIndex(assetIndex, chunkIndex);
-	if (node != nullptr && eChunk == node->getType())
-	{
-		static_cast<BlastChunkNode*>(node)->setVisible(visible);
-	}
-}
-
-void BlastSceneTree::updateChunkItemSelection()
-{
-	_updateData = false;
-
-	ui.blastSceneTree->clearSelection();
-	BlastTreeData& treeData = BlastTreeData::ins();
-	std::vector<BlastChunkNode*> chunkNodes;
-
-	std::map<BlastAsset*, std::vector<uint32_t>> selectedChunks = SampleManager::ins()->getSelectedChunks();
-	std::map<BlastAsset*, std::vector<uint32_t>>::iterator itrAssetSelectedChunks = selectedChunks.begin();
-	for (; itrAssetSelectedChunks != selectedChunks.end(); ++itrAssetSelectedChunks)
-	{
-		std::vector<BlastChunkNode*> aseetNodes = treeData.getChunkNodeByBlastChunk(itrAssetSelectedChunks->first, itrAssetSelectedChunks->second);
-		chunkNodes.insert(chunkNodes.end(), aseetNodes.begin(), aseetNodes.end());
-	}
-
-	for (BlastChunkNode* node : chunkNodes)
-	{
-		selectTreeItem(node, false);
-	}
-
-	_updateData = true;
-}
-
-void BlastSceneTree::makeSupport()
-{
-	std::vector<BlastChunkNode*> selectedChunkNodes;
-	QItemSelectionModel* selectionModel = ui.blastSceneTree->selectionModel();
-	QModelIndexList selectedIndexes = selectionModel->selectedIndexes();
-	for (int i = 0; i < selectedIndexes.count(); ++i)
-	{
-		QMap<QStandardItem*, BlastNode*>::iterator itr = _treeItemDataMap.find(_treeModel->itemFromIndex(selectedIndexes.at(i)));
-
-		if (eChunk == itr.value()->getType())
-		{
-			selectedChunkNodes.push_back((BlastChunkNode*)itr.value());
-		}
-	}
-
-	std::vector<BlastChunkNode*> topChunkNodes = BlastTreeData::getTopChunkNodes(selectedChunkNodes);
-	std::set<BlastAsset*> assets;
-	for (BlastChunkNode* chunkNode : topChunkNodes)
-	{
-		if (chunkNode->isSupport() && !((BPPChunk*)chunkNode->getData())->staticFlag)
-			continue;
-		BlastTreeData::makeSupport(chunkNode);
-		BlastAsset* pBlastAsset = BlastTreeData::ins().getAsset(chunkNode);
-		assets.insert(pBlastAsset);
-	}
-
-	if (0 == assets.size())
-		return;
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	for (BlastAsset* asset : assets)
-	{
-		pSampleManager->refreshAsset(asset);
-	}
-
-	return;
-}
-
-void BlastSceneTree::makeStaticSupport()
-{
-	std::vector<BlastChunkNode*> selectedChunkNodes;
-	QItemSelectionModel* selectionModel = ui.blastSceneTree->selectionModel();
-	QModelIndexList selectedIndexes = selectionModel->selectedIndexes();
-	for (int i = 0; i < selectedIndexes.count(); ++i)
-	{
-		QMap<QStandardItem*, BlastNode*>::iterator itr = _treeItemDataMap.find(_treeModel->itemFromIndex(selectedIndexes.at(i)));
-
-		if (eChunk == itr.value()->getType())
-		{
-			selectedChunkNodes.push_back((BlastChunkNode*)itr.value());
-		}
-	}
-
-	std::vector<BlastChunkNode*> topChunkNodes = BlastTreeData::getTopChunkNodes(selectedChunkNodes);
-	std::set<BlastAsset*> assets;
-	for (BlastChunkNode* chunkNode : topChunkNodes)
-	{
-		if (chunkNode->isSupport() && ((BPPChunk*)chunkNode->getData())->staticFlag)
-			continue;
-		BlastTreeData::makeStaticSupport(chunkNode);
-		BlastAsset* pBlastAsset = BlastTreeData::ins().getAsset(chunkNode);
-		assets.insert(pBlastAsset);
-	}
-
-	if (0 == assets.size())
-		return;
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	for (BlastAsset* asset : assets)
-	{
-		pSampleManager->refreshAsset(asset);
-	}
-
-	return;
-}
-
-void BlastSceneTree::removeSupport()
-{
-	std::vector<BlastChunkNode*> selectedChunkNodes;
-	QItemSelectionModel* selectionModel = ui.blastSceneTree->selectionModel();
-	QModelIndexList selectedIndexes = selectionModel->selectedIndexes();
-	for (int i = 0; i < selectedIndexes.count(); ++i)
-	{
-		QMap<QStandardItem*, BlastNode*>::iterator itr = _treeItemDataMap.find(_treeModel->itemFromIndex(selectedIndexes.at(i)));
-
-		if (eChunk == itr.value()->getType())
-		{
-			selectedChunkNodes.push_back((BlastChunkNode*)itr.value());
-		}
-	}
-
-	std::vector<BlastChunkNode*> topChunkNodes = BlastTreeData::getTopChunkNodes(selectedChunkNodes);
-	std::set<BlastAsset*> assets;
-	for (BlastChunkNode* chunkNode : topChunkNodes)
-	{
-		if (!chunkNode->isSupport() || BlastTreeData::isLeaf(chunkNode))
-			continue;
-		BlastTreeData::removeSupport(chunkNode);
-		BlastAsset* pBlastAsset = BlastTreeData::ins().getAsset(chunkNode);
-		assets.insert(pBlastAsset);
-	}
-
-	if (0 == assets.size())
-		return;
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	for (BlastAsset* asset : assets)
-	{
-		pSampleManager->refreshAsset(asset);
-	}
-
-	return;
-}
-
-void BlastSceneTree::makeWorld()
-{
-	std::vector<BlastBondNode*> selectedBondNodes;
-	QItemSelectionModel* selectionModel = ui.blastSceneTree->selectionModel();
-	QModelIndexList selectedIndexes = selectionModel->selectedIndexes();
-	for (int i = 0; i < selectedIndexes.count(); ++i)
-	{
-		QMap<QStandardItem*, BlastNode*>::iterator itr = _treeItemDataMap.find(_treeModel->itemFromIndex(selectedIndexes.at(i)));
-
-		if (eBond == itr.value()->getType())
-		{
-			selectedBondNodes.push_back((BlastBondNode*)itr.value());
-		}
-	}
-	if (selectedBondNodes.size() == 0)
-	{
-		return;
-	}
-
-	std::vector<BlastBondNode*>::iterator itSBN;
-	std::map<BlastAsset*, BlastAsset*> UniqueAssets;
-	for (itSBN = selectedBondNodes.begin(); itSBN != selectedBondNodes.end(); itSBN++)
-	{
-		BlastBondNode* node = *itSBN;
-
-		BPPBond* bond = static_cast<BPPBond*>(node->getData());
-		bond->toChunk = 0xFFFFFFFF;
-
-		BlastAsset* pBlastAsset = BlastTreeData::ins().getAsset(node);
-		UniqueAssets[pBlastAsset] = pBlastAsset;
-	}
-
-	
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, BlastAsset*>::iterator itUA;
-	for (itUA = UniqueAssets.begin(); itUA != UniqueAssets.end(); itUA++)
-	{
-		BlastAsset* pBlastAsset = itUA->second;
-		pSampleManager->refreshAsset(pBlastAsset);
-	}
-}
-
-void BlastSceneTree::removeWorld()
-{
-	std::vector<BlastBondNode*> selectedBondNodes;
-	QItemSelectionModel* selectionModel = ui.blastSceneTree->selectionModel();
-	QModelIndexList selectedIndexes = selectionModel->selectedIndexes();
-	for (int i = 0; i < selectedIndexes.count(); ++i)
-	{
-		QMap<QStandardItem*, BlastNode*>::iterator itr = _treeItemDataMap.find(_treeModel->itemFromIndex(selectedIndexes.at(i)));
-
-		if (eBond == itr.value()->getType())
-		{
-			selectedBondNodes.push_back((BlastBondNode*)itr.value());
-		}
-	}
-	if (selectedBondNodes.size() == 0)
-	{
-		return;
-	}
-
-	std::vector<BlastBondNode*>::iterator itSBN;
-	std::map<BlastAsset*, BlastAsset*> UniqueAssets;
-	for (itSBN = selectedBondNodes.begin(); itSBN != selectedBondNodes.end(); itSBN++)
-	{
-		BlastBondNode* node = *itSBN;
-
-		BPPBond* bond = static_cast<BPPBond*>(node->getData());
-		bond->toChunk = 0xFFFFFFFF - 1;
-
-		BlastAsset* pBlastAsset = BlastTreeData::ins().getAsset(node);
-		UniqueAssets[pBlastAsset] = pBlastAsset;
-	}
-
-	
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, BlastAsset*>::iterator itUA;
-	for (itUA = UniqueAssets.begin(); itUA != UniqueAssets.end(); itUA++)
-	{
-		BlastAsset* pBlastAsset = itUA->second;
-		pSampleManager->refreshAsset(pBlastAsset);
-	}
-}
-
-void BlastSceneTree::bondChunks()
-{
-
-}
-
-void BlastSceneTree::bondChunksWithJoints()
-{
-
-}
-
-void BlastSceneTree::removeAllBonds()
-{
-
-}
-
-void BlastSceneTree::setChunkSelected(std::vector<uint32_t> depths, bool selected)
-{
-	std::vector<BlastNode*> nodes = BlastTreeData::ins().getNodesByDepth(depths);
-	for (BlastNode* node : nodes)
-	{
-		if (eChunk == node->getType())
-		{
-			static_cast<BlastChunkNode*>(node)->setSelected(selected);
-			selectTreeItem(node);
-		}
-	}
-}
-
-void BlastSceneTree::setChunkVisible(std::vector<uint32_t> depths, bool bVisible)
-{
-	std::vector<BlastNode*> nodes = BlastTreeData::ins().getNodesByDepth(depths);
-	for (BlastNode* node : nodes)
-	{
-		if (eChunk == node->getType())
-		{
-			static_cast<BlastChunkNode*>(node)->setVisible(bVisible);
-		}
-	}
-}
-
-void BlastSceneTree::hideAllChunks()
-{
-	std::vector<BlastNode*> nodes;
-	BlastTreeData::ins().getAllChunkNodes(nodes);
-	for (BlastNode* node : nodes)
-	{
-		if (eChunk == node->getType())
-		{
-			static_cast<BlastChunkNode*>(node)->setVisible(false);
-		}
-	}
-}
-
-void BlastSceneTree::setChunkVisibleFullCoverage(int depth)
-{
-	std::vector<BlastNode*> nodes;
-	BlastTreeData::ins().getChunkNodesFullCoverage(nodes, depth);
-	for (BlastNode* node : nodes)
-	{
-		if (eChunk == node->getType())
-		{
-			static_cast<BlastChunkNode*>(node)->setVisible(true);
-		}
-	}
-}
-
-void BlastSceneTree::on_btnAsset_clicked()
-{
-    QMessageBox::information(NULL, "Blast Tool", "This feature isn't implemented currently!");
-}
-
-void BlastSceneTree::on_assetComposite_clicked()
-{
-    QMessageBox::information(NULL, "Blast Tool", "This feature isn't implemented currently!");
-}
-
-void BlastSceneTree::on_btnChunk_clicked()
-{
-    QMessageBox::information(NULL, "Blast Tool", "This feature isn't implemented currently!");
-}
-
-void BlastSceneTree::on_btnBond_clicked()
-{
-    QMessageBox::information(NULL, "Blast Tool", "This feature isn't implemented currently!");
-}
-
-void BlastSceneTree::on_btnProjectile_clicked()
-{
-    QMessageBox::information(NULL, "Blast Tool", "This feature isn't implemented currently!");
-}
-
-void BlastSceneTree::on_btnExpandCollapse_clicked()
-{
-	onCollapseExpandClicked();
-}
-
-void BlastSceneTree::on_blastSceneTree_customContextMenuRequested(const QPoint &pos)
-{
-	QItemSelectionModel* selectionModel = ui.blastSceneTree->selectionModel();
-	QModelIndexList selectedIndexes = selectionModel->selectedIndexes();
-
-	std::vector<BlastChunkNode*> chunkNodes;
-	std::vector<BlastBondNode*> bondNodes;
-	for (int i = 0; i < selectedIndexes.count(); ++i)
-	{
-		QMap<QStandardItem*, BlastNode*>::iterator itr = _treeItemDataMap.find(_treeModel->itemFromIndex(selectedIndexes.at(i)));
-		if (itr != _treeItemDataMap.end())
-		{
-			if (eChunk == itr.value()->getType())
-			{
-				chunkNodes.push_back((BlastChunkNode*)itr.value());
-			}
-			else if (eBond == itr.value()->getType())
-			{
-				bondNodes.push_back((BlastBondNode*)itr.value());
-			}
-		}
-	}
-
-	{
-		std::vector<BlastChunkNode*> topChunkNodes = BlastTreeData::getTopChunkNodes(chunkNodes);
-		_makeSupportAction->setEnabled(true);
-		_makeStaticSupportAction->setEnabled(true);
-		_removeSupportAction->setEnabled(true);
-		_makeWorldAction->setEnabled(true);
-		_removeWorldAction->setEnabled(true);
-
-		//select chunk nodes have parent child relation ship, disable all menu items
-		if (topChunkNodes.size() < chunkNodes.size())
-		{
-			_makeSupportAction->setEnabled(false);
-			_makeStaticSupportAction->setEnabled(false);
-			_removeSupportAction->setEnabled(false);
-		}
-		else
-		{
-			bool allSupported = true, allStaticSupport = true, allUnSupported = true, hasLeaf = false;
-
-			for (BlastChunkNode* chunkNode : chunkNodes)
-			{
-				BPPChunk* chunk = (BPPChunk*)(chunkNode->getData());
-				if (chunk->support)
-				{
-					allUnSupported = false;
-				}
-				else
-				{
-					allSupported = false;
-				}
-
-				if (!chunk->staticFlag)
-				{
-					allStaticSupport = false;
-				}
-
-				if (BlastTreeData::isLeaf(chunkNode))
-				{
-					hasLeaf = true;
-				}
-			}
-
-			if (allSupported && !allStaticSupport)
-			{
-				_makeSupportAction->setEnabled(false);
-			}
-
-			if (allStaticSupport)
-			{
-				_makeStaticSupportAction->setEnabled(false);
-			}
-
-			if (allUnSupported || hasLeaf)
-			{
-				_removeSupportAction->setEnabled(false);
-			}
-		}
-	}
-
-	if (chunkNodes.size() > 0 && bondNodes.size() > 0)
-	{
-		_makeSupportAction->setEnabled(false);
-		_makeStaticSupportAction->setEnabled(false);
-		_removeSupportAction->setEnabled(false);
-		_makeWorldAction->setEnabled(false);
-		_removeWorldAction->setEnabled(false);
-	}
-	else if (chunkNodes.size() > 0 && bondNodes.size() == 0)
-	{
-		_makeWorldAction->setEnabled(false);
-		_removeWorldAction->setEnabled(false);
-	}
-	else if (chunkNodes.size() == 0 && bondNodes.size() > 0)
-	{
-		_makeSupportAction->setEnabled(false);
-		_makeStaticSupportAction->setEnabled(false);
-		_removeSupportAction->setEnabled(false);
-	}
-
-	if (0 < chunkNodes.size() || 0 < bondNodes.size())
-	{
-		_treeContextMenu->exec(QCursor::pos());
-	}
-
-}
-
-void BlastSceneTree::on_blastSceneTree_itemSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
-{
-	if (!_updateData)
-		return;
-
-	SampleManager::ins()->clearChunksSelected();
-
-	QItemSelectionModel* selectionModel = ui.blastSceneTree->selectionModel();
-	QModelIndexList selectedIndexes = selectionModel->selectedIndexes();
-
-	std::vector<BlastNode*> nodes;
-	for (int i = 0; i < selectedIndexes.count(); ++i)
-	{
-		QMap<QStandardItem*, BlastNode*>::iterator itr = _treeItemDataMap.find(_treeModel->itemFromIndex(selectedIndexes.at(i)));
-		if (itr != _treeItemDataMap.end())
-		{
-			nodes.push_back(itr.value());
-
-			BlastNode* node = itr.value();
-			if (eChunk == node->getType())
-			{
-				((BlastChunkNode*)node)->setSelected(true);
-
-				if (BlastTreeData::isRoot((BlastChunkNode*)node))
-				{
-					std::vector<BlastAssetInstanceNode*> instanceNodes = BlastTreeData::ins().getAssetInstanceNodes((BlastChunkNode*)node);
-					for (BlastAssetInstanceNode* instanceNode : instanceNodes)
-					{
-						selectTreeItem(instanceNode, false);
-						nodes.push_back(instanceNode);
-					}
-				}
-			}
-			else if (eAssetInstance == node->getType())
-			{
-				((BlastAssetInstanceNode*)node)->setSelected(true);
-
-				BlastSceneTreeDataLock lock;
-				std::vector<BlastChunkNode*> chunkNodes = BlastTreeData::ins().getRootChunkNodeByInstance((BlastAssetInstanceNode*)node);
-				for (BlastChunkNode* chunkNode : chunkNodes)
-				{
-					selectTreeItem(chunkNode, false);
-					nodes.push_back(chunkNode);
-				}
-			}
-			else if (eAsset == node->getType())
-			{
-				((BlastAssetNode*)node)->setSelected(true);
-			}
-		}
-	}
-
-	for (size_t i = 0; i < _observers.size(); ++i)
-	{
-		_observers[i]->dataSelected(nodes);
-	}
-}
-
-void BlastSceneTree::onMakeSupportMenuItemClicked()
-{
-	makeSupport();
-}
-
-void BlastSceneTree::onMakeStaticSupportMenuItemClicked()
-{
-	makeStaticSupport();
-}
-
-void BlastSceneTree::onRemoveSupportMenuItemClicked()
-{
-	removeSupport();
-}
-
-void BlastSceneTree::onMakeWorldMenuItemClicked()
-{
-	makeWorld();
-}
-
-void BlastSceneTree::onRemoveWorldMenuItemClicked()
-{
-	removeWorld();
-}
-
-void BlastSceneTree::onBondChunksMenuItemClicked()
-{
-	bondChunks();
-}
-
-void BlastSceneTree::onBondChunksWithJointsMenuItemClicked()
-{
-	bondChunksWithJoints();
-}
-
-void BlastSceneTree::onRemoveAllBondsMenuItemClicked()
-{
-	removeAllBonds();
-}
-
-void BlastSceneTree::onCollapseExpandClicked()
-{
-	static bool expand = true;
-	if (expand)
-	{
-		ui.blastSceneTree->collapseAll();
-		expand = false;
-	}
-	else
-	{
-		ui.blastSceneTree->expandAll();
-		expand = true;
-	}
-}
-
-void BlastSceneTree::_updateTreeUIs()
-{
-#ifdef _DEBUG
-	static int gcounter = 0;
-	static char gbuf[128];
-	sprintf(gbuf, "_updateTreeUIs called %d", ++gcounter);
-	viewer_msg(gbuf);
-#endif
-	//ui.blastSceneTree->setUpdatesEnabled(false);
-	_treeModel->clear();
-	_treeItemDataMap.clear();
-	_treeDataItemMap.clear();
-
-	BlastAssetInstancesNode* assetInstancesNode = BlastTreeData::ins().getBlastAssetInstancesNode();
-	if (assetInstancesNode != nullptr)
-	{
-		QStandardItem* compositeTreeItem = new QStandardItem();
-		compositeTreeItem->setText(assetInstancesNode->name.c_str());
-		compositeTreeItem->setIcon(sCompositeIcon);
-		_treeItemDataMap.insert(compositeTreeItem, assetInstancesNode);
-		_treeDataItemMap.insert(assetInstancesNode, compositeTreeItem);
-		_treeModel->appendRow(compositeTreeItem);
-		size_t count = assetInstancesNode->children.size();
-		for (size_t i = 0; i < count; ++i)
-		{
-			BlastNode* assetInstanceNode = assetInstancesNode->children[i];
-			QStandardItem* assetInstanceItem = new QStandardItem();
-			compositeTreeItem->appendRow(assetInstanceItem);
-			assetInstanceItem->setText(assetInstanceNode->name.c_str());
-			if (assetInstanceNode->getType() == eAssetInstance)
-				assetInstanceItem->setIcon(QIcon(":/AppMainWindow/images/Asset.png"));
-			_treeItemDataMap.insert(assetInstanceItem, assetInstanceNode);
-			_treeDataItemMap.insert(assetInstanceNode, assetInstanceItem);
-		}
-	}
-
-	std::vector<BlastAssetNode*>& assets = BlastTreeData::ins().getAssetNodes();
-	size_t count = assets.size();
-	for (size_t i = 0; i < count; ++i)
-	{
-		BlastAssetNode* assetNode = assets[i];
-
-		QStandardItem* assetTreeWidgetItem = new QStandardItem();
-		_treeModel->appendRow(assetTreeWidgetItem);
-		assetTreeWidgetItem->setText(assetNode->name.c_str());
-		assetTreeWidgetItem->setIcon(sAssetIcon);
-		_treeItemDataMap.insert(assetTreeWidgetItem, assetNode);
-		_treeDataItemMap.insert(assetNode, assetTreeWidgetItem);
-
-		_addChunkUI(assetNode, assetTreeWidgetItem);
-	}
-
-	std::vector<BlastProjectileNode*>& projectiles = BlastTreeData::ins().getProjectileNodes();
-	count = projectiles.size();
-	for (int i = 0; i < count; ++i)
-	{
-		BlastProjectileNode* projectileNode = projectiles[i];
-
-		QStandardItem* projectileTreeItem = new QStandardItem();
-		_treeModel->appendRow(projectileTreeItem);
-		projectileTreeItem->setText(projectileNode->name.c_str());
-		projectileTreeItem->setIcon(sProjectileIcon);
-		_treeItemDataMap.insert(projectileTreeItem, projectileNode);
-		_treeDataItemMap.insert(projectileNode, projectileTreeItem);
-	}
-
-	std::vector<BlastGraphicsMeshNode*>& graphicsMeshes = BlastTreeData::ins().getGraphicsMeshNodes();
-	count = graphicsMeshes.size();
-	for (int i = 0; i < count; ++i)
-	{
-		BlastGraphicsMeshNode* graphicsMesheNode = graphicsMeshes[i];
-
-		QStandardItem* graphicsMesheTreeWidgetItem = new QStandardItem();
-		_treeModel->appendRow(graphicsMesheTreeWidgetItem);
-		graphicsMesheTreeWidgetItem->setText(graphicsMesheNode->name.c_str());
-		_treeItemDataMap.insert(graphicsMesheTreeWidgetItem, graphicsMesheNode);
-		_treeDataItemMap.insert(graphicsMesheNode, graphicsMesheTreeWidgetItem);
-	}
-
-	ui.blastSceneTree->expandAll();
-
-	// notify no selection
-	//std::vector<BlastNode*> nodes;
-	//for (size_t i = 0; i < _observers.size(); ++i)
-	//{
-	//	_observers[i]->dataSelected(nodes);
-	//}
-
-	bool autoSelectNewChunks = BlastProject::ins().getParams().fracture.general.autoSelectNewChunks;
-	if (!autoSelectNewChunks)
-	{
-		m_pNewBlastAsset = nullptr;
-		m_NewChunkIndexes.clear();
-		return;
-	}
-
-	if (m_pNewBlastAsset == nullptr || m_NewChunkIndexes.size() == 0)
-	{
-		return;
-	}
-
-	_updateData = false;
-	ui.blastSceneTree->clearSelection();
-	std::vector<BlastChunkNode*> chunkNodes =
-		BlastTreeData::ins().getChunkNodeByBlastChunk(m_pNewBlastAsset, m_NewChunkIndexes);
-	for (BlastChunkNode* node : chunkNodes)
-	{
-		node->setVisible(true);
-		selectTreeItem(node);
-	}
-
-	m_pNewBlastAsset = nullptr;
-	m_NewChunkIndexes.clear();
-
-	_updateData = true;
-}
-
-void BlastSceneTree::_addChunkUI(const BlastNode* parentNode, QStandardItem* parentTreeItem)
-{
-	if (parentNode != nullptr && parentTreeItem != nullptr)
-	{
-		for (size_t i = 0; i < parentNode->children.size(); ++i)
-		{
-			BlastNode* node = parentNode->children[i];
-			if (node == nullptr)
-				continue;
-
-			QStandardItem* treeWidgetItem = new QStandardItem();
-			parentTreeItem->appendRow(treeWidgetItem);
-
-			if (node->getType() == eChunk)
-			{
-				BlastChunkNode* chunkNode = static_cast<BlastChunkNode*>(node);
-				treeWidgetItem->setText(chunkNode->name.c_str());
-
-				BPPChunk* chunk = static_cast<BPPChunk*>(chunkNode->getData());
-				if (!chunk->support)
-				{
-					treeWidgetItem->setIcon(sChunkUUIcon);
-				}
-				else if (chunk->support && !chunk->staticFlag)
-				{
-					treeWidgetItem->setIcon(sChunkSUIcon);
-				}
-				else if (chunk->support && chunk->staticFlag)
-				{
-					treeWidgetItem->setIcon(sChunkSSIcon);
-				}
-
-				_addChunkUI(chunkNode, treeWidgetItem);
-			}
-			else if (node->getType() == eBond)
-			{
-				BlastBondNode* bond = static_cast<BlastBondNode*>(node);
-				treeWidgetItem->setIcon(sBondIcon);
-				treeWidgetItem->setText(bond->name.c_str());
-			}
-
-			if (treeWidgetItem == nullptr)
-				continue;
-
-			_treeItemDataMap.insert(treeWidgetItem, node);
-			_treeDataItemMap.insert(node, treeWidgetItem);
-		}
-	}
-}
-
-void BlastSceneTree::_updateChunkTreeItemAndMenu(BPPChunk* chunk, QStandardItem* chunkItem)
-{
-	assert(chunk != nullptr);
-
-	_removeSupportAction->setEnabled(true);
-	_makeSupportAction->setEnabled(true);
-	_makeStaticSupportAction->setEnabled(true);
-
-	if (!chunk->support && !chunk->staticFlag)
-	{
-		_removeSupportAction->setEnabled(false);
-		chunkItem->setIcon(sChunkUUIcon);
-	}
-	else if (chunk->support && !chunk->staticFlag)
-	{
-		_makeSupportAction->setEnabled(false);
-		chunkItem->setIcon(sChunkSUIcon);
-	}
-	else if (chunk->support && chunk->staticFlag)
-	{
-		_makeStaticSupportAction->setEnabled(false);
-		chunkItem->setIcon(sChunkSSIcon);
-	}
-}
-
-void BlastSceneTree::_updateChunkTreeItems()
-{
-	for (QMap<BlastNode*, QStandardItem*>::iterator itr = _treeDataItemMap.begin(); itr != _treeDataItemMap.end(); ++itr)
-	{
-		BlastNode* node = itr.key();
-		QStandardItem* treeItem = itr.value();
-		if (eChunk == node->getType())
-		{
-			BPPChunk* chunk = static_cast<BPPChunk*>(node->getData());
-			if (!chunk->support)
-			{
-				treeItem->setIcon(sChunkUUIcon);
-			}
-			else if (chunk->support && !chunk->staticFlag)
-			{
-				treeItem->setIcon(sChunkSUIcon);
-			}
-			else if (chunk->support && chunk->staticFlag)
-			{
-				treeItem->setIcon(sChunkSSIcon);
-			}
-		}
-	}
-}
-
-void BlastSceneTree::ApplyAutoSelectNewChunks(BlastAsset* pNewBlastAsset, std::vector<uint32_t>& NewChunkIndexes)
-{
-	if (pNewBlastAsset == nullptr || NewChunkIndexes.size() == 0)
-	{
-		return;
-	}
-
-	m_pNewBlastAsset = pNewBlastAsset;
-	m_NewChunkIndexes.clear();
-	for (uint32_t nci : NewChunkIndexes)
-	{
-		m_NewChunkIndexes.push_back(nci);
-	}
-}
-
-/*
-BlastAssetNode* BlastTreeData::addBlastAsset(BPPAsset& asset)
-{
-	BlastAsset* pBlastAsset = nullptr;
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator it;
-	for (it = AssetDescMap.begin(); it != AssetDescMap.end(); it++)
-	{
-		std::string assetname = asset.name.buf;
-		if (it->second.name == assetname)
-		{
-			pBlastAsset = it->first;
-		}
-	}
-
-	BlastAssetNode* assetNode = new BlastAssetNode(asset.name.buf, asset);
-	_assets.push_back(assetNode);
-	_blastProjectDataToNodeMap.insert(std::make_pair((void*)&asset, assetNode));
-
-	std::vector<BPPChunk*> childChunks = BlastProject::ins().getChildrenChunks(asset, -1);
-	int childChunksSize = childChunks.size();
-	for (size_t i = 0; i < childChunksSize; ++i)
-	{
-		BPPChunk& chunk = *(childChunks[i]);
-		BlastChunkNode* chunkNode = new BlastChunkNode(chunk.name.buf, chunk, pBlastAsset);
-		assetNode->children.push_back(chunkNode);
-		chunkNode->setParent(assetNode);
-		_blastProjectDataToNodeMap.insert(std::make_pair((void*)&chunk, chunkNode));
-
-		_addChunkNode(chunk, asset, chunkNode, pBlastAsset);
-	}
-
-	return assetNode;
-}
-
-void BlastTreeData::removeBlastAsset(BPPAsset& asset)
-{
-	_removeChunkNode(asset);
-
-	std::map<void*, BlastNode*>::iterator it = _blastProjectDataToNodeMap.find(&asset);
-	if (it == _blastProjectDataToNodeMap.end())
-	{
-		return;
-	}
-
-	BlastNode* node = it->second;
-	_blastProjectDataToNodeMap.erase(it);
-	std::vector<BlastAssetNode*>::iterator itAsset;
-	for (itAsset = _assets.begin(); itAsset != _assets.end(); itAsset++)
-	{
-		if (node == *itAsset)
-		{
-			_assets.erase(itAsset);
-			break;
-		}
-	}
-
-	delete node;
-}
-
-BlastAssetInstanceNode* BlastTreeData::addBlastInstance(BPPAssetInstance& instance)
-{
-	BlastAssetInstanceNode* blastAssetInstanceNode = new BlastAssetInstanceNode(instance.name.buf, instance);
-	_assetInstancesNode->children.push_back(blastAssetInstanceNode);
-	blastAssetInstanceNode->setParent(_assetInstancesNode);
-	void* pointer = (void*)&instance;
-	_blastProjectDataToNodeMap.insert(std::make_pair(pointer, blastAssetInstanceNode));
-	return blastAssetInstanceNode;
-}
-
-void BlastTreeData::removeBlastInstance(BPPAssetInstance& instance)
-{
-	void* pointer = (void*)&instance;
-	std::map<void*, BlastNode*>::iterator it = _blastProjectDataToNodeMap.find(pointer);
-	if (it == _blastProjectDataToNodeMap.end())
-	{
-		return;
-	}
-
-	BlastNode* node = it->second;
-	_blastProjectDataToNodeMap.erase(it);
-	delete node;
-
-	int count = _assetInstancesNode->children.size();
-	for (int i = count - 1; i >= 0; --i)
-	{
-		BlastNode* pBN = _assetInstancesNode->children[i];
-		if (pBN == node)
-		{
-			_assetInstancesNode->children.erase(_assetInstancesNode->children.begin() + i);
-		}
-		else
-		{
-			BlastAssetInstanceNode* blastAssetInstanceNode = dynamic_cast<BlastAssetInstanceNode*>(_assetInstancesNode->children[i]);
-			if (blastAssetInstanceNode && blastAssetInstanceNode->getData() == &instance)
-			{
-				_assetInstancesNode->children.erase(_assetInstancesNode->children.begin() + i);
-			}
-		}
-	}
-}
-
-BlastProjectileNode* BlastTreeData::addProjectile(PhysXSceneActor* projectile)
-{
-	SceneController& sceneController = SampleManager::ins()->getSceneController();
-	BlastProjectileNode* projectileNode = new BlastProjectileNode(sceneController.getProjectileName(projectile), projectile);
-	_projectiles.push_back(projectileNode);
-	return projectileNode;
-}
-
-void BlastTreeData::clearProjectile()
-{
-	std::vector<BlastProjectileNode*>::iterator it;
-	for (it = _projectiles.begin(); it != _projectiles.end(); it++)
-	{
-		delete *it;
-	}
-	_projectiles.clear();
-}
-
-void BlastTreeData::refreshProjectDataToNodeMap(std::map<BPPAsset*, BPPAsset*>& changeMap)
-{
-	std::map<BPPAsset*, BPPAsset*>::iterator it;
-	std::map<void*, BlastNode*>::iterator itNode;
-	for (it = changeMap.begin(); it != changeMap.end(); it++)
-	{
-		itNode = _blastProjectDataToNodeMap.find(it->first);
-		if (itNode == _blastProjectDataToNodeMap.end())
-		{
-			continue;
-		}
-
-		BlastNode* node = itNode->second;
-		_blastProjectDataToNodeMap.erase(itNode);
-		_blastProjectDataToNodeMap[it->second] = node;
-	}
-}
-
-void BlastTreeData::refreshProjectDataToNodeMap(std::map<BPPAssetInstance*, BPPAssetInstance*>& changeMap)
-{
-	std::map<BPPAssetInstance*, BPPAssetInstance*>::iterator it;
-	std::map<void*, BlastNode*>::iterator itNode;
-	for (it = changeMap.begin(); it != changeMap.end(); it++)
-	{
-		itNode = _blastProjectDataToNodeMap.find(it->first);
-		if (itNode == _blastProjectDataToNodeMap.end())
-		{
-			continue;
-		}
-
-		BlastNode* node = itNode->second;
-		_blastProjectDataToNodeMap.erase(itNode);
-		_blastProjectDataToNodeMap[it->second] = node;
-		node->setData(it->second);
-	}
-}
-
-void BlastSceneTree::addBlastAsset(BPPAsset& asset)
-{
-	BlastAssetNode* assetNode = BlastTreeData::ins().addBlastAsset(asset);
-	if (assetNode == nullptr)
-	{
-		return;
-	}
-
-	QStandardItem* assetTreeWidgetItem = new QStandardItem();
-	_treeModel->appendRow(assetTreeWidgetItem);
-	assetTreeWidgetItem->setText(assetNode->name.c_str());
-	assetTreeWidgetItem->setIcon(sAssetIcon);
-	_treeItemDataMap.insert(assetTreeWidgetItem, assetNode);
-	_treeDataItemMap.insert(assetNode, assetTreeWidgetItem);
-
-	_addChunkUI(assetNode, assetTreeWidgetItem);
-
-	ui.blastSceneTree->expandAll();
-}
-
-void BlastSceneTree::removeBlastAsset(BPPAsset& asset)
-{
-	BlastNode* node = BlastTreeData::ins().getBlastNodeByProjectData(&asset);
-
-	QMap<BlastNode*, QStandardItem*>::iterator it = _treeDataItemMap.find(node);
-	if (it != _treeDataItemMap.end())
-	{
-		QStandardItem* item = it.value();
-		
-		if (item != nullptr)
-		{
-			_treeModel->removeRow(_treeModel->indexFromItem(item).row());
-			ui.blastSceneTree->expandAll();
-		}
-	}
-
-	BlastTreeData::ins().removeBlastAsset(asset);
-}
-
-void BlastSceneTree::addBlastInstance(BPPAssetInstance& instance)
-{
-	BlastAssetInstanceNode* assetInstanceNode = BlastTreeData::ins().addBlastInstance(instance);
-	if (assetInstanceNode == nullptr)
-	{
-		return;
-	}
-
-	QStandardItem* assetInstanceItem = new QStandardItem();
-	_compositeTreeItem->appendRow(assetInstanceItem);
-	assetInstanceItem->setText(assetInstanceNode->name.c_str());
-	if (assetInstanceNode->getType() == eAssetInstance)
-		assetInstanceItem->setIcon(sAssetIcon);
-	_treeItemDataMap.insert(assetInstanceItem, assetInstanceNode);
-	_treeDataItemMap.insert(assetInstanceNode, assetInstanceItem);
-
-	ui.blastSceneTree->expandAll();
-}
-
-void BlastSceneTree::removeBlastInstance(BPPAssetInstance& instance)
-{
-	BlastNode* node = BlastTreeData::ins().getBlastNodeByProjectData(&instance);
-
-	QMap<BlastNode*, QStandardItem*>::iterator it = _treeDataItemMap.find(node);
-	if (it != _treeDataItemMap.end())
-	{
-		QStandardItem* item = it.value();
-
-		if (item != nullptr)
-		{
-			_compositeTreeItem->removeRow(_treeModel->indexFromItem(_compositeTreeItem).row());
-			ui.blastSceneTree->expandAll();
-		}
-	}
-
-	BlastTreeData::ins().removeBlastInstance(instance);
-}
-
-void BlastSceneTree::removeBlastInstances(BPPAsset& asset)
-{
-	std::vector<BPPAssetInstance*> instances;
-	BlastProject::ins().getAssetInstances(asset.ID, instances);
-
-	std::vector<BPPAssetInstance*>::iterator it;
-	for (it = instances.begin(); it != instances.end(); it++)
-	{
-		removeBlastInstance(**it);
-		BlastTreeData::ins().removeBlastInstance(**it);
-	}
-}
-
-void BlastSceneTree::addProjectile(PhysXSceneActor* projectile)
-{
-	BlastProjectileNode* projectileNode = BlastTreeData::ins().addProjectile(projectile);
-	if (projectileNode == nullptr)
-	{
-		return;
-	}
-
-	QStandardItem* projectileTreeItem = new QStandardItem();
-	projectileTreeItem->setText(projectileNode->name.c_str());
-	projectileTreeItem->setIcon(sProjectileIcon);
-	_treeModel->appendRow(projectileTreeItem);
-	_projectileItemActorMap[projectileTreeItem] = projectile;;
-}
-
-void BlastSceneTree::clearProjectile()
-{
-	QMap<QStandardItem*, PhysXSceneActor*>::iterator it;
-	for (it =_projectileItemActorMap.begin(); it != _projectileItemActorMap.end(); it++)
-	{
-		_treeModel->removeRow(_treeModel->indexFromItem(it.key()).row());
-	}
-	_projectileItemActorMap.clear();
-
-	BlastTreeData::ins().clearProjectile();
-}
-*/
-BlastNode* BlastSceneTree::getBlastNodeByItem(QStandardItem* item)
-{
-	QMap<QStandardItem*, BlastNode*>::iterator itr = _treeItemDataMap.find(item);
-	if (itr == _treeItemDataMap.end())
-		return nullptr;
-
-	return itr.value();
-}
-
-PhysXSceneActor* BlastSceneTree::getProjectileActorByItem(QStandardItem* item)
-{
-	QMap<QStandardItem*, PhysXSceneActor*>::iterator itr = _projectileItemActorMap.find(item);
-	if (itr == _projectileItemActorMap.end())
-		return nullptr;
-
-	return itr.value();
-}
-
-void BlastSceneTree::selectTreeItem(BlastNode* node, bool updateData)
-{
-	_updateData = updateData;
-	QMap<BlastNode*, QStandardItem*>::iterator itr = _treeDataItemMap.find(node);
-	if (itr != _treeDataItemMap.end())
-	{
-		QItemSelectionModel* selectionModel = ui.blastSceneTree->selectionModel();
-		selectionModel->select(_treeModel->indexFromItem(itr.value()), QItemSelectionModel::Select);
-	}
-
-	_updateData = true;
-}
-
-void BlastSceneTree::selectTreeItem(BlastFamily* family)
-{
-	BlastAssetInstanceNode* instanceNode = BlastTreeData::ins().getAssetInstanceNode(family);
-	selectTreeItem(instanceNode, false);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/BlastSceneTree.h b/tools/ArtistTools/source/BlastPlugin/Window/BlastSceneTree.h
deleted file mode 100644
index 423c2b7..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/BlastSceneTree.h
+++ /dev/null
@@ -1,389 +0,0 @@
-#ifndef BLASTSCENETREE_H
-#define BLASTSCENETREE_H
-
-#include <QtWidgets/QDockWidget>
-#include "ui_BlastSceneTree.h"
-#include "ProjectParams.h"
-#include <vector>
-#include <string>
-#include <QtCore/QMap>
-#include <QtGui/QStandardItemModel>
-#include <QtWidgets/QStyledItemDelegate>
-
-class QTreeWidgetItem;
-class BlastAsset;
-class PhysXSceneActor;
-class BlastNode;
-class BlastFamily;
-
-enum EBlastNodeType
-{
-	eBond,
-	eChunk,
-	eAsset,
-	eProjectile,
-	eGraphicsMesh,
-	eAssetInstance,
-	eAssetInstances,
-};
-
-class BlastVisitorBase
-{
-public:
-	BlastVisitorBase() : _continueTraversing(true)
-	{
-	}
-
-	virtual void visit(BlastNode *pNode) { return; }
-	inline bool continueTraversing(void) const { return _continueTraversing; }
-
-protected:
-	bool	_continueTraversing;
-};
-
-class BlastNode
-{
-public:
-	BlastNode(const std::string& inName, void* inData)
-		: name(inName)
-		, _data(inData)
-		, _parent(nullptr)
-	{
-	}
-
-	virtual ~BlastNode()
-	{
-	}
-
-	inline void* getData() { return _data;  }
-	void setParent(BlastNode* parent) { _parent = parent; }
-	BlastNode* getParent() { return _parent; }
-	void traverse(BlastVisitorBase& visitor);
-
-	virtual EBlastNodeType getType() = 0;
-	virtual bool getVisible() = 0;
-	virtual void setVisible(bool val) = 0;
-
-	std::string name;
-	std::vector<BlastNode*> children;
-
-protected:
-	inline void setData(void* data) { _data = data; }
-
-private:
-	void* _data;
-	BlastNode* _parent;
-};
-
-class BlastBondNode : public BlastNode
-{
-public:
-	BlastBondNode(const std::string& inName, BPPBond& inData)
-		: BlastNode(inName, &inData)
-	{
-	}
-	virtual EBlastNodeType getType() { return eBond; }
-	virtual bool getVisible() { return ((BPPBond*)getData())->visible; }
-	virtual void setVisible(bool val) { ((BPPBond*)getData())->visible = val; }
-	bool isWolrd() { return ((BPPBond*)getData())->toChunk == 0xFFFFFFFF; }
-
-private:
-	std::vector<BlastNode*> children;
-};
-
-class BlastChunkNode : public BlastNode
-{
-public:
-	BlastChunkNode(const std::string& inName, BPPChunk& inData, void* assetPtr)
-		: BlastNode(inName, &inData)
-	{
-		_assetPtr = assetPtr;
-	}
-	virtual EBlastNodeType getType() { return eChunk; }
-	virtual bool getVisible() { return ((BPPChunk*)getData())->visible; }
-	virtual void setVisible(bool val);// { ((BPPChunk*)getData())->visible = val; }
-	void setSelected(bool val);
-	bool isSupport()	{ return ((BPPChunk*)getData())->support; }
-	bool isStatic() { return ((BPPChunk*)getData())->staticFlag; }
-	void* _assetPtr;
-};
-
-class BlastAssetNode : public BlastNode
-{
-public:
-	BlastAssetNode(const std::string& inName, BPPAsset& inData)
-		: BlastNode(inName, &inData)
-	{
-	}
-	virtual EBlastNodeType getType() { return eAsset; }
-	virtual bool getVisible() { return ((BPPAsset*)getData())->visible; }
-	virtual void setVisible(bool val) { ((BPPAsset*)getData())->visible = val; }
-	void setSelected(bool val);
-};
-
-class BlastProjectileNode : public BlastNode
-{
-public:
-	BlastProjectileNode(const std::string& inName, PhysXSceneActor* inData)
-		: BlastNode(inName, inData)
-	{
-	}
-	virtual EBlastNodeType getType() { return eProjectile; }
-	virtual bool getVisible();
-	virtual void setVisible(bool val);
-};
-
-class BlastGraphicsMeshNode : public BlastNode
-{
-public:
-	BlastGraphicsMeshNode(const std::string& inName, BPPGraphicsMesh& inData)
-		: BlastNode(inName, &inData)
-	{
-	}
-	virtual EBlastNodeType getType() { return eGraphicsMesh; }
-	virtual bool getVisible() { return true; }
-	virtual void setVisible(bool val) { }
-};
-
-class BlastAssetInstanceNode : public BlastNode
-{
-public:
-	BlastAssetInstanceNode(const std::string& inName, BPPAssetInstance& inData)
-		: BlastNode(inName, &inData)
-	{
-	}
-	~BlastAssetInstanceNode()
-	{
-	}
-	virtual EBlastNodeType getType() { return eAssetInstance; }
-	virtual bool getVisible() { return ((BPPAssetInstance*)getData())->visible; }
-	virtual void setVisible(bool val) { ((BPPAssetInstance*)getData())->visible = val; }
-	void setSelected(bool val);
-};
-
-class BlastAssetInstancesNode : public BlastNode
-{
-public:
-	BlastAssetInstancesNode(const std::string& inName)
-		: BlastNode(inName, nullptr)
-	{
-	}
-	virtual EBlastNodeType getType() { return eAssetInstances; }
-	virtual bool getVisible() { return true; }
-	virtual void setVisible(bool val) { return; }
-};
-
-class BlastTreeData
-{
-public:
-	static BlastTreeData& ins();
-	static bool isChild(BlastChunkNode* parent, BlastChunkNode* child);
-	static std::vector<BlastChunkNode*> getTopChunkNodes(std::vector<BlastChunkNode*>& nodes);
-	static int getDepth(BlastNode* node);// if node is not a chunk or bond, then depth is -1.
-	static bool isRoot(BlastChunkNode* node);
-	static bool isLeaf(BlastChunkNode* node);
-	static void makeSupport(BlastChunkNode* node);
-	static void makeStaticSupport(BlastChunkNode* node);
-	static void removeSupport(BlastChunkNode* node);
-	static std::string getAssetName(BlastAsset* asset);
-	static BlastAsset* getAsset(std::string assetName);
-
-	BlastNode* getBlastNodeByProjectData(void* blastProjectData);
-	BlastAssetInstancesNode* getBlastAssetInstancesNode()						{ return _assetInstancesNode; }
-	std::vector<BlastAssetNode*>& getAssetNodes()				{ return _assets; }
-	BlastAsset* getAsset(BlastNode* node);
-	BlastAssetNode* getAssetNode(BlastAsset* asset);
-	std::vector<BlastProjectileNode*>& getProjectileNodes()		{ return _projectiles; }
-	std::vector<BlastGraphicsMeshNode*>& getGraphicsMeshNodes()	{ return _graphicsMeshes; }
-	std::vector<BlastChunkNode*> getChunkNodeByBlastChunk(const BlastAsset* asset, const std::vector<uint32_t>& chunkIndexes);
-	std::vector<BlastChunkNode*> getRootChunkNodeByInstance(const BlastAssetInstanceNode* node);
-	std::vector<BlastNode*> getNodesByDepth(BlastAssetNode* node, uint32_t depth);
-	std::vector<BlastNode*> getNodesByDepth(uint32_t depth);
-	std::vector<BlastNode*> getNodesByDepth(std::vector<uint32_t> depths);
-	BlastNode* getNodeByIndex(uint32_t assetIndex, uint32_t chunkIndex);	
-	std::vector<BlastChunkNode*> getSupportChunkNodes(BlastAssetNode* node);
-	std::vector<BlastChunkNode*> getSupportChunkNodes();
-	std::vector<BlastChunkNode*> getSiblingChunkNodes(BlastChunkNode* node);
-	BlastChunkNode* getSupportAncestor(BlastChunkNode* node);
-	const std::vector<BlastNode*>& getAllChunkNodes(std::vector<BlastNode*>& res, BlastAssetNode* node);
-	const std::vector<BlastNode*>& getAllChunkNodes(std::vector<BlastNode*>& res);
-	const std::vector<BlastNode*>& getAllLeavesChunkNodes(std::vector<BlastNode*>& res, BlastAssetNode* node);
-	const std::vector<BlastNode*>& getAllLeavesChunkNodes(std::vector<BlastNode*>& res);
-	const std::vector<BlastNode*>& getChunkNodesFullCoverage(std::vector<BlastNode*>& res, BlastAssetNode* node, int depth);
-	const std::vector<BlastNode*>& getChunkNodesFullCoverage(std::vector<BlastNode*>& res, int depth);
-
-	bool isCompleteSupportAsset(const BlastAsset* asset);
-	bool isCompleteSupportAsset(const BlastAssetNode* node);
-	bool isOverlapSupportAsset(const BlastAsset* asset);
-	bool isOverlapSupportAsset(const BlastAssetNode* node);
-
-	BlastAssetNode* addAsset(const BlastAsset* asset);
-	BlastAssetInstanceNode* addAssetInstance(const BlastAsset* asset);
-	void remove(const BlastAssetNode* node);
-	void remove(const BlastAssetInstanceNode* node);
-	BlastAssetInstanceNode* getAssetInstanceNode(BlastFamily* family);
-	BlastAssetInstanceNode* getAssetInstanceNode(BPPAssetInstance* instance);
-	std::vector<BlastAssetInstanceNode*> getAssetInstanceNodes(BlastChunkNode* chunkNode);
-
-	void update();
-	void update(const BlastAsset* asset);
-	/*
-	BlastAssetNode* addBlastAsset(BPPAsset& asset);
-	void removeBlastAsset(BPPAsset& asset);
-
-	BlastAssetInstanceNode* addBlastInstance(BPPAssetInstance& instance);
-	void removeBlastInstance(BPPAssetInstance& instance);
-
-	BlastProjectileNode* addProjectile(PhysXSceneActor* projectile);
-	void clearProjectile();
-
-	void refreshProjectDataToNodeMap(std::map<BPPAsset*, BPPAsset*>& changeMap);
-	void refreshProjectDataToNodeMap(std::map<BPPAssetInstance*, BPPAssetInstance*>& changeMap);
-	*/
-
-	void traverse(BlastVisitorBase& visitor);
-
-private:
-	BlastTreeData();
-	void _addChunkNode(BPPChunk& parentData, BPPAsset& asset, BlastChunkNode* parentNode, void* assetPtr);
-	void _removeChunkNode(BPPAsset& asset);
-	void _freeBlastNode();
-	BlastAssetNode* _getAssetNode(const BlastAsset* asset);
-
-private:
-	BlastAssetInstancesNode*			_assetInstancesNode;
-	std::vector<BlastAssetNode*>		_assets;
-	std::vector<BlastProjectileNode*>	_projectiles;
-	std::vector<BlastGraphicsMeshNode*>	_graphicsMeshes;
-	std::map<void*, BlastNode*>			_blastProjectDataToNodeMap;
-};
-
-class ISceneObserver
-{
-public:
-	virtual void dataSelected(std::vector<BlastNode*> selections) = 0;
-};
-
-class BlastTreeViewDelegate : QStyledItemDelegate
-{
-	Q_OBJECT
-
-public:
-	BlastTreeViewDelegate(QObject* parent, QStandardItemModel* model);
-	void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
-	bool editorEvent(QEvent* evt, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index);
-
-protected:
-	bool eventFilter(QObject* object, QEvent* event);
-
-private:
-	QStandardItemModel*		_treeModel;
-};
-
-class BlastSceneTreeDataLock;
-
-class BlastSceneTree : public QDockWidget, public ISceneObserver
-{
-	Q_OBJECT
-
-	friend class BlastSceneTreeDataLock;
-public:
-	static BlastSceneTree* ins();
-
-	BlastSceneTree(QWidget *parent = 0);
-	~BlastSceneTree();
-
-	void updateValues(bool updataData = true);
-
-	void clear();
-
-	virtual void dataSelected(std::vector<BlastNode*> selections);
-
-	void addObserver(ISceneObserver* observer);
-	void removeObserver(ISceneObserver* observer);
-
-	void updateVisible(uint32_t assetIndex, uint32_t chunkIndex, bool visible);
-	void updateChunkItemSelection();
-
-	void makeSupport();
-	void makeStaticSupport();
-	void removeSupport();
-	void makeWorld();
-	void removeWorld();
-	void bondChunks();
-	void bondChunksWithJoints();
-	void removeAllBonds();
-
-	void setChunkSelected(std::vector<uint32_t> depths, bool selected);
-	void setChunkVisible(std::vector<uint32_t> depths, bool bVisible);
-
-	void setChunkVisibleFullCoverage(int depth);
-	void hideAllChunks();
-	/*
-	void addBlastAsset(BPPAsset& asset);
-	void removeBlastAsset(BPPAsset& asset);
-
-	void addBlastInstance(BPPAssetInstance& instance);
-	void removeBlastInstance(BPPAssetInstance& instance);
-	void removeBlastInstances(BPPAsset& asset);
-
-	void addProjectile(PhysXSceneActor* projectile);
-	void clearProjectile();
-	*/
-	BlastNode* getBlastNodeByItem(QStandardItem* item);
-	PhysXSceneActor* getProjectileActorByItem(QStandardItem* item);
-
-	void selectTreeItem(BlastNode* node, bool updateData = true);
-	void selectTreeItem(BlastFamily* family);
-
-	void ApplyAutoSelectNewChunks(BlastAsset* pNewBlastAsset, std::vector<uint32_t>& NewChunkIndexes);
-
-protected slots:
-	void on_btnAsset_clicked();
-	void on_assetComposite_clicked();
-	void on_btnChunk_clicked();
-	void on_btnBond_clicked();
-	void on_btnProjectile_clicked();
-	void on_btnExpandCollapse_clicked();
-	void on_blastSceneTree_customContextMenuRequested(const QPoint& pos);
-	void on_blastSceneTree_itemSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
-	void onMakeSupportMenuItemClicked();
-	void onMakeStaticSupportMenuItemClicked();
-	void onRemoveSupportMenuItemClicked();
-	void onMakeWorldMenuItemClicked();
-	void onRemoveWorldMenuItemClicked();
-	void onBondChunksMenuItemClicked();
-	void onBondChunksWithJointsMenuItemClicked();
-	void onRemoveAllBondsMenuItemClicked();
-	void onCollapseExpandClicked();
-
-private:
-	void _updateTreeUIs();
-	void _addChunkUI(const BlastNode* parentNode, QStandardItem* parentTreeItem);
-	void _updateChunkTreeItemAndMenu(BPPChunk* chunk, QStandardItem* chunkItem);
-	void _updateChunkTreeItems();
-
-private:
-	Ui::BlastSceneTree ui;
-	QStandardItemModel*					_treeModel;
-	QMap<QStandardItem*, BlastNode*>	_treeItemDataMap;
-	QMap<BlastNode*, QStandardItem*>	_treeDataItemMap;
-	QMenu*								_treeContextMenu;
-	QAction*							_makeSupportAction;
-	QAction*							_makeStaticSupportAction;
-	QAction*							_removeSupportAction;
-	QAction*							_makeWorldAction;
-	QAction*							_removeWorldAction;
-	QAction*							_bondChunksAction;
-	QAction*							_bondChunksWithJointsAction;
-	QAction*							_removeAllBondsAction;
-	std::vector<ISceneObserver*>		_observers;
-	bool								_updateData;
-//	QStandardItem*						_compositeTreeItem;
-	QMap<QStandardItem*, PhysXSceneActor*>	_projectileItemActorMap;
-
-	BlastAsset* m_pNewBlastAsset;
-	std::vector<uint32_t> m_NewChunkIndexes;
-};
-
-#endif // BLASTSCENETREE_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp b/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp
deleted file mode 100644
index 1eed17b..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp
+++ /dev/null
@@ -1,1077 +0,0 @@
-#include "BlastToolbar.h"
-
-#include <QtWidgets/QFileDialog>
-#include "AppMainWindow.h"
-#include "PhysXController.h"
-#include "QtUtil.h"
-
-#include "SampleManager.h"
-#include "SceneController.h"
-#include "DamageToolController.h"
-#include "SelectionToolController.h"
-#include "ExplodeToolController.h"
-#include "GizmoToolController.h"
-#include "BlastController.h"
-#include "SourceAssetOpenDlg.h"
-#include "BlastPlugin.h"
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QActionGroup>
-#include "Shlwapi.h"
-#include "BlastSceneTree.h"
-#include "BlastFamily.h"
-#include "FileReferencesPanel.h"
-#include "GlobalSettings.h"
-#include "PxScene.h"
-#include "PxRigidDynamic.h"
-#include "ViewerOutput.h"
-
-#include <QtCore/QTimer>
-QTimer gDropTimer;
-int nExplodedViewState = 0;
-
-BlastToolbar::BlastToolbar(QWidget* parent)
-	: QDockWidget(parent)
-	, m_fullCoverage(false)
-{
-	// to hide the title bar completely must replace the default widget with a generic one 
-	QWidget* titleWidget = new QWidget(this);
-	this->setTitleBarWidget(titleWidget);
-	this->setObjectName(QString::fromUtf8("AppMainToolbar"));
-	this->setMinimumSize(QSize(0, 50));
-	this->setMaximumSize(QSize(16777215, 80));
-	
-	if (this->objectName().isEmpty())
-		this->setObjectName(QStringLiteral("AppMainToolbar"));
-	this->resize(1330, 54);
-
-	QWidget* widget = new QWidget();
-	hLayout = new QHBoxLayout(widget);
-	hLayout->setObjectName(QStringLiteral("hLayout"));
-	hLayout->setContentsMargins(-1, 3, -1, 3);
-
-	QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed);
-	sizePolicy1.setHorizontalStretch(0);
-	sizePolicy1.setVerticalStretch(0);
-
-	btnOpenProject = new QPushButton(widget);
-	setStyledToolTip(btnOpenProject, "Open Project");
-	const QFont& font = btnOpenProject->font();
-	QFont fontCopy(font);
-	fontCopy.setPixelSize(9);
-
-	btnOpenProject->setObjectName(QStringLiteral("btnOpenProject"));
-	sizePolicy1.setHeightForWidth(btnOpenProject->sizePolicy().hasHeightForWidth());
-	btnOpenProject->setSizePolicy(sizePolicy1);
-	btnOpenProject->setMinimumSize(QSize(40, 40));
-	btnOpenProject->setMaximumSize(QSize(40, 40));
-	btnOpenProject->setText(QApplication::translate("AppMainToolbar", "Open", 0));
-	hLayout->addWidget(btnOpenProject);
-
-	btnSaveProject = new QPushButton(widget);
-	setStyledToolTip(btnSaveProject, "Save Project and assets");
-	btnSaveProject->setObjectName(QStringLiteral("btnSaveProject"));
-	sizePolicy1.setHeightForWidth(btnOpenProject->sizePolicy().hasHeightForWidth());
-	btnSaveProject->setSizePolicy(sizePolicy1);
-	btnSaveProject->setMinimumSize(QSize(40, 40));
-	btnSaveProject->setMaximumSize(QSize(40, 40));
-	btnSaveProject->setText(QApplication::translate("AppMainToolbar", "Save\nAll", 0));
-	hLayout->addWidget(btnSaveProject);
-
-	btnExportAssets = new QPushButton(widget);
-	setStyledToolTip(btnExportAssets, "Export Blast assets");
-	btnExportAssets->setObjectName(QStringLiteral("btnExportAssets"));
-	sizePolicy1.setHeightForWidth(btnExportAssets->sizePolicy().hasHeightForWidth());
-	btnExportAssets->setSizePolicy(sizePolicy1);
-	btnExportAssets->setMinimumSize(QSize(40, 40));
-	btnExportAssets->setMaximumSize(QSize(40, 40));
-	btnExportAssets->setText(QApplication::translate("AppMainToolbar", "Export", 0));
-	hLayout->addWidget(btnExportAssets);
-
-	vLayoutExport = new QVBoxLayout();
-	vLayoutExport->setObjectName(QStringLiteral("vLayoutExport"));
-
-	hLayoutExport = new QHBoxLayout();
-	hLayoutExport->setObjectName(QStringLiteral("hLayoutExport"));
-
-	lExportFilepath = new QLabel(widget);
-	lExportFilepath->setObjectName(QStringLiteral("lExportFilepath"));
-	lExportFilepath->setText(QApplication::translate("AppMainToolbar", "Export Path", 0));
-	hLayoutExport->addWidget(lExportFilepath);
-
-	btnExportFilepath = new QPushButton(widget);
-	btnExportFilepath->setObjectName(QStringLiteral("btnExportFilepath"));
-	sizePolicy1.setHeightForWidth(btnExportFilepath->sizePolicy().hasHeightForWidth());
-	btnExportFilepath->setSizePolicy(sizePolicy1);
-	btnExportFilepath->setMinimumSize(QSize(14, 14));
-	btnExportFilepath->setMaximumSize(QSize(14, 14));
-	btnExportFilepath->setText(QApplication::translate("AppMainToolbar", "", 0));
-	btnExportFilepath->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnExportFilepath.png"));
-	btnExportFilepath->setIconSize(QSize(14, 14));
-	hLayoutExport->addWidget(btnExportFilepath);
-
-	vLayoutExport->addLayout(hLayoutExport);
-	
-	leExportFilepath = new QLineEdit(widget);
-	leExportFilepath->setObjectName(QStringLiteral("leExportFilepath"));
-	sizePolicy1.setHeightForWidth(leExportFilepath->sizePolicy().hasHeightForWidth());
-	leExportFilepath->setSizePolicy(sizePolicy1);
-	leExportFilepath->setMinimumSize(QSize(150, 20));
-	leExportFilepath->setMaximumSize(QSize(150, 20));
-	leExportFilepath->setText(QApplication::translate("AppMainToolbar", "", 0));
-	leExportFilepath->setEnabled(false); // do not allow direct change to make sure the folder exists.
-	vLayoutExport->addWidget(leExportFilepath);
-
-	hLayout->addLayout(vLayoutExport);
-
-	fSeparate = new QFrame(widget);
-	fSeparate->setObjectName(QStringLiteral("fSeparate"));
-	fSeparate->setFrameShape(QFrame::VLine);
-	fSeparate->setFrameShadow(QFrame::Sunken);
-	hLayout->addWidget(fSeparate);
-
-	vLayoutDepthCoverage = new QVBoxLayout();
-	vLayoutDepthCoverage->setObjectName(QStringLiteral("vLayoutDepthCoverage"));
-
-	hlDepthPreview = new QHBoxLayout();
-	hlDepthPreview->setObjectName(QStringLiteral("hlDepthPreview"));
-
-	lbDepthPreview = new QLabel(widget);
-	lbDepthPreview->setObjectName(QStringLiteral("lbDepthPreview"));
-	lbDepthPreview->setText(QApplication::translate("AppMainToolbar", "Depth Preview", 0));
-	hlDepthPreview->addWidget(lbDepthPreview);
-
-	ssbiDepthPreview = new SlideSpinBoxInt(widget);
-	ssbiDepthPreview->setObjectName(QStringLiteral("ssbiDepthPreview"));
-	QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Fixed);
-	sizePolicy2.setHorizontalStretch(0);
-	sizePolicy2.setVerticalStretch(0);
-	sizePolicy2.setHeightForWidth(ssbiDepthPreview->sizePolicy().hasHeightForWidth());
-	ssbiDepthPreview->setSizePolicy(sizePolicy2);
-	ssbiDepthPreview->setMinimumSize(QSize(40, 20));
-	ssbiDepthPreview->setMaximumSize(QSize(100, 16777215));
-	hlDepthPreview->addWidget(ssbiDepthPreview);
-
-	vLayoutDepthCoverage->addLayout(hlDepthPreview);
-
-	hlExactCoverage = new QHBoxLayout();
-	hlExactCoverage->setObjectName(QStringLiteral("hlExactCoverage"));
-
-	lbExactCoverage = new QLabel(widget);
-	lbExactCoverage->setObjectName(QStringLiteral("lbExactCoverage"));
-	lbExactCoverage->setText(QApplication::translate("AppMainToolbar", "Full Coverage", 0));
-	hlExactCoverage->addWidget(lbExactCoverage);
-
-	cbExactCoverage = new QCheckBox(widget);
-	cbExactCoverage->setObjectName(QStringLiteral("cbExactCoverage"));
-	sizePolicy1.setHeightForWidth(cbExactCoverage->sizePolicy().hasHeightForWidth());
-	cbExactCoverage->setSizePolicy(sizePolicy1);
-	cbExactCoverage->setLayoutDirection(Qt::RightToLeft);
-	hlExactCoverage->addWidget(cbExactCoverage);
-
-	vLayoutDepthCoverage->addLayout(hlExactCoverage);
-
-	hLayout->addLayout(vLayoutDepthCoverage);
-
-	fSeparate = new QFrame(widget);
-	fSeparate->setObjectName(QStringLiteral("fSeparate"));
-	fSeparate->setFrameShape(QFrame::VLine);
-	fSeparate->setFrameShadow(QFrame::Sunken);
-	hLayout->addWidget(fSeparate);
-
-	QButtonGroup* gizmoGroup = new QButtonGroup(this);
-
-	btnSelectTool = new QPushButton(widget);
-	setStyledToolTip(btnSelectTool, "Switch to Selection Mode");
-	btnSelectTool->setObjectName(QStringLiteral("btnSelectTool"));
-	sizePolicy1.setHeightForWidth(btnSelectTool->sizePolicy().hasHeightForWidth());
-	btnSelectTool->setSizePolicy(sizePolicy1);
-	btnSelectTool->setMinimumSize(QSize(40, 40));
-	btnSelectTool->setMaximumSize(QSize(40, 40));
-	btnSelectTool->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnSelectTool.png"));
-	btnSelectTool->setIconSize(QSize(36, 36));
-	// because we can detect click or draw rect. we do not need menu by now.
-	//QAction* pointselect_action = new QAction(tr("point select"), this);
-	//QAction* rectselect_action = new QAction(tr("rect select"), this);
-	//QAction* drawselect_action = new QAction(tr("draw select"), this);
-	//pointselect_action->setCheckable(true);
-	//rectselect_action->setCheckable(true);
-	//drawselect_action->setCheckable(true);
-	//QActionGroup* selectGroup = new QActionGroup(this);
-	//selectGroup->addAction(pointselect_action);
-	//selectGroup->addAction(rectselect_action);
-	//selectGroup->addAction(drawselect_action);
-	//connect(pointselect_action, SIGNAL(triggered()), this, SLOT(on_pointselect_action()));
-	//connect(rectselect_action, SIGNAL(triggered()), this, SLOT(on_rectselect_action()));
-	//connect(drawselect_action, SIGNAL(triggered()), this, SLOT(on_drawselect_action()));
-	//QMenu* menu = new QMenu(btnSelectTool);
-	//menu->addAction(pointselect_action);
-	//menu->addAction(rectselect_action);
-	//menu->addAction(drawselect_action);
-	//btnSelectTool->setMenu(menu);
-	hLayout->addWidget(btnSelectTool);
-	btnSelectTool->setCheckable(true);
-	gizmoGroup->addButton(btnSelectTool);
-
-	btnExplodedViewTool = new QPushButton(widget);
-	setStyledToolTip(btnExplodedViewTool, "Exploded View Tool");
-	btnExplodedViewTool->setObjectName(QStringLiteral("btnExplodedViewTool"));
-	sizePolicy1.setHeightForWidth(btnExplodedViewTool->sizePolicy().hasHeightForWidth());
-	btnExplodedViewTool->setSizePolicy(sizePolicy1);
-	btnExplodedViewTool->setMinimumSize(QSize(40, 40));
-	btnExplodedViewTool->setMaximumSize(QSize(40, 40));
-	btnExplodedViewTool->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnExplodedViewTool.png"));
-	btnExplodedViewTool->setIconSize(QSize(36, 36));
-	btnExplodedViewTool->setCheckable(true);
-	hLayout->addWidget(btnExplodedViewTool);
-	gizmoGroup->addButton(btnExplodedViewTool);
-
-	btnTranslate = new QPushButton(widget);
-	setStyledToolTip(btnTranslate, "Translate Tool");
-	btnTranslate->setObjectName(QStringLiteral("btnTranslate"));
-	sizePolicy1.setHeightForWidth(btnTranslate->sizePolicy().hasHeightForWidth());
-	btnTranslate->setSizePolicy(sizePolicy1);
-	btnTranslate->setMinimumSize(QSize(40, 40));
-	btnTranslate->setMaximumSize(QSize(40, 40));
-	btnTranslate->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnTranslate.png"));
-	btnTranslate->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnTranslate);
-	btnTranslate->setCheckable(true);
-	gizmoGroup->addButton(btnTranslate);
-
-	btnRotate = new QPushButton(widget);
-	setStyledToolTip(btnRotate, "Rotate Tool");
-	btnRotate->setObjectName(QStringLiteral("btnRotate"));
-	sizePolicy1.setHeightForWidth(btnRotate->sizePolicy().hasHeightForWidth());
-	btnRotate->setSizePolicy(sizePolicy1);
-	btnRotate->setMinimumSize(QSize(40, 40));
-	btnRotate->setMaximumSize(QSize(40, 40));
-	btnRotate->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnRotate.png"));
-	btnRotate->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnRotate);
-	btnRotate->setCheckable(true);
-	gizmoGroup->addButton(btnRotate);
-
-	btnScale = new QPushButton(widget);
-	setStyledToolTip(btnScale, "Scale Tool");
-	btnScale->setObjectName(QStringLiteral("btnScale"));
-	sizePolicy1.setHeightForWidth(btnScale->sizePolicy().hasHeightForWidth());
-	btnScale->setSizePolicy(sizePolicy1);
-	btnScale->setMinimumSize(QSize(40, 40));
-	btnScale->setMaximumSize(QSize(40, 40));
-	btnScale->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnScale.png"));
-	btnScale->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnScale);
-	btnScale->setCheckable(true);
-	gizmoGroup->addButton(btnScale);
-
-	btnGizmoWithLocal = new QPushButton(widget);
-	setStyledToolTip(btnGizmoWithLocal, "Gizmo in Global Mode");
-	btnGizmoWithLocal->setObjectName(QStringLiteral("btnGizmoWithLocal"));
-	sizePolicy1.setHeightForWidth(btnGizmoWithLocal->sizePolicy().hasHeightForWidth());
-	btnGizmoWithLocal->setSizePolicy(sizePolicy1);
-	btnGizmoWithLocal->setMinimumSize(QSize(40, 40));
-	btnGizmoWithLocal->setMaximumSize(QSize(40, 40));
-	btnGizmoWithLocal->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnGizmoWithGlobal.png"));
-	btnGizmoWithLocal->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnGizmoWithLocal);
-	btnGizmoWithLocal->setCheckable(true);
-
-	//fSeparate = new QFrame(widget);
-	//fSeparate->setObjectName(QStringLiteral("fSeparate"));
-	//fSeparate->setFrameShape(QFrame::VLine);
-	//fSeparate->setFrameShadow(QFrame::Sunken);
-	//hLayout->addWidget(fSeparate);
-
-	btnPaintbrush = new QPushButton(widget);
-	setStyledToolTip(btnPaintbrush, "Not Implement");
-	btnPaintbrush->setObjectName(QStringLiteral("btnPaintbrush"));
-	sizePolicy1.setHeightForWidth(btnPaintbrush->sizePolicy().hasHeightForWidth());
-	btnPaintbrush->setSizePolicy(sizePolicy1);
-	btnPaintbrush->setMinimumSize(QSize(40, 40));
-	btnPaintbrush->setMaximumSize(QSize(40, 40));
-	btnPaintbrush->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnPaintbrush.png"));
-	btnPaintbrush->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnPaintbrush);
-
-	btnFractureTool = new QPushButton(widget);
-	setStyledToolTip(btnFractureTool, "Not Implement");
-	btnFractureTool->setObjectName(QStringLiteral("btnFractureTool"));
-	sizePolicy1.setHeightForWidth(btnFractureTool->sizePolicy().hasHeightForWidth());
-	btnFractureTool->setSizePolicy(sizePolicy1);
-	btnFractureTool->setMinimumSize(QSize(40, 40));
-	btnFractureTool->setMaximumSize(QSize(40, 40));
-	btnFractureTool->setText(QApplication::translate("AppMainToolbar", "Fracture", 0));
-	btnFractureTool->setFont(fontCopy);
-	hLayout->addWidget(btnFractureTool);
-
-	btnJointsTool = new QPushButton(widget);
-	setStyledToolTip(btnJointsTool, "Not Implement");
-	btnJointsTool->setObjectName(QStringLiteral("btnJointsTool"));
-	sizePolicy1.setHeightForWidth(btnJointsTool->sizePolicy().hasHeightForWidth());
-	btnJointsTool->setSizePolicy(sizePolicy1);
-	btnJointsTool->setMinimumSize(QSize(40, 40));
-	btnJointsTool->setMaximumSize(QSize(40, 40));
-	btnJointsTool->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnJointsTool.png"));
-	btnJointsTool->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnJointsTool);
-
-	btnFuseSelectedChunks = new QPushButton(widget);
-	setStyledToolTip(btnFuseSelectedChunks, "Not Implement");
-	btnFuseSelectedChunks->setObjectName(QStringLiteral("btnFuseSelectedChunks"));
-	sizePolicy1.setHeightForWidth(btnFuseSelectedChunks->sizePolicy().hasHeightForWidth());
-	btnFuseSelectedChunks->setSizePolicy(sizePolicy1);
-	btnFuseSelectedChunks->setMinimumSize(QSize(40, 40));
-	btnFuseSelectedChunks->setMaximumSize(QSize(40, 40));
-	btnFuseSelectedChunks->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnFuseSelectedChunks.png"));
-	btnFuseSelectedChunks->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnFuseSelectedChunks);
-
-	fSeparate = new QFrame(widget);
-	fSeparate->setObjectName(QStringLiteral("fSeparate"));
-	fSeparate->setFrameShape(QFrame::VLine);
-	fSeparate->setFrameShadow(QFrame::Sunken);
-	hLayout->addWidget(fSeparate);
-
-	QButtonGroup* editSimModeGroup = new QButtonGroup(this);
-
-	btnReset = new QPushButton(widget);
-	setStyledToolTip(btnReset, "Reset Chunks and Switch to Edition Mode");
-	btnReset->setObjectName(QStringLiteral("btnReset"));
-	sizePolicy1.setHeightForWidth(btnReset->sizePolicy().hasHeightForWidth());
-	btnReset->setSizePolicy(sizePolicy1);
-	btnReset->setMinimumSize(QSize(40, 40));
-	btnReset->setMaximumSize(QSize(40, 40));
-	btnReset->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnReset.png"));
-	btnReset->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnReset);
-	btnReset->setCheckable(true);
-	editSimModeGroup->addButton(btnReset);
-
-	btnSimulatePlay = new QPushButton(widget);
-	setStyledToolTip(btnSimulatePlay, "Switch to Simulate Mode");
-	btnSimulatePlay->setObjectName(QStringLiteral("btnSimulatePlay"));
-	sizePolicy1.setHeightForWidth(btnSimulatePlay->sizePolicy().hasHeightForWidth());
-	btnSimulatePlay->setSizePolicy(sizePolicy1);
-	btnSimulatePlay->setMinimumSize(QSize(40, 40));
-	btnSimulatePlay->setMaximumSize(QSize(40, 40));
-	btnSimulatePlay->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnSimulatePlay.png"));
-	btnSimulatePlay->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnSimulatePlay);
-	btnSimulatePlay->setCheckable(true);
-	editSimModeGroup->addButton(btnSimulatePlay);
-
-	btnFrameStepForward = new QPushButton(widget);
-	setStyledToolTip(btnFrameStepForward, "Switch to StepForward Mode");
-	btnFrameStepForward->setObjectName(QStringLiteral("btnFrameStepForward"));
-	sizePolicy1.setHeightForWidth(btnFrameStepForward->sizePolicy().hasHeightForWidth());
-	btnFrameStepForward->setSizePolicy(sizePolicy1);
-	btnFrameStepForward->setMinimumSize(QSize(40, 40));
-	btnFrameStepForward->setMaximumSize(QSize(40, 40));
-	btnFrameStepForward->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnFrameStepForward.png"));
-	btnFrameStepForward->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnFrameStepForward);
-	btnFrameStepForward->setCheckable(true);
-	editSimModeGroup->addButton(btnFrameStepForward);
-
-	fSeparate = new QFrame(widget);
-	fSeparate->setObjectName(QStringLiteral("fSeparate"));
-	fSeparate->setFrameShape(QFrame::VLine);
-	fSeparate->setFrameShadow(QFrame::Sunken);
-	hLayout->addWidget(fSeparate);
-
-	// use btnDamage for Damage function.
-	btnDamage = new QPushButton(widget);
-	setStyledToolTip(btnDamage, "Switch on/off Damage Mode");
-	btnDamage->setObjectName(QStringLiteral("btnDamage"));
-	sizePolicy1.setHeightForWidth(btnDamage->sizePolicy().hasHeightForWidth());
-	btnDamage->setSizePolicy(sizePolicy1);
-	btnDamage->setMinimumSize(QSize(40, 40));
-	btnDamage->setMaximumSize(QSize(40, 40));
-	btnDamage->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnDamage.png"));
-	btnDamage->setIconSize(QSize(36, 36));
-	btnDamage->setCheckable(true);
-	hLayout->addWidget(btnDamage);
-
-	btnProjectile = new QPushButton(widget);
-	setStyledToolTip(btnProjectile, "Throw a Box to Chunks");
-	btnProjectile->setObjectName(QStringLiteral("btnProjectile"));
-	sizePolicy1.setHeightForWidth(btnProjectile->sizePolicy().hasHeightForWidth());
-	btnProjectile->setSizePolicy(sizePolicy1);
-	btnProjectile->setMinimumSize(QSize(40, 40));
-	btnProjectile->setMaximumSize(QSize(40, 40));
-	btnProjectile->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnProjectile.png"));
-	btnProjectile->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnProjectile);
-
-	btnDropObject = new QPushButton(widget);
-	setStyledToolTip(btnDropObject, "Drop the object and simulate");
-	btnDropObject->setObjectName(QStringLiteral("btnDropObject"));
-	sizePolicy1.setHeightForWidth(btnDropObject->sizePolicy().hasHeightForWidth());
-	btnDropObject->setSizePolicy(sizePolicy1);
-	btnDropObject->setMinimumSize(QSize(40, 40));
-	btnDropObject->setMaximumSize(QSize(40, 40));
-	btnDropObject->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnDropObject.png"));
-	btnDropObject->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnDropObject);
-
-	fSeparate = new QFrame(widget);
-	fSeparate->setObjectName(QStringLiteral("fSeparate"));
-	fSeparate->setFrameShape(QFrame::VLine);
-	fSeparate->setFrameShadow(QFrame::Sunken);
-	hLayout->addWidget(fSeparate);
-
-	btnPreferences = new QPushButton(widget);
-	setStyledToolTip(btnPreferences, "Save Blast Asset");
-	btnPreferences->setObjectName(QStringLiteral("btnPreferences"));
-	sizePolicy1.setHeightForWidth(btnPreferences->sizePolicy().hasHeightForWidth());
-	btnPreferences->setSizePolicy(sizePolicy1);
-	btnPreferences->setMinimumSize(QSize(40, 40));
-	btnPreferences->setMaximumSize(QSize(40, 40));
-	btnPreferences->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnPreferences.png"));
-	btnPreferences->setIconSize(QSize(36, 36));
-	hLayout->addWidget(btnPreferences);
-
-	QSpacerItem *horizontalSpacer;
-	horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-	hLayout->addItem(horizontalSpacer);
-
-	this->setWidget(widget);
-
-	connect(&gDropTimer, SIGNAL(timeout()), this, SLOT(on_btnDropObject_clicked()));
-	connect(btnOpenProject, SIGNAL(clicked()), this, SLOT(on_btnOpenProject_clicked()));
-	connect(btnSaveProject, SIGNAL(clicked()), this, SLOT(on_btnSaveProject_clicked()));
-	connect(btnExportAssets, SIGNAL(clicked()), this, SLOT(on_btnExportAssets_clicked()));
-	connect(btnExportFilepath, SIGNAL(clicked()), this, SLOT(on_btnExportFilepath_clicked()));
-	connect(ssbiDepthPreview, SIGNAL(valueChanged(int)), this, SLOT(on_ssbiDepthPreview_valueChanged(int)));
-	connect(cbExactCoverage, SIGNAL(stateChanged(int)), this, SLOT(on_cbExactCoverage_stateChanged(int)));
-	connect(btnSelectTool, SIGNAL(clicked()), this, SLOT(on_btnSelectTool_clicked()));
-	connect(btnTranslate, SIGNAL(clicked()), this, SLOT(on_Translate_clicked()));
-	connect(btnRotate, SIGNAL(clicked()), this, SLOT(on_Rotation_clicked()));
-	connect(btnScale, SIGNAL(clicked()), this, SLOT(on_Scale_clicked()));
-	connect(btnGizmoWithLocal, SIGNAL(clicked()), this, SLOT(on_btnGizmoWithLocal_clicked()));
-	connect(btnPaintbrush, SIGNAL(clicked()), this, SLOT(on_btnPaintbrush_clicked()));
-	connect(btnFractureTool, SIGNAL(clicked()), this, SLOT(on_btnFractureTool_clicked()));
-	connect(btnExplodedViewTool, SIGNAL(clicked()), this, SLOT(on_btnExplodedViewTool_clicked()));
-	connect(btnJointsTool, SIGNAL(clicked()), this, SLOT(on_btnJointsTool_clicked()));
-	connect(btnFuseSelectedChunks, SIGNAL(clicked()), this, SLOT(on_btnFuseSelectedChunks_clicked()));
-	connect(btnReset, SIGNAL(clicked()), this, SLOT(on_btnReset_clicked()));
-	connect(btnSimulatePlay, SIGNAL(clicked()), this, SLOT(on_btnSimulatePlay_clicked()));
-	connect(btnFrameStepForward, SIGNAL(clicked()), this, SLOT(on_btnFrameStepForward_clicked()));
-	connect(btnDamage, SIGNAL(clicked()), this, SLOT(on_btnDamage_clicked()));
-	connect(btnProjectile, SIGNAL(clicked()), this, SLOT(on_btnProjectile_clicked()));
-	connect(btnDropObject, SIGNAL(clicked()), this, SLOT(on_btnDropObject_clicked()));
-	connect(btnPreferences, SIGNAL(clicked()), this, SLOT(on_btnPreferences_clicked()));
-
-	QPushButton* unImplementButtons[] =
-	{
-		btnPaintbrush, btnFractureTool, btnJointsTool, btnFuseSelectedChunks, btnPreferences
-	};
-	int buttonSize = sizeof(unImplementButtons) / sizeof(QPushButton*);
-	for (int bs = 0; bs < buttonSize; bs++)
-	{
-		unImplementButtons[bs]->setVisible(false);
-	}
-}
-
-void BlastToolbar::updateValues()
-{
-	leExportFilepath->setText(GlobalSettings::Inst().m_projectFileDir.c_str());
-	btnGizmoWithLocal->setChecked(AppMainWindow::Inst().m_bGizmoWithLocal);
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	DamageToolController& damageToolController = pSampleManager->getDamageToolController();
-	bool bChecked = damageToolController.IsEnabled() && damageToolController.IsEnabled() && damageToolController.isDamageMode();
-	btnDamage->setChecked(bChecked);
-}
-
-void BlastToolbar::on_btnOpenProject_clicked()
-{
-	//BlastPlugin::OpenBpxa("", "");
-	BlastPlugin::Inst().menu_openProject();
-	// show project path in toolbar
-	updateValues();
-}
-
-void BlastToolbar::on_btnSaveProject_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-	on_btnExportAssets_clicked();
-	BlastPlugin::Inst().menu_saveProject();
-}
-
-void BlastToolbar::on_btnExportAssets_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-	FileReferencesPanel* pPanel = BlastPlugin::Inst().GetFileReferencesPanel();
-	if (pPanel)
-	{
-		BlastAssetInstancesNode* assetInstancesNode = BlastTreeData::ins().getBlastAssetInstancesNode();
-		if (assetInstancesNode != nullptr)
-		{
-			size_t count = assetInstancesNode->children.size();
-			for (size_t i = 0; i < count; ++i)
-			{
-				BlastAssetInstanceNode* assetInstanceNode = dynamic_cast<BlastAssetInstanceNode*>(assetInstancesNode->children[i]);
-				if (assetInstanceNode)
-				{
-					assetInstanceNode->setSelected(true);
-					pPanel->on_btnSave_clicked();
-				}
-			}
-		}
-	}
-}
-
-void BlastToolbar::on_btnExportFilepath_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-	AppMainWindow& window = AppMainWindow::Inst();
-	QString lastDir = leExportFilepath->text();
-	if (lastDir.length() < 1)
-	{
-		lastDir = GlobalSettings::Inst().m_projectFileDir.c_str();
-	}
-	QString pathName = QFileDialog::getExistingDirectory(&window, "Exporting Path", lastDir);
-	if (!pathName.isEmpty())
-	{
-		GlobalSettings::Inst().m_projectFileDir = pathName.toUtf8().data();
-		leExportFilepath->setText(pathName);
-	}
-}
-
-void BlastToolbar::on_ssbiDepthPreview_valueChanged(int v)
-{
-	qDebug("%s", __FUNCTION__);
-	BlastSceneTree* pBlastSceneTree = BlastSceneTree::ins();
-	pBlastSceneTree->hideAllChunks();
-	if (m_fullCoverage)
-	{
-		pBlastSceneTree->setChunkVisibleFullCoverage(v);
-	}
-	else
-	{
-		std::vector<uint32_t> depths(1, v);
-		pBlastSceneTree->setChunkVisible(depths, true);
-	}
-	// refresh display in scene tree
-	//pBlastSceneTree->updateValues(false);
-	SampleManager::ins()->m_bNeedRefreshTree = true;
-}
-
-void BlastToolbar::on_cbExactCoverage_stateChanged(int state)
-{
-	qDebug("%s", __FUNCTION__);
-	m_fullCoverage = (state != 0);
-	//lbExactCoverage->setText(QApplication::translate("AppMainToolbar", (m_fullCoverage? "Full Coverage" : "Exact Coverage"), 0));
-	int depth = ssbiDepthPreview->value();
-	on_ssbiDepthPreview_valueChanged(depth);
-}
-
-void BlastToolbar::on_btnSelectTool_clicked()
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	SelectionToolController& selectionToolController = pSampleManager->getSelectionToolController();
-	ExplodeToolController& expolodeController = pSampleManager->getExplodeToolController();
-	expolodeController.DisableController();
-	GizmoToolController& gizmoToolController = pSampleManager->getGizmoToolController();
-	gizmoToolController.showAxisRenderables(false);
-
-	if (gizmoToolController.IsEnabled())
-	{
-		gizmoToolController.DisableController();
-		selectionToolController.setTargetActor(gizmoToolController.getTargetActor());
-	}
-	selectionToolController.EnableController();
-
-}
-
-void BlastToolbar::on_pointselect_action()
-{
-	qDebug("%s", __FUNCTION__);
-}
-
-void BlastToolbar::on_rectselect_action()
-{
-	qDebug("%s", __FUNCTION__);
-}
-
-void BlastToolbar::on_drawselect_action()
-{
-	qDebug("%s", __FUNCTION__);
-}
-
-bool BlastToolbar::on_Translate_clicked()
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	SelectionToolController& selectionToolController = pSampleManager->getSelectionToolController();
-	ExplodeToolController& expolodeController = pSampleManager->getExplodeToolController();
-	expolodeController.DisableController();
-	GizmoToolController& gizmoToolController = pSampleManager->getGizmoToolController();
-	gizmoToolController.showAxisRenderables(false);
-
-	if (selectionToolController.IsEnabled())
-	{
-		selectionToolController.DisableController();
-		gizmoToolController.setTargetActor(selectionToolController.getTargetActor());
-	}
-	gizmoToolController.EnableController();
-	gizmoToolController.setGizmoToolMode(GTM_Translate);
-
-	return true;
-}
-
-bool BlastToolbar::on_Rotation_clicked()
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	SelectionToolController& selectionToolController = pSampleManager->getSelectionToolController();
-	ExplodeToolController& expolodeController = pSampleManager->getExplodeToolController();
-	expolodeController.DisableController();
-	GizmoToolController& gizmoToolController = pSampleManager->getGizmoToolController();
-	gizmoToolController.showAxisRenderables(false);
-
-	if (selectionToolController.IsEnabled())
-	{
-		selectionToolController.DisableController();
-		gizmoToolController.setTargetActor(selectionToolController.getTargetActor());
-	}
-	gizmoToolController.EnableController();
-	gizmoToolController.setGizmoToolMode(GTM_Rotation);
-
-	return true;
-}
-
-bool BlastToolbar::on_Scale_clicked()
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	SelectionToolController& selectionToolController = pSampleManager->getSelectionToolController();
-	ExplodeToolController& expolodeController = pSampleManager->getExplodeToolController();
-	expolodeController.DisableController();
-	GizmoToolController& gizmoToolController = pSampleManager->getGizmoToolController();
-	gizmoToolController.showAxisRenderables(false);
-
-	if (selectionToolController.IsEnabled())
-	{
-		selectionToolController.DisableController();
-		gizmoToolController.setTargetActor(selectionToolController.getTargetActor());
-	}
-	gizmoToolController.EnableController();
-	gizmoToolController.setGizmoToolMode(GTM_Scale);
-
-	return true;
-}
-
-void BlastToolbar::on_btnGizmoWithLocal_clicked()
-{
-	AppMainWindow& app = AppMainWindow::Inst();
-	app.m_bGizmoWithLocal = !app.m_bGizmoWithLocal;
-	if (app.m_bGizmoWithLocal)
-	{
-		btnGizmoWithLocal->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnGizmoWithLocal.png"));
-		setStyledToolTip(btnGizmoWithLocal, "Gizmo in Local Mode");
-	}
-	else
-	{
-		btnGizmoWithLocal->setIcon(QIcon(":/AppMainWindow/images/Blast_ToolBar_btnGizmoWithGlobal.png"));
-		setStyledToolTip(btnGizmoWithLocal, "Gizmo in Global Mode");
-	}
-	app.updateUI();
-}
-
-void BlastToolbar::on_btnPaintbrush_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-}
-
-void BlastToolbar::on_btnFractureTool_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-}
-
-void BlastToolbar::on_btnExplodedViewTool_clicked()
-{
-#if (1)
-	SampleManager* pSampleManager = SampleManager::ins();
-	ExplodeToolController& explodeToolController = pSampleManager->getExplodeToolController();
-	GizmoToolController& gizmoToolController = pSampleManager->getGizmoToolController();
-	gizmoToolController.showAxisRenderables(false);
-
-	pSampleManager->getSelectionToolController().DisableController();
-
-	if (gizmoToolController.IsEnabled())
-	{
-		gizmoToolController.DisableController();
-	}
-	explodeToolController.EnableController();
-#endif
-
-#if (0)
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (pSampleManager->IsSimulating())
-	{
-		return;
-	}
-
-	BlastAsset* pBlastAsset = nullptr;
-	int nFamilyIndex = -1;
-	pSampleManager->getCurrentSelectedInstance(&pBlastAsset, nFamilyIndex);
-	if (pBlastAsset == nullptr)
-	{
-		std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-		if (AssetDescMap.size() == 1)
-		{
-			std::map<BlastAsset*, AssetList::ModelAsset>::iterator itAssetDescMap = AssetDescMap.begin();
-			pSampleManager->setCurrentSelectedInstance(itAssetDescMap->first, -1);
-			pBlastAsset = pSampleManager->getCurBlastAsset();
-			viewer_msg("no asset selected, use the only one in current scene.");
-		}
-	}
-	if (pBlastAsset == nullptr)
-	{
-		viewer_msg("please select one asset before explode.");
-		return;
-	}
-
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = pSampleManager->getAssetFamiliesMap();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>::iterator itAFM = AssetFamiliesMap.find(pBlastAsset);
-	if (itAFM == AssetFamiliesMap.end())
-	{
-		return;
-	}
-
-	std::vector<BlastFamily*> families = itAFM->second;
-	int familySize = families.size();
-	if (familySize == 0)
-	{
-		viewer_msg("no instance for current asset.");
-		return;
-	}
-
-	if (nFamilyIndex == -1 || nFamilyIndex >= familySize)
-	{
-		nFamilyIndex = 0;
-		viewer_msg("no instance selected, use the first one of current asset.");
-	}
-
-	BlastFamily* pFamily = families[nFamilyIndex];	
-
-	PxScene& scene = pSampleManager->getPhysXController().getEditPhysXScene();
-	const PxU32 actorsCountTotal = scene.getNbActors(PxActorTypeFlag::eRIGID_DYNAMIC);
-	if (actorsCountTotal == 0)
-	{
-		return;
-	}
-
-	std::vector<PxActor*> actorsTotal(actorsCountTotal);
-	PxU32 nbActors = scene.getActors(PxActorTypeFlag::eRIGID_DYNAMIC, &actorsTotal[0], actorsCountTotal, 0);
-	PX_ASSERT(actorsCountTotal == nbActors);
-
-	std::vector<PxActor*> actors;
-	PxActor* pRootActor = nullptr;
-	for (int act = 0; act < actorsCountTotal; act++)
-	{
-		if (pFamily->find(*actorsTotal[act]))
-		{
-			if (pRootActor == nullptr)
-			{
-				uint32_t chunkIndex = pFamily->getChunkIndexByPxActor(*actorsTotal[act]);
-				std::vector<uint32_t> chunkIndexes;
-				chunkIndexes.push_back(chunkIndex);
-				std::vector<BlastChunkNode*> chunkNodes = BlastTreeData::ins().getChunkNodeByBlastChunk(pBlastAsset, chunkIndexes);
-				if (chunkNodes.size() > 0 && BlastTreeData::isRoot(chunkNodes[0]))
-				{
-					pRootActor = actorsTotal[act];
-				}
-				else
-				{
-					actors.push_back(actorsTotal[act]);
-				}
-			}
-			else
-			{
-				actors.push_back(actorsTotal[act]);
-			}			
-		}
-	}
-
-	if (pRootActor == nullptr)
-	{
-		return;
-	}
-
-	++nExplodedViewState;
-
-	BlastController& blastController = pSampleManager->getBlastController();	
-
-	PxVec3 origin = pRootActor->getWorldBounds().getCenter();
-
-	int actorsCount = actors.size();
-	for (int ac = 0; ac < actorsCount; ac++)
-	{
-		PxActor* actor = actors[ac];
-		PxRigidDynamic* dynamic = actor->is<PxRigidDynamic>();
-		PX_ASSERT(dynamic != nullptr);
-		PxTransform transformOld = dynamic->getGlobalPose();
-		PxTransform transformNew = transformOld;
-
-		PxBounds3 bound = actor->getWorldBounds();
-		PxVec3 target = bound.getCenter();
-		PxVec3 tChange = (target - origin) * 0.5;
-		if (nExplodedViewState > 5)
-		{
-			tChange = (origin - target) / 3;
-		}
-		PxVec3 newTarget = target + tChange;
-		transformNew.p = transformOld.p + tChange;
-		dynamic->setGlobalPose(transformNew);
-		blastController.updateActorRenderableTransform(*actor, transformNew, false);
-	}
-	if (nExplodedViewState > 9)
-		nExplodedViewState = 0;
-
-#endif
-}
-
-void BlastToolbar::on_btnJointsTool_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-}
-
-void BlastToolbar::on_btnFuseSelectedChunks_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-}
-
-void BlastToolbar::on_btnReset_clicked()
-{
-	nExplodedViewState = 0;
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	bool bStopSimulation = pSampleManager->IsSimulating();
-	pSampleManager->resetScene();
-	// only show depth 0 if stop from simulation. Otherwise, just show as previous.
-	if (bStopSimulation)
-	{
-		BlastSceneTree* pBlastSceneTree = BlastSceneTree::ins();
-		pBlastSceneTree->hideAllChunks();
-		std::vector<uint32_t> depths(1, 0);
-		pBlastSceneTree->setChunkVisible(depths, true);
-		// refresh display in scene tree
-		//pBlastSceneTree->updateValues(false);
-		SampleManager::ins()->m_bNeedRefreshTree = true;
-	}
-	updateValues();
-}
-
-void BlastToolbar::on_btnSimulatePlay_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (!pSampleManager->IsSimulating())
-	{
-		// force to recreate BlastFamilyModelSimple from project data
-		pSampleManager->resetScene();
-		pSampleManager->EnableSimulating(true);
-		// set right damage mode
-		DamageToolController& damageToolController = pSampleManager->getDamageToolController();
-		bool bChecked = damageToolController.IsEnabled() && damageToolController.IsEnabled() && damageToolController.isDamageMode();
-		if (damageToolController.isDamageMode() && !bChecked)
-		{
-			on_btnDamage_clicked();
-		}
-	}
-	else
-	{
-		// pause it or continue
-		PhysXController& physx = pSampleManager->getPhysXController();
-		bool bState = physx.isPaused();
-		physx.setPaused(!bState);
-	}
-}
-
-void BlastToolbar::on_btnFrameStepForward_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (!pSampleManager->IsSimulating())
-	{
-		// force to recreate BlastFamilyModelSimple from project data
-		pSampleManager->resetScene();
-		// set right damage mode
-		DamageToolController& damageToolController = pSampleManager->getDamageToolController();
-		bool bChecked = damageToolController.IsEnabled() && damageToolController.IsEnabled() && damageToolController.isDamageMode();
-		if (damageToolController.isDamageMode() && !bChecked)
-		{
-			on_btnDamage_clicked();
-		}
-	}
-	pSampleManager->EnableSimulating(true);
-	pSampleManager->EnableStepforward(true);
-}
-
-void BlastToolbar::on_btnDamage_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-	SampleManager* pSampleManager = SampleManager::ins();
-	DamageToolController& damageToolController = pSampleManager->getDamageToolController();
-	if (damageToolController.IsEnabled())
-	{
-		damageToolController.DisableController();
-		damageToolController.setDamageMode(false);
-		btnDamage->setChecked(false);
-	}
-	else
-	{
-		damageToolController.EnableController();
-		damageToolController.setDamageMode(true);
-		btnDamage->setChecked(true);
-	}
-//	pSampleManager->getDamageToolController().setDamageMode(!pSampleManager->getDamageToolController().isDamageMode());
-}
-
-void BlastToolbar::on_btnProjectile_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-
-	SampleManager* pSampleManager = SampleManager::ins();	
-	if (pSampleManager->IsSimulating())
-	{
-		SceneController& sceneController = pSampleManager->getSceneController();
-		sceneController.addProjectile();
-	}
-	else
-	{
-		viewer_msg("Please use it when simulation runs.");
-	}
-}
-
-void BlastToolbar::on_btnDropObject_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (pSampleManager->IsSimulating())
-	{
-		on_btnReset_clicked();
-		// if not use timer, it could go to strange paused state.
-		gDropTimer.start(10);
-		return;
-	}
-	gDropTimer.stop();
-	BlastAssetInstancesNode* assetInstancesNode = BlastTreeData::ins().getBlastAssetInstancesNode();
-	if (assetInstancesNode != nullptr)
-	{
-		physx::PxVec3 size = pSampleManager->getAssetExtent();
-		float fChange = size.magnitude();
-		size_t count = assetInstancesNode->children.size();
-		// find the min height first
-		float minHeight = NV_MAX_F32;
-		for (size_t i = 0; i < count; ++i)
-		{
-			BlastAssetInstanceNode* assetInstanceNode = (BlastAssetInstanceNode*)assetInstancesNode->children[i];
-			BPPAssetInstance* bppInstance = (BPPAssetInstance*)assetInstanceNode->getData();
-			if (bppInstance)
-			{
-				BlastFamily* family = SampleManager::ins()->getFamilyByInstance(bppInstance);
-				if (family)
-				{
-					physx::PxTransform t = family->getSettings().transform;
-					if (GlobalSettings::Inst().m_zup)
-					{
-						if (t.p.z < minHeight)
-							minHeight = t.p.z;
-					}
-					else
-					{
-						if (t.p.y < minHeight)
-							minHeight = t.p.y;
-					}
-				}
-			}
-		}
-		// make fChange
-		while ((minHeight + fChange) < 0.0f)
-		{
-			fChange += fChange;
-		}
-		// change position
-		for (size_t i = 0; i < count; ++i)
-		{
-			BlastAssetInstanceNode* assetInstanceNode = (BlastAssetInstanceNode*)assetInstancesNode->children[i];
-			BPPAssetInstance* bppInstance = (BPPAssetInstance*)assetInstanceNode->getData();
-			if (bppInstance)
-			{
-				BlastFamily* family = SampleManager::ins()->getFamilyByInstance(bppInstance);
-				if (family)
-				{
-					physx::PxTransform t = family->getSettings().transform;
-					if (GlobalSettings::Inst().m_zup)
-					{
-						t.p.z += fChange;
-					}
-					else
-					{
-						t.p.y += fChange;
-					}
-					family->initTransform(t);
-				}
-			}
-		}
-		// have to reset scene to make the new positions used.
-		on_btnReset_clicked();
-		pSampleManager->EnableSimulating(true);
-		// restore original position
-		for (size_t i = 0; i < count; ++i)
-		{
-			BlastAssetInstanceNode* assetInstanceNode = (BlastAssetInstanceNode*)assetInstancesNode->children[i];
-			BPPAssetInstance* bppInstance = (BPPAssetInstance*)assetInstanceNode->getData();
-			if (bppInstance)
-			{
-				BlastFamily* family = SampleManager::ins()->getFamilyByInstance(bppInstance);
-				if (family)
-				{
-					physx::PxTransform t = family->getSettings().transform;
-					if (GlobalSettings::Inst().m_zup)
-					{
-						t.p.z -= fChange;
-					}
-					else
-					{
-						t.p.y -= fChange;
-					}
-					family->initTransform(t);
-				}
-			}
-		}
-		// set right damage mode
-		DamageToolController& damageToolController = pSampleManager->getDamageToolController();
-		bool bChecked = damageToolController.IsEnabled() && damageToolController.IsEnabled() && damageToolController.isDamageMode();
-		if (damageToolController.isDamageMode() && !bChecked)
-		{
-			on_btnDamage_clicked();
-		}
-	}
-}
-
-void BlastToolbar::on_btnPreferences_clicked()
-{
-	qDebug("%s", __FUNCTION__);
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	BlastAsset* pBlastAsset = pSampleManager->getCurBlastAsset();
-	pSampleManager->saveAsset(pBlastAsset);
-}
-
-void BlastToolbar::updateCheckIconsStates()
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	SelectionToolController& selectionToolController = pSampleManager->getSelectionToolController();
-	btnSelectTool->setChecked(selectionToolController.IsEnabled());
-
-	GizmoToolController& gizmoToolController = pSampleManager->getGizmoToolController();
-	bool bGizmo = gizmoToolController.IsEnabled();
-	GizmoToolMode mode = gizmoToolController.getGizmoToolMode();
-	btnTranslate->setChecked(mode == GTM_Translate && bGizmo);
-	btnRotate->setChecked(mode == GTM_Rotation && bGizmo);
-	btnScale->setChecked(mode == GTM_Scale && bGizmo);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.h b/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.h
deleted file mode 100644
index 24129e8..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef BlastToolbar_h__
-#define BlastToolbar_h__
-
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QDockWidget>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QLineEdit>
-
-#include "SlideSpinBox.h"
-
-class BlastToolbar : public QDockWidget
-{
-	Q_OBJECT
-
-public:
-	BlastToolbar(QWidget* parent);
-
-	void updateValues();
-
-public slots:
-		void on_btnOpenProject_clicked();
-		void on_btnSaveProject_clicked();
-		void on_btnExportAssets_clicked();
-
-		void on_btnExportFilepath_clicked();
-		void on_ssbiDepthPreview_valueChanged(int v);
-		void on_cbExactCoverage_stateChanged(int state);
-
-		void on_btnSelectTool_clicked();
-		void on_pointselect_action();
-		void on_rectselect_action();
-		void on_drawselect_action();
-
-		bool on_Translate_clicked();
-		bool on_Rotation_clicked();
-		bool on_Scale_clicked();
-		void on_btnGizmoWithLocal_clicked();
-
-		void on_btnPaintbrush_clicked();
-		void on_btnFractureTool_clicked();
-		void on_btnExplodedViewTool_clicked();
-		void on_btnJointsTool_clicked();
-		void on_btnFuseSelectedChunks_clicked();
-
-		void on_btnReset_clicked();
-		void on_btnSimulatePlay_clicked();
-		void on_btnFrameStepForward_clicked();
-
-		void on_btnDamage_clicked();
-		void on_btnProjectile_clicked();
-		void on_btnDropObject_clicked();
-
-		void on_btnPreferences_clicked();
-
-		void updateCheckIconsStates();
-
-private:
-	QHBoxLayout *hLayout;
-	QFrame *fSeparate;
-
-	QPushButton *btnOpenProject;
-	QPushButton *btnSaveProject;
-	QPushButton *btnExportAssets;
-	
-	QVBoxLayout *vLayoutExport;
-	QHBoxLayout *hLayoutExport;	
-	QLabel *lExportFilepath;
-	QPushButton *btnExportFilepath;
-	QLineEdit* leExportFilepath;
-
-	QVBoxLayout *vLayoutDepthCoverage;
-	QHBoxLayout *hlDepthPreview;
-	QLabel *lbDepthPreview;
-	SlideSpinBoxInt* ssbiDepthPreview;
-	QHBoxLayout *hlExactCoverage;
-	QLabel *lbExactCoverage;
-	QCheckBox* cbExactCoverage;
-	
-	QPushButton *btnSelectTool;
-	QPushButton *btnTranslate;
-	QPushButton *btnRotate;
-	QPushButton *btnScale;
-	QPushButton *btnGizmoWithLocal;
-
-	QPushButton *btnPaintbrush;
-	QPushButton *btnFractureTool;
-	QPushButton *btnExplodedViewTool;
-	QPushButton *btnJointsTool;
-	QPushButton *btnFuseSelectedChunks;
-	
-	QPushButton *btnReset;
-	QPushButton *btnSimulatePlay;
-	QPushButton *btnFrameStepForward;
-	
-	QPushButton *btnDamage;
-	QPushButton *btnProjectile;
-	QPushButton *btnDropObject;
-	
-	QPushButton *btnPreferences;
-
-	bool m_fullCoverage;
-};
-#endif // BlastToolbar_h__
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/CollisionToolsDlg.cpp b/tools/ArtistTools/source/BlastPlugin/Window/CollisionToolsDlg.cpp
deleted file mode 100644
index 4aa2b79..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/CollisionToolsDlg.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "CollisionToolsDlg.h"
-#include "ui_CollisionToolsDlg.h"
-
-CollisionToolsDlg::CollisionToolsDlg(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::CollisionToolsDlg)
-{
-    ui->setupUi(this);
-}
-
-CollisionToolsDlg::~CollisionToolsDlg()
-{
-    delete ui;
-}
-
-void CollisionToolsDlg::on_comboBoxApplyFilter_currentIndexChanged(int index)
-{
-
-}
-
-void CollisionToolsDlg::on_comboBoxCollisionShape_currentIndexChanged(int index)
-{
-
-}
-
-void CollisionToolsDlg::on_spinBoxQuality_valueChanged(int arg1)
-{
-
-}
-
-void CollisionToolsDlg::on_spinBoxMaxHulls_valueChanged(int arg1)
-{
-
-}
-
-void CollisionToolsDlg::on_spinBoxTrimHulls_valueChanged(int arg1)
-{
-
-}
-
-void CollisionToolsDlg::on_comboBoxTargetPlatform_currentIndexChanged(int index)
-{
-
-}
-
-void CollisionToolsDlg::on_btnReset_clicked()
-{
-
-}
-
-void CollisionToolsDlg::on_btnApply_clicked()
-{
-
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/CollisionToolsDlg.h b/tools/ArtistTools/source/BlastPlugin/Window/CollisionToolsDlg.h
deleted file mode 100644
index d3c8c00..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/CollisionToolsDlg.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef COLLISIONTOOLSDLG_H
-#define COLLISIONTOOLSDLG_H
-
-#include <QtWidgets/QDialog>
-
-namespace Ui {
-class CollisionToolsDlg;
-}
-
-class CollisionToolsDlg : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit CollisionToolsDlg(QWidget *parent = 0);
-    ~CollisionToolsDlg();
-
-private slots:
-    void on_comboBoxApplyFilter_currentIndexChanged(int index);
-
-    void on_comboBoxCollisionShape_currentIndexChanged(int index);
-
-    void on_spinBoxQuality_valueChanged(int arg1);
-
-    void on_spinBoxMaxHulls_valueChanged(int arg1);
-
-    void on_spinBoxTrimHulls_valueChanged(int arg1);
-
-    void on_comboBoxTargetPlatform_currentIndexChanged(int index);
-
-    void on_btnReset_clicked();
-
-    void on_btnApply_clicked();
-
-private:
-    Ui::CollisionToolsDlg *ui;
-};
-
-#endif // COLLISIONTOOLSDLG_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/DefaultDamagePanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/DefaultDamagePanel.cpp
deleted file mode 100644
index 5d82ce5..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/DefaultDamagePanel.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-#include "DefaultDamagePanel.h"
-#include "ui_DefaultDamagePanel.h"
-#include "ProjectParams.h"
-#include "BlastSceneTree.h"
-#include <float.h>
-
-#include "DamageToolController.h"
-
-DefaultDamagePanel* gDefaultDamagePanel = nullptr;
-DefaultDamagePanel* DefaultDamagePanel::ins()
-{
-	return gDefaultDamagePanel;
-}
-
-QComboBox* DefaultDamagePanel::getDamageProfile()
-{
-	return ui->comboBoxDamageProfile;
-}
-
-void DefaultDamagePanel::setUpdateData(bool bUpdateData)
-{
-	_updateData = bUpdateData;
-}
-
-DefaultDamagePanel::DefaultDamagePanel(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::DefaultDamagePanel),
-	_updateData(true)
-{
-	gDefaultDamagePanel = this;
-
-    ui->setupUi(this);
-
-	_updateData = false;
-	ui->spinBoxDamageAmount->setRange(0.0f, DBL_MAX);
-	ui->spinBoxExplosiveImpulse->setRange(0.0f, DBL_MAX);
-	ui->spinBoxDamageRadius->setRange(0.0f, DBL_MAX);
-	ui->spinBoxStressDamageForce->setRange(0.0f, DBL_MAX);
-	ui->checkBoxDamageContinuously->setChecked(false);
-	_updateData = true;
-}
-
-DefaultDamagePanel::~DefaultDamagePanel()
-{
-    delete ui;
-}
-
-void DefaultDamagePanel::updateValues()
-{
-	_updateData = false;
-	BPPDefaultDamage& damage = BlastProject::ins().getParams().defaultDamage;
-	if (damage.damageStructs.arraySizes[0] > 0)
-	{		
-		uint32_t damageProfile = damage.damageProfile;
-		BPPDamageStruct& damageStruct = damage.damageStructs.buf[damageProfile];
-		ui->spinBoxDamageAmount->setValue(damage.damageAmount);
-		ui->spinBoxExplosiveImpulse->setValue(damage.explosiveImpulse);
-		ui->spinBoxStressDamageForce->setValue(damage.stressDamageForce);
-		ui->comboBoxDamageProfile->setCurrentIndex(damageProfile);
-		ui->spinBoxDamageRadius->setValue(damageStruct.damageRadius);
-		ui->checkBoxDamageContinuously->setChecked(damageStruct.continuously);
-	}
-	else
-	{
-		ui->spinBoxDamageAmount->setValue(0);
-		ui->spinBoxExplosiveImpulse->setValue(0);
-		ui->spinBoxDamageRadius->setValue(0);
-		ui->spinBoxStressDamageForce->setValue(0);
-		ui->checkBoxDamageContinuously->setChecked(false);
-		ui->comboBoxDamageProfile->setCurrentIndex(0);
-	}
-	_updateData = true;
-}
-
-void DefaultDamagePanel::dataSelected(std::vector<BlastNode*> selections)
-{
-	_selectedAssets.clear();
-
-	for (BlastNode* node: selections)
-	{
-		if (eAsset == node->getType())
-		{
-			BPPAsset* asset = static_cast<BPPAsset*>(node->getData());
-			_selectedAssets.push_back(asset);
-		}
-	}
-
-	updateValues();
-}
-
-void DefaultDamagePanel::on_spinBoxDamageAmount_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPDefaultDamage& damage = BlastProject::ins().getParams().defaultDamage;
-	damage.damageAmount = arg1;
-
-	DamageToolController::ins()->setDamageAmount(arg1);
-}
-
-void DefaultDamagePanel::on_spinBoxExplosiveImpulse_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPDefaultDamage& damage = BlastProject::ins().getParams().defaultDamage;
-	damage.explosiveImpulse = arg1;
-
-	DamageToolController::ins()->setExplosiveImpulse(arg1);
-}
-
-void DefaultDamagePanel::on_spinBoxDamageRadius_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPDefaultDamage& damage = BlastProject::ins().getParams().defaultDamage;
-	uint32_t damageProfile = damage.damageProfile;
-	BPPDamageStruct& damageStruct = damage.damageStructs.buf[damageProfile];
-	damageStruct.damageRadius = arg1;
-
-	DamageToolController::ins()->setRadius(arg1);
-}
-
-void DefaultDamagePanel::on_spinBoxStressDamageForce_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPDefaultDamage& damage = BlastProject::ins().getParams().defaultDamage;
-	damage.stressDamageForce = arg1;
-
-	DamageToolController::ins()->setStressForceFactor(arg1);
-}
-
-void DefaultDamagePanel::on_comboBoxDamageProfile_currentIndexChanged(int index)
-{
-	if (!_updateData)
-		return;
-
-	BPPDefaultDamage& damage = BlastProject::ins().getParams().defaultDamage;
-	damage.damageProfile = index;
-
-	DamageToolController::ins()->setDamagerIndex(index);
-
-	updateValues();
-}
-
-void DefaultDamagePanel::on_checkBoxDamageContinuously_stateChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPDefaultDamage& damage = BlastProject::ins().getParams().defaultDamage;
-	uint32_t damageProfile = damage.damageProfile;
-	BPPDamageStruct& damageStruct = damage.damageStructs.buf[damageProfile];
-	damageStruct.continuously = arg1;
-
-	DamageToolController::ins()->setDamageWhilePressed(arg1);
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/DefaultDamagePanel.h b/tools/ArtistTools/source/BlastPlugin/Window/DefaultDamagePanel.h
deleted file mode 100644
index 044311e..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/DefaultDamagePanel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef DEFAULTDAMAGEPANEL_H
-#define DEFAULTDAMAGEPANEL_H
-
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QComboBox>
-#include "BlastSceneTree.h"
-
-namespace Ui {
-class DefaultDamagePanel;
-}
-
-class DefaultDamagePanel : public QWidget, public ISceneObserver
-{
-    Q_OBJECT
-
-public:
-    explicit DefaultDamagePanel(QWidget *parent = 0);
-    ~DefaultDamagePanel();
-	void updateValues();
-
-	static DefaultDamagePanel* ins();
-	QComboBox* getDamageProfile();
-	void setUpdateData(bool bUpdateData);
-
-	virtual void dataSelected(std::vector<BlastNode*> selections);
-
-private slots:
-    void on_spinBoxDamageAmount_valueChanged(double arg1);
-
-    void on_spinBoxExplosiveImpulse_valueChanged(double arg1);
-
-	void on_spinBoxDamageRadius_valueChanged(double arg1);
-
-	void on_spinBoxStressDamageForce_valueChanged(double arg1);
-
-    void on_comboBoxDamageProfile_currentIndexChanged(int index);
-
-	void on_checkBoxDamageContinuously_stateChanged(int arg1);
-
-private:
-    Ui::DefaultDamagePanel		*ui;
-	bool						_updateData;
-	std::vector<BPPAsset*>		_selectedAssets;
-};
-
-#endif // DEFAULTDAMAGEPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FileReferencesPanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/FileReferencesPanel.cpp
deleted file mode 100644
index b3b09b4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FileReferencesPanel.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-#include "FileReferencesPanel.h"
-#include "ui_FileReferencesPanel.h"
-#include "AppMainWindow.h"
-#include <QtWidgets/QFileDialog>
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
-#include "GlobalSettings.h"
-#include "SampleManager.h"
-#include "ViewerOutput.h"
-
-FileReferencesPanel* gFileReferencesPanel = nullptr;
-FileReferencesPanel* FileReferencesPanel::ins()
-{
-	return gFileReferencesPanel;
-}
-
-FileReferencesPanel::FileReferencesPanel(QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::FileReferencesPanel)
-{
-    ui->setupUi(this);
-	ui->lineEditFBXSourceAsset->setReadOnly(true);
-
-	ui->lineEditFBX->setText("New.fbx");
-	ui->lineEditObj->setText("New.obj");
-	ui->lineEditLLAsset->setText("Newll.blast");
-	ui->lineEditTKAsset->setText("Newtk.blast");
-	ui->lineEditBPXA->setText("New.blast");
-	bValid = false;
-	ui->checkBoxFBX->setChecked(false);
-	ui->checkBoxObj->setChecked(false);
-	ui->checkBoxLLAsset->setChecked(false);
-	ui->checkBoxTKAsset->setChecked(false);
-	ui->checkBoxBPXA->setChecked(false);
-	bValid = true;
-
-	gFileReferencesPanel = this;
-
-	updateValues();
-}
-
-FileReferencesPanel::~FileReferencesPanel()
-{
-    delete ui;
-}
-
-void FileReferencesPanel::updateValues()
-{
-	AppMainWindow& window = AppMainWindow::Inst();
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPFileReferences& fileReferences = projectParams.blast.fileReferences;
-	if (fileReferences.fbxSourceAsset.buf != nullptr)
-		ui->lineEditFBXSourceAsset->setText(fileReferences.fbxSourceAsset.buf);
-	else
-		ui->lineEditFBXSourceAsset->setText("");
-
-	ui->lineEditFBX->setText("");
-	ui->lineEditObj->setText("");
-	ui->lineEditLLAsset->setText("");
-	ui->lineEditTKAsset->setText("");
-	ui->lineEditBPXA->setText("");
-	bValid = false;
-	ui->checkBoxFBX->setChecked(false);
-	ui->checkBoxObj->setChecked(false);
-	ui->checkBoxTKAsset->setChecked(false);
-	ui->checkBoxBPXA->setChecked(false);
-	bValid = true;
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (pSampleManager == nullptr)
-	{
-		return;
-	}
-
-	BlastAsset* pBlastAsset = pSampleManager->getCurBlastAsset();
-	if (pBlastAsset == nullptr)
-	{
-		return;
-	}
-
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itADM = AssetDescMap.find(pBlastAsset);
-	if (itADM  == AssetDescMap.end())
-	{
-		return;
-	}
-
-	AssetList::ModelAsset modelAsset = itADM->second;
-	if (modelAsset.name.empty())
-	{
-		return;
-	}
-
-	BPPAssetArray& assetArray = projectParams.blast.blastAssets;
-	BPPAsset asset;
-	int aaas = 0;
-	for (; aaas < assetArray.arraySizes[0]; aaas++)
-	{
-		asset = assetArray.buf[aaas];
-		std::string assetname = asset.name;
-		if (assetname == modelAsset.name)
-			break;
-	}
-	if (aaas == assetArray.arraySizes[0])
-	{
-		return;
-	}
-
-	QFileInfo fileInfo(modelAsset.name.c_str());
-
-	if (asset.fbx.buf != nullptr)
-		ui->lineEditFBX->setText(asset.fbx.buf);
-	else
-	{
-		ui->lineEditFBX->setText(fileInfo.baseName() + "_New.fbx");
-	}
-
-	if (asset.obj.buf != nullptr)
-		ui->lineEditObj->setText(asset.obj.buf);
-	else
-	{
-		ui->lineEditObj->setText(fileInfo.baseName() + "_New.obj");
-	}
-
-	if (asset.llasset.buf != nullptr)
-		ui->lineEditLLAsset->setText(asset.llasset.buf);
-	else
-	{
-		ui->lineEditLLAsset->setText(fileInfo.baseName() + "_Newll.blast");
-	}
-
-	if (asset.tkasset.buf != nullptr)
-		ui->lineEditTKAsset->setText(asset.tkasset.buf);
-	else
-	{
-		ui->lineEditTKAsset->setText(fileInfo.baseName() + "_Newtk.blast");
-	}
-
-	if (asset.bpxa.buf != nullptr)
-		ui->lineEditBPXA->setText(asset.bpxa.buf);
-	else
-	{
-		ui->lineEditBPXA->setText(fileInfo.baseName() + "_New.blast");
-	}
-
-	bValid = false;
-	ui->checkBoxFBX->setChecked(asset.exportFBX);
-	ui->checkBoxEmbedFBXCollision->setChecked(asset.embedFBXCollision);
-	ui->checkBoxObj->setChecked(asset.exportOBJ);
-	ui->checkBoxLLAsset->setChecked(asset.exportLLAsset);
-	ui->checkBoxTKAsset->setChecked(asset.exportTKAsset);
-	ui->checkBoxBPXA->setChecked(asset.exportBPXA);
-	bValid = true;
-}
-
-void FileReferencesPanel::on_btnOpenFile_clicked()
-{
-	AppMainWindow& window = AppMainWindow::Inst();
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPFileReferences& fileReferences = projectParams.blast.fileReferences;
-	const char* fbxSourceAsset = fileReferences.fbxSourceAsset.buf;
-	QString lastDir = (fbxSourceAsset != nullptr ? fbxSourceAsset : window._lastFilePath);
-	QString fileName = QFileDialog::getOpenFileName(&window, "Open FBX File", lastDir, "FBX File (*.FBX)");
-
-	ui->lineEditFBXSourceAsset->setText(fileName);
-}
-
-void FileReferencesPanel::on_btnReload_clicked()
-{
-
-}
-
-void FileReferencesPanel::on_btnRemove_clicked()
-{
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPFileReferences& fileReferences = projectParams.blast.fileReferences;
-	if (fileReferences.fbxSourceAsset.buf != nullptr)
-	{
-		ui->lineEditFBXSourceAsset->setText("");
-		freeString(fileReferences.fbxSourceAsset);
-		// to do: remove source fbx file
-	}
-}
-
-void FileReferencesPanel::on_checkBoxFBX_stateChanged(int arg1)
-{
-	if (!bValid)
-	{
-		return;
-	}
-
-	BPPAsset* assetPtr = _getCurrentAsset();
-	if (nullptr == assetPtr)
-		return;
-
-	BPPAsset& asset = *assetPtr;
-	asset.exportFBX = ui->checkBoxFBX->isChecked();
-}
-
-void FileReferencesPanel::on_checkBoxEmbedFBXCollision_stateChanged(int arg1)
-{
-	if (!bValid)
-	{
-		return;
-	}
-
-	BPPAsset* assetPtr = _getCurrentAsset();
-	if (nullptr == assetPtr)
-		return;
-
-	BPPAsset& asset = *assetPtr;
-	asset.embedFBXCollision = ui->checkBoxEmbedFBXCollision->isChecked();
-}
-
-void FileReferencesPanel::on_checkBoxObj_stateChanged(int arg1)
-{
-	if (!bValid)
-	{
-		return;
-	}
-
-	BPPAsset* assetPtr = _getCurrentAsset();
-	if (nullptr == assetPtr)
-		return;
-
-	BPPAsset& asset = *assetPtr;
-	asset.exportOBJ = ui->checkBoxObj->isChecked();
-}
-
-void FileReferencesPanel::on_checkBoxLLAsset_stateChanged(int arg1)
-{
-	if (!bValid)
-	{
-		return;
-	}
-
-	BPPAsset* assetPtr = _getCurrentAsset();
-	if (nullptr == assetPtr)
-		return;
-
-	BPPAsset& asset = *assetPtr;
-	asset.exportLLAsset = ui->checkBoxLLAsset->isChecked();
-}
-	
-void FileReferencesPanel::on_checkBoxTKAsset_stateChanged(int arg1)
-{
-	if (!bValid)
-	{
-		return;
-	}
-
-	BPPAsset* assetPtr = _getCurrentAsset();
-	if (nullptr == assetPtr)
-		return;
-
-	BPPAsset& asset = *assetPtr;
-	asset.exportTKAsset = ui->checkBoxTKAsset->isChecked();
-}
-	
-void FileReferencesPanel::on_checkBoxBPXA_stateChanged(int arg1)
-{
-	if (!bValid)
-	{
-		return;
-	}
-
-	BPPAsset* assetPtr = _getCurrentAsset();
-	if (nullptr == assetPtr)
-		return;
-
-	BPPAsset& asset = *assetPtr;
-	asset.exportBPXA = ui->checkBoxBPXA->isChecked();
-
-	if (asset.exportBPXA)
-	{
-		bValid = false;
-		ui->checkBoxObj->setChecked(true);
-		asset.exportOBJ = true;
-		bValid = true;
-	}
-}
-
-void FileReferencesPanel::on_btnSave_clicked()
-{
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPFileReferences& fileReferences = projectParams.blast.fileReferences;
-
-	copy(fileReferences.fbxSourceAsset, ui->lineEditFBXSourceAsset->text().toUtf8().data());
-
-	BPPAsset* assetPtr = _getCurrentAsset();
-	if (nullptr == assetPtr)
-		return;
-
-	BPPAsset& asset = *assetPtr;
-
-	copy(asset.fbx, ui->lineEditFBX->text().toUtf8().data());
-	asset.exportFBX = ui->checkBoxFBX->isChecked();
-
-	copy(asset.obj, ui->lineEditObj->text().toUtf8().data());
-	asset.exportOBJ = ui->checkBoxObj->isChecked();
-
-	copy(asset.llasset, ui->lineEditLLAsset->text().toUtf8().data());
-	asset.exportLLAsset = ui->checkBoxLLAsset->isChecked();
-
-	copy(asset.tkasset, ui->lineEditTKAsset->text().toUtf8().data());
-	asset.exportTKAsset = ui->checkBoxTKAsset->isChecked();
-
-	copy(asset.bpxa, ui->lineEditBPXA->text().toUtf8().data());
-	asset.exportBPXA = ui->checkBoxBPXA->isChecked();
-
-	SampleManager::ins()->exportAsset();
-}
-
-BPPAsset* FileReferencesPanel::_getCurrentAsset()
-{
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (pSampleManager == nullptr)
-	{
-		return nullptr;
-	}
-
-	BlastAsset* pBlastAsset = pSampleManager->getCurBlastAsset();
-	if (pBlastAsset == nullptr)
-	{
-		return nullptr;
-	}
-
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>::iterator itADM = AssetDescMap.find(pBlastAsset);
-	if (itADM == AssetDescMap.end())
-	{
-		return nullptr;
-	}
-
-	AssetList::ModelAsset modelAsset = itADM->second;
-	if (modelAsset.name.empty())
-	{
-		return nullptr;
-	}
-
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPAssetArray& assetArray = projectParams.blast.blastAssets;
-	int aaas = 0;
-	for (; aaas < assetArray.arraySizes[0]; aaas++)
-	{
-		std::string assetname = assetArray.buf[aaas].name;
-		if (assetname == modelAsset.name)
-			break;
-	}
-	if (aaas == assetArray.arraySizes[0])
-	{
-		return nullptr;
-	}
-
-	BPPAsset& asset = assetArray.buf[aaas];
-
-	return &asset;
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FileReferencesPanel.h b/tools/ArtistTools/source/BlastPlugin/Window/FileReferencesPanel.h
deleted file mode 100644
index 9accf6a..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FileReferencesPanel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef FILEREFERENCESPANEL_H
-#define FILEREFERENCESPANEL_H
-
-#include <QtWidgets/QWidget>
-
-namespace Ui {
-class FileReferencesPanel;
-}
-
-#include "ProjectParams.h"
-
-class FileReferencesPanel : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit FileReferencesPanel(QWidget *parent = 0);
-    ~FileReferencesPanel();
-	void updateValues();
-
-	static FileReferencesPanel* ins();
-
-public slots:
-    void on_btnOpenFile_clicked();
-
-    void on_btnReload_clicked();
-
-    void on_btnRemove_clicked();
-
-    void on_checkBoxFBX_stateChanged(int arg1);
-
-	void on_checkBoxEmbedFBXCollision_stateChanged(int arg1);
-
-    void on_checkBoxObj_stateChanged(int arg1);
-	
-	void on_checkBoxLLAsset_stateChanged(int arg1);
-	
-	void on_checkBoxTKAsset_stateChanged(int arg1);
-	
-	void on_checkBoxBPXA_stateChanged(int arg1);
-
-    void on_btnSave_clicked();
-
-private:
-	BPPAsset* _getCurrentAsset();
-
-private:
-    Ui::FileReferencesPanel *ui;
-	bool bValid;
-};
-
-#endif // FILEREFERENCESPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FiltersDockWidget.cpp b/tools/ArtistTools/source/BlastPlugin/Window/FiltersDockWidget.cpp
deleted file mode 100644
index daf4397..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FiltersDockWidget.cpp
+++ /dev/null
@@ -1,877 +0,0 @@
-#include "FiltersDockWidget.h"
-#include "ui_FiltersDockWidget.h"
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QMessageBox>
-#include "SampleManager.h"
-#include "BlastSceneTree.h"
-#include "BlastFamily.h"
-#include "ViewerOutput.h"
-
-const QString LISTITEM_NORMAL_STYLESHEET = ":enabled { background: rgb(68,68,68); }";
-
-const QString LISTITEM_SELECTED_STYLESHEET = ":enabled { background: rgba(118,185,0, 250); }";
-
-const QString LISTITEM_BUTTON_STYLESHEET = ":enabled { border: 0px; }";
-
-class FilterOperation
-{
-public:
-	virtual void execute(BlastNode *node) = 0;
-};
-
-class FilterVisitor : public BlastVisitorBase
-{
-public:
-	FilterVisitor(FilterPreset& filterPreset, FilterOperation&	filterOperation)
-		: resultCount(0)
-		, _filterPreset(filterPreset)
-		, _filterOperation(filterOperation)
-		
-	{
-
-	}
-
-	virtual void visit(BlastNode *node);
-
-	int					resultCount;
-private:
-	bool _canSatisfyFilter(BlastNode *node);
-
-	FilterPreset&		_filterPreset;
-	FilterOperation&	_filterOperation;
-};
-
-void FilterVisitor::visit(BlastNode *node)
-{
-	if (_canSatisfyFilter(node))
-	{
-		_filterOperation.execute(node);
-		++resultCount;
-	}
-}
-
-bool FilterVisitor::_canSatisfyFilter(BlastNode *node)
-{
-	EFilterRestriction restrictions = eFilterRestriction_Invalid;
-
-	for (std::vector<EFilterRestriction>::iterator itr = _filterPreset.filters.begin(); itr != _filterPreset.filters.end(); ++itr)
-	{
-		restrictions = (EFilterRestriction)(restrictions | (*itr));
-	}
-
-	bool matchDepth = false, matchItemType = false;
-
-	// jude whether current node can be filtered by depth restrictions
-	if (restrictions & eFilterRestriction_DepthAll)
-	{
-		matchDepth = true;
-	}
-	else
-	{
-		int nodeDepth = BlastTreeData::getDepth(node);
-		int allDepthRestrictions = eFilterRestriction_Depth0 | eFilterRestriction_Depth1 | eFilterRestriction_Depth2 | eFilterRestriction_Depth3 | eFilterRestriction_Depth4 | eFilterRestriction_Depth5;
-
-		if ((restrictions & eFilterRestriction_AllDescendants) && (restrictions & eFilterRestriction_AllParents))
-		{
-			if (restrictions & allDepthRestrictions)
-			{
-				matchDepth = true;
-			}
-		}
-		else if ((restrictions & eFilterRestriction_AllDescendants) && !(restrictions & eFilterRestriction_AllParents))
-		{
-			int expectMinDepthRestirction = 5;
-			if ((restrictions & eFilterRestriction_Depth0))
-			{
-				expectMinDepthRestirction = 0;
-			}
-			else if ((restrictions & eFilterRestriction_Depth1))
-			{
-				expectMinDepthRestirction = 1;
-			}
-			else if ((restrictions & eFilterRestriction_Depth2))
-			{
-				expectMinDepthRestirction = 2;
-			}
-			else if ((restrictions & eFilterRestriction_Depth3))
-			{
-				expectMinDepthRestirction = 3;
-			}
-			else if ((restrictions & eFilterRestriction_Depth4))
-			{
-				expectMinDepthRestirction = 4;
-			}
-			else if ((restrictions & eFilterRestriction_Depth5))
-			{
-				expectMinDepthRestirction = 5;
-			}
-
-			if (expectMinDepthRestirction <= nodeDepth)
-			{
-				matchDepth = true;
-			}
-		}
-		else if (!(restrictions & eFilterRestriction_AllDescendants) && (restrictions & eFilterRestriction_AllParents))
-		{
-			int expectMaxDepthRestirction = 0;
-			if ((restrictions & eFilterRestriction_Depth5))
-			{
-				expectMaxDepthRestirction = 5;
-			}
-			else if ((restrictions & eFilterRestriction_Depth4))
-			{
-				expectMaxDepthRestirction = 4;
-			}
-			else if ((restrictions & eFilterRestriction_Depth3))
-			{
-				expectMaxDepthRestirction = 3;
-			}
-			else if ((restrictions & eFilterRestriction_Depth2))
-			{
-				expectMaxDepthRestirction = 2;
-			}
-			else if ((restrictions & eFilterRestriction_Depth1))
-			{
-				expectMaxDepthRestirction = 1;
-			}
-			else if ((restrictions & eFilterRestriction_Depth0))
-			{
-				expectMaxDepthRestirction = 0;
-			}
-
-			if (nodeDepth <= expectMaxDepthRestirction)
-			{
-				matchDepth = true;
-			}
-		}
-		else if (!(restrictions & eFilterRestriction_AllDescendants) && !(restrictions & eFilterRestriction_AllParents))
-		{
-			EFilterRestriction expectDepthRestriction = (EFilterRestriction)(eFilterRestriction_Depth0 << nodeDepth);
-
-			if (restrictions & expectDepthRestriction)
-			{
-				matchDepth = true;
-			}
-		}
-	}
-
-	// jude whether current node can be filtered by item type restrictions
-	if ((restrictions & eFilterRestriction_ItemTypeAll))
-	{
-		matchItemType = true;
-	}
-	else
-	{
-		EBlastNodeType nodeType = node->getType();
-		if (eChunk == nodeType)
-		{
-			BlastChunkNode* chunkNode = (BlastChunkNode*)node;
-			if (restrictions & eFilterRestriction_Chunk)
-			{
-				matchItemType = true;
-			}
-			else if (restrictions & eFilterRestriction_SupportChunk)
-			{
-				if (chunkNode->isSupport())
-				{
-					matchItemType = true;
-				}
-			}
-			else if (restrictions & eFilterRestriction_StaticSupportChunk)
-			{
-				if (chunkNode->isSupport() && chunkNode->isStatic())
-				{
-					matchItemType = true;
-				}
-			}
-		}
-		else if (eBond == nodeType)
-		{
-			BlastBondNode* bondNode = (BlastBondNode*)node;
-			if (restrictions & eFilterRestriction_Bond)
-			{
-				matchItemType = true;
-			}
-			else if (restrictions & eFilterRestriction_WorldBond)
-			{
-				if (bondNode->isWolrd())
-				{
-					matchItemType = true;
-				}
-			}
-		}
-	}
-
-	if ((restrictions & eFilterRestriction_EqualTo) && (restrictions & eFilterRestriction_NotEquaTo))
-	{
-		return true;
-	} 
-	else if (!(restrictions & eFilterRestriction_EqualTo) && !(restrictions & eFilterRestriction_NotEquaTo)
-		|| (restrictions & eFilterRestriction_EqualTo))
-	{
-		if (matchDepth && matchItemType)
-			return true;
-	}
-	else if ((restrictions & eFilterRestriction_NotEquaTo))
-	{
-		if (!(matchDepth && matchItemType))
-			return true;
-	}
-
-	return false;
-}
-
-class FilterSelectOperation : public FilterOperation
-{
-public:
-	virtual void execute(BlastNode *node)
-	{
-		if (nullptr != node)
-		{
-			BlastSceneTree::ins()->selectTreeItem(node);
-		}
-	}
-};
-
-class FilterVisibilityOperation : public FilterOperation
-{
-public:
-	FilterVisibilityOperation(bool visible)
-		: _visible(visible)
-	{
-	}
-
-	virtual void execute(BlastNode *node)
-	{
-		if (nullptr != node)
-		{
-			node->setVisible(_visible);
-		}
-	}
-
-private:
-	bool	_visible;
-};
-
-struct FilterItemInfo
-{
-public:
-	FilterItemInfo(FilterItemWidget* inWidget, const QString& inText)
-		: itemWidget(inWidget)
-		, text(inText)
-	{
-	}
-
-	FilterItemWidget* itemWidget;
-	QString text;
-};
-
-FilterItemWidget::FilterItemWidget(FiltersDockWidget* parent, QListWidgetItem* item, const QString& filterPreset, EFilterRestriction restriction)
-	: QWidget(parent)
-	, _relatedListWidgetItem(item)
-	, _filterPreset(filterPreset)
-	, _restriction(restriction)
-{
-	QHBoxLayout* layout = new QHBoxLayout(this);
-	layout->setContentsMargins(0, 0, 0, 0);
-	_label = new QLabel(this);
-
-	_removeBtn = new QPushButton(this);
-	_removeBtn->setMaximumSize(20, 20);
-	_removeBtn->setText("X");
-	_removeBtn->setStyleSheet(LISTITEM_BUTTON_STYLESHEET);
-
-	layout->addWidget(_label);
-	layout->addWidget(_removeBtn);
-
-	this->setLayout(layout);
-
-	QObject::connect(_removeBtn, SIGNAL(clicked()), this, SLOT(onRemoveButtonClicked()));
-	QObject::connect(this, SIGNAL(RemoveItem(QListWidgetItem*)), parent, SLOT(onListWidgetRemoveBtnClicked(QListWidgetItem*)));
-
-	deSelect();
-}
-
-void FilterItemWidget::setText(const QString& title)
-{
-	_label->setText(title);
-}
-
-void FilterItemWidget::select()
-{
-	_label->setStyleSheet(LISTITEM_SELECTED_STYLESHEET);
-}
-
-void FilterItemWidget::deSelect()
-{
-	_label->setStyleSheet(LISTITEM_NORMAL_STYLESHEET);
-}
-
-void FilterItemWidget::onRemoveButtonClicked()
-{
-	emit RemoveItem(_relatedListWidgetItem);
-}
-
-FiltersDockWidget::FiltersDockWidget(QWidget *parent) :
-	QDockWidget(parent),
-	ui(new Ui::FiltersDockWidget),
-	_updateData(true),
-	_filterUIItems(),
-	_filterItemWidgets(),
-	_lastSelectRow(-1)
-{
-    ui->setupUi(this);
-
-	_restrictionActionMap[eFilterRestriction_AllDescendants] = ui->actionAllDescendants;
-	_restrictionActionMap[eFilterRestriction_AllParents] = ui->actionAllParents;
-	_restrictionActionMap[eFilterRestriction_DepthAll] = ui->actionDepthAll;
-	_restrictionActionMap[eFilterRestriction_Depth0] = ui->actionDepth0;
-	_restrictionActionMap[eFilterRestriction_Depth1] = ui->actionDepth1;
-	_restrictionActionMap[eFilterRestriction_Depth2] = ui->actionDepth2;
-	_restrictionActionMap[eFilterRestriction_Depth3] = ui->actionDepth3;
-	_restrictionActionMap[eFilterRestriction_Depth4] = ui->actionDepth4;
-	_restrictionActionMap[eFilterRestriction_Depth5] = ui->actionDepth5;
-	_restrictionActionMap[eFilterRestriction_ItemTypeAll] = ui->actionItemTypeAll;
-	_restrictionActionMap[eFilterRestriction_Chunk] = ui->actionChunk;
-	_restrictionActionMap[eFilterRestriction_SupportChunk] = ui->actionSupportChunk;
-	_restrictionActionMap[eFilterRestriction_StaticSupportChunk] = ui->actionStaticSupportChunk;
-	_restrictionActionMap[eFilterRestriction_Bond] = ui->actionBond;
-	_restrictionActionMap[eFilterRestriction_WorldBond] = ui->actionWorldBond;
-	_restrictionActionMap[eFilterRestriction_EqualTo] = ui->actionEqualTo;
-	_restrictionActionMap[eFilterRestriction_NotEquaTo] = ui->actionNotEquaTo;
-
-	_updateFilterItemList();
-}
-
-FiltersDockWidget::~FiltersDockWidget()
-{
-	delete ui;
-}
-
-void FiltersDockWidget::updateValues()
-{
-	_updateData = false;
-	ui->comboBoxFilterPreset->clear();
-	std::vector<FilterPreset>& filterPresets = BlastProject::ins().getFilterPresets();
-	QStringList filterNames;
-	filterNames.append("Default");
-	int count = (int)filterPresets.size();
-	for (int i = 0; i < count; ++i)
-	{
-		filterNames.append(filterPresets[i].name.c_str());
-	}
-	ui->comboBoxFilterPreset->addItems(filterNames);
-
-	BPParams& projectParams = BlastProject::ins().getParams();
-	if (nullptr == projectParams.filter.activeFilter.buf
-		|| 0 == strlen(projectParams.filter.activeFilter.buf)
-		|| !(BlastProject::ins().isFilterPresetNameExist(projectParams.filter.activeFilter.buf)))
-	{
-		ui->comboBoxFilterPreset->setCurrentIndex(0);
-	}
-	else
-	{
-		ui->comboBoxFilterPreset->setCurrentText(projectParams.filter.activeFilter.buf);
-	}
-
-	_updateFilterItemList();
-
-	if (count > 0)
-	{
-		ui->btnModifyFilterPreset->setEnabled(true);
-		ui->btnRemoveFilterPreset->setEnabled(true);
-	}
-	else
-	{
-		ui->btnModifyFilterPreset->setEnabled(false);
-		ui->btnRemoveFilterPreset->setEnabled(false);
-	}
-	_updateData = true;
-}
-
-void FiltersDockWidget::on_comboBoxFilterPreset_currentIndexChanged(int index)
-{
-	if (!_updateData)
-		return;
-
-	BPParams& projectParams = BlastProject::ins().getParams();
-	copy(projectParams.filter.activeFilter, ui->comboBoxFilterPreset->currentText().toUtf8().data());
-
-	_updateFilterItemList();
-}
-
-void FiltersDockWidget::on_btnAddFilterPrest_clicked()
-{
-	bool ok = false;
-	QString name = QInputDialog::getText(this,
-		tr("Blast Tool"),
-		tr("Please input name for new filter preset:"),
-		QLineEdit::Normal,
-		"",
-		&ok);
-	bool nameExist = BlastProject::ins().isFilterPresetNameExist(name.toUtf8().data());
-	if (ok && !name.isEmpty() && !nameExist)
-	{
-		BlastProject::ins().addFilterPreset(name.toUtf8().data());
-		updateValues();
-		ui->comboBoxFilterPreset->setCurrentIndex(ui->comboBoxFilterPreset->count() - 1);
-	}
-	else if (ok && nameExist)
-	{
-		QMessageBox::warning(this, "Blast Tool", "The name you input is already exist!");
-	}
-	else if (ok && name.isEmpty())
-	{
-		QMessageBox::warning(this, "Blast Tool", "You need input a name for the new filter preset!");
-	}
-}
-
-void FiltersDockWidget::on_btnModifyFilterPreset_clicked()
-{
-	if (ui->comboBoxFilterPreset->currentIndex() < 1)
-	{
-		QMessageBox::warning(this, "Blast Tool", "You should select an filter preset!");
-		return;
-	}
-
-	QByteArray tmp = ui->comboBoxFilterPreset->currentText().toUtf8();
-	const char* oldName = tmp.data();
-
-	bool ok = false;
-	QString newName = QInputDialog::getText(this,
-		tr("Blast Tool"),
-		tr("Please input new name for the selected filter preset:"),
-		QLineEdit::Normal,
-		oldName,
-		&ok);
-	bool nameExist = BlastProject::ins().isFilterPresetNameExist(newName.toUtf8().data());
-	if (ok && !newName.isEmpty() && !nameExist)
-	{
-		int index = ui->comboBoxFilterPreset->currentIndex();
-		BlastProject::ins().renameFilterPreset(oldName, newName.toUtf8().data());
-		updateValues();
-		ui->comboBoxFilterPreset->setCurrentIndex(index);
-	}
-	else if (ok && nameExist)
-	{
-		QMessageBox::warning(this, "Blast Tool", "The name you input is already exist!");
-	}
-	else if (ok && newName.isEmpty())
-	{
-		QMessageBox::warning(this, "Blast Tool", "You need input a name for the selected filter preset!");
-	}
-}
-
-void FiltersDockWidget::on_btnRemoveFilterPreset_clicked()
-{
-	if (ui->comboBoxFilterPreset->currentIndex() < 1)
-	{
-		QMessageBox::warning(this, "Blast Tool", "You should select an filter preset!");
-		return;
-	}
-
-	QByteArray tmp = ui->comboBoxFilterPreset->currentText().toUtf8();
-	const char* name = tmp.data();
-	BlastProject::ins().removeFilterPreset(name);
-	updateValues();
-}
-
-void FiltersDockWidget::on_btnSaveFilterPreset_clicked()
-{
-	BlastProject::ins().saveFilterPreset();
-}
-
-void FiltersDockWidget::on_actionAllDescendants_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_AllDescendants, checked);
-}
-
-void FiltersDockWidget::on_actionAllParents_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_AllParents, checked);
-}
-
-void FiltersDockWidget::on_actionDepthAll_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_DepthAll, checked);
-}
-
-void FiltersDockWidget::on_actionDepth0_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_Depth0, checked);
-}
-
-void FiltersDockWidget::on_actionDepth1_triggered(bool checked)
-{
-	_addRemoveRestriction(eFilterRestriction_Depth1, checked);
-}
-
-void FiltersDockWidget::on_actionDepth2_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_Depth2, checked);
-}
-
-void FiltersDockWidget::on_actionDepth3_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_Depth3, checked);
-}
-
-void FiltersDockWidget::on_actionDepth4_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_Depth4, checked);
-}
-
-void FiltersDockWidget::on_actionDepth5_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_Depth5, checked);
-}
-
-void FiltersDockWidget::on_actionItemTypeAll_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_ItemTypeAll, checked);
-}
-
-void FiltersDockWidget::on_actionChunk_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_Chunk, checked);
-}
-
-void FiltersDockWidget::on_actionSupportChunk_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_SupportChunk, checked);
-}
-
-void FiltersDockWidget::on_actionStaticSupportChunk_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_StaticSupportChunk, checked);
-}
-
-void FiltersDockWidget::on_actionBond_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_Bond, checked);
-}
-
-void FiltersDockWidget::on_actionWorldBond_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_WorldBond, checked);
-}
-
-void FiltersDockWidget::on_actionEqualTo_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_EqualTo, checked);
-}
-
-void FiltersDockWidget::on_actionNotEquaTo_triggered(bool checked)
-{
-	if (!_updateData)
-		return;
-
-	_addRemoveRestriction(eFilterRestriction_NotEquaTo, checked);
-}
-
-void FiltersDockWidget::on_btnSelect_clicked()
-{
-	FilterPreset filterPreset("Default");
-	FilterPreset* filterPresetPtr = BlastProject::ins().getFilterPreset(ui->comboBoxFilterPreset->currentText().toUtf8().data());
-	if (nullptr == filterPresetPtr)
-	{
-		BPPFilter& bppFilter = BlastProject::ins().getParams().filter;
-		for (int i = 0; i < bppFilter.filterRestrictions.arraySizes[0]; ++i)
-		{
-			filterPreset.filters.push_back(convertStringToFilterRestriction(bppFilter.filterRestrictions.buf[i]));
-		}
-	}
-	else
-	{
-		filterPreset = *filterPresetPtr;
-	}
-
-	// clear old selection
-	BlastSceneTree::ins()->updateValues(false);
-
-	FilterSelectOperation operation;
-	FilterVisitor visitor(filterPreset, operation);
-	BlastTreeData::ins().traverse(visitor);
-
-	if (0 == visitor.resultCount)
-	{
-		viewer_msg("No items statify current filters");
-	}
-	//BlastSceneTree::ins()->updateValues(false);
-
-	//std::vector<uint32_t> depths;
-	//for (FilterItemWidget* itemWidget : _filterItemWidgets)
-	//{
-	//	depths.push_back(itemWidget->_restriction);
-	//}
-	////SampleManager::ins()->setChunkSelected(depths, true);
-	//BlastSceneTree::ins()->setChunkSelected(depths, true);
-}
-
-void FiltersDockWidget::on_btnVisible_clicked()
-{
-	FilterPreset filterPreset("Default");
-	FilterPreset* filterPresetPtr = BlastProject::ins().getFilterPreset(ui->comboBoxFilterPreset->currentText().toUtf8().data());
-	if (nullptr == filterPresetPtr)
-	{
-		BPPFilter& bppFilter = BlastProject::ins().getParams().filter;
-		for (int i = 0; i < bppFilter.filterRestrictions.arraySizes[0]; ++i)
-		{
-			filterPreset.filters.push_back(convertStringToFilterRestriction(bppFilter.filterRestrictions.buf[i]));
-		}
-	}
-	else
-	{
-		filterPreset = *filterPresetPtr;
-	}
-
-	FilterVisibilityOperation operation(true);
-	FilterVisitor visitor(filterPreset, operation);
-	BlastTreeData::ins().traverse(visitor);
-	BlastSceneTree::ins()->updateValues(false);
-	if (0 == visitor.resultCount)
-	{
-		viewer_msg("No items statify current filters");
-	}
-	//std::vector<uint32_t> depths;
-	//for (FilterItemWidget* itemWidget : _filterItemWidgets)
-	//{
-	//	depths.push_back(itemWidget->_restriction);
-	//}
-	////SampleManager::ins()->setChunkVisible(depths, true);
-	//BlastSceneTree::ins()->setChunkVisible(depths, true);
-	//// refresh display in scene tree
-	//BlastSceneTree* pBlastSceneTree = BlastSceneTree::ins();
-	//pBlastSceneTree->updateValues(false);
-}
-
-void FiltersDockWidget::on_btnInVisible_clicked()
-{
-	FilterPreset filterPreset("Default");
-	FilterPreset* filterPresetPtr = BlastProject::ins().getFilterPreset(ui->comboBoxFilterPreset->currentText().toUtf8().data());
-	if (nullptr == filterPresetPtr)
-	{
-		BPPFilter& bppFilter = BlastProject::ins().getParams().filter;
-		for (int i = 0; i < bppFilter.filterRestrictions.arraySizes[0]; ++i)
-		{
-			filterPreset.filters.push_back(convertStringToFilterRestriction(bppFilter.filterRestrictions.buf[i]));
-		}
-	}
-	else
-	{
-		filterPreset = *filterPresetPtr;
-	}
-
-	FilterVisibilityOperation operation(false);
-	FilterVisitor visitor(filterPreset, operation);
-	BlastTreeData::ins().traverse(visitor);
-	BlastSceneTree::ins()->updateValues(false);
-	if (0 == visitor.resultCount)
-	{
-		viewer_msg("No items statify current filters");
-	}
-	//std::vector<uint32_t> depths;
-	//for (FilterItemWidget* itemWidget : _filterItemWidgets)
-	//{
-	//	depths.push_back(itemWidget->_restriction);
-	//}
-	////SampleManager::ins()->setChunkVisible(depths, false);
-	//BlastSceneTree::ins()->setChunkVisible(depths, false);
-	//// refresh display in scene tree
-	//BlastSceneTree* pBlastSceneTree = BlastSceneTree::ins();
-	//pBlastSceneTree->updateValues(false);
-}
-
-void FiltersDockWidget::on_listWidget_currentRowChanged(int index)
-{
-	if (!_updateData)
-		return;
-
-	if (-1 != _lastSelectRow && _lastSelectRow < _filterItemWidgets.size())
-		static_cast<FilterItemWidget*>(_filterItemWidgets[_lastSelectRow])->deSelect();
-
-	if (-1 != index && index < _filterItemWidgets.size())
-		static_cast<FilterItemWidget*>(_filterItemWidgets[index])->select();
-
-	_lastSelectRow = index;
-}
-
-void FiltersDockWidget::onListWidgetRemoveBtnClicked(QListWidgetItem* item)
-{
-	/// remove former ui info
-	map<QListWidgetItem*, FilterItemInfo*>::iterator toRemoveItem = _filterUIItems.find(item);
-	if (toRemoveItem != _filterUIItems.end())
-	{
-		FilterItemWidget* itemWidget = toRemoveItem->second->itemWidget;
-		itemWidget->setParent(nullptr);
-
-		_filterItemWidgets.erase(std::find(_filterItemWidgets.begin(), _filterItemWidgets.end(), toRemoveItem->second->itemWidget));
-
-		if (0 < ui->comboBoxFilterPreset->currentIndex())
-		{
-			QByteArray filterPreset = itemWidget->_filterPreset.toUtf8();
-			BlastProject::ins().removeFilterRestriction(filterPreset.data(), itemWidget->_restriction);
-		}
-		else if (0 == ui->comboBoxFilterPreset->currentIndex())
-		{
-			removeItem(BlastProject::ins().getParams().filter.filterRestrictions, convertFilterRestrictionToString(itemWidget->_restriction));
-		}
-
-		ui->listWidget->takeItem(ui->listWidget->row(item));
-		ui->listWidget->removeItemWidget(item);
-		delete item;
-		delete itemWidget;
-		_filterUIItems.erase(toRemoveItem);
-
-		_updateFilterItemList();
-		
-	}
-}
-
-void FiltersDockWidget::_updateFilterItemList()
-{
-	_updateData = false;
-	/// remove former ui info
-	map<QListWidgetItem*, FilterItemInfo*>::iterator theEnd = _filterUIItems.end();
-	for (map<QListWidgetItem*, FilterItemInfo*>::iterator itr = _filterUIItems.begin(); itr != theEnd; ++itr)
-	{
-		itr->second->itemWidget->setParent(nullptr);
-		delete itr->first;
-		delete itr->second->itemWidget;
-		delete itr->second;
-	}
-	_filterUIItems.clear();
-	ui->listWidget->clear();
-	_filterItemWidgets.clear();
-
-	FilterPreset* filterPreset = BlastProject::ins().getFilterPreset(ui->comboBoxFilterPreset->currentText().toUtf8().data());
-
-	if (nullptr != filterPreset)
-	{
-		for (EFilterRestriction restriction : filterPreset->filters)
-		{
-			_addFilterListItem(filterPreset->name.c_str(), restriction);
-		}
-	}
-	else
-	{
-		BPParams& projectParams = BlastProject::ins().getParams();
-		BPPStringArray& filterRestrictions = projectParams.filter.filterRestrictions;
-
-		for (int i = 0; i < filterRestrictions.arraySizes[0]; ++i)
-		{
-			_addFilterListItem("Default", convertStringToFilterRestriction(filterRestrictions.buf[i].buf));
-		}
-	}
-
-	_updateFilterUIs();
-
-	_updateData = true;
-}
-
-void FiltersDockWidget::_addFilterListItem(const char* filterPresetName, EFilterRestriction restriction)
-{
-	QListWidgetItem* item = new QListWidgetItem(NULL);
-	FilterItemWidget* itemWidget = new FilterItemWidget(this, item, filterPresetName, restriction);
-
-	QString depthFilterLabel = convertFilterRestrictionToString(restriction);
-	_filterUIItems.insert(std::make_pair(item, new FilterItemInfo(itemWidget, depthFilterLabel)));
-	itemWidget->setText(depthFilterLabel);
-	_filterItemWidgets.push_back(itemWidget);
-
-	ui->listWidget->addItem(item);
-	ui->listWidget->setItemWidget(item, itemWidget);
-}
-
-void FiltersDockWidget::_updateFilterUIs()
-{
-	for (map<EFilterRestriction, QAction*>::iterator itr = _restrictionActionMap.begin(); itr != _restrictionActionMap.end(); ++itr)
-		itr->second->setChecked(false);
-
-	FilterPreset* filterPreset = BlastProject::ins().getFilterPreset(ui->comboBoxFilterPreset->currentText().toUtf8().data());
-
-	if (nullptr != filterPreset)
-	{
-		for (EFilterRestriction restriction : filterPreset->filters)
-		{
-			_restrictionActionMap[restriction]->setChecked(true);
-		}
-	}
-	else
-	{
-		BPPStringArray& filterRestrictions = BlastProject::ins().getParams().filter.filterRestrictions;
-
-		for (int i = 0; i < filterRestrictions.arraySizes[0]; ++i)
-		{
-			_restrictionActionMap[convertStringToFilterRestriction(filterRestrictions.buf[i].buf)]->setChecked(true);
-		}
-	}
-}
-
-void FiltersDockWidget::_addRemoveRestriction(EFilterRestriction restriction, bool add)
-{
-	if (0 < ui->comboBoxFilterPreset->currentIndex())
-	{
-		QByteArray filterPreset = ui->comboBoxFilterPreset->currentText().toUtf8();
-
-		if (add)
-			BlastProject::ins().addFilterRestriction(filterPreset.data(), restriction);
-		else
-			BlastProject::ins().removeFilterRestriction(filterPreset.data(), restriction);
-	}
-	else if (0 == ui->comboBoxFilterPreset->currentIndex())
-	{
-		BPPFilter& filter = BlastProject::ins().getParams().filter;
-		if (add)
-			addItem(filter.filterRestrictions, convertFilterRestrictionToString(restriction));
-		else
-			removeItem(filter.filterRestrictions, convertFilterRestrictionToString(restriction));
-	}
-	_updateFilterItemList();
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FiltersDockWidget.h b/tools/ArtistTools/source/BlastPlugin/Window/FiltersDockWidget.h
deleted file mode 100644
index 43606dc..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FiltersDockWidget.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef FILTERSDOCKWIDGET_H
-#define FILTERSDOCKWIDGET_H
-
-#include <QtWidgets/QDockWidget>
-#include <vector>
-#include <map>
-#include "ProjectParams.h"
-using namespace std;
-
-namespace Ui {
-class FiltersDockWidget;
-}
-
-class QLabel;
-class QPushButton;
-class QListWidgetItem;
-class QAction;
-struct FilterItemInfo;
-class FilterItemWidget;
-class FiltersDockWidget;
-
-class FilterItemWidget : public QWidget
-{
-	Q_OBJECT
-public:
-	FilterItemWidget(FiltersDockWidget* parent, QListWidgetItem* item, const QString& filterPreset, EFilterRestriction restriction);
-	~FilterItemWidget()
-	{
-	}
-
-	void setText(const QString& title);
-	void select();
-	void deSelect();
-
-signals:
-	void RemoveItem(QListWidgetItem* item);
-
-private slots:
-	void onRemoveButtonClicked();
-
-public:
-	QLabel* _label;
-	QPushButton* _removeBtn;
-	QListWidgetItem* _relatedListWidgetItem;
-	QString	_filterPreset;
-	EFilterRestriction	_restriction;
-};
-
-class FiltersDockWidget : public QDockWidget
-{
-    Q_OBJECT
-
-public:
-    explicit FiltersDockWidget(QWidget *parent = 0);
-    ~FiltersDockWidget();
-	void updateValues();
-
-private slots:
-	void on_comboBoxFilterPreset_currentIndexChanged(int index);
-	void on_btnAddFilterPrest_clicked();
-	void on_btnModifyFilterPreset_clicked();
-	void on_btnRemoveFilterPreset_clicked();
-	void on_btnSaveFilterPreset_clicked();
-	void on_actionAllDescendants_triggered(bool checked);
-	void on_actionAllParents_triggered(bool checked);
-	void on_actionDepthAll_triggered(bool checked);
-	void on_actionDepth0_triggered(bool checked);
-	void on_actionDepth1_triggered(bool checked);
-	void on_actionDepth2_triggered(bool checked);
-	void on_actionDepth3_triggered(bool checked);
-	void on_actionDepth4_triggered(bool checked);
-	void on_actionDepth5_triggered(bool checked);
-	void on_actionItemTypeAll_triggered(bool checked);
-	void on_actionChunk_triggered(bool checked);
-	void on_actionSupportChunk_triggered(bool checked);
-	void on_actionStaticSupportChunk_triggered(bool checked);
-	void on_actionBond_triggered(bool checked);
-	void on_actionWorldBond_triggered(bool checked);
-	void on_actionEqualTo_triggered(bool checked);
-	void on_actionNotEquaTo_triggered(bool checked);
-	void on_btnSelect_clicked();
-	void on_btnVisible_clicked();
-	void on_btnInVisible_clicked();
-	void on_listWidget_currentRowChanged(int index);
-	void onListWidgetRemoveBtnClicked(QListWidgetItem* item);
-
-private:
-	void _updateFilterItemList();
-	void _addFilterListItem(const char* filterPresetName, EFilterRestriction restriction);
-	void _updateFilterUIs();
-	void _addRemoveRestriction(EFilterRestriction restriction, bool add);
-
-private:
-    Ui::FiltersDockWidget *ui;
-	bool									_updateData;
-	map<QListWidgetItem*, FilterItemInfo*>	_filterUIItems;
-	vector<FilterItemWidget*>				_filterItemWidgets;
-	int										_lastSelectRow;
-	map<EFilterRestriction, QAction*>		_restrictionActionMap;
-};
-
-#endif // FILTERSDOCKWIDGET_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FractureGeneralPanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/FractureGeneralPanel.cpp
deleted file mode 100644
index 8a92933..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FractureGeneralPanel.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-#include "FractureGeneralPanel.h"
-#include "ui_FractureGeneralPanel.h"
-#include "ProjectParams.h"
-#include "BlastPlugin.h"
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QMessageBox>
-#include "FractureVoronoiSettingsPanel.h"
-#include "FractureSliceSettingsPanel.h"
-#include "FractureVisualizersPanel.h"
-#include "ExpandablePanel.h"
-#include "SampleManager.h"
-
-FractureGeneralPanel* pFractureGeneralPanel = nullptr;
-FractureGeneralPanel* FractureGeneralPanel::ins()
-{
-	return pFractureGeneralPanel;
-}
-
-FractureGeneralPanel::FractureGeneralPanel(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::FractureGeneralPanel),
-	_updateData(true),
-	_voronoiPanel(nullptr),
-	_slicePanel(nullptr),
-	_visualizersPanel(nullptr),
-	_fractureVoronoiSettingsExpandlePanel(nullptr),
-	_fractureSliceSettingsExpandlePanel(nullptr)
-{
-    ui->setupUi(this);
-	pFractureGeneralPanel = this;
-	m_bValid = true;
-
-	QStringList types;
-	types << "Voronoi" << "Slice";
-	_updateData = false;
-	ui->comboBoxFractureType->addItems(types);
-	ui->comboBoxFractureType->setCurrentIndex(0);
-	_updateData = true;
-}
-
-FractureGeneralPanel::~FractureGeneralPanel()
-{
-    delete ui;
-}
-
-void FractureGeneralPanel::updateValues()
-{
-	_updateData = false;
-	m_bValid = false;
-	ui->comboBoxApplyMaterial->clear();
-	m_bValid = true;
-
-	QStringList materialNames;
-	materialNames.append("None");
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPGraphicsMaterialArray& theArray = projectParams.graphicsMaterials;
-	int count = theArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		BPPGraphicsMaterial& item = theArray.buf[i];
-		materialNames.append(item.name.buf);
-	}
-
-	m_bValid = false;
-	ui->comboBoxApplyMaterial->insertItems(0, materialNames);
-	m_bValid = true;
-
-	BPPFractureGeneral& fractureGeneral = BlastProject::ins().getParams().fracture.general;
-
-	std::vector<FracturePreset> presets = BlastProject::ins().getFracturePresets();
-	ui->comboBoxFracturePreset->clear();
-	QStringList presetNames;
-	presetNames.append("Default");
-	int countPresets = (int)presets.size();
-	if (countPresets > 0)
-	{
-		for (int i = 0; i < countPresets; ++i)
-		{
-			presetNames.append(presets[i].name.c_str());
-		}
-	}
-	ui->comboBoxFracturePreset->addItems(presetNames);
-
-	if (nullptr == fractureGeneral.fracturePreset.buf
-		|| 0 == strlen(fractureGeneral.fracturePreset.buf)
-		|| !(BlastProject::ins().isFracturePresetNameExist(fractureGeneral.fracturePreset.buf)))
-	{
-		ui->comboBoxFracturePreset->setCurrentIndex(0);
-	}
-	else
-	{
-		ui->comboBoxFracturePreset->setCurrentText(fractureGeneral.fracturePreset.buf);
-	}
-	_updateFractureUIs();
-	ui->comboBoxApplyMaterial->setCurrentIndex(fractureGeneral.applyMaterial);
-
-	bool checked = BlastProject::ins().getParams().fracture.general.autoSelectNewChunks;
-	ui->checkBoxAutoSelectNewChunks->setChecked(checked);
-	_updateData = true;
-}
-
-void FractureGeneralPanel::setFracturePanels(FractureVoronoiSettingsPanel* voronoiPanel, FractureSliceSettingsPanel* slicePanel, FractureVisualizersPanel* visulizersPanel)
-{
-	_voronoiPanel = voronoiPanel;
-	_slicePanel = slicePanel;
-	_visualizersPanel = visulizersPanel;
-}
-
-void FractureGeneralPanel::setFractureExpandablePanels(ExpandablePanel* voronoiPanel, ExpandablePanel* slicePanel)
-{
-	_fractureVoronoiSettingsExpandlePanel = voronoiPanel;
-	_fractureSliceSettingsExpandlePanel = slicePanel;
-}
-
-void FractureGeneralPanel::on_comboBoxFracturePreset_currentIndexChanged(int index)
-{
-	if (!_updateData)
-		return;
-
-	BPPFractureGeneral& fractureGeneral = BlastProject::ins().getParams().fracture.general;
-	copy(fractureGeneral.fracturePreset, ui->comboBoxFracturePreset->currentText().toStdString().c_str());
-	_updateFractureUIs();
-}
-
-
-void FractureGeneralPanel::on_btnAddPreset_clicked()
-{
-	bool ok = false;
-	QString name = QInputDialog::getText(this,
-		tr("Blast Tool"),
-		tr("Please input name for new fracture preset:"),
-		QLineEdit::Normal,
-		"",
-		&ok);
-	bool nameExist = BlastProject::ins().isFracturePresetNameExist(name.toUtf8().data());
-	if (ok && !name.isEmpty() && !nameExist)
-	{
-		BlastProject::ins().addFracturePreset(name.toUtf8().data(), (FractureType)ui->comboBoxFractureType->currentIndex());
-		updateValues();
-		ui->comboBoxFracturePreset->setCurrentIndex(ui->comboBoxFracturePreset->count() - 1);
-	}
-	else if (ok && nameExist)
-	{
-		QMessageBox::warning(this, "Blast Tool", "The name you input is already exist!");
-	}
-	else if (ok && name.isEmpty())
-	{
-		QMessageBox::warning(this, "Blast Tool", "You need input a name for the new preset!");
-	}
-}
-
-void FractureGeneralPanel::on_btnModifyPreset_clicked()
-{
-	if (ui->comboBoxFracturePreset->currentIndex() < 1)
-	{
-		QMessageBox::warning(this, "Blast Tool", "You should select an fracture preset!");
-		return;
-	}
-
-	QByteArray tmp = ui->comboBoxFracturePreset->currentText().toUtf8();
-	const char* oldName = tmp.data();
-
-	bool ok = false;
-	QString newName = QInputDialog::getText(this,
-		tr("Blast Tool"),
-		tr("Please input new name for the selected fracture preset:"),
-		QLineEdit::Normal,
-		oldName,
-		&ok);
-	bool nameExist = BlastProject::ins().isUserPresetNameExist(newName.toUtf8().data());
-	if (ok && !newName.isEmpty() && !nameExist)
-	{
-		int curIndex = ui->comboBoxFracturePreset->currentIndex() - 1;
-		if(curIndex >= 0)
-		{
-			std::vector<FracturePreset>& presets = BlastProject::ins().getFracturePresets();
-			presets[curIndex].name = newName.toUtf8().data();
-			updateValues();
-			ui->comboBoxFracturePreset->setCurrentIndex(curIndex + 1);
-		}
-	}
-	else if (ok && nameExist)
-	{
-		QMessageBox::warning(this, "Blast Tool", "The name you input is already exist!");
-	}
-	else if (ok && newName.isEmpty())
-	{
-		QMessageBox::warning(this, "Blast Tool", "You need input a name for the selected preset!");
-	}
-}
-
-void FractureGeneralPanel::on_btnSavePreset_clicked()
-{
-	BlastProject::ins().saveFracturePreset();
-}
-
-void FractureGeneralPanel::on_comboBoxFractureType_currentIndexChanged(int index)
-{
-	if (!_updateData)
-		return;
-
-	BPPFractureGeneral& fractureGeneral = BlastProject::ins().getParams().fracture.general;
-	fractureGeneral.fractureType = index;
-
-	FracturePreset* fracturePreset = getCurrentFracturePreset();
-	if (fracturePreset != nullptr)
-	{
-		fracturePreset->setType((FractureType)index);
-	}
-	_showFracturePanel(ui->comboBoxFractureType->currentText());
-}
-
-void FractureGeneralPanel::on_comboBoxApplyMaterial_currentIndexChanged(int index)
-{
-	if (!m_bValid)
-		return;
-
-	if (!_updateData)
-		return;
-
-	BPPFractureGeneral& fractureGeneral = BlastProject::ins().getParams().fracture.general;
-	fractureGeneral.applyMaterial = index;
-}
-
-void FractureGeneralPanel::on_checkBoxAutoSelectNewChunks_stateChanged(int arg1)
-{
-	BlastProject::ins().getParams().fracture.general.autoSelectNewChunks = arg1;
-}
-
-FracturePreset* FractureGeneralPanel::getCurrentFracturePreset()
-{
-	int currentPreset = ui->comboBoxFracturePreset->currentIndex();
-
-	if (0 < currentPreset)
-	{
-		std::vector<FracturePreset>& presets = BlastProject::ins().getFracturePresets();
-		if (presets.size() > 0)
-		{
-			return &(presets[currentPreset - 1]);
-		}
-	}
-
-	return nullptr;
-}
-
-FracturePreset* FractureGeneralPanel::_getFracturePreset(const char* name)
-{
-	std::vector<FracturePreset>& presets = BlastProject::ins().getFracturePresets();
-
-	for (size_t i = 0; i < presets.size(); ++i)
-	{
-		if (presets[i].name == name)
-			return &(presets[i]);
-	}
-
-	return nullptr;
-}
-
-void FractureGeneralPanel::_updateFractureUIs()
-{
-	_updateData = false;
-
-	FracturePreset* fracturePreset = getCurrentFracturePreset();
-	if (fracturePreset != nullptr)
-	{
-		if (eFractureType_Voronoi == fracturePreset->type)
-		{
-			ui->comboBoxFractureType->setCurrentIndex(0);
-		}
-		else if (eFractureType_Slice == fracturePreset->type)
-		{
-			ui->comboBoxFractureType->setCurrentIndex(1);
-		}
-	}
-	else
-	{
-		BPPFracture& fracture = BlastProject::ins().getParams().fracture;
-		ui->comboBoxFractureType->setCurrentIndex(fracture.general.fractureType);
-	}
-
-	_showFracturePanel(ui->comboBoxFractureType->currentText());
-	_visualizersPanel->updateValues();
-	_updateData = true;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void FractureGeneralPanel::_showFracturePanel(const QString& fractireType)
-{
-	_fractureVoronoiSettingsExpandlePanel->hide();
-	_fractureSliceSettingsExpandlePanel->hide();
-	QString fractireTypeLower = fractireType.toLower();
-	if (fractireTypeLower == "voronoi")
-	{
-		_voronoiPanel->updateValues();
-		_fractureVoronoiSettingsExpandlePanel->show();
-	}
-	else if (fractireTypeLower == "slice")
-	{
-		_slicePanel->updateValues();
-		_fractureSliceSettingsExpandlePanel->show();
-	}
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FractureGeneralPanel.h b/tools/ArtistTools/source/BlastPlugin/Window/FractureGeneralPanel.h
deleted file mode 100644
index 1ab9f24..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FractureGeneralPanel.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef FRACTUREGENERALPANEL_H
-#define FRACTUREGENERALPANEL_H
-
-#include <QtWidgets/QWidget>
-#include "ProjectParams.h"
-
-namespace Ui {
-class FractureGeneralPanel;
-}
-
-class FractureVoronoiSettingsPanel;
-class FractureSliceSettingsPanel;
-class FractureVisualizersPanel;
-class ExpandablePanel;
-
-class FractureGeneralPanel : public QWidget
-{
-    Q_OBJECT
-
-public:
-	static FractureGeneralPanel* ins();
-
-    explicit FractureGeneralPanel(QWidget *parent = 0);
-    ~FractureGeneralPanel();
-	void updateValues();
-	void setFracturePanels(FractureVoronoiSettingsPanel* voronoiPanel, FractureSliceSettingsPanel* slicePanel, FractureVisualizersPanel* visulizersPanel);
-	void setFractureExpandablePanels(ExpandablePanel* voronoiPanel, ExpandablePanel* slicePanel);
-
-	FracturePreset* getCurrentFracturePreset();
-
-private slots:
-    void on_comboBoxFracturePreset_currentIndexChanged(int index);
-
-	void on_btnAddPreset_clicked();
-
-	void on_btnModifyPreset_clicked();
-
-	void on_btnSavePreset_clicked();
-
-    void on_comboBoxFractureType_currentIndexChanged(int index);
-
-    void on_comboBoxApplyMaterial_currentIndexChanged(int index);
-	
-	void on_checkBoxAutoSelectNewChunks_stateChanged(int arg1);
-
-private:
-	FracturePreset* _getFracturePreset(const char* name);
-	void _updateFractureUIs();
-	void _showFracturePanel(const QString& fractireType);
-
-private:
-    Ui::FractureGeneralPanel		*ui;
-	bool							m_bValid;
-	bool							_updateData;
-	FractureVoronoiSettingsPanel*	_voronoiPanel;
-	FractureSliceSettingsPanel*		_slicePanel;
-	FractureVisualizersPanel*		_visualizersPanel;
-	ExpandablePanel*				_fractureVoronoiSettingsExpandlePanel;
-	ExpandablePanel*				_fractureSliceSettingsExpandlePanel;
-};
-
-#endif // FRACTUREGENERALPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FractureSliceSettingsPanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/FractureSliceSettingsPanel.cpp
deleted file mode 100644
index 103c01c..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FractureSliceSettingsPanel.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-#include "FractureSliceSettingsPanel.h"
-#include "ui_FractureSliceSettingsPanel.h"
-#include "SimpleScene.h"
-#include "SampleManager.h"
-#include <QtWidgets/QMessageBox>
-#include "FractureGeneralPanel.h"
-#include "BlastFamily.h"
-
-FractureSliceSettingsPanel::FractureSliceSettingsPanel(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::FractureSliceSettingsPanel),
-	_updateData(true),
-	_generalPanel(nullptr)
-{
-    ui->setupUi(this);
-}
-
-FractureSliceSettingsPanel::~FractureSliceSettingsPanel()
-{
-    delete ui;
-}
-
-void FractureSliceSettingsPanel::updateValues()
-{
-	_updateData = false;
-	BPPSlice* slice = _getBPPSlice();
-
-	ui->spinBoxNumSlicesX->setValue(slice->numSlicesX);
-	ui->spinBoxNumSlicesY->setValue(slice->numSlicesY);
-	ui->spinBoxNumSlicesZ->setValue(slice->numSlicesZ);
-	ui->spinBoxOffsetVariation->setValue(slice->offsetVariation);
-	ui->spinBoxRotationVariation->setValue(slice->rotationVariation);
-	ui->spinBoxNoiseAmplitude->setValue(slice->noiseAmplitude);
-	ui->spinBoxNoiseFrequency->setValue(slice->noiseFrequency);
-	ui->spinBoxNoiseOctaveNumber->setValue(slice->noiseOctaveNumber);
-	ui->spinBoxNoiseSeed->setValue(slice->noiseSeed);
-	ui->spinBoxSurfaceResolution->setValue(slice->surfaceResolution);
-	_updateData = true;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxNumSlicesX_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->numSlicesX = arg1;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxNumSlicesY_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->numSlicesY = arg1;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxNumSlicesZ_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->numSlicesZ = arg1;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxOffsetVariation_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->offsetVariation = arg1;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxRotationVariation_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->rotationVariation = arg1;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxNoiseAmplitude_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->noiseAmplitude = arg1;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxNoiseFrequency_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->noiseFrequency = arg1;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxNoiseOctaveNumber_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->noiseOctaveNumber = arg1;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxNoiseSeed_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->noiseSeed = arg1;
-}
-
-void FractureSliceSettingsPanel::on_spinBoxSurfaceResolution_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPSlice* slice = _getBPPSlice();
-	slice->surfaceResolution = arg1;
-}
-
-void FractureSliceSettingsPanel::on_btnApplyFracture_clicked()
-{
-	BPPSlice* slice = _getBPPSlice();
-	SliceFractureExecutor executor;
-	executor.setBPPSlice(slice);
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = pSampleManager->getAssetFamiliesMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPGraphicsMaterialArray& theArray = projectParams.graphicsMaterials;
-	BPPFractureGeneral& fractureGeneral = projectParams.fracture.general;
-	int32_t nMaterialIndex = fractureGeneral.applyMaterial;
-	std::string materialName = "";
-	RenderMaterial* pRenderMaterial = nullptr;
-	if (nMaterialIndex > 0)
-	{
-		BPPGraphicsMaterial& item = theArray.buf[nMaterialIndex - 1];
-		materialName = item.name.buf;
-		pRenderMaterial = pSampleManager->getRenderMaterial(materialName);
-	}
-
-	std::map<BlastAsset*, std::vector<uint32_t>> selectedChunks = SampleManager::ins()->getSelectedChunks();
-	std::map<BlastAsset*, std::vector<uint32_t>>::iterator itrAssetSelectedChunks = selectedChunks.begin();
-	for (; itrAssetSelectedChunks != selectedChunks.end(); itrAssetSelectedChunks++)
-	{
-		if (itrAssetSelectedChunks->second.size() == 0)
-		{
-			continue;
-		}
-
-		if (pRenderMaterial != nullptr)
-		{
-			BlastAsset* pBlastAsset = itrAssetSelectedChunks->first;
-			std::vector<BlastFamily*> families = AssetFamiliesMap[pBlastAsset];
-			int familySize = families.size();
-			for (int fs = 0; fs < familySize; fs++)
-			{
-				BlastFamily* pBlastFamily = families[fs];
-				pBlastFamily->setMaterial(pRenderMaterial, false);
-
-				AssetList::ModelAsset modelAsset = AssetDescMap[pBlastAsset];
-				int assetID = BlastProject::ins().getAssetIDByName(modelAsset.name.c_str());
-				BPPAssetInstance* instance = BlastProject::ins().getAssetInstance(assetID, fs);
-				copy(instance->inMaterial, materialName.c_str());
-			}
-		}
-
-		executor.setSourceAsset(itrAssetSelectedChunks->first);
-		executor.setTargetChunks(itrAssetSelectedChunks->second);
-		executor.execute();
-	}
-}
-
-BPPSlice* FractureSliceSettingsPanel::_getBPPSlice()
-{
-	BPPSlice* slice = nullptr;
-	FracturePreset* preset = _generalPanel->getCurrentFracturePreset();
-	if (nullptr != preset)
-	{
-		slice = &(preset->fracture.slice);
-	}
-	else
-	{
-		slice = &(BlastProject::ins().getParams().fracture.slice);
-	}
-	return slice;
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FractureSliceSettingsPanel.h b/tools/ArtistTools/source/BlastPlugin/Window/FractureSliceSettingsPanel.h
deleted file mode 100644
index 5b68575..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FractureSliceSettingsPanel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef FRACTURESLICESETTINGSPANEL_H
-#define FRACTURESLICESETTINGSPANEL_H
-
-#include <QtWidgets/QWidget>
-#include "ProjectParams.h"
-
-namespace Ui {
-class FractureSliceSettingsPanel;
-}
-class FractureGeneralPanel;
-
-class FractureSliceSettingsPanel : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit FractureSliceSettingsPanel(QWidget *parent = 0);
-    ~FractureSliceSettingsPanel();
-	void updateValues();
-	void setFractureGeneralPanel(FractureGeneralPanel* generalPanel) { _generalPanel = generalPanel; }
-
-private slots:
-    void on_spinBoxNumSlicesX_valueChanged(int arg1);
-	void on_spinBoxNumSlicesY_valueChanged(int arg1);
-	void on_spinBoxNumSlicesZ_valueChanged(int arg1);
-
-    void on_spinBoxOffsetVariation_valueChanged(double arg1);
-
-	void on_spinBoxRotationVariation_valueChanged(double arg1);
-
-    void on_spinBoxNoiseAmplitude_valueChanged(double arg1);
-
-    void on_spinBoxNoiseFrequency_valueChanged(double arg1);
-
-	void on_spinBoxNoiseOctaveNumber_valueChanged(int arg1);
-
-    void on_spinBoxNoiseSeed_valueChanged(int arg1);
-
-	void on_spinBoxSurfaceResolution_valueChanged(int arg1);
-
-    void on_btnApplyFracture_clicked();
-
-private:
-	BPPSlice* _getBPPSlice();
-
-private:
-    Ui::FractureSliceSettingsPanel		*ui;
-	bool								_updateData;
-	FractureGeneralPanel*				_generalPanel;
-};
-
-#endif // FRACTURESLICESETTINGSPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FractureVisualizersPanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/FractureVisualizersPanel.cpp
deleted file mode 100644
index 52d5431..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FractureVisualizersPanel.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "FractureVisualizersPanel.h"
-#include "ui_FractureVisualizersPanel.h"
-#include "ProjectParams.h"
-#include "FractureGeneralPanel.h"
-#include "SampleManager.h"
-
-FractureVisualizersPanel::FractureVisualizersPanel(QWidget *parent) :
-	QWidget(parent),
-	_updateData(true),
-    ui(new Ui::FractureVisualizersPanel)
-{
-    ui->setupUi(this);
-}
-
-FractureVisualizersPanel::~FractureVisualizersPanel()
-{
-    delete ui;
-}
-
-void FractureVisualizersPanel::updateValues()
-{
-	_updateData = false;
-/*
-	BPPFractureVisualization* fractureVisualization = _getBPPVisualization();
-
-	ui->checkBoxFracturePreview->setChecked(fractureVisualization->fracturePreview);
-	ui->checkBoxDisplayFractureWidget->setChecked(fractureVisualization->displayFractureWidget);
-*/
-	bool checked = BlastProject::ins().getParams().fracture.general.selectionDepthTest;
-	ui->checkBoxSelectionDepthTest->setChecked(checked);
-	_updateData = true;
-}
-/*
-void FractureVisualizersPanel::on_checkBoxFracturePreview_stateChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPFractureVisualization* fractureVisualization = _getBPPVisualization();
-	fractureVisualization->fracturePreview = (arg1 != 0 ? true : false);
-}
-
-void FractureVisualizersPanel::on_checkBoxDisplayFractureWidget_stateChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPFractureVisualization* fractureVisualization = _getBPPVisualization();
-	fractureVisualization->displayFractureWidget = (arg1 != 0 ? true : false);
-}
-*/
-void FractureVisualizersPanel::on_checkBoxSelectionDepthTest_stateChanged(int arg1)
-{
-	BlastProject::ins().getParams().fracture.general.selectionDepthTest = arg1;
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (nullptr != pSampleManager)
-	{
-		SampleManager::ins()->ApplySelectionDepthTest();
-	}
-}
-
-BPPFractureVisualization* FractureVisualizersPanel::_getBPPVisualization()
-{
-	BPPFractureVisualization* visualization = nullptr;
-	FracturePreset* preset = _generalPanel->getCurrentFracturePreset();
-	if (nullptr != preset)
-	{
-		visualization = &(preset->visualization);
-	}
-	else
-	{
-		visualization = &(BlastProject::ins().getParams().fracture.visualization);
-	}
-	return visualization;
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FractureVisualizersPanel.h b/tools/ArtistTools/source/BlastPlugin/Window/FractureVisualizersPanel.h
deleted file mode 100644
index 9d944d1..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FractureVisualizersPanel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef FRACTUREVISUALIZERSPANEL_H
-#define FRACTUREVISUALIZERSPANEL_H
-
-#include <QtWidgets/QWidget>
-#include "ProjectParams.h"
-
-namespace Ui {
-class FractureVisualizersPanel;
-}
-class FractureGeneralPanel;
-
-class FractureVisualizersPanel : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit FractureVisualizersPanel(QWidget *parent = 0);
-    ~FractureVisualizersPanel();
-	void updateValues();
-	void setFractureGeneralPanel(FractureGeneralPanel* generalPanel) { _generalPanel = generalPanel; }
-
-private slots:
-/*
-    void on_checkBoxFracturePreview_stateChanged(int arg1);
-
-    void on_checkBoxDisplayFractureWidget_stateChanged(int arg1);
-*/	
-	void on_checkBoxSelectionDepthTest_stateChanged(int arg1);
-
-private:
-	BPPFractureVisualization* _getBPPVisualization();
-private:
-    Ui::FractureVisualizersPanel		*ui;
-	bool								_updateData;
-	FractureGeneralPanel*				_generalPanel;
-};
-
-#endif // FRACTUREVISUALIZERSPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FractureVoronoiSettingsPanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/FractureVoronoiSettingsPanel.cpp
deleted file mode 100644
index 7f18b8d..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FractureVoronoiSettingsPanel.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-#include "FractureVoronoiSettingsPanel.h"
-#include "ui_FractureVoronoiSettingsPanel.h"
-#include "ProjectParams.h"
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QMessageBox>
-#include <QtCore/QFileInfo>
-#include "AppMainWindow.h"
-#include "SimpleScene.h"
-#include "SampleManager.h"
-#include "FractureGeneralPanel.h"
-#include "BlastFamily.h"
-
-FractureVoronoiSettingsPanel::FractureVoronoiSettingsPanel(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::FractureVoronoiSettingsPanel),
-	_updateData(true),
-	_generalPanel(nullptr)
-{
-    ui->setupUi(this);
-
-    ui->groupBoxVisualizers->hide();
-}
-
-FractureVoronoiSettingsPanel::~FractureVoronoiSettingsPanel()
-{
-    delete ui;
-}
-
-void FractureVoronoiSettingsPanel::updateValues()
-{
-	_updateData = false;
-	BPPVoronoi* voronoi = _getBPPVoronoi();
-
-	ui->comboBoxSiteGeneration->setCurrentIndex(voronoi->siteGeneration);
-	_showCurrentSiteGenerationUI();
-	ui->spinBoxNumberOfSites->setValue(voronoi->numSites);
-
-	ui->spinBoxNumberOfClusters->setValue(voronoi->numberOfClusters);
-	ui->spinBoxSitesPerCluster->setValue(voronoi->sitesPerCluster);
-	ui->spinBoxClusterRadius->setValue(voronoi->clusterRadius);
-
-	_updateData = true;
-}
-
-void FractureVoronoiSettingsPanel::on_checkBoxGridPreview_stateChanged(int arg1)
-{
-
-}
-
-void FractureVoronoiSettingsPanel::on_checkBoxFracturePreview_stateChanged(int arg1)
-{
-
-}
-
-void FractureVoronoiSettingsPanel::on_checkBoxCutterMesh_stateChanged(int arg1)
-{
-
-}
-
-void FractureVoronoiSettingsPanel::on_comboBoxSiteGeneration_currentIndexChanged(int index)
-{
-	if (!_updateData)
-		return;
-
-	BPPVoronoi* voronoi = _getBPPVoronoi();
-	voronoi->siteGeneration = index;
-	_showCurrentSiteGenerationUI();
-}
-
-void FractureVoronoiSettingsPanel::on_spinBoxNumberOfSites_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPVoronoi* voronoi = _getBPPVoronoi();
-	voronoi->numSites = arg1;
-}
-
-void FractureVoronoiSettingsPanel::on_spinBoxNumberOfClusters_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPVoronoi* voronoi = _getBPPVoronoi();
-	voronoi->numberOfClusters = arg1;
-}
-
-void FractureVoronoiSettingsPanel::on_spinBoxSitesPerCluster_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPVoronoi* voronoi = _getBPPVoronoi();
-	voronoi->sitesPerCluster = arg1;
-}
-
-void FractureVoronoiSettingsPanel::on_spinBoxClusterRadius_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPVoronoi* voronoi = _getBPPVoronoi();
-	voronoi->clusterRadius = arg1;
-}
-
-void FractureVoronoiSettingsPanel::on_btnApplyFracture_clicked()
-{
-	BPPVoronoi* voronoi = _getBPPVoronoi();
-	VoronoiFractureExecutor executor;
-	executor.setBPPVoronoi(voronoi);
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	std::map<BlastAsset*, std::vector<BlastFamily*>>& AssetFamiliesMap = pSampleManager->getAssetFamiliesMap();
-	std::map<BlastAsset*, AssetList::ModelAsset>& AssetDescMap = pSampleManager->getAssetDescMap();
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPGraphicsMaterialArray& theArray = projectParams.graphicsMaterials;
-	BPPFractureGeneral& fractureGeneral = projectParams.fracture.general;
-	int32_t nMaterialIndex = fractureGeneral.applyMaterial;
-	std::string materialName = "";
-	RenderMaterial* pRenderMaterial = nullptr;
-	if (nMaterialIndex > 0)
-	{
-		BPPGraphicsMaterial& item = theArray.buf[nMaterialIndex - 1];
-		materialName = item.name.buf;
-		pRenderMaterial = pSampleManager->getRenderMaterial(materialName);
-	}
-
-	std::map<BlastAsset*, std::vector<uint32_t>> selectedChunks = SampleManager::ins()->getSelectedChunks();
-	std::map<BlastAsset*, std::vector<uint32_t>>::iterator itrAssetSelectedChunks = selectedChunks.begin();
-	for (; itrAssetSelectedChunks != selectedChunks.end(); itrAssetSelectedChunks++)
-	{
-		if (itrAssetSelectedChunks->second.size() == 0)
-		{
-			continue;
-		}
-
-		if (pRenderMaterial != nullptr)
-		{
-			BlastAsset* pBlastAsset = itrAssetSelectedChunks->first;
-			std::vector<BlastFamily*> families = AssetFamiliesMap[pBlastAsset];
-			int familySize = families.size();
-			for (int fs = 0; fs < familySize; fs++)
-			{
-				BlastFamily* pBlastFamily = families[fs];
-				pBlastFamily->setMaterial(pRenderMaterial, false);
-
-				AssetList::ModelAsset modelAsset = AssetDescMap[pBlastAsset];
-				int assetID = BlastProject::ins().getAssetIDByName(modelAsset.name.c_str());
-				BPPAssetInstance* instance = BlastProject::ins().getAssetInstance(assetID, fs);
-				copy(instance->inMaterial, materialName.c_str());
-			}
-		}
-
-		executor.setSourceAsset(itrAssetSelectedChunks->first);
-		executor.setTargetChunks(itrAssetSelectedChunks->second);
-		executor.execute();
-	}
-}
-
-BPPVoronoi* FractureVoronoiSettingsPanel::_getBPPVoronoi()
-{
-	BPPVoronoi* voronoi = nullptr;
-	FracturePreset* preset = _generalPanel->getCurrentFracturePreset();
-	if (nullptr != preset)
-	{
-		voronoi = &(preset->fracture.voronoi);
-	}
-	else
-	{
-		voronoi = &(BlastProject::ins().getParams().fracture.voronoi);
-	}
-	return voronoi;
-}
-
-void FractureVoronoiSettingsPanel::_showCurrentSiteGenerationUI()
-{
-	ui->widgetUniform->hide();
-	ui->widgetClusters->hide();
-	BPPVoronoi* voronoi = _getBPPVoronoi();
-	switch(voronoi->siteGeneration)
-	{
-	case 0:
-		ui->widgetUniform->show();
-		break;
-	case 1:
-		ui->widgetClusters->show();
-		break;
-	}
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/FractureVoronoiSettingsPanel.h b/tools/ArtistTools/source/BlastPlugin/Window/FractureVoronoiSettingsPanel.h
deleted file mode 100644
index 0f9b252..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/FractureVoronoiSettingsPanel.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef FRACTUREVORONOISETTINGSPANEL_H
-#define FRACTUREVORONOISETTINGSPANEL_H
-
-#include <QtWidgets/QWidget>
-#include "ProjectParams.h"
-
-namespace Ui {
-class FractureVoronoiSettingsPanel;
-}
-class FractureGeneralPanel;
-
-class FractureVoronoiSettingsPanel : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit FractureVoronoiSettingsPanel(QWidget *parent = 0);
-    ~FractureVoronoiSettingsPanel();
-	void updateValues();
-	void setFractureGeneralPanel(FractureGeneralPanel* generalPanel) { _generalPanel = generalPanel; }
-
-private slots:
-    void on_checkBoxGridPreview_stateChanged(int arg1);
-
-    void on_checkBoxFracturePreview_stateChanged(int arg1);
-
-    void on_checkBoxCutterMesh_stateChanged(int arg1);
-
-	void on_comboBoxSiteGeneration_currentIndexChanged(int index);
-
-    void on_spinBoxNumberOfSites_valueChanged(int arg1);
-
-    void on_spinBoxNumberOfClusters_valueChanged(int arg1);
-
-    void on_spinBoxSitesPerCluster_valueChanged(int arg1);
-
-	void on_spinBoxClusterRadius_valueChanged(double arg1);
-
-    void on_btnApplyFracture_clicked();
-
-private:
-	BPPVoronoi* _getBPPVoronoi();
-	void _showCurrentSiteGenerationUI();
-
-private:
-    Ui::FractureVoronoiSettingsPanel	*ui;
-	bool								_updateData;
-	FractureGeneralPanel*				_generalPanel;
-};
-
-#endif // FRACTUREVORONOISETTINGSPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/GeneralPanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/GeneralPanel.cpp
deleted file mode 100644
index aa6af69..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/GeneralPanel.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-#include "GeneralPanel.h"
-#include "ui_GeneralPanel.h"
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QMessageBox>
-#include "SampleManager.h"
-
-GeneralPanel::GeneralPanel(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::GeneralPanel),
-	_updateData(true)
-{
-    ui->setupUi(this);
-}
-
-GeneralPanel::~GeneralPanel()
-{
-    delete ui;
-}
-
-void GeneralPanel::updateValues()
-{
-	_updateData = false;
-	ui->comboBoxUserPreset->clear();
-	QStringList userPresets;
-	userPresets.append("Default");
-	std::vector<StressSolverUserPreset> presets = BlastProject::ins().getUserPresets();
-	int countUserPresets = (int)presets.size();
-	if (countUserPresets > 0)
-	{
-		for (int i = 0; i < countUserPresets; ++i)
-		{
-			userPresets.append(presets[i].name.c_str());
-		}
-	}
-	ui->comboBoxUserPreset->addItems(userPresets);
-
-	if (_selectedAssets.size() > 0)
-	{
-		if (nullptr == _selectedAssets[0]->activeUserPreset.buf
-			|| 0 == strlen(_selectedAssets[0]->activeUserPreset.buf)
-			|| !BlastProject::ins().isUserPresetNameExist(_selectedAssets[0]->activeUserPreset.buf))
-		{
-			ui->comboBoxUserPreset->setCurrentIndex(0);
-		}
-		else
-		{
-			ui->comboBoxUserPreset->setCurrentText(_selectedAssets[0]->activeUserPreset.buf);
-		}
-
-		_updateStressSolverUIs();
-	}
-	else
-	{
-		ui->comboBoxUserPreset->setCurrentIndex(0);
-	}
-	_updateData = true;
-}
-
-void GeneralPanel::dataSelected(std::vector<BlastNode*> selections)
-{
-	_selectedAssets.clear();
-
-	for (BlastNode* node : selections)
-	{
-		if (eAsset == node->getType())
-		{
-			BPPAsset* asset = static_cast<BPPAsset*>(node->getData());
-			_selectedAssets.push_back(asset);
-		}
-	}
-
-	updateValues();
-}
-
-void GeneralPanel::on_comboBoxUserPreset_currentIndexChanged(int index)
-{
-	if (!_updateData)
-		return;
-
-	for (size_t i = 0; i < _selectedAssets.size(); ++i)
-	{
-		QByteArray tem = ui->comboBoxUserPreset->currentText().toUtf8();
-		copy(_selectedAssets[i]->activeUserPreset, tem.data());
-	}
-	_updateStressSolverUIs();
-	_updateStressSolverToBlast();
-}
-
-void GeneralPanel::on_btnAddUserPreset_clicked()
-{
-	bool ok = false;
-	QString name = QInputDialog::getText(this,
-		tr("Blast Tool"),
-		tr("Please input name for new User preset:"),
-		QLineEdit::Normal,
-		"",
-		&ok);
-	bool nameExist = BlastProject::ins().isUserPresetNameExist(name.toUtf8().data());
-	if (ok && !name.isEmpty() && !nameExist)
-	{
-		BlastProject::ins().addUserPreset(name.toUtf8().data());
-		updateValues();
-		ui->comboBoxUserPreset->setCurrentIndex(ui->comboBoxUserPreset->count() - 1);
-	}
-	else if (ok && nameExist)
-	{
-		QMessageBox::warning(this, "Blast Tool", "The name you input is already exist!");
-	}
-	else if (ok && name.isEmpty())
-	{
-		QMessageBox::warning(this, "Blast Tool", "You need input a name for the new preset!");
-	}
-}
-
-void GeneralPanel::on_btnModifyUserPreset_clicked()
-{
-	if (ui->comboBoxUserPreset->currentIndex() < 1)
-	{
-		QMessageBox::warning(this, "Blast Tool", "You should select an user preset!");
-		return;
-	}
-
-	QByteArray tmp = ui->comboBoxUserPreset->currentText().toUtf8();
-	const char* oldName = tmp.data();
-
-	bool ok = false;
-	QString newName = QInputDialog::getText(this,
-		tr("Blast Tool"),
-		tr("Please input new name for the selected user preset:"),
-		QLineEdit::Normal,
-		oldName,
-		&ok);
-	bool nameExist = BlastProject::ins().isUserPresetNameExist(newName.toUtf8().data());
-	if (ok && !newName.isEmpty() && !nameExist)
-	{
-		int curIndex = ui->comboBoxUserPreset->currentIndex() - 1;
-		if (curIndex >= 0)
-		{
-			std::vector<StressSolverUserPreset>& presets = BlastProject::ins().getUserPresets();
-			presets[curIndex].name = newName.toUtf8().data();
-			updateValues();
-			ui->comboBoxUserPreset->setCurrentIndex(curIndex + 1);
-		}
-	}
-	else if (ok && nameExist)
-	{
-		QMessageBox::warning(this, "Blast Tool", "The name you input is already exist!");
-	}
-	else if (ok && newName.isEmpty())
-	{
-		QMessageBox::warning(this, "Blast Tool", "You need input a name for the selected preset!");
-	}
-}
-
-void GeneralPanel::on_btnSaveUserPreset_clicked()
-{
-	BlastProject::ins().saveUserPreset();
-}
-
-void GeneralPanel::on_spinBoxMaterialHardness_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPStressSolver* stressSolver = _getCurrentUserPresetStressSolver();
-
-	if (stressSolver)
-	{
-		stressSolver->hardness = arg1;
-	}
-	else
-	{
-		for (BPPAsset* asset : _selectedAssets)
-		{
-			asset->stressSolver.hardness = arg1;
-		}
-	}
-
-	_updateStressSolverToBlast();
-}
-
-void GeneralPanel::on_spinBoxLinearFactor_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPStressSolver* stressSolver = _getCurrentUserPresetStressSolver();
-
-	if (stressSolver)
-	{
-		stressSolver->linearFactor = arg1;
-	}
-	else
-	{
-		for (BPPAsset* asset : _selectedAssets)
-		{
-			asset->stressSolver.linearFactor = arg1;
-		}
-	}
-
-	_updateStressSolverToBlast();
-}
-
-void GeneralPanel::on_spinBoxAngularFactor_valueChanged(double arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPStressSolver* stressSolver = _getCurrentUserPresetStressSolver();
-
-	if (stressSolver)
-	{
-		stressSolver->angularFactor = arg1;
-	}
-	else
-	{
-		for (BPPAsset* asset : _selectedAssets)
-		{
-			asset->stressSolver.angularFactor = arg1;
-		}
-	}
-
-	_updateStressSolverToBlast();
-}
-
-void GeneralPanel::on_spinBoxBondIterations_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPStressSolver* stressSolver = _getCurrentUserPresetStressSolver();
-
-	if (stressSolver)
-	{
-		stressSolver->bondIterationsPerFrame = arg1;
-	}
-	else
-	{
-		for (BPPAsset* asset : _selectedAssets)
-		{
-			asset->stressSolver.bondIterationsPerFrame = arg1;
-		}
-	}
-
-	_updateStressSolverToBlast();
-}
-
-void GeneralPanel::on_spinBoxGraphReductionLevel_valueChanged(int arg1)
-{
-	if (!_updateData)
-		return;
-
-	BPPStressSolver* stressSolver = _getCurrentUserPresetStressSolver();
-
-	if (stressSolver)
-	{
-		stressSolver->graphReductionLevel = arg1;
-	}
-	else
-	{
-		for (BPPAsset* asset : _selectedAssets)
-		{
-			asset->stressSolver.graphReductionLevel = arg1;
-		}
-	}
-
-	_updateStressSolverToBlast();
-}
-
-BPPStressSolver* GeneralPanel::_getCurrentUserPresetStressSolver()
-{
-	int currentUserPreset = ui->comboBoxUserPreset->currentIndex();
-
-	if (0 < currentUserPreset)
-	{
-		std::vector<StressSolverUserPreset>& presets = BlastProject::ins().getUserPresets();
-		return &(presets[currentUserPreset - 1].stressSolver);
-	}
-
-	return nullptr;
-}
-
-void GeneralPanel::_updateStressSolverUIs()
-{
-	BPPStressSolver noStressSolver;
-	init(noStressSolver);
-	BPPStressSolver* stressSolver = _getCurrentUserPresetStressSolver();
-	if (stressSolver == nullptr)
-	{
-		if (0 < _selectedAssets.size())
-		{
-			copy(noStressSolver, _selectedAssets[0]->stressSolver);
-		}
-		stressSolver = &noStressSolver;
-	}
-
-	_updateData = false;
-	ui->spinBoxMaterialHardness->setValue(stressSolver->hardness);
-	ui->spinBoxLinearFactor->setValue(stressSolver->linearFactor);
-	ui->spinBoxAngularFactor->setValue(stressSolver->angularFactor);
-	ui->spinBoxBondIterations->setValue(stressSolver->bondIterationsPerFrame);
-	ui->spinBoxGraphReductionLevel->setValue(stressSolver->graphReductionLevel);
-	_updateData = true;
-}
-
-void GeneralPanel::_updateStressSolverToBlast()
-{
-	BPPStressSolver* stressSolver = _getCurrentUserPresetStressSolver();
-
-	for (BPPAsset* asset : _selectedAssets)
-	{
-		SampleManager::ins()->updateAssetFamilyStressSolver(asset, nullptr != stressSolver? *stressSolver : asset->stressSolver);
-	}
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/GeneralPanel.h b/tools/ArtistTools/source/BlastPlugin/Window/GeneralPanel.h
deleted file mode 100644
index 9651185..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/GeneralPanel.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef GENERALPANEL_H
-#define GENERALPANEL_H
-
-#include <QtWidgets/QWidget>
-#include "ProjectParams.h"
-#include "BlastSceneTree.h"
-
-namespace Ui {
-class GeneralPanel;
-}
-
-class GeneralPanel : public QWidget, public ISceneObserver
-{
-    Q_OBJECT
-
-public:
-    explicit GeneralPanel(QWidget *parent = 0);
-    ~GeneralPanel();
-	void updateValues();
-
-	virtual void dataSelected(std::vector<BlastNode*> selections);
-
-private slots:
-    void on_comboBoxUserPreset_currentIndexChanged(int index);
-
-    void on_btnAddUserPreset_clicked();
-
-    void on_btnModifyUserPreset_clicked();
-
-    void on_btnSaveUserPreset_clicked();
-
-	void on_spinBoxMaterialHardness_valueChanged(double arg1);
-
-	void on_spinBoxLinearFactor_valueChanged(double arg1);
-
-	void on_spinBoxAngularFactor_valueChanged(double arg1);
-
-	void on_spinBoxBondIterations_valueChanged(int arg1);
-
-	void on_spinBoxGraphReductionLevel_valueChanged(int arg1);
-
-private:
-	BPPStressSolver* _getCurrentUserPresetStressSolver();
-	void _updateStressSolverUIs();
-	void _updateStressSolverToBlast();
-
-private:
-    Ui::GeneralPanel		*ui;
-	bool					_updateData;
-	std::vector<BPPAsset*>	_selectedAssets;
-};
-
-#endif // GENERALPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/MaterialAssignmentsPanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/MaterialAssignmentsPanel.cpp
deleted file mode 100644
index 0ecfaf0..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/MaterialAssignmentsPanel.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-#include "MaterialAssignmentsPanel.h"
-#include "ui_MaterialAssignmentsPanel.h"
-#include "ProjectParams.h"
-#include "SampleManager.h"
-#include "MaterialLibraryPanel.h"
-#include <assert.h>
-
-MaterialAssignmentsPanel* pMaterialAssignmentsPanel = nullptr;
-MaterialAssignmentsPanel* MaterialAssignmentsPanel::ins()
-{
-	return pMaterialAssignmentsPanel;
-}
-
-MaterialAssignmentsPanel::MaterialAssignmentsPanel(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::MaterialAssignmentsPanel),
-	_selectedGraphicsMesh(-1)
-{
-    ui->setupUi(this);
-	pMaterialAssignmentsPanel = this;
-	m_bValid = true;
-}
-
-void MaterialAssignmentsPanel::getMaterialNameAndPaths(std::vector<std::string>& materialNames, std::vector<std::string>& materialPaths)
-{
-	QString m1 = ui->comboBoxMaterialID1->currentText();
-	QString m2 = ui->comboBoxMaterialID2->currentText();
-	std::string name1 = m1.toUtf8().data();
-	std::string name2 = m2.toUtf8().data();
-	std::string path1 = "";
-	std::string path2 = "";
-
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPGraphicsMaterialArray& theArray = projectParams.graphicsMaterials;
-	int count = theArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		BPPGraphicsMaterial& item = theArray.buf[i];
-		std::string name = item.name.buf;
-		std::string path = "";
-		if (item.diffuseTextureFilePath.buf != nullptr)
-		{
-			path = item.diffuseTextureFilePath.buf;
-		}
-		if (name1 == name)
-		{
-			path1 = path;
-		}
-		else if (name2 == name)
-		{
-			path2 = path;
-		}
-		else if (path1 != "" && path2 != "")
-		{
-			break;
-		}
-	}
-
-	materialNames[0] = name1;
-	materialPaths[0] = path1;
-
-	BPPFractureGeneral& fractureGeneral = BlastProject::ins().getParams().fracture.general;
-	int32_t nMaterialIndex = fractureGeneral.applyMaterial;
-	assert(theArray.buf != nullptr);
-	if (nMaterialIndex > 0 && theArray.buf)
-	{
-		BPPGraphicsMaterial& item = theArray.buf[nMaterialIndex - 1];
-		name2 = item.name.buf;
-		if (item.diffuseTextureFilePath.buf)
-		{
-			path2 = item.diffuseTextureFilePath.buf;
-		}
-	}
-	materialNames[1] = name2;
-	materialPaths[1] = path2;
-}
-
-MaterialAssignmentsPanel::~MaterialAssignmentsPanel()
-{
-    delete ui;
-}
-
-void MaterialAssignmentsPanel::updateValues()
-{
-	m_bValid = false;
-	ui->comboBoxMaterialID1->clear();
-	ui->comboBoxMaterialID2->clear();
-	ui->comboBoxMaterialID1->setEnabled(false);
-	ui->comboBoxMaterialID2->setEnabled(false);
-	m_bValid = true;
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (pSampleManager == nullptr)
-	{
-		return;
-	}
-
-	BlastAsset* pBlastAsset = nullptr;
-	int index = -1;
-	pSampleManager->getCurrentSelectedInstance(&pBlastAsset, index);
-	if (pBlastAsset == nullptr || index == -1)
-	{
-		return;
-	}
-
-	ui->comboBoxMaterialID1->setEnabled(true);
-	ui->comboBoxMaterialID2->setEnabled(true);
-
-	QStringList materialNames;
-	materialNames.append("None");
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPGraphicsMaterialArray& theArray = projectParams.graphicsMaterials;
-	int count = theArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		BPPGraphicsMaterial& item = theArray.buf[i];
-		materialNames.append(item.name.buf);
-	}
-
-	m_bValid = false;
-	ui->comboBoxMaterialID1->insertItems(0, materialNames);
-	ui->comboBoxMaterialID2->insertItems(0, materialNames);
-	m_bValid = true;
-
-	std::string strMaterialNames[] = { "", "" };
-	bool ex[] = { true, false };
-	for (int i = 0; i < 2; i++)
-	{
-		pSampleManager->getMaterialForCurrentFamily(strMaterialNames[i], ex[i]);
-	}
-
-	m_bValid = false;
-	ui->comboBoxMaterialID1->setCurrentText(strMaterialNames[0].c_str());
-	ui->comboBoxMaterialID2->setCurrentText(strMaterialNames[1].c_str());
-	m_bValid = true;
-	
-	return;
-
-	if (_selectedGraphicsMesh > -1)
-	{
-		BPParams& projectParams = BlastProject::ins().getParams();
-		BPPBlast& blast = projectParams.blast;
-		BPPGraphicsMaterialArray& graphicsMaterialsArray = projectParams.graphicsMaterials;
-
-		//BPPMaterialAssignmentsArray& assignment = blast.graphicsMeshes.buf[_selectedGraphicsMesh].materialAssignments;
-
-		//ui->comboBoxMaterialID1->clear();
-		//ui->comboBoxMaterialID2->clear();
-		//ui->comboBoxMaterialID3->clear();
-		//ui->comboBoxMaterialID4->clear();
-
-		//QStringList materialNames;
-		//materialNames.append("None");
-		//int count = graphicsMaterialsArray.arraySizes[0];
-		//for (int i = 0; i < count; ++i)
-		//{
-		//	materialNames.append(graphicsMaterialsArray.buf[i].name.buf);
-		//}
-
-		//ui->comboBoxMaterialID1->insertItems(0, materialNames);
-		//ui->comboBoxMaterialID2->insertItems(0, materialNames);
-		//ui->comboBoxMaterialID3->insertItems(0, materialNames);
-		//ui->comboBoxMaterialID4->insertItems(0, materialNames);
-
-		//ui->comboBoxMaterialID1->setCurrentIndex(assignment.materialIndexes[0] + 1);
-		//ui->comboBoxMaterialID2->setCurrentIndex(assignment.materialIndexes[1] + 1);
-		//ui->comboBoxMaterialID3->setCurrentIndex(assignment.materialIndexes[2] + 1);
-		//ui->comboBoxMaterialID4->setCurrentIndex(assignment.materialIndexes[3] + 1);
-	}
-}
-
-void MaterialAssignmentsPanel::on_comboBoxMaterialID1_currentIndexChanged(int index)
-{
-	if (index < 0 || !m_bValid)
-		return;
-
-	RenderMaterial* pRenderMaterial = nullptr;
-
-	QString currentText = ui->comboBoxMaterialID1->currentText();
-	std::string name = currentText.toUtf8().data();
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (pSampleManager == nullptr)
-	{
-		return;
-	}
-
-	pSampleManager->setMaterialForCurrentFamily(name, true);
-	
-	return;
-	assignMaterialToMaterialID(0, index - 1);
-}
-
-void MaterialAssignmentsPanel::on_comboBoxMaterialID2_currentIndexChanged(int index)
-{
-	if (index < 0 || !m_bValid)
-		return;
-
-	RenderMaterial* pRenderMaterial = nullptr;
-
-	QString currentText = ui->comboBoxMaterialID2->currentText();
-	std::string name = currentText.toUtf8().data();
-
-	SampleManager* pSampleManager = SampleManager::ins();
-	if (pSampleManager == nullptr)
-	{
-		return;
-	}
-
-	pSampleManager->setMaterialForCurrentFamily(name, false);
-
-	return;
-	assignMaterialToMaterialID(1, index - 1);
-}
-
-void MaterialAssignmentsPanel::on_comboBoxMaterialID3_currentIndexChanged(int index)
-{
-	assignMaterialToMaterialID(2, index - 1);
-}
-
-void MaterialAssignmentsPanel::on_comboBoxMaterialID4_currentIndexChanged(int index)
-{
-	assignMaterialToMaterialID(3, index - 1);
-}
-
-void MaterialAssignmentsPanel::assignMaterialToMaterialID(int materialID, int materialIndex)
-{
-	if (materialID < 0 || materialID > 3 || materialIndex < 0)
-		return;
-
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPGraphicsMaterialArray& graphicsMaterialArray = projectParams.graphicsMaterials;
-	BPPBlast& blast = projectParams.blast;
-
-	if (materialIndex >= graphicsMaterialArray.arraySizes[0])
-		return;
-
-	//BPPGraphicsMeshArray& graphicsMeshArray = blast.graphicsMeshes;
-
-	//if (_selectedGraphicsMesh > -1 && _selectedGraphicsMesh < graphicsMeshArray.arraySizes[0])
-	//{
-	//	graphicsMeshArray.buf[_selectedGraphicsMesh].materialAssignments.materialIndexes[materialID] = materialIndex;
-	//}
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/MaterialAssignmentsPanel.h b/tools/ArtistTools/source/BlastPlugin/Window/MaterialAssignmentsPanel.h
deleted file mode 100644
index 782baa8..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/MaterialAssignmentsPanel.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef MATERIALASSIGNMENTSPANEL_H
-#define MATERIALASSIGNMENTSPANEL_H
-
-#include <QtWidgets/QWidget>
-
-namespace Ui {
-class MaterialAssignmentsPanel;
-}
-
-class MaterialAssignmentsPanel : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit MaterialAssignmentsPanel(QWidget *parent = 0);
-    ~MaterialAssignmentsPanel();
-	void updateValues();
-
-	static MaterialAssignmentsPanel* ins();
-	void getMaterialNameAndPaths(std::vector<std::string>& materialNames, std::vector<std::string>& materialPaths);
-
-private slots:
-    void on_comboBoxMaterialID1_currentIndexChanged(int index);
-
-    void on_comboBoxMaterialID2_currentIndexChanged(int index);
-
-    void on_comboBoxMaterialID3_currentIndexChanged(int index);
-
-    void on_comboBoxMaterialID4_currentIndexChanged(int index);
-
-private:
-	void assignMaterialToMaterialID(int materialID, int materialIndex);
-
-private:
-    Ui::MaterialAssignmentsPanel *ui;
-	int							_selectedGraphicsMesh;
-	bool m_bValid;
-};
-
-#endif // MATERIALASSIGNMENTSPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/MaterialLibraryPanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/MaterialLibraryPanel.cpp
deleted file mode 100644
index f062ad4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/MaterialLibraryPanel.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-#include "MaterialLibraryPanel.h"
-#include "ui_MaterialLibraryPanel.h"
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QMessageBox>
-#include "QtUtil.h"
-#include "AppMainWindow.h"
-#include "SampleManager.h"
-#include "MaterialAssignmentsPanel.h"
-#include "FractureGeneralPanel.h"
-#include "ResourceManager.h"
-enum ETextureType
-{
-	eDiffuseTexture,
-	eSpecularTexture,
-	eNormalTexture
-};
-
-void OnTextureButtonClicked(BPPGraphicsMaterial& material, ETextureType t, QPushButton* pButton)
-{
-	QString texName = AppMainWindow::Inst().OpenTextureFile();
-
-	QFileInfo fileInfo(texName);
-	QByteArray ba = fileInfo.absoluteFilePath().toLocal8Bit();
-	const char* filePath = (const char*)(ba);
-
-	switch (t)
-	{
-	case eDiffuseTexture:
-		copy(material.diffuseTextureFilePath, filePath);
-		break;
-	case eSpecularTexture:
-		copy(material.specularTextureFilePath, filePath);
-		break;
-	case eNormalTexture:
-		copy(material.normalTextureFilePath, filePath);
-		break;
-	}
-
-	if (texName.isEmpty())
-		pButton->setIcon(QIcon(":/AppMainWindow/images/TextureEnabled_icon.png"));
-	else
-		pButton->setIcon(QIcon(":/AppMainWindow/images/TextureIsUsed_icon.png"));
-
-}
-
-void OnTextureReload(BPPGraphicsMaterial& material, ETextureType t, QPushButton* pButton)
-{
-	QString texName;
-	switch (t)
-	{
-	case eDiffuseTexture:
-		texName = material.diffuseTextureFilePath.buf;
-		// to do: reload texture
-		break;
-	case eSpecularTexture:
-		texName = material.specularTextureFilePath.buf;
-		// to do: reload texture
-		break;
-	case eNormalTexture:
-		texName = material.normalTextureFilePath.buf;
-		// to do: reload texture
-		break;
-	}
-
-	if (texName.isEmpty())
-		pButton->setIcon(QIcon(":/AppMainWindow/images/TextureEnabled_icon.png"));
-	else
-		pButton->setIcon(QIcon(":/AppMainWindow/images/TextureIsUsed_icon.png"));
-
-}
-
-void OnTextureClear(BPPGraphicsMaterial& material, ETextureType t, QPushButton* pButton)
-{
-	switch (t)
-	{
-	case eDiffuseTexture:
-		freeString(material.diffuseTextureFilePath);
-		// to do: clear texture
-		break;
-	case eSpecularTexture:
-		freeString(material.specularTextureFilePath);
-		// to do: clear texture
-		break;
-	case eNormalTexture:
-		freeString(material.normalTextureFilePath);
-		// to do: clear texture
-		break;
-	}
-
-	pButton->setIcon(QIcon(":/AppMainWindow/images/TextureEnabled_icon.png"));
-
-}
-
-MaterialLibraryPanel* pMaterialLibraryPanel = nullptr;
-MaterialLibraryPanel* MaterialLibraryPanel::ins()
-{
-	return pMaterialLibraryPanel;
-}
-
-MaterialLibraryPanel::MaterialLibraryPanel(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::MaterialLibraryPanel)
-{
-    ui->setupUi(this);
-
-	pMaterialLibraryPanel = this;
-}
-
-MaterialLibraryPanel::~MaterialLibraryPanel()
-{
-    delete ui;
-}
-
-void MaterialLibraryPanel::updateValues()
-{
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPGraphicsMaterialArray& graphicsMaterialArray = projectParams.graphicsMaterials;
-
-	ui->listWidget->clear();
-	QStringList materialNames;
-	int count = graphicsMaterialArray.arraySizes[0];
-	for (int i = 0; i < count; ++i)
-	{
-		materialNames.append(graphicsMaterialArray.buf[i].name.buf);
-	}
-	ui->listWidget->addItems(materialNames);
-
-	if (count > 0)
-	{
-		ui->btnModifyMat->setEnabled(true);
-		ui->btnRemoveMat->setEnabled(true);
-	}
-	else
-	{
-		ui->btnModifyMat->setEnabled(false);
-		ui->btnRemoveMat->setEnabled(false);
-	}
-
-	MaterialAssignmentsPanel::ins()->updateValues();
-	FractureGeneralPanel::ins()->updateValues();
-}
-
-void MaterialLibraryPanel::on_btnAddMat_clicked()
-{
-	bool ok = false;
-	QString name = QInputDialog::getText(this,
-		tr("Blast Tool"),
-		tr("Please input name for new graphics material:"),
-		QLineEdit::Normal,
-		"",
-		&ok);
-	bool nameExist = BlastProject::ins().isGraphicsMaterialNameExist(name.toUtf8().data());
-	if (ok && !name.isEmpty() && !nameExist)
-	{
-		std::string strName = name.toUtf8().data();
-		if (!BlastProject::ins().isGraphicsMaterialNameExist(strName.c_str()))
-		{
-			BlastProject::ins().addGraphicsMaterial(strName.c_str());
-			updateValues();
-			ui->listWidget->setCurrentRow(ui->listWidget->count() - 1);
-		}
-	}
-	else if (ok && nameExist)
-	{
-		QMessageBox::warning(this, "Blast Tool", "The name you input is already exist!");
-	}
-	else if (ok && name.isEmpty())
-	{
-		QMessageBox::warning(this, "Blast Tool", "You need input a name for the new graphics material!");
-	}
-}
-
-void MaterialLibraryPanel::on_btnModifyMat_clicked()
-{
-	QList<QListWidgetItem*> items = ui->listWidget->selectedItems();
-	if (items.size() == 0)
-	{
-		SampleManager::ins()->output("please select a material first !");
-		return;
-	}
-	QByteArray tmp = items.at(0)->text().toUtf8();
-	const char* oldName = tmp.data();
-
-	bool ok = false;
-	QString newName = QInputDialog::getText(this,
-		tr("Blast Tool"),
-		tr("Please input new name for the selected graphics material:"),
-		QLineEdit::Normal,
-		oldName,
-		&ok);
-	bool nameExist = BlastProject::ins().isGraphicsMaterialNameExist(newName.toUtf8().data());
-	if (ok && !newName.isEmpty() && !nameExist)
-	{
-		std::string strOldName = oldName;
-		std::string strNewName = newName.toUtf8().data();
-
-		SampleManager::ins()->renameRenderMaterial(strOldName, strNewName);
-
-		BlastProject::ins().renameGraphicsMaterial(oldName, newName.toUtf8().data());
-		updateValues();
-	}
-	else if (ok && nameExist)
-	{
-		QMessageBox::warning(this, "Blast Tool", "The name you input is already exist!");
-	}
-	else if (ok && newName.isEmpty())
-	{
-		QMessageBox::warning(this, "Blast Tool", "You need input a name for the selected graphics material!");
-	}
-}
-
-void MaterialLibraryPanel::on_btnRemoveMat_clicked()
-{
-	QList<QListWidgetItem*> items = ui->listWidget->selectedItems();
-	if (items.size() == 0)
-	{
-		SampleManager::ins()->output("please select a material first !");
-		return;
-	}
-	QByteArray tem = items.at(0)->text().toUtf8();
-
-	std::string strName = tem.data();
-
-	SampleManager::ins()->removeRenderMaterial(strName);
-
-	BlastProject::ins().removeGraphicsMaterial(strName.c_str());
-	updateValues();
-	ui->listWidget->setCurrentRow(ui->listWidget->count() - 1);
-}
-
-void MaterialLibraryPanel::on_listWidget_currentRowChanged(int currentRow)
-{
-	_refreshMaterialValues(currentRow);
-}
-
-void MaterialLibraryPanel::on_btnDiffuseColor_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		atcore_float4* color = (atcore_float4*)&(material->diffuseColor);
-		pickColor(*color);
-		setButtonColor(ui->btnDiffuseColor, color->x, color->y, color->z);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-
-		BlastProject::ins().reloadDiffuseColor(strName.c_str(), color->x, color->y, color->z);
-
-		SampleManager::ins()->reloadRenderMaterial(strName, color->x, color->y, color->z);
-	}
-}
-
-void MaterialLibraryPanel::on_btnDiffuseColorTex_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		OnTextureButtonClicked(*material, eDiffuseTexture, ui->btnDiffuseColorTex);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-		QString qTexture = material->diffuseTextureFilePath.buf;
-		std::string strTexture = qTexture.toUtf8().data();
-
-		BlastProject::ins().reloadDiffuseTexture(strName.c_str(), strTexture.c_str());
-
-		SampleManager::ins()->reloadRenderMaterial(strName, strTexture);
-	}
-}
-
-void MaterialLibraryPanel::on_btnDiffuseColorTexReload_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		OnTextureReload(*material, eDiffuseTexture, ui->btnDiffuseColorTex);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-		QString qTexture = material->diffuseTextureFilePath.buf;
-		std::string strTexture = qTexture.toUtf8().data();
-		
-		SampleManager::ins()->reloadRenderMaterial(strName, "");
-		ResourceManager::ins()->releaseTexture(strTexture.c_str());
-		SampleManager::ins()->reloadRenderMaterial(strName, strTexture);
-	}
-}
-
-void MaterialLibraryPanel::on_btnDiffuseColorTexClear_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		OnTextureClear(*material, eDiffuseTexture, ui->btnDiffuseColorTex);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-
-		BlastProject::ins().reloadDiffuseTexture(strName.c_str(), "");
-		
-		SampleManager::ins()->reloadRenderMaterial(strName, "");
-	}
-}
-
-void MaterialLibraryPanel::on_btnSpecularColor_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		atcore_float4* color = (atcore_float4*)&(material->specularColor);
-		pickColor(*color);
-		setButtonColor(ui->btnSpecularColor, color->x, color->y, color->z);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-
-		BlastProject::ins().reloadSpecularColor(strName.c_str(), color->x, color->y, color->z);
-
-		SampleManager::ins()->reloadRenderMaterial(strName, color->x, color->y, color->z, false);
-	}
-}
-
-void MaterialLibraryPanel::on_btnSpecularColorTex_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		OnTextureButtonClicked(*material, eSpecularTexture, ui->btnSpecularColorTex);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-		QString qTexture = material->specularTextureFilePath.buf;
-		std::string strTexture = qTexture.toUtf8().data();
-
-		BlastProject::ins().reloadSpecularTexture(strName.c_str(), strTexture.c_str());
-
-		SampleManager::ins()->reloadRenderMaterial(strName, strTexture, RenderMaterial::TT_Specular);
-	}
-}
-
-void MaterialLibraryPanel::on_btnSpecularColorTexReload_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		OnTextureReload(*material, eSpecularTexture, ui->btnSpecularColorTex);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-		QString qTexture = material->specularTextureFilePath.buf;
-		std::string strTexture = qTexture.toUtf8().data();
-
-		SampleManager::ins()->reloadRenderMaterial(strName, "", RenderMaterial::TT_Specular);
-		ResourceManager::ins()->releaseTexture(strTexture.c_str());
-		SampleManager::ins()->reloadRenderMaterial(strName, strTexture, RenderMaterial::TT_Specular);
-	}
-}
-
-void MaterialLibraryPanel::on_btnSpecularColorTexClear_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		OnTextureClear(*material, eSpecularTexture, ui->btnSpecularColorTex);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-
-		BlastProject::ins().reloadSpecularTexture(strName.c_str(), "");
-
-		SampleManager::ins()->reloadRenderMaterial(strName, "", RenderMaterial::TT_Specular);
-	}
-}
-
-void MaterialLibraryPanel::on_spinSpecularShin_valueChanged(double arg1)
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		float specularShininess = (float)arg1;
-
-		material->specularShininess = specularShininess;
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-		SampleManager::ins()->reloadRenderMaterial(strName, specularShininess);
-	}
-}
-
-void MaterialLibraryPanel::on_btnNormalColorTex_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		OnTextureButtonClicked(*material, eNormalTexture, ui->btnNormalColorTex);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-		QString qTexture = material->normalTextureFilePath.buf;
-		std::string strTexture = qTexture.toUtf8().data();
-
-		BlastProject::ins().reloadNormalTexture(strName.c_str(), strTexture.c_str());
-
-		SampleManager::ins()->reloadRenderMaterial(strName, strTexture, RenderMaterial::TT_Normal);
-	}
-}
-
-void MaterialLibraryPanel::on_btnNormalColorTexReload_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		OnTextureReload(*material, eNormalTexture, ui->btnNormalColorTex);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-		QString qTexture = material->normalTextureFilePath.buf;
-		std::string strTexture = qTexture.toUtf8().data();
-
-		SampleManager::ins()->reloadRenderMaterial(strName, "", RenderMaterial::TT_Normal);
-		ResourceManager::ins()->releaseTexture(strTexture.c_str());
-		SampleManager::ins()->reloadRenderMaterial(strName, strTexture, RenderMaterial::TT_Normal);
-	}
-}
-
-void MaterialLibraryPanel::on_btnNormalColorTexClear_clicked()
-{
-	BPPGraphicsMaterial* material = _getSelectedMaterial();
-	if (material)
-	{
-		OnTextureClear(*material, eNormalTexture, ui->btnNormalColorTex);
-
-		QString qName = material->name.buf;
-		std::string strName = qName.toUtf8().data();
-
-		BlastProject::ins().reloadNormalTexture(strName.c_str(), "");
-
-		SampleManager::ins()->reloadRenderMaterial(strName, "", RenderMaterial::TT_Normal);
-	}
-}
-
-void MaterialLibraryPanel::_refreshMaterialValues(int idx)
-{
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPGraphicsMaterialArray& graphicsMaterialArray = projectParams.graphicsMaterials;
-	int count = graphicsMaterialArray.arraySizes[0];
-	if (idx >= 0 && idx < count)
-	{
-		const BPPGraphicsMaterial& material = graphicsMaterialArray.buf[idx];
-
-		ui->spinSpecularShin->setValue(material.specularShininess);
-
-		const nvidia::NvVec4& diffuseColor = material.diffuseColor;
-		const nvidia::NvVec4& specularColor = material.specularColor;
-		setButtonColor(ui->btnDiffuseColor, diffuseColor.x, diffuseColor.y, diffuseColor.z);
-		setButtonColor(ui->btnSpecularColor, specularColor.x, specularColor.y, specularColor.z);
-
-		updateTextureButton(ui->btnDiffuseColorTex, material.diffuseTextureFilePath.buf);
-		updateTextureButton(ui->btnSpecularColorTex, material.specularTextureFilePath.buf);
-		updateTextureButton(ui->btnNormalColorTex, material.normalTextureFilePath.buf);
-	}
-	else
-	{
-		ui->spinSpecularShin->setValue(0.0f);
-
-		setButtonColor(ui->btnDiffuseColor, 0, 0, 0);
-		setButtonColor(ui->btnSpecularColor, 0, 0, 0);
-		updateTextureButton(ui->btnDiffuseColorTex, "");
-		updateTextureButton(ui->btnSpecularColorTex, "");
-		updateTextureButton(ui->btnNormalColorTex, "");
-	}
-}
-
-BPPGraphicsMaterial* MaterialLibraryPanel::_getSelectedMaterial()
-{
-	BPParams& projectParams = BlastProject::ins().getParams();
-	BPPGraphicsMaterialArray& graphicsMaterialArray = projectParams.graphicsMaterials;
-
-	int idx = ui->listWidget->currentRow();
-	int count = graphicsMaterialArray.arraySizes[0];
-	if (idx < 0 || idx > count)
-		return nullptr;
-
-	return &(graphicsMaterialArray.buf[idx]);
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/MaterialLibraryPanel.h b/tools/ArtistTools/source/BlastPlugin/Window/MaterialLibraryPanel.h
deleted file mode 100644
index 9012294..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/MaterialLibraryPanel.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef MATERIALLIBRARYPANEL_H
-#define MATERIALLIBRARYPANEL_H
-
-#include <QtWidgets/QWidget>
-#include "ProjectParams.h"
-
-class RenderMaterial;
-
-namespace Ui {
-class MaterialLibraryPanel;
-}
-
-class MaterialLibraryPanel : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit MaterialLibraryPanel(QWidget *parent = 0);
-    ~MaterialLibraryPanel();
-	void updateValues();
-
-	static MaterialLibraryPanel* ins();
-
-private slots:
-    void on_btnAddMat_clicked();
-
-    void on_btnModifyMat_clicked();
-
-    void on_btnRemoveMat_clicked();
-
-    void on_listWidget_currentRowChanged(int currentRow);
-
-    void on_btnDiffuseColor_clicked();
-
-    void on_btnDiffuseColorTex_clicked();
-
-    void on_btnDiffuseColorTexReload_clicked();
-
-    void on_btnDiffuseColorTexClear_clicked();
-
-    void on_btnSpecularColor_clicked();
-
-    void on_btnSpecularColorTex_clicked();
-
-    void on_btnSpecularColorTexReload_clicked();
-
-    void on_btnSpecularColorTexClear_clicked();
-
-	void on_spinSpecularShin_valueChanged(double arg1);
-
-    void on_btnNormalColorTex_clicked();
-
-    void on_btnNormalColorTexReload_clicked();
-
-    void on_btnNormalColorTexClear_clicked();
-
-private:
-	void _refreshMaterialValues(int idx);
-	BPPGraphicsMaterial* _getSelectedMaterial();
-
-private:
-    Ui::MaterialLibraryPanel *ui;
-};
-
-#endif // MATERIALLIBRARYPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/NoiseToolsDlg.cpp b/tools/ArtistTools/source/BlastPlugin/Window/NoiseToolsDlg.cpp
deleted file mode 100644
index 748002c..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/NoiseToolsDlg.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "NoiseToolsDlg.h"
-#include "ui_NoiseToolsDlg.h"
-
-NoiseToolsDlg::NoiseToolsDlg(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::NoiseToolsDlg)
-{
-    ui->setupUi(this);
-}
-
-NoiseToolsDlg::~NoiseToolsDlg()
-{
-    delete ui;
-}
-
-void NoiseToolsDlg::on_comboBoxApplyByMaterial_currentIndexChanged(int index)
-{
-
-}
-
-void NoiseToolsDlg::on_spinBoxAmplitude_valueChanged(double arg1)
-{
-
-}
-
-void NoiseToolsDlg::on_spinBoxFrequency_valueChanged(double arg1)
-{
-
-}
-
-void NoiseToolsDlg::on_spinBoxAmplitude_3_valueChanged(double arg1)
-{
-
-}
-
-void NoiseToolsDlg::on_btnApply_clicked()
-{
-
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/NoiseToolsDlg.h b/tools/ArtistTools/source/BlastPlugin/Window/NoiseToolsDlg.h
deleted file mode 100644
index 057dd42..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/NoiseToolsDlg.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef NOISETOOLSDLG_H
-#define NOISETOOLSDLG_H
-
-#include <QtWidgets/QDialog>
-
-namespace Ui {
-class NoiseToolsDlg;
-}
-
-class NoiseToolsDlg : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit NoiseToolsDlg(QWidget *parent = 0);
-    ~NoiseToolsDlg();
-
-private slots:
-    void on_comboBoxApplyByMaterial_currentIndexChanged(int index);
-
-    void on_spinBoxAmplitude_valueChanged(double arg1);
-
-    void on_spinBoxFrequency_valueChanged(double arg1);
-
-    void on_spinBoxAmplitude_3_valueChanged(double arg1);
-
-    void on_btnApply_clicked();
-
-private:
-    Ui::NoiseToolsDlg *ui;
-};
-
-#endif // NOISETOOLSDLG_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/QtUtil.cpp b/tools/ArtistTools/source/BlastPlugin/Window/QtUtil.cpp
deleted file mode 100644
index b2fdd75..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/QtUtil.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include "QtUtil.h"
-
-#include <QtWidgets/QLabel>
-#include "AppMainWindow.h"
-
-#include "SimpleScene.h"
-
-//////////////////////////////////////////////////////////
-void setStyledToolTip(QPushButton *pButton, const char *tooltip)
-{
-	char styledString[1024];
-	sprintf(styledString, "<span style=\"color:black;\">%s</span>", tooltip);
-	pButton->setToolTip(styledString);
-}
-
-//////////////////////////////////////////////////////////
-QString addStar(QString text, bool add)
-{
-	QByteArray ba = text.toUtf8();
-
-	const char* in = ba.data();
-	char out[1024];
-
-	int i = 0;
-	for (i = 0; i < strlen(in); i++)
-	{
-		if (in[i] == '*')
-			break;
-		out[i] = in[i];
-	}
-	out[i] = 0;
-
-	QString newtext;
-	if (add)
-		newtext = QString((const char*)out) + QString("*");
-	else
-		newtext = QString((const char*)out) ;
-	return newtext;
-}
-
-//////////////////////////////////////////////////////////
-void setFocusColor(QWidget* qWidget, bool sameAsDefault, bool sameForAllAssets)
-{
-	if (!qWidget)
-		return;
-
-	QString sameStyle = QString("font: ; color: rgb(150,150,150);") ;
-	QString differentStyle = QString("font: bold; color: rgb(255,55,55);");
-	QString style = (sameForAllAssets) ? sameStyle : differentStyle;
-
-	qWidget->setStyleSheet(style);
-
-	QLabel* label = dynamic_cast<QLabel*>(qWidget);
-	if (label)
-	{
-		QString newtext = addStar(label->text(), !sameAsDefault);
-
-		label->setFrameStyle(0);
-		label->setText(newtext);
-	}
-}
-
-//////////////////////////////////////////////////////////
-void pickColor(atcore_float4& color)
-{
-	QColor currentColor;
-	currentColor.setRgbF(color.x, color.y, color.z);
-
-	QColor newColor = QColorDialog::getColor(currentColor, NV_NULL);
-	if(newColor.isValid())
-	{
-		qreal r,g,b;
-		newColor.getRgbF(&r, &g, &b);
-
-		color.x = r;
-		color.y = g;
-		color.z = b;
-	}
-}
-
-//////////////////////////////////////////////////////////
-void setButtonColor(QPushButton *button, float r, float g, float b)
-{
-	QColor specColor;
-	specColor.setRgbF(r,g,b);
-	QString specBtnStyle = QString("background-color: rgb(%1,%2,%3);")
-		.arg(specColor.red())
-		.arg(specColor.green())
-		.arg(specColor.blue());
-
-	button->setStyleSheet(specBtnStyle);
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-void updateColorButton(QPushButton* button, int paramID, QLabel* label)
-{
-	//atcore_float4 v;
-	//SimpleScene::Inst()->GetFurCharacter().GetHairParam(paramID, &v);
-
-	//setButtonColor(button, v.x, v.y, v.z);
-
-	//if (label)
-	//	setFocusColor(label, paramID);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-void setClearButtonIcon(QPushButton *pButton)
-{
-	pButton->setIcon(QIcon(":/AppMainWindow/images/Remove_icon.png"));
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-void setTextureButtons(QPushButton *pTex, QPushButton *pReload, QPushButton *pClear)
-{
-	pTex->setIcon(QIcon(":/AppMainWindow/images/TextureEnabled_icon.png"));
-	pReload->setIcon(QIcon(":/AppMainWindow/images/Refresh_icon.png"));
-	pClear->setIcon(QIcon(":/AppMainWindow/images/Remove_icon.png"));
-
-	pTex->setIconSize(QSize(12,12));
-	pReload->setIconSize(QSize(12,12));
-	pClear->setIconSize(QSize(12,12));
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-void updateTextureButton(QPushButton* pButton, const QString& texturePath)
-{
-	if (!texturePath.isEmpty())		setStyledToolTip(pButton, texturePath.toUtf8().data());
-
-	bool isTextureUsed = true;
-	QIcon notUsedIcon = QIcon(":/AppMainWindow/images/TextureEnabled_icon.png");
-	QIcon isUsedIcon = QIcon(":/AppMainWindow/images/TextureIsUsed_icon.png");
-	QIcon disabledIcon = QIcon(":/AppMainWindow/images/TextureDisabled_icon.png");
-
-	pButton->setIcon(!texturePath.isEmpty() ? isUsedIcon : notUsedIcon);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-//bool LoadHairTexture(NvHair::TextureType::Enum textureType)
-//{
-//	QString texName = AppMainWindow::Inst().OpenTextureFile();
-//	return SimpleScene::Inst()->GetFurCharacter().LoadHairTexture(textureType, texName.toLocal8Bit());
-//}
-//
-///////////////////////////////////////////////////////////////////////////////////////
-//bool ReloadHairTexture(NvHair::TextureType::Enum textureType)
-//{
-//	return SimpleScene::Inst()->GetFurCharacter().ReloadHairTexture(textureType);
-//}
-//
-///////////////////////////////////////////////////////////////////////////////////////
-//bool ClearHairTexture(NvHair::TextureType::Enum textureType)
-//{
-//	return SimpleScene::Inst()->GetFurCharacter().ClearHairTexture(textureType);
-//}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/QtUtil.h b/tools/ArtistTools/source/BlastPlugin/Window/QtUtil.h
deleted file mode 100644
index 2372b06..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/QtUtil.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef QtUtil_h__
-#define QtUtil_h__
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtWidgets/QColorDialog>
-#include <QtGui/QPalette>
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QSpinBox>
-#include <QtWidgets/QDoubleSpinBox>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QSlider>
-#include "corelib_global.h"
-
-// utility functions to quickly set and update UI
-
-void setStyledToolTip(QPushButton *pButton, const char *tooltip);
-void pickColor(atcore_float4& color);
-void setButtonColor(QPushButton *button, float r, float g, float b);
-
-void setFocusColor(QWidget* qWidget, bool sameAsDefault, bool sameForAllAssets);
-
-void updateColorButton(QPushButton* pButton, int paramID, QLabel* label = 0);
-
-void setTextureButtons(QPushButton *pButton, QPushButton *pReload, QPushButton *pClear);
-void updateTextureButton(QPushButton* pButton, const QString& texturePath);
-
-void setClearButtonIcon(QPushButton *pButton);
-
-//bool LoadHairTexture(NvHair::TextureType::Enum textureType);
-//bool ReloadHairTexture(NvHair::TextureType::Enum textureType);
-//bool ClearHairTexture(NvHair::TextureType::Enum textureType);
-
-#endif
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.cpp b/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.cpp
deleted file mode 100644
index 9db55c2..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-#include "SourceAssetOpenDlg.h"
-#include "ui_SourceAssetOpenDlg.h"
-#include <QtWidgets/QFileDialog>
-#include "AppMainWindow.h"
-#include "GlobalSettings.h"
-
-SourceAssetOpenDlg::SourceAssetOpenDlg(int usefor, QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::SourceAssetOpenDlg)
-{
-    ui->setupUi(this);
-
-	m_usefor = usefor;
-	ui->buttonBox->button(QDialogButtonBox::Ok)->setFixedWidth(100);
-	ui->buttonBox->button(QDialogButtonBox::Cancel)->setFixedWidth(100);
-	ui->spinBoxDegree->setMaximum(180);
-	ui->spinBoxDegree->setMinimum(-180);
-
-	ui->spinBoxXPosition->setRange(-DBL_MAX, DBL_MAX);
-	ui->spinBoxYPosition->setRange(-DBL_MAX, DBL_MAX);
-	ui->spinBoxZPosition->setRange(-DBL_MAX, DBL_MAX);
-	ui->spinBoxXAxis->setRange(-DBL_MAX, DBL_MAX);
-	ui->spinBoxYAxis->setRange(-DBL_MAX, DBL_MAX);
-	ui->spinBoxZAxis->setRange(-DBL_MAX, DBL_MAX);
-
-	if (m_usefor == 2)
-	{
-		ui->fileLabel->setVisible(false);
-		ui->lineEditFile->setVisible(false);
-		ui->btnOpenFile->setVisible(false);
-
-		ui->skinnedLabel->setVisible(false);
-		ui->checkBoxSkinned->setVisible(false);
-
-		ui->appendLabel->setVisible(false);
-		ui->checkBoxAppend->setVisible(false);
-
-		ui->preFracturedLabel->setVisible(false);
-		ui->checkBoxPreFractured->setVisible(false);
-	}
-
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-	ui->cbSceneUnit->setCurrentIndex(globalSettings.m_sceneUnitIndex);
-	
-	if (m_usefor != 0)
-	{
-		ui->autoComputeLabel->setVisible(false);
-		ui->checkBoxAutoCompute->setVisible(false);
-	}
-}
-
-SourceAssetOpenDlg::~SourceAssetOpenDlg()
-{
-    delete ui;
-}
-
-void SourceAssetOpenDlg::setDefaultFile(const QString& fn)
-{
-	ui->lineEditFile->setText(fn);
-}
-
-QString SourceAssetOpenDlg::getFile()
-{
-    return ui->lineEditFile->text();
-}
-
-bool SourceAssetOpenDlg::getSkinned()
-{
-    return ui->checkBoxSkinned->isChecked();
-}
-
-QVector3D SourceAssetOpenDlg::getPosition()
-{
-    return QVector3D(ui->spinBoxXPosition->value(), ui->spinBoxYPosition->value(), ui->spinBoxZPosition->value());
-}
-
-QVector3D SourceAssetOpenDlg::getRotationAxis()
-{
-    return QVector3D(ui->spinBoxXAxis->value(), ui->spinBoxYAxis->value(), ui->spinBoxZAxis->value());
-}
-
-double SourceAssetOpenDlg::getRotationDegree()
-{
-	return ui->spinBoxDegree->value();
-}
-
-int  SourceAssetOpenDlg::sceneUnitIndex()
-{
-	return ui->cbSceneUnit->currentIndex();
-}
-
-bool SourceAssetOpenDlg::isAppend()
-{
-	return ui->checkBoxAppend->isChecked();
-}
-
-bool SourceAssetOpenDlg::isPreFractured()
-{
-	return ui->checkBoxPreFractured->isChecked();
-}
-
-bool SourceAssetOpenDlg::isAutoCompute()
-{
-	return ui->checkBoxAutoCompute->isChecked();
-}
-
-void SourceAssetOpenDlg::on_btnOpenFile_clicked()
-{
-	QString lastDir = AppMainWindow::Inst()._lastFilePath;
-	QString titleStr = "Open Source Asset File";
-
-	QString filetype = "Source Asset (*.fbx)";
-	if (m_usefor == 1)
-	{
-		filetype = "Source Asset (*.blast)";
-	}
-	QString fileName = QFileDialog::getOpenFileName(this, titleStr, lastDir, filetype);
-	if (!fileName.isEmpty())
-	{
-		QFileInfo fileInfo(fileName);
-		AppMainWindow::Inst()._lastFilePath = fileInfo.absoluteDir().absolutePath();
-	}
-
-	ui->lineEditFile->setText(fileName);
-}
-
-void SourceAssetOpenDlg::on_buttonBox_accepted()
-{
-
-}
-
-void SourceAssetOpenDlg::on_buttonBox_rejected()
-{
-
-}
-
-void SourceAssetOpenDlg::on_checkBoxPreFractured_stateChanged(int arg1)
-{
-	if (!ui->checkBoxPreFractured->isChecked())
-	{
-		ui->checkBoxAutoCompute->setChecked(false);
-	}
-}
-
-void SourceAssetOpenDlg::on_checkBoxAutoCompute_stateChanged(int arg1)
-{
-	if (ui->checkBoxAutoCompute->isChecked())
-	{
-		ui->checkBoxPreFractured->setChecked(true);
-	}
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.h b/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.h
deleted file mode 100644
index ed6da9c..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef SOURCEASSETOPENDLG_H
-#define SOURCEASSETOPENDLG_H
-
-#include <QtWidgets/QDialog>
-#include <QtGui/QVector3D>
-
-namespace Ui {
-class SourceAssetOpenDlg;
-}
-
-class SourceAssetOpenDlg : public QDialog
-{
-    Q_OBJECT
-
-public:
-	explicit SourceAssetOpenDlg(int usefor, QWidget *parent = 0);
-    ~SourceAssetOpenDlg();
-
-	void setDefaultFile(const QString& fn);
-    QString getFile();
-    bool getSkinned();
-    QVector3D getPosition();
-    QVector3D getRotationAxis();
-    double getRotationDegree();
-	bool isAppend();
-	bool isPreFractured();
-	bool isAutoCompute();
-	int  sceneUnitIndex();
-
-private slots:
-    void on_btnOpenFile_clicked();
-
-    void on_buttonBox_accepted();
-
-    void on_buttonBox_rejected();
-
-	void on_checkBoxPreFractured_stateChanged(int arg1);
-	void on_checkBoxAutoCompute_stateChanged(int arg1);
-
-private:
-    Ui::SourceAssetOpenDlg *ui;
-	/*
-	m_usefor:
-	0 for open fbx file
-	1 for open blast file
-	2 for add BlastFamily
-	*/
-	int m_usefor;
-};
-
-#endif // SOURCEASSETOPENDLG_H
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/SupportPanel.cpp b/tools/ArtistTools/source/BlastPlugin/Window/SupportPanel.cpp
deleted file mode 100644
index 556da33..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/SupportPanel.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "SupportPanel.h"
-#include "ui_SupportPanel.h"
-
-SupportPanel::SupportPanel(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::SupportPanel)
-{
-    ui->setupUi(this);
-
-	//ui->labelHealthMask->setEnabled(false);
-	//ui->comboBoxHealthMask->setEnabled(false);
-	//ui->btnAddHealthMask->setEnabled(false);
-	//ui->btnPen->setEnabled(false);
-	//ui->btnRemove->setEnabled(false);
-
-	_selectedBonds.clear();
-}
-
-SupportPanel::~SupportPanel()
-{
-    delete ui;
-
-	_selectedBonds.clear();
-}
-
-void SupportPanel::updateValues()
-{
-	if (_selectedBonds.size() > 0)
-	{
-		BPPBond* bond = _selectedBonds[0];
-
-		//ui->comboBoxHealthMask->clear();
-		//ui->comboBoxHealthMask->addItem(bond->name.buf);
-		ui->spinBoxBondStrength->setValue(bond->support.bondStrength);
-		ui->checkBoxEnableJoint->setChecked(bond->support.enableJoint);
-	}
-	else
-	{
-		//ui->comboBoxHealthMask->clear();
-		//ui->comboBoxHealthMask->addItem("None");
-		ui->spinBoxBondStrength->setValue(1.0f);
-		ui->checkBoxEnableJoint->setChecked(false);
-	}
-}
-
-void SupportPanel::dataSelected(std::vector<BlastNode*> selections)
-{
-	_selectedBonds.clear();
-
-	for (BlastNode* node : selections)
-	{
-		if (eBond == node->getType())
-		{
-			BPPBond* bond = static_cast<BPPBond*>(node->getData());
-			_selectedBonds.push_back(bond);
-		}
-	}
-
-	updateValues();
-}
-
-void SupportPanel::on_comboBoxHealthMask_currentIndexChanged(int index)
-{
-
-}
-
-void SupportPanel::on_btnAddHealthMask_clicked()
-{
-
-}
-
-void SupportPanel::on_btnPen_clicked()
-{
-
-}
-
-void SupportPanel::on_btnRemove_clicked()
-{
-
-}
-
-void SupportPanel::on_spinBoxBondStrength_valueChanged(double arg1)
-{
-	for (size_t i = 0; i < _selectedBonds.size(); ++i)
-	{
-		_selectedBonds[i]->support.bondStrength = arg1;
-	}
-}
-
-void SupportPanel::on_checkBoxEnableJoint_stateChanged(int arg1)
-{
-	for (size_t i = 0; i < _selectedBonds.size(); ++i)
-	{
-		_selectedBonds[i]->support.enableJoint = arg1;
-	}
-}
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/SupportPanel.h b/tools/ArtistTools/source/BlastPlugin/Window/SupportPanel.h
deleted file mode 100644
index 0987e46..0000000
--- a/tools/ArtistTools/source/BlastPlugin/Window/SupportPanel.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef SUPPORTPANEL_H
-#define SUPPORTPANEL_H
-
-#include <QtWidgets/QWidget>
-#include "BlastSceneTree.h"
-
-namespace Ui {
-class SupportPanel;
-}
-
-class SupportPanel : public QWidget, public ISceneObserver
-{
-    Q_OBJECT
-
-public:
-    explicit SupportPanel(QWidget *parent = 0);
-    ~SupportPanel();
-	void updateValues();
-
-	virtual void dataSelected(std::vector<BlastNode*> selections);
-
-private slots:
-    void on_comboBoxHealthMask_currentIndexChanged(int index);
-
-    void on_btnAddHealthMask_clicked();
-
-    void on_btnPen_clicked();
-
-    void on_btnRemove_clicked();
-
-    void on_spinBoxBondStrength_valueChanged(double arg1);
-
-    void on_checkBoxEnableJoint_stateChanged(int arg1);
-
-private:
-    Ui::SupportPanel *ui;
-	std::vector<BPPBond*> _selectedBonds;
-};
-
-#endif // SUPPORTPANEL_H
diff --git a/tools/ArtistTools/source/BlastPlugin/blastplugin.json b/tools/ArtistTools/source/BlastPlugin/blastplugin.json
deleted file mode 100644
index 0967ef4..0000000
--- a/tools/ArtistTools/source/BlastPlugin/blastplugin.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/tools/ArtistTools/source/BlastPlugin/blastplugin_global.h b/tools/ArtistTools/source/BlastPlugin/blastplugin_global.h
deleted file mode 100644
index 082519a..0000000
--- a/tools/ArtistTools/source/BlastPlugin/blastplugin_global.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifdef PLUGINBT_LIB
-# define PLUGINBT_EXPORT Q_DECL_EXPORT
-#else
-# define PLUGINBT_EXPORT Q_DECL_IMPORT
-#endif
-
-#ifdef PLUGINBTRENDER_LIB
-# define PLUGINBTRENDER_EXPORT Q_DECL_EXPORT
-#else
-# define PLUGINBTRENDER_EXPORT Q_DECL_IMPORT
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Anim/AnimUtil.cpp b/tools/ArtistTools/source/CoreLib/Anim/AnimUtil.cpp
deleted file mode 100644
index f070f42..0000000
--- a/tools/ArtistTools/source/CoreLib/Anim/AnimUtil.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file contains wrapper functions to make hair lib easy to setup and use
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <string>
-
-#include "AnimUtil.h"
-#include "MathUtil.h"
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-AnimationCache::~AnimationCache()
-{
-	Release();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void AnimationCache::Initialize(int numBones, NvInt32 frameStart, NvInt32 frameEnd)
-{
-	m_numBones = numBones;
-	m_frameStart = frameStart;
-	m_frameEnd = frameEnd;
-
-	m_numFrames = frameEnd - frameStart + 1;
-
-	Release();
-	Allocate();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void AnimationCache::Allocate()
-{
-	m_pBoneMatrices = new atcore_float4x4[m_numFrames * m_numBones];
-	m_pBoneNames	= new char[NV_HAIR_MAX_STRING * m_numBones];
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void AnimationCache::Release()
-{
-	if (m_pBoneMatrices)
-		delete []m_pBoneMatrices;
-
-	if (m_pBoneNames)
-		delete []m_pBoneNames;
-
-	m_pBoneMatrices = 0;
-	m_pBoneNames = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool AnimationCache::GetInterpolationInfo(float frame, int& indexStart, int& indexEnd, float &fracFrame)
-{
-	if (frame < m_frameStart)
-		return false;
-
-	if (frame > m_frameEnd)
-		return false;
-
-	int startFrame = (int)frame;
-	
-	fracFrame = frame - startFrame;
-
-	indexStart = (int)(frame - m_frameStart);
-	indexEnd = indexStart + 1;
-
-	if (indexEnd >= (int)m_numFrames)
-	{
-		indexEnd = indexStart;
-		fracFrame = 0.0f;
-	}
-
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-int AnimationCache::FindBone(const char *toFind) const
-{
-	if (!toFind)
-		return -1;
-	for (int i = 0; i < m_numBones; i++)
-	{
-		const char* boneName = GetBoneName(i);
-		if (!strcmp(boneName, toFind))
-			return i;
-	}
-	return -1;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool AnimationCache::FindBoneMapping( int numBones, const NvChar* boneNames, int* mappedBoneId) const
-{
-	// mappedBoneId must be pre-allocated
-
-	for (int i = 0; i < numBones; i++)
-	{
-		mappedBoneId[i] = FindBone(boneNames + i * NV_HAIR_MAX_STRING);
-	}
-
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void BoneData::Allocate(NvUInt32 numBones)
-{
-	Release();
-
-	m_numBones = numBones;
-
-	m_pPoseMatrices		= new atcore_float4x4[numBones];
-	m_pSkinMatrices		= new atcore_float4x4[numBones];
-	m_pBoneMatrices		= new atcore_float4x4[numBones];
-
-	m_pSkinDQs			= new atcore_dualquaternion[numBones];
-	m_pBoneNames		= new char[NV_HAIR_MAX_STRING * m_numBones];
-	m_pMappedBoneId		= new int[numBones];
-
-	for (int i = 0; i < numBones; i++)
-	{
-		gfsdk_makeIdentity(m_pPoseMatrices[i]);
-		gfsdk_makeIdentity(m_pSkinMatrices[i]);
-		m_pMappedBoneId[i] = -1;
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void BoneData::Release()
-{
-	if (m_pPoseMatrices)
-	{
-		delete []m_pPoseMatrices;
-		m_pPoseMatrices = 0;
-	}
-
-	if (m_pBoneMatrices)
-	{
-		delete []m_pBoneMatrices;
-		m_pBoneMatrices = 0;
-	}
-
-	if (m_pSkinMatrices)
-	{
-		delete []m_pSkinMatrices;
-		m_pSkinMatrices = 0;
-	}
-
-	if (m_pSkinDQs)
-	{
-		delete []m_pSkinDQs;
-		m_pSkinDQs = 0;
-	}
-
-	if (m_pBoneNames)
-	{
-		delete []m_pBoneNames;
-		m_pBoneNames = 0;
-	}
-
-	if (m_pMappedBoneId)
-	{
-		delete []m_pMappedBoneId;
-		m_pMappedBoneId = 0;
-	}
-
-	m_numBones = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void BoneData::InitializeAnimationCache(AnimationCache* pGlobalCache, const char* nodeName)
-{
-	if (!pGlobalCache || !pGlobalCache->isValid())
-		return;
-
-	pGlobalCache->FindBoneMapping(m_numBones, m_pBoneNames, m_pMappedBoneId);
-
-	m_nodeId = pGlobalCache->FindBone(nodeName);
-
-	m_pAnimationCache = pGlobalCache;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool BoneData::Update(float frameTime, const char* rootBoneName, bool bindPose, bool zup)
-{
-	if (!m_pAnimationCache || !m_pAnimationCache->isValid() )
-		bindPose = true;
-
-	atcore_float4x4 model;
-	gfsdk_makeIdentity(model);
-
-	if (bindPose)
-	{
-		for (int i = 0; i < m_numBones; i++)
-		{
-			m_pBoneMatrices[i] = m_pPoseMatrices[i];
-			m_pSkinMatrices[i] = model;
-			m_pSkinDQs[i] = gfsdk_makeDQ(m_pSkinMatrices[i]);
-		}
-		return true;
-	}
-
-	int indexStart, indexEnd;
-	float fracFrame = 0.0f;
-	if (false == m_pAnimationCache->GetInterpolationInfo(frameTime, indexStart, indexEnd, fracFrame))
-		return false;
-
-	atcore_float4x4* pBoneStart	= m_pAnimationCache->GetNodeMatrices(indexStart);
-	atcore_float4x4* pBoneEnd	= m_pAnimationCache->GetNodeMatrices(indexEnd);
-
-	int numBones = m_numBones;
-
-	atcore_float4x4 root;
-	gfsdk_makeIdentity(root);
-
-	if (rootBoneName)
-	{
-		int rootIndex = m_pAnimationCache->FindBone(rootBoneName);
-
-		if (rootIndex >= 0)
-		{
-			root = gfsdk_lerp(pBoneStart[rootIndex], pBoneEnd[rootIndex], fracFrame);
-
-			atcore_float3 lT = gfsdk_getTranslation(root);
-
-			if (zup)
-				lT.z = 0;
-			else
-				lT.y = 0;
-
-			gfsdk_makeIdentity(root);
-			gfsdk_setTranslation(root, -1.0f * lT);
-		}
-	}
-
-	// interpolate skinning matrix
-	for (int i = 0; i < numBones; i++)
-	{
-		atcore_float4x4 bone;
-
-		int index = m_pMappedBoneId[i];
-		if (index >= 0)
-			bone = gfsdk_lerp(pBoneStart[index], pBoneEnd[index], fracFrame);
-		else
-			gfsdk_makeIdentity(bone);
-
-		atcore_float4x4 pose = m_pPoseMatrices[i];
-
-		m_pBoneMatrices[i] = bone;
-		m_pSkinMatrices[i] = gfsdk_inverse(pose) * bone * root;
-		m_pSkinDQs[i] = gfsdk_makeDQ(m_pSkinMatrices[i]);
-	}
-
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void MeshDesc::Allocate(NvUInt32 numVertices, NvUInt32 numTriangles)
-{
-	Release();
-
-	m_NumTriangles			= numTriangles;
-	m_NumVertices			= numVertices;
-
-	m_pVertices				= new atcore_float3[numVertices];
-
-	m_pVertexNormals		= new atcore_float3[numTriangles * 3];
-	m_pFaceNormals			= new atcore_float3[numTriangles * 3];
-
-	m_pTangents				= new atcore_float3[numTriangles * 3];
-
-	m_pIndices = new NvUInt32[numTriangles * 3];
-	m_pTexCoords			= new atcore_float2[numTriangles * 3];
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void MeshDesc::Release()
-{
-	if (m_pVertices)
-		delete []m_pVertices;
-	if (m_pVertexNormals)
-		delete []m_pVertexNormals;
-	if (m_pFaceNormals)
-		delete []m_pFaceNormals;
-	if (m_pTangents)
-		delete []m_pTangents;
-
-	if (m_pIndices)
-		delete []m_pIndices;
-	if (m_pTexCoords)
-		delete []m_pTexCoords;
-
-	m_NumTriangles = 0;
-	m_NumVertices = 0;
-
-	m_pVertices				= nullptr;
-	m_pVertexNormals		= nullptr;
-	m_pFaceNormals			= nullptr;
-	m_pTangents				= nullptr;
-
-	m_pIndices				= nullptr;
-	m_pTexCoords			= nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void MeshDesc::UpdateNormal(bool updateVertexNormal)
-{
-	atcore_float3* vertexNormal = new atcore_float3[m_NumVertices];
-	memset(vertexNormal, 0, sizeof(atcore_float3) * m_NumVertices);
-
-	for (int i = 0; i < m_NumTriangles; i++)
-	{
-		atcore_float3 faceNormal;
-
-		int fidx = i*3;
-		int id0 = m_pIndices[fidx++];
-		int id1 = m_pIndices[fidx++];
-		int id2 = m_pIndices[fidx++];
-		
-		atcore_float3 p0 = m_pVertices[id0];
-		atcore_float3 p1 = m_pVertices[id1];
-		atcore_float3 p2 = m_pVertices[id2];
-		atcore_float3 p01 = p1 - p0;
-		atcore_float3 p02 = p2 - p0;
-
-		faceNormal.x = p01.y * p02.z - p01.z * p02.y;
-		faceNormal.y = p01.z * p02.x - p01.x * p02.z;
-		faceNormal.z = p01.x * p02.y - p01.y * p02.x;
-
-		gfsdk_normalize(faceNormal);
-
-		m_pFaceNormals[i * 3 + 0] = faceNormal;
-		m_pFaceNormals[i * 3 + 1] = faceNormal;
-		m_pFaceNormals[i * 3 + 2] = faceNormal;
-
-		vertexNormal[id0] += faceNormal;
-		vertexNormal[id1] += faceNormal;
-		vertexNormal[id2] += faceNormal;
-	}
-	
-	if (updateVertexNormal)
-	{
-		for (int i = 0; i < m_NumVertices; ++i)
-			gfsdk_normalize(vertexNormal[i]);
-
-		for (int i = 0; i < m_NumTriangles; i++)
-		{
-			int fidx = i*3;
-			int id0 = m_pIndices[fidx++];
-			int id1 = m_pIndices[fidx++];
-			int id2 = m_pIndices[fidx++];
-		
-			for (int k = 0; k < 3; k++)
-			{
-				int fidx = i*3 + k;
-				int vidx = m_pIndices[fidx];
-				m_pVertexNormals[fidx] = vertexNormal[vidx];
-			}
-		}
-	}
-
-	delete []vertexNormal;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void SkinData::Allocate(NvUInt32 numBones, NvUInt32 numVertices)
-{
-	Release();
-
-	m_boneData.Allocate(numBones);
-
-	m_pBoneIndices = new atcore_float4[numVertices];
-	m_pBoneWeights = new atcore_float4[numVertices];
-
-	memset(m_pBoneIndices, 0, sizeof(atcore_float4) * numVertices);
-	memset(m_pBoneWeights, 0, sizeof(atcore_float4) * numVertices);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void SkinData::Release()
-{
-	// clear memory
-	if (m_pBoneIndices)
-		delete []m_pBoneIndices;
-	if (m_pBoneWeights)
-		delete []m_pBoneWeights;
-
-	m_pBoneIndices	= 0;
-	m_pBoneWeights	= 0;
-
-	m_boneData.Release();
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Anim/AnimUtil.h b/tools/ArtistTools/source/CoreLib/Anim/AnimUtil.h
deleted file mode 100644
index 5fd239b..0000000
--- a/tools/ArtistTools/source/CoreLib/Anim/AnimUtil.h
+++ /dev/null
@@ -1,219 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#pragma once
-
-#include "MathUtil.h"
-#include <string.h>
-#define NV_HAIR_MAX_STRING 128
-
-////////////////////////////////////////////////////////////////////////////////////////
-// cache for animated bone data
-struct CORELIB_EXPORT AnimationCache
-{
-	NvUInt32		m_numBones;
-	NvChar*			m_pBoneNames;
-
-	NvInt32			m_frameStart;
-	NvInt32			m_frameEnd;
-	NvUInt32		m_numFrames;
-
-	atcore_float4x4*		m_pBoneMatrices;
-
-	AnimationCache() :
-		m_numBones(0),
-		m_frameStart(0),
-		m_frameEnd(0),
-		m_numFrames(0),
-		m_pBoneMatrices(nullptr),
-		m_pBoneNames(nullptr)
-		{
-		}
-
-	bool isValid() const {
-		return (m_numBones > 0) && (m_numFrames > 0) && (m_pBoneMatrices != 0);
-	}
-
-	void Allocate();
-	void Release();
-	void Initialize(int numBones, NvInt32 frameStart, NvInt32 frameEnd);
-
-	bool GetInterpolationInfo(float frameTime, int& indexStart, int& indexEnd, float &fracFrame);
-
-	const atcore_float4x4* GetNodeMatrices(int index) const { return m_pBoneMatrices + index * m_numBones; }
-	atcore_float4x4* GetNodeMatrices(int index) { return m_pBoneMatrices + index * m_numBones; }
-	
-	const char* GetBoneName(int index) const
-	{
-		return m_pBoneNames + index * NV_HAIR_MAX_STRING;
-	}
-
-	void	SetBoneName(int index, const char* boneName)
-	{
-		char* str = m_pBoneNames + index * NV_HAIR_MAX_STRING;
-		strcpy_s(str, NV_HAIR_MAX_STRING, boneName);
-	}
-
-	int		FindBone(const char *boneName) const;
-	bool	FindBoneMapping( int numBones, const NvChar* boneNames, int* mappedBoneId) const;
-
-	~AnimationCache();
-};
-
-////////////////////////////////////////////////////////////////////////////////////////
-// bone matrices at each frame
-////////////////////////////////////////////////////////////////////////////////////////
-struct CORELIB_EXPORT BoneData
-{
-	NvUInt32			m_numBones;
-	NvChar*				m_pBoneNames;
-
-	atcore_float4x4*			m_pPoseMatrices; // rest pose for each bone
-	atcore_float4x4*			m_pBoneMatrices; // updated bone matrix
-	atcore_float4x4*			m_pSkinMatrices; // interpolated skinning matrix for current frame
-	atcore_dualquaternion*	m_pSkinDQs; // dual quats
-
-	AnimationCache*			m_pAnimationCache; 
-	int*					m_pMappedBoneId;
-	int						m_nodeId;
-
-public:
-	BoneData() :
-		m_numBones(0),
-		m_pBoneNames(nullptr),
-		m_pPoseMatrices(nullptr),
-		m_pBoneMatrices(nullptr),
-		m_pSkinMatrices(nullptr),
-		m_pSkinDQs(nullptr),
-		m_pAnimationCache(nullptr),
-		m_pMappedBoneId(nullptr),
-		m_nodeId(-1)
-		{}
-
-	void Allocate(NvUInt32 numBones);
-	void Release();
-
-	const char* getBoneName(int index)
-	{
-		return m_pBoneNames + index * NV_HAIR_MAX_STRING;
-	}
-
-	void setBoneName(int index, const char* boneName)
-	{
-		char* str = m_pBoneNames + index * NV_HAIR_MAX_STRING;
-		strcpy_s(str, NV_HAIR_MAX_STRING, boneName);
-	}
-
-	void InitializeAnimationCache(AnimationCache* pGlobalCache, const char* nodeName);
-	bool Update(float frameTime, const char* rootBoneName, bool bindPose, bool zup);
-
-};
-
-////////////////////////////////////////////////////////////////////////////////////////
-// Skinning data
-struct CORELIB_EXPORT SkinData
-{
-	BoneData			m_boneData;
-
-	atcore_float4*		m_pBoneIndices;
-	atcore_float4*		m_pBoneWeights;
-
-public:
-	SkinData() : 
-		m_pBoneIndices(nullptr),
-		m_pBoneWeights(nullptr)
-		{}
-
-	void Allocate(NvUInt32 numBones, NvUInt32 numVertices);
-	void Release();
-};
-
-
-////////////////////////////////////////////////////////////////////////////////////////
-struct CORELIB_EXPORT MeshDesc
-{
-	NvUInt32				m_NumVertices;
-	NvUInt32				m_NumTriangles;
-
-	atcore_float3*			m_pVertices;
-	atcore_float3*			m_pVertexNormals;
-	atcore_float3*			m_pFaceNormals;
-	atcore_float3*			m_pTangents;
-	atcore_float3			m_ColorRGB;
-
-	NvUInt32*				m_pIndices;
-	atcore_float2*			m_pTexCoords;
-
-public:
-	MeshDesc() :
-		m_NumVertices(0),
-		m_NumTriangles(0),
-
-		m_pVertices(nullptr),
-		m_pVertexNormals(nullptr),
-		m_pFaceNormals(nullptr),
-		m_pTangents(nullptr),
-
-		m_pIndices(nullptr),
-		m_pTexCoords(nullptr)
-		{
-			m_ColorRGB = gfsdk_makeFloat3(0, 0, 0);
-		}
-
-	void Allocate(NvUInt32 numVertices, NvUInt32 numTriangles);
-	void Release();
-
-	void UpdateNormal(bool updateVertexNormal = false);
-};
-
-////////////////////////////////////////////////////////////////////////////////////////
-#define MATERIAL_NAME_SIZE	128
-
-struct CORELIB_EXPORT MeshMaterial
-{
-	NvChar				m_name[MATERIAL_NAME_SIZE];
-
-	atcore_float3		m_ambientColor;
-	float				m_ambientFactor;
-
-	atcore_float3		m_diffuseColor;
-	float				m_diffuseFactor;
-
-	float				m_specularFactor;
-	float				m_shininess;
-
-	NvChar				m_diffuseTexture[MATERIAL_NAME_SIZE];
-	NvChar				m_specularTexture[MATERIAL_NAME_SIZE];
-	NvChar				m_bumpTexture[MATERIAL_NAME_SIZE];
-	NvChar				m_normalTexture[MATERIAL_NAME_SIZE];
-	NvChar				m_transparentTexture[MATERIAL_NAME_SIZE];
-
-public:
-	MeshMaterial() 
-		{}
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Anim/FbxUtil.cpp b/tools/ArtistTools/source/CoreLib/Anim/FbxUtil.cpp
deleted file mode 100644
index 1d78d5c..0000000
--- a/tools/ArtistTools/source/CoreLib/Anim/FbxUtil.cpp
+++ /dev/null
@@ -1,1029 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file contains wrapper functions to make hair lib easy to setup and use
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#include "fbxsdk.h"
-#include <vector>
-#include <string>
-
-#include "FbxUtil.h"
-#include "MathUtil.h"
-#include "GlobalSettings.h"
-
-// local functions used only in this file
-namespace {
-
-	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	// Get the geometry offset to a node. It is never inherited by the children.
-	FbxAMatrix GetGeometry(FbxNode* pNode)
-	{
-		const FbxVector4 lT = pNode->GetGeometricTranslation(FbxNode::eSourcePivot);
-		const FbxVector4 lR = pNode->GetGeometricRotation(FbxNode::eSourcePivot);
-		const FbxVector4 lS = pNode->GetGeometricScaling(FbxNode::eSourcePivot);
-
-		return FbxAMatrix(lT, lR, lS);
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////
-	void convertFromFbxMatrix(atcore_float4x4& transform, FbxAMatrix& tmatrix)
-	{
-		float* data = (float*)&transform;
-
-		// update skinning matrix
-		for (int row = 0; row < 4; row++)
-			for (int col = 0; col < 4; col++)
-			{
-				data[ row * 4 + col] = float(tmatrix.Get(row,col));
-			}
-	}
-
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	bool checkMesh(FbxNode* pNode)
-	{
-		FbxMesh* pMesh = pNode->GetMesh();
-		if (!pMesh)
-			return false;
-
-		return true;
-	}
-
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	bool checkSkinned(FbxNode* pNode)
-	{
-		FbxGeometry* pFbxGeometry = pNode->GetGeometry();
-		if (!pFbxGeometry)
-			return false;
-	
-		FbxSkin* pFbxSkin = (FbxSkin*)pFbxGeometry->GetDeformer(0, FbxDeformer::eSkin);
-		if (!pFbxSkin)
-			return false;
-
-		return true;
-	}
-}
-
-namespace
-{
-	FbxManager*			s_FbxManager = nullptr;
-	FbxScene*			s_FbxScene = nullptr;
-	
-
-	/////////////////////////////////////////////////////////////////////////////
-	// find node by name
-	FbxNode* 
-	FindNodeByName(FbxScene* scene, const char* nodeName)
-	{
-		if (!scene)
-			return 0;
-
-		if (!nodeName)
-			return 0;
-
-		for (int i = 0; i < scene->GetNodeCount(); i++)
-		{
-			FbxNode* node = scene->GetNode(i);
-			const char* name = node->GetName();
-			if (!strcmp(nodeName, name))
-				return node;
-		}
-		return 0;
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool
-FbxUtil::Release(void)
-{
-	if (s_FbxScene)
-	{
-		s_FbxScene->Destroy();
-		s_FbxScene = nullptr;
-	}
-
-	if (s_FbxManager)
-	{
-		s_FbxManager->Destroy();
-		s_FbxManager = nullptr;
-	}
-	
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//// if fbx uses one unit which is not supported, we will also convert its unit.
-bool FbxUtil::Initialize(const char* fbxFileName, nvidia::Float& fbxSceneUnit, nvidia::Float toScneUnit, bool bConvertUnit)
-{
-	if (fbxFileName)
-	{
-		FbxImporter*		s_FbxImporter = nullptr;
-
-		if (!s_FbxManager)
-			s_FbxManager = FbxManager::Create();
-
-		if (!s_FbxImporter)
-			s_FbxImporter = FbxImporter::Create(s_FbxManager, "");
-
-		if (!s_FbxScene)
-			s_FbxScene = FbxScene::Create(s_FbxManager, "");
-	
-		if (!s_FbxImporter->Initialize(fbxFileName, -1))
-			return false;
-
-		if (!s_FbxImporter->Import(s_FbxScene))
-			return false;
-
-		FbxGlobalSettings& settings = s_FbxScene->GetGlobalSettings();
-
-		FbxSystemUnit fbxUnit = settings.GetSystemUnit();
-		fbxSceneUnit = fbxUnit.GetScaleFactor();
-		bool bSupported = GlobalSettings::Inst().isSupportedUnitByUnitInCm(fbxSceneUnit);
-		bool bNeedConvert = ((toScneUnit > 0.0f) && bConvertUnit && (fabs(toScneUnit - fbxSceneUnit) > 0.001f));
-		if (bNeedConvert || !bSupported)
-		{
-			// if FBX has a non-supported unit, we still convert its unit
-			FbxSystemUnit convertUnit(toScneUnit);
-			convertUnit.ConvertScene(s_FbxScene);
-		}
-
-		s_FbxImporter->Destroy();
-
-		// get time info
-		FbxTimeSpan timespan;
-		settings.GetTimelineDefaultTimeSpan(timespan);
-
-		FbxTime startTime = timespan.GetStart();
-		FbxTime endTime = timespan.GetStop();
-
-	}
-
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool FbxUtil::GetGlobalSettings(float* pStartFrame, float* pEndFrame, float *pFps, int *upAxis, char* rootBoneName)
-{
-	if ( !s_FbxScene)
-		return false;
-
-	FbxGlobalSettings& settings = s_FbxScene->GetGlobalSettings();
-
-	FbxTimeSpan timespan;
-	settings.GetTimelineDefaultTimeSpan(timespan);
-
-	FbxTime startTime = timespan.GetStart();
-	FbxTime endTime = timespan.GetStop();
-	
-	if (pStartFrame) 
-		*pStartFrame = (float)startTime.GetFrameCount();
-
-	if (pEndFrame) 
-		*pEndFrame = (float)endTime.GetFrameCount();
-
-	if (pFps)
-		*pFps = (float)endTime.GetFrameRate(FbxTime::GetGlobalTimeMode());
-
-	if (upAxis)
-	{
-		int upSign = 0;
-		FbxAxisSystem axisSystem = settings.GetAxisSystem();
-		FbxAxisSystem::EUpVector upVector = axisSystem.GetUpVector(upSign);
-
-		enum FbxAxisSystem::ECoordSystem coordSystem = axisSystem.GetCoorSystem();
-
-		switch (upVector)
-		{
-		case FbxAxisSystem::eXAxis: *upAxis = 0; break;
-		case FbxAxisSystem::eYAxis: *upAxis = 1; break;
-		case FbxAxisSystem::eZAxis: *upAxis = 2; break;
-		}
-	}
-
-	if (rootBoneName)
-	{
-		FbxNode* pRoot = s_FbxScene->GetRootNode();
-		if (pRoot)
-		{
-			strncpy(rootBoneName, pRoot->GetName(), NV_HAIR_MAX_STRING);
-		}
-		else
-			strcpy(rootBoneName, "");
-	}
-
-	return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-bool
-FbxUtil::InitializeAnimationCache(AnimationCache& animCache)
-{
-	if (!s_FbxScene)
-		return false;
-
-	float startFrame, endFrame, fps;
-	FbxUtil::GetGlobalSettings(&startFrame, &endFrame, &fps);
-
-	int numNodes = s_FbxScene->GetNodeCount();
-
-	////////////////////////////////////////////
-	animCache.Initialize(numNodes, (NvInt32)startFrame, (NvInt32)endFrame);
-
-	for (int i = 0; i < numNodes; i++)
-	{
-		FbxNode* node = s_FbxScene->GetNode(i);
-		const char* nodeName = node->GetName();
-		animCache.SetBoneName(i, nodeName);
-	}
-
-	////////////////////////////////////////////
-	for (NvInt frame = animCache.m_frameStart; frame <= animCache.m_frameEnd; frame++)
-	{
-		FbxTime lTime;
-		lTime.SetSecondDouble( frame / fps);
-
-		int index = frame - animCache.m_frameStart;
-		atcore_float4x4 *pNodeMatrices = animCache.GetNodeMatrices(index);
-
-		for (int i = 0; i < numNodes; i++)
-		{
-			FbxNode* node = s_FbxScene->GetNode(i);
-			FbxAMatrix nodeMatrix = node->EvaluateGlobalTransform(lTime);
-			convertFromFbxMatrix(pNodeMatrices[i], nodeMatrix);
-		}
-	}
-
-	return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-static FbxSkin* GetFbxSkin( FbxNode* pFbxNode )
-{
-	if (!pFbxNode)
-		return 0;
-	
-	FbxMesh* pFbxMesh = pFbxNode->GetMesh();
-	if (!pFbxMesh)
-		return 0;
-
-	FbxGeometry* pFbxGeometry = pFbxNode->GetGeometry();
-	if (!pFbxGeometry)
-		return 0;
-
-	int deformerCount = pFbxGeometry->GetDeformerCount(FbxDeformer::eSkin);
-
-	FbxSkin *pFbxSkin = 0;
-	if (deformerCount > 0)
-		pFbxSkin = (FbxSkin*)pFbxGeometry->GetDeformer(0, FbxDeformer::eSkin);
-
-	return pFbxSkin;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-static int GetNumMeshPoints( FbxNode* pFbxNode)
-{
-	if (!pFbxNode)
-		return 0;
-
-	FbxMesh* pFbxMesh = pFbxNode->GetMesh();
-	if (!pFbxMesh)
-		return 0;
-
-	return pFbxMesh->GetControlPointsCount();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-static bool GetBoneData(FbxSkin *pFbxSkin, FbxNode* pFbxNode, NvChar* pBoneNames, atcore_float4x4 *pBindPoses)
-{
-	if (!pFbxSkin || !pFbxNode)
-		return false;
-
-	int numBones = (int)pFbxSkin->GetClusterCount();
-
-	for (int i = 0; i < numBones; i++)
-	{
-		FbxCluster* pFbxCluster = pFbxSkin->GetCluster(i);
-			
-		FbxNode* pLink = pFbxCluster->GetLink();
-
-		// copy bone names
-		const char* boneName = pLink->GetName();
-		char* str = pBoneNames + i * NV_HAIR_MAX_STRING;
-		strcpy_s(str, NV_HAIR_MAX_STRING, boneName);
-
-		// write pose matrix
-		{
-			FbxAMatrix lReferenceGlobalInitPosition;
-			pFbxCluster->GetTransformMatrix(lReferenceGlobalInitPosition);
-
-			FbxAMatrix lReferenceGeometry = GetGeometry(pFbxNode);
-			lReferenceGlobalInitPosition *= lReferenceGeometry;
-
-			FbxAMatrix lClusterGlobalInitPosition;
-			pFbxCluster->GetTransformLinkMatrix(lClusterGlobalInitPosition);
-
-			FbxAMatrix lClusterMatrix = lClusterGlobalInitPosition.Inverse() * lReferenceGlobalInitPosition;
-			convertFromFbxMatrix(pBindPoses[i], lClusterMatrix.Inverse());
-		}
-	}
-	return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-static bool GetSkinningWeights(FbxSkin* pFbxSkin, atcore_float4* boneIndices, atcore_float4* boneWeights, int numPoints)
-{
-	int numClusters = (int)pFbxSkin->GetClusterCount();
-	if (numClusters == 0)
-		return false;
-
-	// copy skinning weights and indices
-	int* pIndexCounts = new int[numPoints];
-	memset(pIndexCounts, 0, sizeof(int) * numPoints);
-
-	for (int i = 0; i < numClusters; i++)
-	{
-		if (!pFbxSkin) continue;
-
-		FbxCluster* pFbxCluster = pFbxSkin->GetCluster(i);
-
-		if (!pFbxCluster) continue;
-
-		int		cpCount = pFbxCluster->GetControlPointIndicesCount();
-		int*		pPointIndices = pFbxCluster->GetControlPointIndices();
-		double*		pWeights = pFbxCluster->GetControlPointWeights();
-
-		for (int j = 0; j < cpCount; j++)
-		{
-			if (pWeights[j] == 0.0f)
-				continue;
-
-			int pointIndex = pPointIndices[j];
-			int& cnt = pIndexCounts[pointIndex];
-
-			float* pBoneIndex = (float*)&boneIndices[pointIndex];
-			float* pBoneWeights = (float*)&boneWeights[pointIndex];
-
-			if (cnt < 4)
-			{
-				pBoneIndex[cnt] = float(i);
-				pBoneWeights[cnt] = float(pWeights[j]);
-				cnt++;
-			}
-			else // over 4, so we just bind to largest weights
-			{
-				float minWeight = (float)pWeights[j];
-				int minIndex = -1;
-				for (int b = 0; b < 4; b++) 
-				{
-					float w = pBoneWeights[b];
-
-					if (w < minWeight)
-					{
-						minWeight = w;
-						minIndex = b;
-					}
-				}
-
-				if (minIndex >= 0)
-				{
-					pBoneIndex[minIndex] = float(i);
-					pBoneWeights[minIndex] = float(pWeights[j]);
-				}
-
-				cnt++;
-			}
-		}
-	}
-
-	for (int i = 0; i < numPoints; i++)
-	{
-		float* pBoneWeights = (float*)&boneWeights[i];
-
-		float weightsum = 0;
-		for (int i = 0; i < 4; i++)
-		{
-			weightsum += pBoneWeights[i];
-		}
-
-		if (weightsum == 0)
-			continue;
-
-		for (int i = 0; i < 4; i++)
-			pBoneWeights[i] /= weightsum;
-	}
-
-	if (pIndexCounts) delete []pIndexCounts;
-
-	return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-bool FbxUtil::InitializeSkinData( const char* meshName, SkinData& skinData)
-{
-	FbxNode* pFbxNode = FindNodeByName(s_FbxScene, meshName);
-	if (!pFbxNode)
-		return false;
-	
-	FbxSkin* pFbxSkin = GetFbxSkin(pFbxNode);
-	int numPoints = GetNumMeshPoints(pFbxNode);
-
-	BoneData& boneData = skinData.m_boneData;
-
-	if (pFbxSkin)
-	{
-		int numBones = (int)pFbxSkin->GetClusterCount();
-		skinData.Allocate(numBones, numPoints);
-
-		// get bone data (bind pose, bone names, ..)
-		GetBoneData(pFbxSkin, pFbxNode, boneData.m_pBoneNames, boneData.m_pPoseMatrices);
-
-		// get skinning weights 
-		atcore_float4* boneIndices = skinData.m_pBoneIndices;
-		atcore_float4* boneWeights = skinData.m_pBoneWeights;
-
-		GetSkinningWeights(pFbxSkin, boneIndices, boneWeights, numPoints);
-	}
-	else // no skinning, use model matrix
-	{
-		int numBones = 1;
-
-		skinData.Allocate(numBones, numPoints);
-
-		// copy bone name
-		const char* boneName = pFbxNode->GetName();
-		boneData.setBoneName(0, boneName);
-
-		// make pose matrix
-		gfsdk_makeIdentity(boneData.m_pPoseMatrices[0]);
-
-		// all the vertices map to the model matrix
-		atcore_float4* boneIndices = skinData.m_pBoneIndices;
-		atcore_float4* boneWeights = skinData.m_pBoneWeights;
-
-		for (int i = 0; i < numPoints; i++)
-		{
-			boneIndices[i] = gfsdk_makeFloat4(0, 0, 0, 0);
-			boneWeights[i] = gfsdk_makeFloat4(1, 0, 0, 0);
-		}
-	}
-
-	return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool FbxUtil::GetMeshInfo(int* numMeshes, char** meshNames, char** parents, char** skinned)
-{
-	int cnt = 0;
-
-	for (int i = 0; i < s_FbxScene->GetNodeCount(); i++)
-	{
-		FbxNode* pNode = s_FbxScene->GetNode(i);
-		if (checkMesh(pNode))
-			cnt++;
-	}
-
-	char *pNameBuffer = new char[cnt * 128];
-	char *pSkinnedBuffer = new char[cnt];
-
-	char *pParentBuffer = new char[cnt * 128];
-	memset(pParentBuffer, 0, cnt * 128);
-
-	cnt = 0;
-	for (int i = 0; i < s_FbxScene->GetNodeCount(); i++)
-	{
-		FbxNode* pNode = s_FbxScene->GetNode(i);
-
-		if (!checkMesh(pNode))
-			continue;
-
-		strcpy(pNameBuffer + cnt * 128, pNode->GetName());
-
-		FbxNode* pParentNode = pNode->GetParent();
-		if (pParentNode != nullptr)
-		{
-			strcpy(pParentBuffer + cnt * 128, pParentNode->GetName());
-		}
-
-		pSkinnedBuffer[cnt] = checkSkinned(pNode);
-
-		cnt++;
-	}
-
-	*numMeshes = cnt;
-	if (skinned)
-	{
-		*skinned = pSkinnedBuffer;
-	}
-	else
-		delete []pSkinnedBuffer;
-
-	*meshNames = pNameBuffer;
-	*parents = pParentBuffer;
-
-	return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool FbxUtil::GetMeshMaterials( const NvChar* meshName, int *numMaterials, MeshMaterial** materials)
-{
-	if (!s_FbxScene)
-		return false;
-
-	FbxNode* pNode = FindNodeByName(s_FbxScene, meshName);
-	if (!pNode)
-		return false;
-
-	int numMats = pNode->GetMaterialCount();
-	if (numMats == 0)
-		return false;
-
-	*materials = new MeshMaterial[numMats];
-
-	int matCnt = 0;
-
-	for (int i = 0; i < numMats; i++)
-	{
-		FbxSurfaceMaterial *mat = pNode->GetMaterial(i);
-		if (!mat) continue;
-		if (mat->GetUserDataPtr()) continue;
-
-		MeshMaterial& material = (*materials)[matCnt];
-			
-		strcpy(material.m_name, mat->GetName());
-		strcpy(material.m_diffuseTexture, "");
-		strcpy(material.m_bumpTexture, "");
-		strcpy(material.m_transparentTexture, "");
-		strcpy(material.m_normalTexture, "");
-
-		(atcore_float3&)material.m_ambientColor = gfsdk_makeFloat3(1.0f, 1.0f, 1.0f);
-		(atcore_float3&)material.m_diffuseColor = gfsdk_makeFloat3(1.0f, 1.0f, 1.0f);
-	
-		FbxProperty prop;
-		FbxProperty fact;
-		FbxDouble3 d3;
-
-		// get ambient
-		{
-			fact = mat->FindProperty(FbxSurfaceMaterial::sAmbientFactor);
-			material.m_ambientFactor = fact.IsValid() ? (float)fact.Get<FbxDouble>() : 0.1f;
-
-			prop = mat->FindProperty(FbxSurfaceMaterial::sAmbient);
-			if (prop.IsValid())
-			{
-				FbxDouble3 d3 = prop.Get<FbxDouble3>();
-				material.m_ambientColor = gfsdk_makeFloat3((float)d3[0], (float)d3[1], (float)d3[2]);
-			}
-		}
-
-		// get specular
-		{
-			fact = mat->FindProperty(FbxSurfaceMaterial::sSpecularFactor);
-			material.m_specularFactor = fact.IsValid() ? (float)fact.Get<FbxDouble>() : 0.1f;
-
-			fact = mat->FindProperty(FbxSurfaceMaterial::sShininess);
-			material.m_shininess = fact.IsValid() ? (float)fact.Get<FbxDouble>() : 20.0f;
-		}
-
-		// get diffuse
-		{
-			fact = mat->FindProperty(FbxSurfaceMaterial::sDiffuseFactor);
-			material.m_diffuseFactor = fact.IsValid() ? (float)fact.Get<FbxDouble>() : 0.5f;
-
-			prop = mat->FindProperty(FbxSurfaceMaterial::sDiffuse);
-			if (prop.IsValid())
-			{
-				FbxDouble3 d3 = prop.Get<FbxDouble3>();
-				material.m_diffuseColor = gfsdk_makeFloat3((float)d3[0], (float)d3[1], (float)d3[2]);
-
-				const FbxFileTexture* tex = prop.GetSrcObject<FbxFileTexture>();
-				if (tex) 
-					strcpy(material.m_diffuseTexture, tex->GetFileName());
-			}
-		}
-
-		// get normal map
-		{
-			prop = mat->FindProperty(FbxSurfaceMaterial::sNormalMap);
-			if (prop.IsValid())
-			{
-				const FbxFileTexture* tex = prop.GetSrcObject<FbxFileTexture>();
-				if (tex) 
-					strcpy(material.m_normalTexture, tex->GetFileName());
-			}
-		}
-
-		matCnt++;
-	}
-
-	*numMaterials = matCnt;
-
-	return true;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool FbxUtil::CreateMeshDescriptor(const char* meshName, MeshDesc &desc)
-{
-	if (!s_FbxScene)
-		return false;
-
-	FbxNode* pNode = FindNodeByName(s_FbxScene, meshName);
-	if (!pNode)
-		return false;
-
-	// read growth mesh data
-	FbxMesh* pMesh = pNode->GetMesh();
-	if (!pMesh)
-		return false;
-
-	FbxDouble3 meshColor = pMesh->Color.Get();
-	desc.m_ColorRGB = gfsdk_makeFloat3(meshColor[0], meshColor[1], meshColor[2]);
-
-	int cpCount = pMesh->GetControlPointsCount();
-
-	int triCount = 0;
-	for (int i = 0; i < pMesh->GetPolygonCount(); i++)
-	{
-		int psize = pMesh->GetPolygonSize(i);
-		triCount += (psize - 2);
-	}
-
-	// allocate buffers
-	desc.Allocate(cpCount, triCount);
-
-	// read positions
-	FbxVector4* points = pMesh->GetControlPoints();
-	FbxAMatrix matrixGeo = pNode->EvaluateGlobalTransform();
-	for (int i = 0; i < desc.m_NumVertices; i++)
-	{		
-		FbxVector4 v = matrixGeo.MultT(points[i]);
-		desc.m_pVertices[i] = gfsdk_makeFloat3(v.mData[0], v.mData[1], v.mData[2]);
-	}
-
-	memset(desc.m_pTexCoords, 0, sizeof(atcore_float2) * desc.m_NumTriangles * 3);
-	
-	// read uvs 
-	FbxLayerElementUV* leUV = pMesh->GetLayer(0)->GetUVs();
-
-	FbxGeometryElementNormal *lNormals = pMesh->GetElementNormal();
-	FbxGeometryElementTangent* lTangents = pMesh->GetElementTangent();
-
-	int tcnt = 0;
-	int vertexBase = 0;
-	for (int i = 0; i < pMesh->GetPolygonCount(); i++)
-	{
-		int vcnt = pMesh->GetPolygonSize(i);
-		for (int j = 0; j < (vcnt-2); j++)
-		{	
-			int pIndex[3] = { 0, j+1, j+2 };
-
-			// get polygon index
-			for (int p = 0; p < 3; ++p)
-				desc.m_pIndices[tcnt*3+p] = pMesh->GetPolygonVertex(i, pIndex[p]);	
-			
-			// get face normal
-			if (lNormals)
-			{
-				FbxLayerElement::EMappingMode mode = lNormals->GetMappingMode();
-
-				for (int p = 0; p < 3; ++p)
-				{
-					int vertexId = vertexBase + pIndex[p];
-					int normalId = vertexId;
-					if (mode == FbxGeometryElement::eByPolygonVertex) 
-					{
-						if (lNormals->GetReferenceMode() == FbxGeometryElement::eIndexToDirect) 
-							normalId = lNormals->GetIndexArray().GetAt(vertexId);
-					}
-					else if (mode == FbxGeometryElement::eByControlPoint)
-						normalId = pMesh->GetPolygonVertex(i, pIndex[p]);
-
-					const FbxVector4 &n = lNormals->GetDirectArray().GetAt(normalId);
-					desc.m_pVertexNormals[tcnt*3+p] = gfsdk_makeFloat3((float)n[0], (float)n[1], (float)n[2]);
-				}
-			}
-
-			// get face normal
-			if (lTangents)
-			{
-				FbxLayerElement::EMappingMode mode = lTangents->GetMappingMode();
-
-				for (int p = 0; p < 3; ++p)
-				{
-					int vertexId = vertexBase + pIndex[p];
-					int tangentId = vertexId;
-					if (mode == FbxGeometryElement::eByPolygonVertex) 
-					{
-						if (lTangents->GetReferenceMode() == FbxGeometryElement::eIndexToDirect) 
-							tangentId = lTangents->GetIndexArray().GetAt(vertexId);
-					}
-					else if (mode == FbxGeometryElement::eByControlPoint)
-						tangentId = pMesh->GetPolygonVertex(i, pIndex[p]);
-
-					const FbxVector4 &n = lTangents->GetDirectArray().GetAt(tangentId);
-					desc.m_pTangents[tcnt*3+p] = gfsdk_makeFloat3((float)n[0], (float)n[1], (float)n[2]);
-				}
-			}
-
-			if (leUV)
-			{
-				int i0 = pMesh->GetTextureUVIndex(i, 0);
-				int i1 = pMesh->GetTextureUVIndex(i, j+1);
-				int i2 = pMesh->GetTextureUVIndex(i, j+2);
-
-				FbxVector2 texCoord0 = leUV->GetDirectArray().GetAt(i0);
-				FbxVector2 texCoord1 = leUV->GetDirectArray().GetAt(i1);
-				FbxVector2 texCoord2 = leUV->GetDirectArray().GetAt(i2);
-
-				desc.m_pTexCoords[tcnt*3+0] = gfsdk_makeFloat2(1.0f * float(texCoord0[0]), 1.0f - float(texCoord0[1]));
-				desc.m_pTexCoords[tcnt*3+1] = gfsdk_makeFloat2(1.0f * float(texCoord1[0]), 1.0f - float(texCoord1[1]));
-				desc.m_pTexCoords[tcnt*3+2] = gfsdk_makeFloat2(1.0f * float(texCoord2[0]), 1.0f - float(texCoord2[1]));
-			}
-			
-			tcnt++;			
-		}
-		vertexBase += vcnt;
-	}
-
-	return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*
-bool FbxUtil::CreateHairFromFbx(const char* guideName, const char* growthMeshName, NvHair::AssetDescriptor& hairAsset)
-{
-	if (!s_FbxScene)
-		return false;
-
-	// read growth mesh data
-	MeshDesc meshDesc;
-	if (false == FbxUtil::CreateMeshDescriptor(growthMeshName, meshDesc))
-		return false;
-
-	FbxNode* pHairNode = FindNodeByName(s_FbxScene, guideName);
-	if (!pHairNode)
-		return false;
-
-	FbxNode* pMeshNode = FindNodeByName(s_FbxScene, growthMeshName);
-	if (!pMeshNode)
-		return false;
-
-	FbxSkin* pFbxSkin = GetFbxSkin(pMeshNode);
-	int numBones = 1;
-
-	if (pFbxSkin)
-		numBones = (int)pFbxSkin->GetClusterCount();
-
-	// get skin data from mesh
-	int numPoints = meshDesc.m_NumVertices;
-
-	atcore_float4* pMeshBoneIndices = new atcore_float4[numPoints];
-	atcore_float4* pMeshBoneWeights = new atcore_float4[numPoints];
-
-	GetSkinningWeights(pFbxSkin, pMeshBoneIndices, pMeshBoneWeights, numPoints);
-
-	// create raw hair array
-	FbxLine* pLine = pHairNode->GetLine();
-	if (!pLine)
-		return false;
-
-	int cpCount = pLine->GetControlPointsCount();
-	int curveCount = pLine->GetEndPointCount();
-
-	atcore_float3*	pVertices	= new atcore_float3[cpCount];
-	NvUInt32*		pEndIndices = new NvUInt32[curveCount];
-
-	FbxVector4*		pFbxPoints		= pLine->GetControlPoints();
-	FbxArray<int>*	pFbxEndIndices	= pLine->GetEndPointArray();
-
-	for (int i = 0; i < cpCount; i++)
-		pVertices[i] = gfsdk_makeFloat3(float(pFbxPoints[i][0]), float(pFbxPoints[i][1]), float(pFbxPoints[i][2]));
-
-	for (int i = 0; i < curveCount; i++)
-		pEndIndices[i] = (*pFbxEndIndices)[i];
-
-	// check against closest growth mesh points
-	const float distThreshold = 25.0;
-
-	int numValidHairs = 0;
-	int numValidHairVertices = 0;
-
-	int* pMeshToHairMap = new int[meshDesc.m_NumVertices];
-	int* pHairToMeshMap = new int[curveCount];
-	int* pHairToHairMap = new int[curveCount];
-	float* pMinDistances = new float[meshDesc.m_NumVertices];
-	atcore_float3* pRootVertices = new atcore_float3[curveCount];
-	atcore_float3* pTriangleCenters = new atcore_float3[meshDesc.m_NumTriangles];
-
-	// initialize triangle centers
-	for (int i = 0; i < meshDesc.m_NumTriangles; i++)
-	{
-		NvUInt32 v0 = meshDesc.m_pIndices[i*3 + 0];
-		NvUInt32 v1 = meshDesc.m_pIndices[i * 3 + 1];
-		NvUInt32 v2 = meshDesc.m_pIndices[i * 3 + 2];
-
-		atcore_float3 p0 = meshDesc.m_pVertices[v0];
-		atcore_float3 p1 = meshDesc.m_pVertices[v1];
-		atcore_float3 p2 = meshDesc.m_pVertices[v2];
-
-		pTriangleCenters[i] = 1.0f / 3.0f * (p0 + p1 + p2);
-	}
-
-	// initialize mesh to hair map
-	for (int i = 0; i < meshDesc.m_NumVertices; i++)
-	{
-		pMeshToHairMap[i] = -1;
-		pMinDistances[i] = FLT_MAX;
-	}
-
-	// copy root vertices of input hairs
-
-	for (int i = 0; i < curveCount; i++)
-	{
-		int root = (i == 0) ? 0 : pEndIndices[i-1]+1;
-		pRootVertices[i] = pVertices[root];
-		pHairToMeshMap[i] = -1;
-	}
-
-	// for each input hair curve, find the closest mesh vertex
-	for (int i = 0; i < curveCount; i++)
-	{
-		atcore_float3 hp = pRootVertices[i];
-
-		float minDist = FLT_MAX;
-		int closestTriangle = -1;
-		for (int j = 0; j < meshDesc.m_NumTriangles; j++)
-		{
-			atcore_float3 c = pTriangleCenters[j];
-
-			float distSquared = gfsdk_lengthSquared(hp - c);
-			if (distSquared < minDist) 
-			{
-				minDist = distSquared;
-				closestTriangle = j;
-			}
-		}
-
-		if (closestTriangle >= 0)
-		{
-			for (int k = 0; k < 3; k++)
-			{
-				NvUInt32 v = meshDesc.m_pIndices[closestTriangle * 3 + k];
-				atcore_float3 p = meshDesc.m_pVertices[v];
-
-				float distSquared = gfsdk_lengthSquared(hp - p);
-				if (distSquared < pMinDistances[v])
-				{
-					pMinDistances[v] = distSquared;
-					pMeshToHairMap[v] = i;
-				}
-			}
-		}
-	}
-
-	// prepare mapping from new hair set to mesh and old hairs
-	for (int i = 0; i < meshDesc.m_NumVertices; i++)
-	{
-		int closestHair = pMeshToHairMap[i];
-		if (closestHair < 0)
-			continue;
-
-		pHairToMeshMap[numValidHairs] = i;
-		pHairToHairMap[numValidHairs] = closestHair;
-		pMeshToHairMap[i] = numValidHairs; // update hair with new hair index
-
-		int root	= (closestHair == 0) ? 0 : pEndIndices[closestHair-1]+1;
-		int tip		= pEndIndices[closestHair];
-
-		numValidHairVertices += (tip - root + 1);
-		numValidHairs++;
-	}
-
-	// allocate new hairs
-	hairAsset.m_numGuideHairs	= numValidHairs;
-	hairAsset.m_numVertices		= numValidHairVertices;
-
-	hairAsset.m_boneIndices	= new atcore_float4[hairAsset.m_numGuideHairs];
-	hairAsset.m_boneWeights	= new atcore_float4[hairAsset.m_numGuideHairs];
-
-	hairAsset.m_vertices		= new atcore_float3[hairAsset.m_numVertices];
-	hairAsset.m_endIndices = new NvUInt32[hairAsset.m_numGuideHairs];
-	hairAsset.m_faceIndices = new NvUInt32[meshDesc.m_NumTriangles * 3];
-	hairAsset.m_faceUvs		= new atcore_float2[meshDesc.m_NumTriangles * 3];
-
-	hairAsset.m_numBones		= numBones;
-	hairAsset.m_boneNames		= new NvChar[NV_HAIR_MAX_STRING * hairAsset.m_numBones];
-	hairAsset.m_bindPoses		= new atcore_float4x4[hairAsset.m_numBones];
-	hairAsset.m_boneParents	= new NvInt32[hairAsset.m_numBones];
-
-	if (pFbxSkin)
-		GetBoneData(pFbxSkin, pMeshNode, hairAsset.m_boneNames, hairAsset.m_bindPoses);
-	else
-	{
-		strcpy(hairAsset.m_boneNames, "Root");
-		gfsdk_makeIdentity(hairAsset.m_bindPoses[0]);
-		hairAsset.m_boneParents[0] = -1;
-	}
-
-	// copy vertex data
-	int vertexCnt = 0;
-
-	for (int i = 0; i < hairAsset.m_numGuideHairs; i++)
-	{
-		int oldHair = pHairToHairMap[i];
-
-		int oldRoot = (oldHair == 0) ? 0 : pEndIndices[oldHair-1]+1;
-		int oldTip	= pEndIndices[oldHair];
-
-		int offset = oldTip - oldRoot;
-
-		int newRoot = vertexCnt;
-		int newTip	= vertexCnt + offset;
-
-		vertexCnt += (offset + 1);
-
-		hairAsset.m_endIndices[i] = newTip;
-
-		int meshVertex = pHairToMeshMap[i];
-		atcore_float3 meshRoot = meshDesc.m_pVertices[meshVertex];
-		atcore_float3 hairRoot = pVertices[oldRoot];
-
-		atcore_float3 rootOffset = meshRoot - hairRoot;
-
-		for (int j = 0; j <= offset; j++)
-			hairAsset.m_vertices[newRoot + j] = pVertices[oldRoot + j] + rootOffset;
-
-		hairAsset.m_boneIndices[i] = gfsdk_makeFloat4(0,0,0,0);
-		hairAsset.m_boneWeights[i] = gfsdk_makeFloat4(1,0,0,0);
-
-		if (pFbxSkin)
-		{
-			hairAsset.m_boneIndices[i] = pMeshBoneIndices[meshVertex];
-			hairAsset.m_boneWeights[i] = pMeshBoneWeights[meshVertex];
-		}
-	}
-
-	// copy face indices and texture uvs
-	int faceCnt = 0;
-	for (int i = 0; i < meshDesc.m_NumTriangles; i++)
-	{
-		NvUInt32 i0 = meshDesc.m_pIndices[i * 3 + 0];
-		NvUInt32 i1 = meshDesc.m_pIndices[i * 3 + 1];
-		NvUInt32 i2 = meshDesc.m_pIndices[i * 3 + 2];
-
-		int h0 = pMeshToHairMap[i0];
-		int h1 = pMeshToHairMap[i1];
-		int h2 = pMeshToHairMap[i2];
-
-		if ((h0 < 0) || (h1 < 0) || (h2 < 0))
-			continue; // invalid face
-
-		hairAsset.m_faceIndices[ faceCnt * 3 + 0] = h0;
-		hairAsset.m_faceIndices[ faceCnt * 3 + 1] = h1;
-		hairAsset.m_faceIndices[ faceCnt * 3 + 2] = h2;
-
-		hairAsset.m_faceUvs[ faceCnt * 3 + 0 ] = meshDesc.m_pTexCoords[i * 3 + 0];
-		hairAsset.m_faceUvs[ faceCnt * 3 + 1 ] = meshDesc.m_pTexCoords[i * 3 + 1];
-		hairAsset.m_faceUvs[ faceCnt * 3 + 2 ] = meshDesc.m_pTexCoords[i * 3 + 2];
-
-		faceCnt++;
-	}
-
-	hairAsset.m_numFaces = faceCnt;
-
-	delete []pMeshBoneIndices;
-	delete []pMeshBoneWeights;
-
-	delete []pMeshToHairMap;
-	delete []pHairToMeshMap;
-	delete []pHairToHairMap;
-
-	return true;
-}
-*/
diff --git a/tools/ArtistTools/source/CoreLib/Anim/FbxUtil.h b/tools/ArtistTools/source/CoreLib/Anim/FbxUtil.h
deleted file mode 100644
index 5cbf18c..0000000
--- a/tools/ArtistTools/source/CoreLib/Anim/FbxUtil.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#pragma once
-
-#include "AnimUtil.h"
-
-
-////////////////////////////////////////////////////////////////////////////////////////
-// Helper for fbx file load
-class CORELIB_EXPORT FbxUtil
-{
-public:
-
-	/// initialize fbx loader.  
-	static bool Initialize(const nvidia::Char* fbxFileName, nvidia::Float& fbxSceneUnit, float toScneUnit = 0.0f, bool bConvertUnit = true);
-	static bool Release(void);
-
-	static bool InitializeAnimationCache(AnimationCache& cache);
-
-	/// Get global frame range and fps information from fbx.
-	static bool GetGlobalSettings(nvidia::Float32* pStarfFrame = 0, nvidia::Float32* pEndFrame = 0, nvidia::Float32 *pFps = 0, int* upAxis = 0, char* rootBoneName = 0);
-
-	/// get skinning data from the mesh node
-	static bool InitializeSkinData( const nvidia::Char* meshName, SkinData& pSkinningDataToUpdate);
-
-	/// create mesh descriptor from fbx mesh node
-	static bool CreateMeshDescriptor(const nvidia::Char* meshName, MeshDesc &meshDesc);
-
-	/// get all the renderable meshes from the fbx scene
-	static bool GetMeshInfo(int* numMeshes, char** meshNames, char** parents, char** skinned);
-
-	/// get mesh material info from fbx scene
-	static bool GetMeshMaterials(const nvidia::Char* meshName, int *numMaterials, MeshMaterial** materials);
-
-	/// get hair directly from fbx
-//	static bool CreateHairFromFbx(const char* guideName, const char* growthMeshName, NvHair::AssetDescriptor &hairAsset);
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Backdoor/backdoor.cpp b/tools/ArtistTools/source/CoreLib/Backdoor/backdoor.cpp
deleted file mode 100644
index 222debd..0000000
--- a/tools/ArtistTools/source/CoreLib/Backdoor/backdoor.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-#include "backdoor.h"
-#include <stdio.h>
-#include <string.h>
-#include <malloc.h>
-#include <Windows.h>
-#include "Nv.h"
-
-namespace BACKDOOR
-{
-
-	struct Header
-	{
-		int	mCount;
-		int mType; 
-	};
-
-#define MAX_BACKDOOR_PACKET 1024 	// maximum size of a send/receive packet
-#define HEADER_SIZE (sizeof(Header))
-#define DATA_SIZE (MAX_BACKDOOR_PACKET - HEADER_SIZE)
-#define STRING_SIZE (DATA_SIZE - 1)
-#define MAX_ARGS 32
-#pragma warning(disable:4996)
-
-	// Chagne this helper class to use the memory mapped IO API relevant to your system.
-	// This implementation uses the Windows API for a memory mapped shared file system.
-	class MemoryMappedFile
-	{
-	public:
-
-		MemoryMappedFile(const char *mappingObject,unsigned int mapSize);
-		~MemoryMappedFile(void);
-		void * getBaseAddress(void);
-	private:
-		class	MemoryMappedFileImpl	*mImpl;
-	};
-
-
-	class MemoryMappedFileImpl
-	{
-	public:
-		HANDLE	mMapFile;
-		void *  mHeader;
-	};
-
-	MemoryMappedFile::MemoryMappedFile(const char *mappingObject,unsigned int mapSize)
-	{
-		mImpl = (MemoryMappedFileImpl *)::malloc(sizeof(MemoryMappedFileImpl));
-		mImpl->mHeader = NV_NULL;
-		mImpl->mMapFile = OpenFileMappingA(FILE_MAP_ALL_ACCESS,FALSE,mappingObject);
-		if ( mImpl->mMapFile == NV_NULL )
-		{
-			mImpl->mMapFile = CreateFileMappingA(
-				INVALID_HANDLE_VALUE,    // use paging file
-				NV_NULL,                    // default security
-				PAGE_READWRITE,          // read/write access
-				0,                       // maximum object size (high-order DWORD)
-				mapSize,                // maximum object size (low-order DWORD)
-				mappingObject);
-		}
-		if ( mImpl->mMapFile )
-		{
-			mImpl->mHeader = MapViewOfFile(mImpl->mMapFile,FILE_MAP_ALL_ACCESS,0,0,mapSize);
-		}
-
-	}
-
-	MemoryMappedFile::~MemoryMappedFile(void)
-	{
-
-		if ( mImpl->mHeader )
-		{
-			UnmapViewOfFile(mImpl->mHeader);
-			if ( mImpl->mMapFile )
-			{
-				CloseHandle(mImpl->mMapFile);
-			}
-		}
-
-		::free(mImpl);
-	}
-
-	void * MemoryMappedFile::getBaseAddress(void)
-	{
-		return mImpl->mHeader;
-	}
-
-
-
-class _Backdoor : public Backdoor
-{
-	MemoryMappedFile	*mReceiveFile;
-	MemoryMappedFile	*mSendFile;
-	const char			*mArgv[MAX_ARGS];
-	char				mBuffer[MAX_BACKDOOR_PACKET];
-
-	int	mSendCount;
-	int	mReceiveCount;
-
-public:
-	_Backdoor(const char *sendName,	// The name of the shared memory file to act as the 'sender' stream.
- 			  const char *receiveName) // The name of the shared memory file to act as the 'receive' message stream.
-	{
-		mSendCount = 0;	// This is a semaphore used to signal when a new message has been sent.
-		mReceiveCount = 0; // This is a semaphore used to detect if a new message has been received.
-		mReceiveFile = new MemoryMappedFile(receiveName,MAX_BACKDOOR_PACKET);	// Open the receive stream file
-		mSendFile = new MemoryMappedFile(sendName,MAX_BACKDOOR_PACKET); // Open the send stream file
-	}
-
-	virtual ~_Backdoor(void)
-	{
-		delete mReceiveFile; // Close the receive stream file
-		delete mSendFile;	// Close the send stream file.
-	}
-
-	virtual void send(const char *fmt,...)
-	{
-		char wbuff[DATA_SIZE];
-		wbuff[STRING_SIZE] = 0;
-		_vsnprintf(wbuff,STRING_SIZE, fmt, (char *)(&fmt+1));
-
-		mSendCount++;	// Increment the send counter.
-		size_t len = strlen(wbuff);
-
-		if ( len < STRING_SIZE && mSendFile )
-		{
-			char *baseAddress = (char *)mSendFile->getBaseAddress();	// get the base address of the shared memory
-			int *dest = (int *)baseAddress;
-
-			baseAddress+=sizeof(Header);
-
-			memcpy(baseAddress,wbuff,len+1);	// First copy the message.
-			*dest = mSendCount;				// Now revised the send count semaphore so the other process knows there is a new message to processs.
-		}
-	}
-
-	virtual const char **getInput(int &argc)
-	{
-		const char **ret = NV_NULL;
-		argc = 0;
-
-		if ( mReceiveFile )
-		{
-			const char *baseAddress = (const char *)mReceiveFile->getBaseAddress();
-			const int *source = (const int *)baseAddress;
-			baseAddress+=sizeof(Header);
-			if ( *source != mReceiveCount )
-			{
-				mReceiveCount = *source;
-				memcpy(mBuffer,baseAddress,DATA_SIZE);
-
-				char *scan = mBuffer;
-				while ( *scan == 32 ) scan++;	// skip leading spaces
-				if ( *scan )	// if not EOS
-				{
-					argc = 1;
-					mArgv[0] = scan;	// set the first argument
-
-					while ( *scan && argc < MAX_ARGS)	// while still data and we haven't exceeded the maximum argument count.
-					{
-						while ( *scan && *scan != 32 ) scan++;	// scan forward to the next space
-						if ( *scan == 32 )	// if we hit a space
-						{
-							*scan = 0; // null-terminate the argument
-							scan++;	// skip to the next character
-							while ( *scan == 32 ) scan++;	// skip any leading spaces
-							if ( *scan )	// if there is still a valid non-space character process that as the next argument
-							{
-								mArgv[argc] = scan;
-								argc++;
-							}
-						}
-					}
-					ret = mArgv;
-				}
-			}
-		}
-
-		return ret;
-	}
-
-	bool sendData(char* ptr, size_t size, int dataType)
-	{
-		if ( size > DATA_SIZE || !mSendFile )
-			return false;
-
-		mSendCount++;	// Increment the send counter.
-
-		char *baseAddress = (char *)mSendFile->getBaseAddress();	// get the base address of the shared memory
-
-		Header* header = (Header*)baseAddress;
-
-		header->mCount = mSendCount;
-		header->mType = dataType;
-
-		baseAddress+=sizeof(Header);
-		memcpy(baseAddress,ptr, size);
-
-		return true;
-	}
-
-	bool receiveData(char* ptr, size_t size, int dataType)
-	{
-		if ( size > DATA_SIZE || !mReceiveFile )
-			return false;
-
-		const char *baseAddress = (const char *)mReceiveFile->getBaseAddress();
-		const int *source = (const int *)baseAddress;
-		
-		Header* header = (Header*)baseAddress;
-		if (header->mType != dataType)
-			return false;
-
-		baseAddress+=sizeof(Header);		
-
-		if ( *source != mReceiveCount )
-		{
-			mReceiveCount = *source;
-			memcpy(ptr, baseAddress, size);
-		}
-
-		return true;
-	}
-
-	bool checkMessage(const char* msg)
-	{
-		if (!mReceiveFile)
-			return false;
-
-		const char *baseAddress = (const char *)mReceiveFile->getBaseAddress();
-		const int *source = (const int *)baseAddress;
-
-		if (*source == mReceiveCount)
-			return false;
-
-		if ( *source != mReceiveCount )
-		{
-			baseAddress+=sizeof(Header);
-
-			return (!strcmp(baseAddress, msg));
-		}
-
-		return false;
-	}
-
-	virtual void release(void)
-	{
-		delete this;
-	}
-
-
-};
-
-}; // end of namespace
-
-using namespace BACKDOOR;
-
-
-Backdoor * createBackdoor(const char *sendName,const char *receiveName)
-{
-	_Backdoor *ret = new _Backdoor(sendName,receiveName);
-	return static_cast< Backdoor *>(ret);
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Backdoor/backdoor.h b/tools/ArtistTools/source/CoreLib/Backdoor/backdoor.h
deleted file mode 100644
index a8ea1ac..0000000
--- a/tools/ArtistTools/source/CoreLib/Backdoor/backdoor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef BACKDOOR_H
-
-#define BACKDOOR_H
-
-// This is a tiny helper class that let's you easily perform communication using shared file memory between
-// two processes on the same machine.  It is built to comple on Windows; but relatively minor changes
-// are necesary to make it work on other platforms; just change the memory mapped IO calls.
-//
-// This same technique would work as well if you simply opened a file on disk; though shared memory is much
-// faster.
-//
-// This is not meant to be some kind of sophisticated inter-process communciations class.  Instead it's just
-// used for the very basic use case where you need to easily send simple 'commands' between two proceses.
-//
-// This code snippet comes with a console application which can be used to send commands to another process
-// and display received messaegs from that other process.
-//
-// Simply launch this console app with a command line argument indicating whether it is considered the 'server'
-// or the 'client'.  You can test it by launching it twice; once as server and once as client and then send
-// chat messages back and forth.
-//
-// Written by John W. Ratcliff on February 10, 2013 and released into the public domain.
-//
-// mailto:[email protected]
-
-class Backdoor
-{
-public:
-
-	virtual void send(const char *str,...) = 0;	// This sends a 'command' to the other process. Uses the printf style format for convenience.
-
-	// This method consumes an inomcing command from the other process and parses it into an argc/argv format.
-	virtual const char **getInput(int &argc) = 0;
-
-	virtual bool sendData(char* ptr, size_t size, int dataType) = 0;
-
-	virtual bool receiveData(char* ptr, size_t size, int dataType) = 0;
-
-	virtual bool checkMessage(const char* msg) = 0;
-
-	// This method releases the Backdoor interface class.
-	virtual void release(void) = 0;
-protected:
-	virtual ~Backdoor(void)
-	{
-	}
-};
-
-Backdoor * createBackdoor(const char *sendName,const char *receiveName);
-
-
-#endif
diff --git a/tools/ArtistTools/source/CoreLib/CoreLib.cpp b/tools/ArtistTools/source/CoreLib/CoreLib.cpp
deleted file mode 100644
index ceeae6c..0000000
--- a/tools/ArtistTools/source/CoreLib/CoreLib.cpp
+++ /dev/null
@@ -1,1508 +0,0 @@
-#include <QtWidgets/QApplication>
-#include <QtCore/QTimer>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtWidgets/QMessageBox>
-#include <QtCore/QFileInfo>
-
-#include "Nv.h"
-
-#include "AppMainWindow.h"
-#include "D3DWidget.h"
-#include "SimpleScene.h"
-#include "Automate.h"
-#include "Settings.h"
-#include "RenderInterface.h"
-#include "GlobalSettings.h"
-
-#ifndef NV_ARTISTTOOLS
-#include "FurCharacter.h"
-#include "PluginBlast.h"
-#endif // NV_ARTISTTOOLS
-
-#include "RenderPlugin.h"
-
-void SetupStyles()
-{
-	//QFile styleFile( ":/AppMainWindow/ThemeDefault.qss" );
-	QString appPath = QCoreApplication::applicationDirPath();
-	QString themeFilePath = appPath + "/ArtistToolsTheme.qss";
-	QFile styleFile;
-	if (QFile::exists(themeFilePath))
-	{
-		styleFile.setFileName(themeFilePath);
-	}
-	else
-	{
-		styleFile.setFileName(":/AppMainWindow/ThemeDark.qss");
-	}
-	styleFile.open(QFile::ReadOnly);
-
-	QString styleSheet(styleFile.readAll());
-	QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false);
-	qApp->setStyleSheet(styleSheet);
-}
-
-int ShowErrorMsg(int errorCode)
-{
-	const char* errorMsg = 0;
-	switch (errorCode)
-	{
-	case 1:
-		errorMsg = "Fail to create GPU device and context. "
-			"Please make sure you are using an independant GPU and choose '3D App - Game Development' in the Global Settings page in its Control Panel.";
-		break;
-	case 2:
-		errorMsg = "Fail to initialize all the shared shaders, resources, etc. "
-			"Please make sure you are using an independant GPU and choose '3D App - Game Development' in the Global Settings page in its Control Panel.";
-		break;
-	case 3:
-		errorMsg = "Fail to create render window, target, swap chains, etc. "
-			"Please make sure you are using an independant GPU and choose '3D App - Game Development' in the Global Settings page in its Control Panel.";
-		break;
-	case 4:
-		// Unable to load/start the dll.
-		errorMsg = "Unable to load and/or start the Blast dll. "
-			"Please make sure the appropriate hairworks dll is the same directory as the viewer executable.";
-		break;
-	default:
-		errorMsg = "We need define one error message!";
-	}
-	QMessageBox messageBox;
-	messageBox.information(0, "Error", errorMsg);
-	return errorCode;
-}
-
-extern void CreateAppMainWindow();
-extern void ReleaseAppMainWindow();
-
-int RunApp(QApplication& app)
-{
-	CreateAppMainWindow();
-
-	// resolution
-	int windowWidth = 0;
-	int windowHeight = 0;
-	std::string resolution = AppSettings::Inst().GetOptionValue("User/Resolution")->Value.Enum;
-	int width, height;
-	sscanf(resolution.c_str(), "%dx%d", &windowWidth, &windowHeight);
-
-	// aa sample count
-	int sampleCount = 8;
-	if (stricmp(AppSettings::Inst().GetOptionValue("User/AA")->Value.Enum, "2X") == 0)
-	{
-		sampleCount = 2;
-	}
-	else if (stricmp(AppSettings::Inst().GetOptionValue("User/AA")->Value.Enum, "4X") == 0)
-	{
-		sampleCount = 4;
-	}
-	else if (stricmp(AppSettings::Inst().GetOptionValue("User/AA")->Value.Enum, "8X") == 0)
-	{
-		sampleCount = 8;
-	}
-	else if (stricmp(AppSettings::Inst().GetOptionValue("User/AA")->Value.Enum, "Off") == 0)
-	{
-		sampleCount = 1;
-	}
-
-	// device id
-	int deviceID = (AppSettings::Inst().GetOptionValue("User/Device")->Value.Int);
-	if (deviceID < 0 || deviceID > 3)
-	{
-		deviceID = -1;  // when -1 to choose a good GPU
-	}
-
-	// backdoor connection mode
-	int backdoor = 0;
-	if (stricmp(AppSettings::Inst().GetOptionValue("User/Backdoor")->Value.String, "master") == 0)
-	{
-		backdoor = 1;
-	}
-	else if (stricmp(AppSettings::Inst().GetOptionValue("User/Backdoor")->Value.String, "slave") == 0)
-	{
-		backdoor = 2;
-	}
-
-	AppMainWindow::setConnectionMode(backdoor);
-
-	SimpleScene::Inst();
-#ifdef NV_ARTISTTOOLS
-	CoreLib::Inst()->SimpleScene_SimpleScene();
-#endif // NV_ARTISTTOOLS
-	// initialize main window
-	// HAIR-285 Viewer - new command line to start Viewer in full screen
-	AppMainWindow::Inst().InitUI();
-	if (windowWidth == 0)
-		AppMainWindow::Inst().showFullScreen();
-	else if (windowWidth<0)
-		AppMainWindow::Inst().showMaximized();
-	else
-		AppMainWindow::Inst().resize(windowWidth, windowHeight);
-
-	D3DWidget* d3dWidget = AppMainWindow::Inst().GetRenderWidget();
-
-	HWND hWidget = (HWND)d3dWidget->winId();
-
-	// create GPU device and context
-	if (false == RenderInterface::InitDevice(deviceID))
-		return ShowErrorMsg(1);
-
-	// initialize all the shared shaders, resources, etc
-	if (false == RenderInterface::Initialize())
-		return ShowErrorMsg(2);
-
-	// create render window, target, swap chains, etc.
-	if (false == RenderInterface::CreateRenderWindow(hWidget, sampleCount))
-		return ShowErrorMsg(3);
-
-	SimpleScene* scene = SimpleScene::Inst();
-	if (false == scene->Initialize(hWidget, backdoor))
-		return ShowErrorMsg(4);
-
-	GlobalSettings::Inst().setRenderFps(60);
-
-	GlobalSettings::GetFrameTimer().start();
-
-	QObject::connect(&GlobalSettings::GetFrameTimer(), SIGNAL(timeout()), d3dWidget, SLOT(Timeout()));
-	QObject::connect(&app, SIGNAL(aboutToQuit()), d3dWidget, SLOT(Shutdown()));
-
-	SetupStyles();
-
-	AppMainWindow::Inst().show();
-	AppMainWindow::Inst().update();
-
-	std::string title = "";
-
-#ifdef NV_ARTISTTOOLS
-	title = "ArtistTools";
-#else
-	title = "Blast Viewer";
-#endif // NV_ARTISTTOOLS
-
-#ifdef _WIN64
-	title.append(" x64");
-#endif
-
-#ifdef _DEBUG
-	title.append(" (Debug)");
-#else			
-#endif
-
-	std::string strApi = RenderPlugin::Instance()->GetRenderApi();
-	title.append(" ");
-	title.append(strApi);
-
-	switch (backdoor)
-	{
-	case 1:
-		title.append(" (Master Mode)");
-		break;
-	case 2:
-		title.append(" (Slave Mode)");
-		break;
-	}
-
-	AppMainWindow::Inst().setWindowTitle(title.c_str());
-
-	OptionValue* option = AppSettings::Inst().GetOptionValue("User/HideUI");
-	if (option)
-	{
-		if (option->Value.Bool == OA_TRUE)
-		{
-			AppMainWindow::Inst().shortcut_expert();
-		}
-	}
-
-#ifndef NV_ARTISTTOOLS
-	option = AppSettings::Inst().GetOptionValue("User/FurAssetPath");
-	if (option && option->Value.String && strlen(option->Value.String))
-	{
-		const char* path = option->Value.String;
-		QFileInfo fi(path);
-		QByteArray dir = QDir::toNativeSeparators(fi.absoluteDir().absolutePath()).toLocal8Bit();
-		QByteArray file = fi.fileName().toLocal8Bit();
-		scene->GetFurCharacter().LoadHairAsset(dir, file);
-	}
-#else
-	CoreLib::Inst()->CoreLib_RunApp();
-#endif // NV_ARTISTTOOLS
-
-	option = AppSettings::Inst().GetOptionValue("User/ProjectPath");
-	if (option && option->Value.String && strlen(option->Value.String))
-	{
-		const char* path = option->Value.String;
-		QFileInfo fi(path);
-		QByteArray dir = QDir::toNativeSeparators(fi.absoluteDir().absolutePath()).toLocal8Bit();
-		QByteArray file = fi.fileName().toLocal8Bit();
-		scene->LoadProject(dir, file);
-	}
-	option = AppSettings::Inst().GetOptionValue("User/Play");
-	if (option)
-	{
-		if (option->Value.Bool == OA_TRUE)
-		{
-			AppMainWindow::Inst().shortcut_pause();
-		}
-	}
-
-	int ret = app.exec();
-	// release GUI before releasing QApplication (and QWindowsContext) to avoid crash. 
-	// e.g. GWDCC-415 Blast Viewer crashes when quit after clicked any main menu.
-	ReleaseAppMainWindow();
-	return ret;
-}
-
-static void ShowUsage()
-{
-	char message[] = {
-		"FurViewer Command-line Options:\n\n"
-		"Usage: FurViewer.[win64|win32].exe [file] [options]...\n\n"
-		"[file]: \n"
-		"\t: File to load. .blastProj, .apx or .apb are supported.\n\t ex) media/Ball/ball.blastProj\n\n"
-		"[options]:\n"
-		"-size <width>x<height>\n\t: Window resolution\t  ex) -size 1024x768\n"
-		"-aa <1|2|4|8>\n\t: MSAA anti-aliasing options. 1 for off.\t  ex) -aa 4 or -aa 1\n"
-		"-backdoor <master|slave>\n\t: Backdoor options\n"
-		"-device <0|1|2|3>\n\t: Which GPU to use\n"
-		"-noui \n\t: Set this option to hide UI\n"
-		"-play \n\t: Play the default animation if it has\n"
-		"-fullscreen \n\t: Start the application in full screen\n"
-		"-maxscreen \n\t: Start the application in max sized screen\n"
-		"-demoMode playlistname.plist \n\t: Start the application and demo the projects in a fur playlist stored in media/playlists folder.\n"
-	};
-	QMessageBox messageBox;
-	messageBox.information(0, "Usage", message);
-}
-
-bool ParseCommandLineOptions(int argc, char* argv[])
-{
-	AppSettings& settings = AppSettings::Inst();
-
-	for (int idx = 1; idx < argc; ++idx)
-	{
-		if (!stricmp(argv[idx], "-size"))
-		{
-			if ((idx + 1) < argc)
-			{
-				oaValue value;
-				value.Enum = argv[idx + 1];
-				settings.SetOptionValue("User/Resolution", OA_TYPE_ENUM, &value);
-				idx++; // Skip next option
-			}
-		}
-		else if (!stricmp(argv[idx], "-fullscreen"))
-		{
-			// HAIR-285 Viewer - new command line to start Viewer in full screen
-			oaValue value;
-			value.Enum = "0x0";
-			settings.SetOptionValue("User/Resolution", OA_TYPE_ENUM, &value);;
-		}
-		else if (!stricmp(argv[idx], "-maxscreen"))
-		{
-			// HAIR-285 Viewer - new command line to start Viewer in full screen
-			oaValue value;
-			value.Enum = "-1x0";
-			settings.SetOptionValue("User/Resolution", OA_TYPE_ENUM, &value);;
-		}
-		else if (!stricmp(argv[idx], "-backdoor"))
-		{
-			if ((idx + 1) < argc)
-			{
-				oaValue value;
-				bool isValid = true;
-				if (!strcmp(argv[idx + 1], "master"))
-					value.String = "master";
-				else if (!strcmp(argv[idx + 1], "slave"))
-					value.String = "slave";
-				else
-					isValid = false;
-
-				if (isValid)
-					settings.SetOptionValue("User/Backdoor", OA_TYPE_STRING, &value);
-				idx++; // Skip next option
-			}
-		}
-		else if (!stricmp(argv[idx], "-aa"))
-		{
-			if ((idx + 1) < argc)
-			{
-				oaValue value;
-				bool isValid = true;
-				if (!strcmp(argv[idx + 1], "1"))
-					value.Enum = "Off";
-				else if (!strcmp(argv[idx + 1], "2"))
-					value.Enum = "2X";
-				else if (!strcmp(argv[idx + 1], "4"))
-					value.Enum = "4X";
-				else if (!strcmp(argv[idx + 1], "8"))
-					value.Enum = "8X";
-				else
-					isValid = false;
-				if (isValid)
-					settings.SetOptionValue("User/AA", OA_TYPE_ENUM, &value);
-				idx++; // Skip next option
-			}
-		}
-		else if (!stricmp(argv[idx], "-device"))
-		{
-			if ((idx + 1) < argc)
-			{
-				oaValue value;
-				bool isValid = true;
-				if (!strcmp(argv[idx + 1], "0"))
-					value.Int = 0;
-				else if (!strcmp(argv[idx + 1], "1"))
-					value.Int = 1;
-				else if (!strcmp(argv[idx + 1], "2"))
-					value.Int = 2;
-				else if (!strcmp(argv[idx + 1], "3"))
-					value.Int = 3;
-				else
-					isValid = false;
-				if (isValid)
-					settings.SetOptionValue("User/Device", OA_TYPE_INT, &value);
-				idx++; // Skip next option
-			}
-		}
-		else if (!stricmp(argv[idx], "-noui"))
-		{
-			oaValue value;
-			value.Bool = OA_TRUE;
-			settings.SetOptionValue("User/HideUI", OA_TYPE_BOOL, &value);
-		}
-		else if (!stricmp(argv[idx], "-perf"))
-		{
-			oaValue value;
-			value.Bool = OA_TRUE;
-			settings.SetOptionValue("User/PerfMode", OA_TYPE_BOOL, &value);
-		}
-		else if (!stricmp(argv[idx], "-play"))
-		{
-			oaValue value;
-			value.Bool = OA_TRUE;
-			settings.SetOptionValue("User/Play", OA_TYPE_BOOL, &value);
-		}
-		else if (!stricmp(argv[idx], "-install"))
-		{
-			// Install mode
-			// Just ignore here
-		}
-		else if (!stricmp(argv[idx], "-openautomate"))
-		{
-			// OpenAutomate mode
-			// Just ignore here
-			idx++; // Skip next option
-		}
-		else if (!stricmp(argv[idx], "-demoMode"))
-		{
-			//QMessageBox messageBox;
-			//messageBox.information(0, "debug", argv[idx]);
-			idx++; // check next arg
-			if (idx < argc)
-			{
-				bool isValid = false;
-				char* extension = strrchr(argv[idx], '.');
-				if (extension)
-				{
-					if (!_stricmp(extension, ".plist"))
-					{
-						oaValue value;
-						value.String = argv[idx];
-						settings.SetOptionValue("User/FurDemoPlaylist", OA_TYPE_STRING, &value);
-						isValid = true;
-					}
-				}
-			}
-		}
-		else // Try to load the file
-		{
-			bool isValid = false;
-			char* extension = strrchr(argv[idx], '.');
-			if (extension)
-			{
-				if (!_stricmp(extension, ".blastProj"))
-				{
-					oaValue value;
-					value.String = argv[idx];
-					settings.SetOptionValue("User/ProjectPath", OA_TYPE_STRING, &value);
-					isValid = true;
-				}
-				//else if (!_stricmp(extension, ".apx") || !_stricmp(extension, ".apb"))
-				//{
-				//	oaValue value;
-				//	value.String = argv[idx];
-				//	settings.SetOptionValue("User/FurAssetPath", OA_TYPE_STRING, &value);
-				//	isValid = true;
-				//}
-			}
-			if (!isValid)
-			{
-				// Invalid option
-				return false;
-			}
-		}
-	}
-	return true;
-}
-
-typedef RenderPlugin*(*Func)(void);
-
-void GetRenderPlugins(QApplication& app, std::vector<std::string>& render_plugins)
-{
-	HMODULE module = NULL;
-	Func CreateFunc = NULL;
-	RenderPlugin* Plugin = NULL;
-
-	QDir pluginsDir(app.applicationDirPath());
-	foreach(QString fileName, pluginsDir.entryList(QDir::Files)) {
-#ifdef NV_ARTISTTOOLS
-		if (!fileName.startsWith("Render"))
-#else
-		if (!fileName.startsWith("FurRender"))
-#endif
-		{
-			continue;
-		}
-
-#ifdef _WIN64
-#ifdef _DEBUG
-		if (!fileName.endsWith(".win64.d.dll"))
-		{
-			continue;
-		}
-#else						  
-		if (!fileName.endsWith(".win64.dll"))
-		{
-			continue;
-		}
-#endif
-#else
-#ifdef _DEBUG
-		if (!fileName.endsWith(".win32.d.dll"))
-		{
-			continue;
-		}
-#else
-		if (!fileName.endsWith(".win32.dll"))
-		{
-			continue;
-		}
-#endif
-#endif
-
-		QByteArray tmp = pluginsDir.absoluteFilePath(fileName).toUtf8();
-		const char* pName = tmp.data();		
-		module = LoadLibraryA(pName);
-		if (NULL == module)
-			continue;
-
-		CreateFunc = (Func)GetProcAddress(module, "CreateRenderPlugin");
-		if (NULL == CreateFunc)
-			continue;
-
-		Plugin = CreateFunc();
-		if (NULL != Plugin)
-		{
-			std::string name = Plugin->GetRenderApi();
-			render_plugins.push_back(name);
-			delete Plugin;
-			Plugin = NULL;
-		}
-	}
-}
-
-
-#include "RenderPlugin.h"
-#include "CoreLib.h"
-
-#include <io.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define LINE 10
-
-#ifndef NV_ARTISTTOOLS
-int CoreLib::CoreMain(int argc, char *argv[])
-#else
-int CoreLib::CoreMain(int argc, char *argv[], bool withPlugin)
-#endif
-{
-#ifdef OPEN_CONSOLE
-	AllocConsole();
-	freopen("CONOUT$", "w", stdout);
-	freopen("CONOUT$", "w", stderr);
-#endif
-
-	QApplication a(argc, argv);
-
-	AppSettings::Inst().InitOptions();
-
-	if (!ParseCommandLineOptions(argc, argv))
-	{
-		// Invalid option. Show the usage  and quit
-		ShowUsage();
-		return 0;
-	}
-#if (0) // Install mode for OpenAutomate is not tested yet
-	bool isAutomateInstallMode = GetAutomateInstallModeOption(argc, argv);
-	if (isAutomateInstallMode)
-	{
-		if (AutomateInstallApp())
-		{
-			QMessageBox messageBox;
-			messageBox.information(0, "Info", "Install succeeded");
-		}
-		else
-		{
-			QMessageBox messageBox;
-			messageBox.information(0, "Info", "Install failed. Did you run with admin privilege?");
-		}
-		return 0;
-	}
-#endif
-	std::string openAutomateOptions = GetAutomateOption(argc, argv);
-	if (!openAutomateOptions.empty())
-	{
-		AutomateInit(openAutomateOptions.c_str());
-	}
-
-	std::vector<std::string> render_plugins;
-	std::vector<std::string>::iterator it;
-
-	FILE *pf;
-	if ((_access("RenderPlugin.txt", 0)) == -1)
-	{
-		GetRenderPlugins(a, render_plugins);
-
-		if (render_plugins.size() > 1)
-		{
-			pf = fopen("RenderPlugin.txt", "a");
-			for (it = render_plugins.begin(); it != render_plugins.end(); it++)
-			{
-				fprintf(pf, "%s\n", (*it).c_str());
-			}
-			fclose(pf);
-		}
-	}
-	else
-	{
-		pf = fopen("RenderPlugin.txt", "r");
-		char buf[LINE];
-		while (1) {
-			memset(buf, 0, LINE);
-			if (fscanf(pf, "%s", buf) == -1)
-				break;
-			render_plugins.push_back(buf);
-		}
-		fclose(pf);
-	}
-
-	RenderPlugin::Load(render_plugins);
-
-	std::string strApi = RenderPlugin::Instance()->GetRenderApi();
-	if ("" == strApi)
-	{
-		return -1;
-	}
-
-#ifdef NV_ARTISTTOOLS
-	if (withPlugin)
-	{
-		LoadPlugins(a);
-	}
-#else
-	bool loaded = PluginBlast::Create(strApi);
-	if (!loaded)
-	{
-		return -1;
-	}
-#endif
-
-	return RunApp(a);
-}
-
-CoreLib::CoreLib()
-{
-
-}
-
-CoreLib::~CoreLib()
-{
-
-}
-
-CoreLib* CoreLib::Inst()
-{
-	static CoreLib coreLib;
-	return &coreLib;
-}
-
-#ifdef NV_ARTISTTOOLS
-#include <QtWidgets/QApplication>
-#include <QtCore/QTimer>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtWidgets/QMessageBox>
-#include <QtCore/QFileInfo>
-
-#include "Nv.h"
-
-#include "AppMainWindow.h"
-#include "D3DWidget.h"
-#include "SimpleScene.h"
-#include "Automate.h"
-#include "Settings.h"
-#include "RenderInterface.h"
-#include "Light.h"
-
-#include <QtCore/QPluginLoader> 
-void CoreLib::LoadPlugins(QApplication& app)
-{
-	QDir pluginsDir(app.applicationDirPath());
-	foreach(QString fileName, pluginsDir.entryList(QDir::Files)) {
-		if (!fileName.startsWith("Plugin"))
-		{
-			continue;
-		}
-
-#ifdef _WIN64
-#ifdef _DEBUG
-		if (!fileName.endsWith(".win64.d.dll"))
-		{
-			continue;
-		}
-#else						  
-		if (!fileName.endsWith(".win64.dll"))
-		{
-			continue;
-		}
-#endif
-#else
-#ifdef _DEBUG
-		if (!fileName.endsWith(".win32.d.dll"))
-		{
-			continue;
-		}
-#else
-		if (!fileName.endsWith(".win32.dll"))
-		{
-			continue;
-		}
-#endif
-#endif
-
-		PluginInterface* pInterface;
-		QByteArray tmp = pluginsDir.absoluteFilePath(fileName).toUtf8();
-		const char* pName = tmp.data();
-		QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName));
-		QObject *plugin = pluginLoader.instance();
-		if (plugin) {
-			pInterface = qobject_cast<PluginInterface *>(plugin);
-			if (pInterface)
-			{
-				std::string strApi = RenderPlugin::Instance()->GetRenderApi();
-				bool loaded = pInterface->LoadRenderPlugin(strApi);
-				if (!loaded)
-				{
-					continue;
-				}
-
-				QString name = pInterface->GetPluginName();
-				m_PluginInterfaces[name] = pInterface;
-			}
-		}
-		else
-		{
-			QMessageBox::critical(nullptr, "", pluginLoader.errorString());
-		}
-	}
-}
-
-PluginInterface* CoreLib::GetPluginInterface(QString name)
-{
-	PluginInterface* pPluginInterface = 0;
-	std::map<QString, PluginInterface*>::iterator it;
-	it = m_PluginInterfaces.find(name);
-	if (it != m_PluginInterfaces.end())
-	{
-		pPluginInterface = it->second;
-	}
-	return pPluginInterface;
-}
-
-bool CoreLib::GetBoneNames(std::vector<std::string>& BoneNames)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->GetBoneNames(BoneNames))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::CoreLib_RunApp()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->CoreLib_RunApp())
-			break;
-	}
-
-	return true;
-}
-
-bool CoreLib::MainToolbar_updateValues()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->MainToolbar_updateValues())
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::CurveEditor_updateValues(int _paramId, float* _values)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->CurveEditor_updateValues(_paramId, _values))
-			break;
-	}
-	return true;
-}
-bool CoreLib::CurveEditor_onUpdateValues(int _paramId, float* _values)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->CurveEditor_onUpdateValues(_paramId, _values))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::DisplayMeshesPanel_updateValues()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->DisplayMeshesPanel_updateValues())
-			break;
-	}
-	return true;
-}
-bool CoreLib::DisplayMeshesPanel_EmitToggleSignal(unsigned int id, bool visible)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->DisplayMeshesPanel_EmitToggleSignal(id, visible))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::Camera_LoadParameters(void* ptr, Camera* pCamera)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->Camera_LoadParameters(ptr, pCamera))
-			break;
-	}
-	return true;
-}
-bool CoreLib::Camera_SaveParameters(void* ptr, Camera* pCamera)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->Camera_SaveParameters(ptr, pCamera))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::Light_loadParameters(NvParameterized::Handle& handle, Light* pLight)
-{
- 	std::map<QString, PluginInterface*>::iterator it;
- 	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
- 	{
- 		if (!(it->second)->Light_loadParameters(handle, pLight))
- 			break;
- 	}
-	return true;
-}
-
-bool CoreLib::Light_saveParameters(NvParameterized::Handle& handle, Light* pLight)
-{
- 	std::map<QString, PluginInterface*>::iterator it;
- 	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
- 	{
- 		if (!(it->second)->Light_saveParameters(handle, pLight))
- 			break;
- 	}
-	return true;
-}
-
-bool CoreLib::Gamepad_ToggleSimulation()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->Gamepad_ToggleSimulation())
-			break;
-	}
-	return true;
-}
-bool CoreLib::Gamepad_LoadSamples(QString fn)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->Gamepad_LoadSamples(fn))
-			break;
-	}
-	return true;
-}
-bool CoreLib::Gamepad_ResetScene()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->Gamepad_ResetScene())
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::Gamepad_PlaySample()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->Gamepad_PlaySample())
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::GamepadHandler_ShowHair()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->GamepadHandler_ShowHair())
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::GamepadHandler_SpinWindStrength(float windStrength)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->GamepadHandler_SpinWindStrength(windStrength))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::Gamepad_ResetAnimation()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->Gamepad_ResetAnimation())
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::Gamepad_PlayPauseAnimation()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->Gamepad_PlayPauseAnimation())
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::SimpleScene_SimpleScene()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_SimpleScene())
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_Initialize(int backdoor)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_Initialize(backdoor))
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_Shutdown()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_Shutdown())
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_Clear()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_Clear())
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_Draw_DX12()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_Draw_DX12())
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_Draw_DX11()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_Draw_DX11())
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_FitCamera(atcore_float3& center, atcore_float3& extents)
-{
-	bool valid = true;
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_FitCamera(center, extents))
-		{
-			valid = false;
-			break;
-		}
-	}
-	return valid;
-}
-bool CoreLib::SimpleScene_ResetUpDir(bool zup)
-{
-	bool valid = true;
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_ResetUpDir(zup))
-		{
-			valid = false;
-			break;
-		}
-	}
-	return valid;
-}
-bool CoreLib::SimpleScene_UpdateCamera()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_UpdateCamera())
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_DrawGround()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_DrawGround())
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_DrawWind()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_DrawWind())
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_DrawAxis()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_DrawAxis())
-			break;
-	}
-	return true;
-}
-void CoreLib::SimpleScene_OpenFilesByDrop(const QStringList& fileNames)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		(it->second)->SimpleScene_OpenFilesByDrop(fileNames);
-	}
-}
-bool CoreLib::SimpleScene_LoadSceneFromFbx(const char* dir, const char* fbxName)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_LoadSceneFromFbx(dir, fbxName))
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_LoadProject(const char* dir, const char* file)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_LoadProject(dir, file))
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_SaveProject(const char* dir, const char* file)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_SaveProject(dir, file))
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_LoadParameters(NvParameterized::Interface* iface)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_LoadParameters(iface))
-			break;
-	}
-	return true;
-}
-bool CoreLib::SimpleScene_SaveParameters(NvParameterized::Interface* iface)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_SaveParameters(iface))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::SimpleScene_LoadCameraBookmarks(NvParameterized::Interface* iface)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_LoadCameraBookmarks(iface))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::SimpleScene_SaveCameraBookmarks(NvParameterized::Interface* iface)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->SimpleScene_SaveCameraBookmarks(iface))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::D3DWidget_resizeEvent(QResizeEvent* e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_resizeEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_paintEvent(QPaintEvent* e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_paintEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_mousePressEvent(QMouseEvent* e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_mousePressEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_mouseReleaseEvent(QMouseEvent* e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_mouseReleaseEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_mouseMoveEvent(QMouseEvent* e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_mouseMoveEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_wheelEvent(QWheelEvent * e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_wheelEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_keyPressEvent(QKeyEvent* e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_keyPressEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_keyReleaseEvent(QKeyEvent* e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_keyReleaseEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_dragEnterEvent(QDragEnterEvent *e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_dragEnterEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_dragMoveEvent(QDragMoveEvent *e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_dragMoveEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_dragLeaveEvent(QDragLeaveEvent *e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_dragLeaveEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_dropEvent(QDropEvent *e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_dropEvent(e))
-			break;
-	}
-	return true;
-}
-bool CoreLib::D3DWidget_contextMenuEvent(QContextMenuEvent *e)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3DWidget_contextMenuEvent(e))
-			break;
-	}
-	return true;
-}
-
-#ifdef NV_ARTISTTOOLS
-bool CoreLib::D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->D3D11Shaders_InitializeShadersD3D11(ShaderMap))
-			break;
-	}
-	return true;
-}
-#endif // NV_ARTISTTOOLS
-
-bool CoreLib::AppMainWindow_AppMainWindow()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_AppMainWindow())
-			break;
-	}
-	return true;
-}
-bool CoreLib::AppMainWindow_InitMenuItems(QMenuBar* pMenuBar)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_InitMenuItems(pMenuBar))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_InitMainTab(QWidget *displayScrollAreaContents, QVBoxLayout *displayScrollAreaLayout, int idx)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_InitMainTab(displayScrollAreaContents, displayScrollAreaLayout, idx))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_InitPluginTab(QTabWidget* pTabWidget)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_InitPluginTab(pTabWidget))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_InitUI()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_InitUI())
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_updateUI()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_updateUI())
-			break;
-	}
-	return true;
-}
-bool CoreLib::AppMainWindow_updatePluginUI()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_updatePluginUI())
-			break;
-	}
-	return true;
-}
-bool CoreLib::AppMainWindow_processDragAndDrop(QString fname)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_processDragAndDrop(fname))
-			break;
-	}
-	return true;
-}
-bool CoreLib::AppMainWindow_closeEvent(QCloseEvent *event)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_closeEvent(event))
-			break;
-	}
-	return true;
-}
-
-
-bool CoreLib::menu_item_triggered(QAction* action)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_menu_item_triggered(action))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_menu_about()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_menu_about())
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_menu_opendoc()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_menu_opendoc())
-			break;
-	}
-	return true;
-}
-#if USE_CURVE_EDITOR
-bool CoreLib::AppMainWindow_UpdateCurveEditor()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_UpdateCurveEditor())
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_ShowCurveEditor(int paramId)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_ShowCurveEditor(paramId))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_onCurveAttributeChanged(nvidia::CurveEditor::CurveAttribute* attribute)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_onCurveAttributeChanged(attribute))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_onColorAttributeChanged(nvidia::CurveEditor::ColorAttribute* attribute)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_onColorAttributeChanged(attribute))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_onReloadColorAttributeTexture(nvidia::CurveEditor::ColorAttribute* attribute, bool reloadColorTex, int selectedCtrlPntIndex)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_onReloadColorAttributeTexture(attribute, reloadColorTex, selectedCtrlPntIndex))
-			break;
-	}
-	return true;
-}
-#endif
-bool CoreLib::AppMainWindow_InitToolbar(QWidget *pQWidget, QVBoxLayout* pLayout)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_InitToolbar(pQWidget, pLayout))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_shortcut_expert(bool mode)
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_shortcut_expert(mode))
-			break;
-	}
-	return true;
-}
-
-bool CoreLib::AppMainWindow_updateMainToolbar()
-{
-	std::map<QString, PluginInterface*>::iterator it;
-	for (it = m_PluginInterfaces.begin(); it != m_PluginInterfaces.end(); it++)
-	{
-		if (!(it->second)->AppMainWindow_updateMainToolbar())
-			break;
-	}
-	return true;
-}
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/CoreLib.h b/tools/ArtistTools/source/CoreLib/CoreLib.h
deleted file mode 100644
index 740a7d0..0000000
--- a/tools/ArtistTools/source/CoreLib/CoreLib.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef CORELIB_H
-#define CORELIB_H
-
-#include "corelib_global.h"
-#include "PluginInterface.h"
-#include "NvParameterized.h"
-#if USE_CURVE_EDITOR
-#include <Attribute.h>
-#endif
-
-class QCloseEvent;
-class Camera;
-class Light;
-namespace NvParameterized
-{
-	class Interface;
-	class Handle;
-}
-class D3D11RenderShader;
-
-class CORELIB_EXPORT CoreLib
-{
-public:
-	CoreLib();
-	~CoreLib();
-
-	static CoreLib*	Inst();
-#ifndef NV_ARTISTTOOLS
-	int CoreMain(int argc, char *argv[]);
-#else
-	int CoreMain(int argc, char *argv[], bool withPlugin = true);
-
-	bool CoreLib_RunApp();
-	void LoadPlugins(QApplication& app);
-	PluginInterface* GetPluginInterface(QString name);
-
-	bool GetBoneNames(std::vector<std::string>& BoneNames);
-	bool MainToolbar_updateValues();
-
-	bool CurveEditor_updateValues(int _paramId, float* _values);
-	bool CurveEditor_onUpdateValues(int _paramId, float* _values);
-
-	bool DisplayMeshesPanel_updateValues();
-	bool DisplayMeshesPanel_EmitToggleSignal(unsigned int id, bool visible);
-
-	bool Camera_LoadParameters(void* ptr, Camera* pCamera);
-	bool Camera_SaveParameters(void* ptr, Camera* pCamera);
-	bool Light_loadParameters(NvParameterized::Handle& handle, Light* pLight);
-	bool Light_saveParameters(NvParameterized::Handle& handle, Light* pLight);
-
-	bool Gamepad_ToggleSimulation();
-	bool Gamepad_LoadSamples(QString fn);
-	bool Gamepad_ResetScene();
-	bool Gamepad_PlaySample();
-	bool GamepadHandler_ShowHair();
-	bool GamepadHandler_SpinWindStrength(float windStrength);
-	bool Gamepad_ResetAnimation();
-	bool Gamepad_PlayPauseAnimation();
-
-	void SimpleScene_OpenFilesByDrop(const QStringList& fileNames);
-	bool SimpleScene_SimpleScene();
-	bool SimpleScene_Initialize(int backdoor);
-	bool SimpleScene_Shutdown();
-	bool SimpleScene_Clear();
-	bool SimpleScene_Draw_DX12();
-	bool SimpleScene_Draw_DX11();
-	bool SimpleScene_FitCamera(atcore_float3& center, atcore_float3& extents);
-	bool SimpleScene_ResetUpDir(bool zup);
-	bool SimpleScene_UpdateCamera();
-	bool SimpleScene_DrawGround();
-	bool SimpleScene_DrawWind();
-	bool SimpleScene_DrawAxis();
-	bool SimpleScene_LoadSceneFromFbx(const char* dir, const char* fbxName);
-	bool SimpleScene_LoadProject(const char* dir, const char* file);
-	bool SimpleScene_SaveProject(const char* dir, const char* file);
-	bool SimpleScene_LoadParameters(NvParameterized::Interface* iface);
-	bool SimpleScene_SaveParameters(NvParameterized::Interface* iface);
-	bool SimpleScene_LoadCameraBookmarks(NvParameterized::Interface* iface);
-	bool SimpleScene_SaveCameraBookmarks(NvParameterized::Interface* iface);
-	
-	bool D3DWidget_resizeEvent(QResizeEvent* e);
-	bool D3DWidget_paintEvent(QPaintEvent* e);
-	bool D3DWidget_mousePressEvent(QMouseEvent* e);
-	bool D3DWidget_mouseReleaseEvent(QMouseEvent* e);
-	bool D3DWidget_mouseMoveEvent(QMouseEvent* e);
-	bool D3DWidget_wheelEvent(QWheelEvent * e);
-	bool D3DWidget_keyPressEvent(QKeyEvent* e);
-	bool D3DWidget_keyReleaseEvent(QKeyEvent* e);
-	bool D3DWidget_dragEnterEvent(QDragEnterEvent *e);
-	bool D3DWidget_dragMoveEvent(QDragMoveEvent *e);
-	bool D3DWidget_dragLeaveEvent(QDragLeaveEvent *e);
-	bool D3DWidget_dropEvent(QDropEvent *e);
-	bool D3DWidget_contextMenuEvent(QContextMenuEvent *e);
-
-	bool D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap);
-
-	bool AppMainWindow_AppMainWindow();
-	bool AppMainWindow_InitMenuItems(QMenuBar* pMenuBar);
-	bool AppMainWindow_InitMainTab(QWidget *displayScrollAreaContents, QVBoxLayout *displayScrollAreaLayout, int idx);
-	bool AppMainWindow_InitPluginTab(QTabWidget* pTabWidget);
-	bool AppMainWindow_InitUI();
-	bool AppMainWindow_updateUI();
-	bool AppMainWindow_updatePluginUI();
-	bool AppMainWindow_processDragAndDrop(QString fname);
-	bool AppMainWindow_closeEvent(QCloseEvent *event);
-	bool AppMainWindow_InitToolbar(QWidget *pQWidget, QVBoxLayout* pLayout);
-	bool AppMainWindow_shortcut_expert(bool mode);
-	bool AppMainWindow_updateMainToolbar();
-
-	bool menu_item_triggered(QAction* action);
-	bool AppMainWindow_menu_about();
-	bool AppMainWindow_menu_opendoc();
-#if USE_CURVE_EDITOR
-	bool AppMainWindow_UpdateCurveEditor();
-	bool AppMainWindow_ShowCurveEditor(int paramId);
-	bool AppMainWindow_onCurveAttributeChanged(nvidia::CurveEditor::CurveAttribute* attribute);
-	bool AppMainWindow_onColorAttributeChanged(nvidia::CurveEditor::ColorAttribute* attribute);
-	bool AppMainWindow_onReloadColorAttributeTexture(nvidia::CurveEditor::ColorAttribute* attribute, bool reloadColorTex, int selectedCtrlPntIndex);
-#endif
-private:
-	std::map<QString, PluginInterface*> m_PluginInterfaces;
-#endif // NV_ARTISTTOOLS
-};
-
-#endif // CORELIB_H
diff --git a/tools/ArtistTools/source/CoreLib/Parameters/FoundationHolder.h b/tools/ArtistTools/source/CoreLib/Parameters/FoundationHolder.h
deleted file mode 100644
index 5ec7868..0000000
--- a/tools/ArtistTools/source/CoreLib/Parameters/FoundationHolder.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "NvErrorCallback.h"
-#include "NsGlobals.h"
-#include "NsVersionNumber.h"
-
-class DefaultErrorCallback : public nvidia::NvErrorCallback
-{
-public:
-	DefaultErrorCallback(void)
-	{
-	}
-
-	virtual void reportError(nvidia::NvErrorCode::Enum code, const char* message, const char* file, int line)
-	{
-		NV_UNUSED(code);
-		printf("PhysX: %s : %s : %d\r\n", message, file, line);
-	}
-private:
-};
-
-class DefaultAllocator : public nvidia::NvAllocatorCallback
-{
-public:
-	DefaultAllocator(void)
-	{
-	}
-
-	~DefaultAllocator(void)
-	{
-	}
-
-	virtual void* allocate(size_t size, const char* typeName, const char* filename, int line)
-	{
-		NV_UNUSED(typeName);
-		NV_UNUSED(filename);
-		NV_UNUSED(line);
-		void *ret = ::_aligned_malloc(size, 16);
-		return ret;
-	}
-
-	virtual void deallocate(void* ptr)
-	{
-		::_aligned_free(ptr);
-	}
-private:
-};
-
-
-#if 0
-class FoundationHolder
-{
-	NvFoundation* mFoundation;
-	FoundationHolder()
-		:mFoundation(nullptr)
-	{
-	}
-
-	~FoundationHolder()
-	{
-		if (mFoundation)
-		{
-			// to-do
-			// we should release foundation. but Hair SDK could release it first.
-			//mFoundation->release();
-			mFoundation = nullptr;
-		}
-	}
-
-public:
-
-	static NvFoundation* GetFoundation()
-	{
-		static FoundationHolder fh;
-		if (fh.mFoundation == nullptr)
-		{
-			static DefaultAllocator sDefaultAllocator;
-			static DefaultErrorCallback sDefaultErrorCallback;
-			fh.mFoundation = NvCreateFoundation(NV_FOUNDATION_VERSION, sDefaultAllocator, sDefaultErrorCallback);
-			assert(fh.mFoundation != nullptr);
-		}
-		return fh.mFoundation;
-	}
-};
-
-#else
-
-class FoundationHolder
-{
-	bool m_isInitialized;
-	public:
-	static void GetFoundation()
-	{
-		static FoundationHolder s_holder;
-		if (!s_holder.m_isInitialized)
-		{
-			static DefaultAllocator sDefaultAllocator;
-			static DefaultErrorCallback sDefaultErrorCallback;
-			nvidia::shdfnd::initializeSharedFoundation(NV_FOUNDATION_VERSION, sDefaultAllocator, sDefaultErrorCallback);
-
-			s_holder.m_isInitialized = true;
-		}
-	}
-	~FoundationHolder()
-	{
-		//nvidia::terminateSharedFoundation();
-	}
-};
-
-#endif
diff --git a/tools/ArtistTools/source/CoreLib/Parameters/HackNvParamBug.cpp b/tools/ArtistTools/source/CoreLib/Parameters/HackNvParamBug.cpp
deleted file mode 100644
index 2ee7769..0000000
--- a/tools/ArtistTools/source/CoreLib/Parameters/HackNvParamBug.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <string.h>
-
-int GetHackElementSize(const char* data)
-{
-	return 0;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Parameters/PlaylistParams.pl b/tools/ArtistTools/source/CoreLib/Parameters/PlaylistParams.pl
deleted file mode 100644
index a4618aa..0000000
--- a/tools/ArtistTools/source/CoreLib/Parameters/PlaylistParams.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	header =>
-	{
-		className => 'PlaylistParams',
-		implementStorage => 1,
-	
-		# Version history
-		# 0.0 Initial Version
-		classVersion => '0.0',
-
-		hints =>
-		{
-		},
-	},
-
-	structs =>
-	[
-	],
-
-	parameters =>
-	[
-		{
-			name => 'blastProjFilePaths',
-			type => 'STRING',
-			isArray => 1,
-			arraySize => '-1',
-			hints =>
-			{
-				shortDescription => "BlastProj file paths",
-			},
-		},
-	]
-}
diff --git a/tools/ArtistTools/source/CoreLib/Parameters/go.bat b/tools/ArtistTools/source/CoreLib/Parameters/go.bat
deleted file mode 100644
index 600bf18..0000000
--- a/tools/ArtistTools/source/CoreLib/Parameters/go.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-SET SRC_ROOT=..\..\..\..\..
-SET EXTERNAL_ROOT=%SRC_ROOT%\..\..\external
-SET BUILDTOOL_ROOT=%SRC_ROOT%\..\..\external
-
-@if "%PERL%"=="" set PERL=%BUILDTOOL_ROOT%\perl\5.8.8_822\bin\perl
-@%PERL% %EXTERNAL_ROOT%\NvParameterized\1.1\trunk\build\scripts\GenParameterized.pl -force PlaylistParams.pl . .
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/PluginInterface.h b/tools/ArtistTools/source/CoreLib/PluginInterface.h
deleted file mode 100644
index a86bf4d..0000000
--- a/tools/ArtistTools/source/CoreLib/PluginInterface.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef BlastInterface_H
-#define BlastInterface_H
-
-#include <QtCore/QString>
-#include <QtCore/QObject>
-#if USE_CURVE_EDITOR
-#include <Attribute.h>
-#endif
-#include <Nv/NvBlastCommon.h>
-class QMenuBar;
-class QHBoxLayout;
-class QVBoxLayout;
-class QTabWidget;
-
-class Camera;
-class Light;
-enum RenderApi;
-namespace NvParameterized
-{
-	class Interface;
-	class Handle;
-}
-class D3D11RenderShader;
-class QCloseEvent;
-#define NV_AT_UNUSED
-
-class QResizeEvent;
-class QPaintEvent;
-class QMouseEvent;
-class QWheelEvent;
-class QKeyEvent;
-class QDragEnterEvent;
-class QDragMoveEvent;
-class QDragLeaveEvent;
-class QDropEvent;
-class QContextMenuEvent;
-class QAction;
-
-class PluginInterface
-{
-public:
-	virtual ~PluginInterface() {}
-
-	virtual QString GetPluginName() = 0;
-
-	virtual bool CoreLib_RunApp() = 0;
-
-	virtual bool LoadRenderPlugin(std::string api) = 0;
-
-	virtual bool GetBoneNames(std::vector<std::string>& BoneNames) = 0;
-
-	NV_AT_UNUSED virtual bool MainToolbar_updateValues() = 0;
-
-	NV_AT_UNUSED virtual bool CurveEditor_updateValues(int _paramId, float* _values) = 0;
-	NV_AT_UNUSED virtual bool CurveEditor_onUpdateValues(int _paramId, float* _values) = 0;
-
-	virtual bool DisplayMeshesPanel_updateValues() = 0;
-	virtual bool DisplayMeshesPanel_EmitToggleSignal(unsigned int id, bool visible) = 0;
-	
-	virtual bool Camera_LoadParameters(void* ptr, Camera* pCamera) = 0;
-	virtual bool Camera_SaveParameters(void * ptr, Camera* pCamera) = 0;
-
-	virtual bool Gamepad_ToggleSimulation() = 0;
-	virtual bool Gamepad_ResetScene() = 0;
-	NV_AT_UNUSED virtual bool Gamepad_LoadSamples(QString fn) = 0;
-	virtual bool Gamepad_PlaySample() = 0;
-	virtual bool GamepadHandler_ShowHair() = 0;
-	virtual bool GamepadHandler_SpinWindStrength(float windStrength) = 0;
-	virtual bool Gamepad_ResetAnimation() = 0;
-	virtual bool Gamepad_PlayPauseAnimation() = 0;
-	
-	virtual bool Light_loadParameters(NvParameterized::Handle& handle, Light* pLight) = 0;
-	virtual bool Light_saveParameters(NvParameterized::Handle& handle, Light* pLight) = 0;
-
-	virtual void SimpleScene_OpenFilesByDrop(const QStringList& fileNames) = 0;
-	virtual bool SimpleScene_SimpleScene() = 0;
-	virtual bool SimpleScene_Initialize(int backdoor) = 0;
-	virtual bool SimpleScene_Shutdown() = 0;
-	virtual bool SimpleScene_Clear() = 0;
-	virtual bool SimpleScene_Draw_DX12() = 0;
-	virtual bool SimpleScene_Draw_DX11() = 0;
-	virtual bool SimpleScene_FitCamera(atcore_float3& center, atcore_float3& extents) = 0;
-	virtual bool SimpleScene_ResetUpDir(bool zup) = 0;
-	virtual bool SimpleScene_UpdateCamera() = 0;
-	virtual bool SimpleScene_LoadSceneFromFbx(const char* dir, const char* fbxName) = 0;
-	virtual bool SimpleScene_LoadProject(const char* dir, const char* file) = 0;
-	virtual bool SimpleScene_SaveProject(const char* dir, const char* file) = 0;
-	virtual bool SimpleScene_LoadParameters(NvParameterized::Interface* iface) = 0;
-	virtual bool SimpleScene_SaveParameters(NvParameterized::Interface* iface) = 0;
-	virtual bool SimpleScene_LoadCameraBookmarks(NvParameterized::Interface* iface) = 0;
-	virtual bool SimpleScene_SaveCameraBookmarks(NvParameterized::Interface* iface) = 0;
-	NV_AT_UNUSED virtual bool SimpleScene_DrawGround() = 0;
-	NV_AT_UNUSED virtual bool SimpleScene_DrawWind() = 0;
-	NV_AT_UNUSED virtual bool SimpleScene_DrawAxis() = 0;
-
-	virtual bool D3DWidget_resizeEvent(QResizeEvent* e) = 0;
-	virtual bool D3DWidget_paintEvent(QPaintEvent* e) = 0;
-	virtual bool D3DWidget_mousePressEvent(QMouseEvent* e) = 0;
-	virtual bool D3DWidget_mouseReleaseEvent(QMouseEvent* e) = 0;
-	virtual bool D3DWidget_mouseMoveEvent(QMouseEvent* e) = 0;
-	virtual bool D3DWidget_wheelEvent(QWheelEvent * e) = 0;
-	virtual bool D3DWidget_keyPressEvent(QKeyEvent* e) = 0;
-	virtual bool D3DWidget_keyReleaseEvent(QKeyEvent* e) = 0;
-	virtual bool D3DWidget_dragEnterEvent(QDragEnterEvent *e) = 0;
-	virtual bool D3DWidget_dragMoveEvent(QDragMoveEvent *e) = 0;
-	virtual bool D3DWidget_dragLeaveEvent(QDragLeaveEvent *e) = 0;
-	virtual bool D3DWidget_dropEvent(QDropEvent *e) = 0;
-	virtual bool D3DWidget_contextMenuEvent(QContextMenuEvent *e) = 0;
-
-	virtual bool D3D11Shaders_InitializeShadersD3D11(std::map<int, D3D11RenderShader*>& ShaderMap) = 0;
-
-	virtual bool AppMainWindow_AppMainWindow() = 0;
-	virtual bool AppMainWindow_InitMenuItems(QMenuBar* pMenuBar) = 0;
-	virtual bool AppMainWindow_InitMainTab(QWidget *displayScrollAreaContents, QVBoxLayout *displayScrollAreaLayout, int idx) = 0;
-	virtual bool AppMainWindow_InitPluginTab(QTabWidget* pTabWidget) = 0;
-	virtual bool AppMainWindow_InitUI() = 0;
-	virtual bool AppMainWindow_updateUI() = 0;
-	virtual bool AppMainWindow_updatePluginUI() = 0;
-	NV_AT_UNUSED virtual bool AppMainWindow_processDragAndDrop(QString fname) = 0;
-	virtual bool AppMainWindow_closeEvent(QCloseEvent *event) = 0;
-	virtual bool AppMainWindow_InitToolbar(QWidget *pQWidget, QVBoxLayout* pLayout) = 0;
-	virtual bool AppMainWindow_shortcut_expert(bool mode) = 0;
-	virtual bool AppMainWindow_updateMainToolbar() = 0;
-
-	virtual bool AppMainWindow_menu_item_triggered(QAction* action) = 0;
-	virtual bool AppMainWindow_menu_about() = 0;
-	virtual bool AppMainWindow_menu_opendoc() = 0;
-#if USE_CURVE_EDITOR
-	virtual bool AppMainWindow_UpdateCurveEditor() = 0;
-	virtual bool AppMainWindow_ShowCurveEditor(int paramId) = 0;
-	virtual bool AppMainWindow_onCurveAttributeChanged(nvidia::CurveEditor::CurveAttribute* attribute) = 0;
-	virtual bool AppMainWindow_onColorAttributeChanged(nvidia::CurveEditor::ColorAttribute* attribute) = 0;
-	virtual bool AppMainWindow_onReloadColorAttributeTexture(nvidia::CurveEditor::ColorAttribute* attribute, bool reloadColorTex, int selectedCtrlPntIndex) = 0;
-#endif
-};
-
-QT_BEGIN_NAMESPACE
-#define PluginInterface_iid "com.nvidia.PluginInterface"
-Q_DECLARE_INTERFACE(PluginInterface, PluginInterface_iid)
-QT_END_NAMESPACE
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Buffer.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Buffer.cpp
deleted file mode 100644
index 4e261f1..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Buffer.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D11Buffer.h"
-
-// shared path
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Buffer.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Buffer.h
deleted file mode 100644
index d9d9730..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Buffer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "RenderResources.h"
-
-#include "d3d11.h"
-
-// GPU resources for texture 
-struct GPUBufferD3D11 : public GPUBufferResource
-{
-	ID3D11Buffer*	m_pD3D11Resource;
-
-public:
-	static GPUBufferResource* Create(ID3D11Buffer* pResource) { 
-		GPUBufferD3D11* pBuffer = new GPUBufferD3D11; 
-		pBuffer->m_pD3D11Resource = pResource;
-		return pBuffer;
-	}
-
-	static ID3D11Buffer* GetResource(GPUBufferResource* pBuffer)
-	{
-		GPUBufferD3D11* pD3D11Buffer = dynamic_cast<GPUBufferD3D11*>(pBuffer);
-		if (!pD3D11Buffer)
-			return 0;
-		return pD3D11Buffer->m_pD3D11Resource;
-	}
-
-	~GPUBufferD3D11()
-	{
-		Release();
-	}
-
-	void Release()
-	{
-		SAFE_RELEASE(m_pD3D11Resource);
-	}
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11GPUProfiler.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11GPUProfiler.cpp
deleted file mode 100644
index 060a0cb..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11GPUProfiler.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D11GPUProfiler.h"
-
-#include "D3D11RenderInterface.h"
-
-///////////////////////////////////////////////////////////////
-// factory function to create D3D11 GPU profiler
-/*
-GPUProfiler* GPUProfiler::CreateD3D11()
-{
-	GPUProfiler* pProfiler = new D3D11GPUProfiler;
-	pProfiler->Initialize();
-	return pProfiler;
-}
-*/
-///////////////////////////////////////////////////////////////
-D3D11GPUProfiler::~D3D11GPUProfiler()
-{
-	Release();
-}
-
-///////////////////////////////////////////////////////////////
-void D3D11GPUProfiler::Initialize()
-{
-	ID3D11Device *pDevice = RenderInterfaceD3D11::GetDevice();
-	
-	m_pContext = RenderInterfaceD3D11::GetDeviceContext();
-
-	D3D11_QUERY_DESC desc;
-	memset(&desc, 0, sizeof(D3D11_QUERY_DESC)); 
-	desc.Query = D3D11_QUERY_TIMESTAMP_DISJOINT;
-	desc.MiscFlags = 0;
-
-	pDevice->CreateQuery(&desc, &m_pQueryDisjoint);
-
-	desc.Query = D3D11_QUERY_TIMESTAMP;
-
-	for (int i = 0; i < MAX_QUERY_COUNT; i++)
-	{
-		pDevice->CreateQuery(&desc, &m_pQueryStart[i]);
-		pDevice->CreateQuery(&desc, &m_pQueryEnd[i]);
-	}
-	m_enable = true;
-}
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(x) { if (x) x->Release(); x = 0; }
-#endif
-
-///////////////////////////////////////////////////////////////
-void D3D11GPUProfiler::Release()
-{
-	for (int i = 0; i < MAX_QUERY_COUNT; i++)
-	{
-		SAFE_RELEASE(m_pQueryStart[i]);
-		SAFE_RELEASE(m_pQueryEnd[i]);
-	}
-
-	SAFE_RELEASE(m_pQueryDisjoint);
-}
-
-///////////////////////////////////////////////////////////////
-void D3D11GPUProfiler::StartProfile(int id)
-{
-	if (!m_enable) return;
-
-	ID3D11Query* pQuery = m_pQueryStart[id];	
-	m_pContext->End(pQuery);
-}
-
-///////////////////////////////////////////////////////////////
-void D3D11GPUProfiler::EndProfile(int id)
-{
-	if (!m_enable) return;
-
-	ID3D11Query* pQuery = m_pQueryEnd[id];	
-	m_pContext->End(pQuery);
-}
-
-///////////////////////////////////////////////////////////////
-void D3D11GPUProfiler::StartFrame()
-{
-	if (!m_enable) return;
-
-	m_pContext->Begin(m_pQueryDisjoint);
-}
-
-///////////////////////////////////////////////////////////////
-void D3D11GPUProfiler::EndFrame()
-{
-	if (!m_enable) return;
-
-	m_pContext->End(m_pQueryDisjoint);
-		
-	while(m_pContext->GetData(m_pQueryDisjoint, &m_disjointData, sizeof(D3D11_QUERY_DATA_TIMESTAMP_DISJOINT), 0) != S_OK);
-}
-
-///////////////////////////////////////////////////////////////
-float D3D11GPUProfiler::GetProfileData(int id)
-{
-	if (!m_enable) 
-		return 0.0f;
-
-	UINT64 startTime = 0;
-	while(m_pContext->GetData(m_pQueryStart[id], &startTime, sizeof(UINT64), 0) != S_OK);
-
-	UINT64 endTime = 0;
-	while(m_pContext->GetData(m_pQueryEnd[id], &endTime, sizeof(UINT64), 0) != S_OK);
-
-	float frequency = static_cast<float>(m_disjointData.Frequency);
-	return (endTime - startTime) / frequency * 1000.0f;
-}
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11GPUProfiler.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11GPUProfiler.h
deleted file mode 100644
index 4c5b32f..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11GPUProfiler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "d3d11.h"
-
-#include "GPUProfiler.h"
-
-#define MAX_QUERY_COUNT 64
-struct D3D11GPUProfiler : public GPUProfiler
-{
-public:
-	~D3D11GPUProfiler();
-
-	void Initialize();
-	void Release();
-	void StartProfile(int id);
-	void EndProfile(int id);
-	void StartFrame();
-	void EndFrame();
-	float GetProfileData(int id);
-
-protected:
-	ID3D11Query*	m_pQueryDisjoint;
-	ID3D11Query*	m_pQueryStart[MAX_QUERY_COUNT];
-	ID3D11Query*	m_pQueryEnd[MAX_QUERY_COUNT];
-	D3D11_QUERY_DATA_TIMESTAMP_DISJOINT m_disjointData;
-	ID3D11DeviceContext* m_pContext;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderInterface.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderInterface.cpp
deleted file mode 100644
index 292de1a..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderInterface.cpp
+++ /dev/null
@@ -1,910 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D11RenderInterface.h"
-
-#include "D3D11TextureResource.h"
-#include "D3D11Shaders.h"
-#include "D3D11Buffer.h"
-#include "Nv.h"
-#ifdef USE_11ON12_WRAPPER
-#include "D3D11on12Wrapper.h"
-#endif // USE_11ON12_WRAPPER
-namespace RenderInterfaceD3D11
-{
-	using namespace RenderInterface;
-
-	ID3D11SamplerState*			m_pSamplerStates[SAMPLER_TYPE_END];
-	ID3D11BlendState*			m_pBlendStates[BLEND_STATE_END];
-	ID3D11DepthStencilState*	m_pDepthStencilStates[DEPTH_STENCIL_STATE_END];
-	ID3D11RasterizerState*		m_pRasterizerStates[RASTERIZER_STATE_END];
-
-#ifdef USE_11ON12_WRAPPER
-#else
-	ID3D11DeviceContext*		g_d3dDeviceContext = 0;
-	ID3D11Device*				g_d3dDevice = 0;
-	IDXGIFactory1*				g_pDXGIFactory1 = 0;
-	IDXGIDevice*				g_dxgiDevice = 0;
-	IDXGIAdapter *				g_pAdapter = 0;
-#endif // USE_11ON12_WRAPPER
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-ID3D11DeviceContext* GetDeviceContext()
-{
-#ifdef USE_11ON12_WRAPPER
-	return D3D11on12Wrapper::GetDeviceContext();
-#else
-	return g_d3dDeviceContext;
-#endif // USE_11ON12_WRAPPER
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-ID3D11Device* GetDevice()
-{
-#ifdef USE_11ON12_WRAPPER
-	return D3D11on12Wrapper::GetDevice11();
-#else
-	return g_d3dDevice;
-#endif // USE_11ON12_WRAPPER
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-IDXGIFactory1* GetDXGIFactory()
-{
-#ifdef USE_11ON12_WRAPPER
-	return D3D11on12Wrapper::GetDXGIFactory();
-#else
-	return g_pDXGIFactory1;
-#endif // USE_11ON12_WRAPPER
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-IDXGIDevice* GetDXGIDevice()
-{
-#ifdef USE_11ON12_WRAPPER
-	return nullptr;
-#else
-	return g_dxgiDevice;
-#endif // USE_11ON12_WRAPPER
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-IDXGIAdapter* GetAdapter()
-{
-#ifdef USE_11ON12_WRAPPER
-	return D3D11on12Wrapper::GetAdapter();
-#else
-	return g_pAdapter;
-#endif // USE_11ON12_WRAPPER
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool IsNvDeviceID(UINT id)
-{
-	return id == 0x10DE;
-}
-
-IDXGIAdapter* FindAdapter(IDXGIFactory* IDXGIFactory_0001, const WCHAR* targetName, bool& isNv)
-{
-	IDXGIAdapter* targetAdapter = nullptr;
-	std::vector<IDXGIAdapter*> adapters;
-	// check current adapter first. EnumAdapters could fail on some device 
-	IDXGIAdapter* pAdapter = nullptr;
-	ID3D11Device* pD3dDevice = nullptr;
-	ID3D11DeviceContext* pD3dDeviceContext = nullptr;
-	DWORD createDeviceFlags = D3D11_CREATE_DEVICE_DEBUG;
-	D3D_FEATURE_LEVEL fl;
-	// This following code is the robust way to get all possible feature levels while handling DirectX 11.0 systems:
-	// please read https://blogs.msdn.microsoft.com/chuckw/2014/02/05/anatomy-of-direct3d-11-create-device/
-	D3D_FEATURE_LEVEL lvl[] = { D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_11_0,
-		D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0,
-		D3D_FEATURE_LEVEL_9_3, D3D_FEATURE_LEVEL_9_2, D3D_FEATURE_LEVEL_9_1 };
-	HRESULT hr = D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr,
-		createDeviceFlags, lvl, _countof(lvl),
-		D3D11_SDK_VERSION, &pD3dDevice, &fl, &pD3dDeviceContext);
-	if (pD3dDevice)
-	{
-		IDXGIDevice* dxgiDevice = nullptr;
-		hr = pD3dDevice->QueryInterface(__uuidof(IDXGIDevice), reinterpret_cast<void**>(&dxgiDevice));
-		if (SUCCEEDED(hr))
-		{
-			hr = dxgiDevice->GetAdapter(&pAdapter);
-			if (pAdapter)
-			{
-				adapters.push_back(pAdapter);
-			}
-			SAFE_RELEASE(dxgiDevice);
-		}
-		SAFE_RELEASE(pD3dDeviceContext);
-		SAFE_RELEASE(pD3dDevice);
-	}
-
-	// Enum Adapters
-	unsigned int adapterNo = 0;
-	HRESULT hres = S_OK;
-	while (SUCCEEDED(hres = IDXGIFactory_0001->EnumAdapters(adapterNo, (IDXGIAdapter**)&pAdapter)))
-	{
-		adapters.push_back(pAdapter);
-		adapterNo++;
-	}
-	if (wcslen(targetName) != 0)
-	{
-		// find the adapter with specified name
-		for (int i = 0; i < adapters.size(); ++i)
-		{
-			IDXGIAdapter* pAdapter = adapters[i];
-			DXGI_ADAPTER_DESC aDesc;
-			pAdapter->GetDesc(&aDesc);
-			std::wstring aName = aDesc.Description;
-			if (aName.find(targetName) != std::string::npos)
-			{
-				targetAdapter = pAdapter;
-				isNv = IsNvDeviceID(aDesc.VendorId);
-			}
-		}
-	}
-	else
-	{
-		// no name specified, find one NV adapter
-		for (int i = 0; i < adapters.size(); ++i)
-		{
-			IDXGIAdapter* pAdapter = adapters[i];
-			DXGI_ADAPTER_DESC aDesc;
-			pAdapter->GetDesc(&aDesc);
-			std::wstring aName = aDesc.Description;
-			if (IsNvDeviceID(aDesc.VendorId))
-			{
-				targetAdapter = pAdapter;
-				isNv = true;
-			}
-		}
-	}
-	if (targetAdapter == nullptr)
-		targetAdapter = adapters[0];
-	for (int i = 0; i < adapters.size(); ++i)
-	{
-		IDXGIAdapter* pAdapter = adapters[i];
-		if(pAdapter != targetAdapter)
-		{
-			pAdapter->Release();
-		}
-	}
-
-	return targetAdapter;
-}
-
-HRESULT UseGoodGPUDevice()
-{
-#ifdef USE_11ON12_WRAPPER
-	return S_OK;
-#else
-	// create factory
-	if (g_pDXGIFactory1 == NV_NULL)
-	{
-		HRESULT hr = CreateDXGIFactory(__uuidof(IDXGIFactory), (void**)(&g_pDXGIFactory1));
-		if (FAILED(hr))
-			return hr;
-	}
-
-	DWORD createDeviceFlags = D3D11_CREATE_DEVICE_SINGLETHREADED; // 0;  // I changed only this line.
-#ifdef _DEBUG
-	createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG;
-#endif
-	bool bNVAdapter = false;
-	WCHAR* pwName = L"";
-	g_pAdapter = FindAdapter(g_pDXGIFactory1, pwName, bNVAdapter);
-
-#ifdef _DEBUG
-	DXGI_ADAPTER_DESC adapterDesc;
-	g_pAdapter->GetDesc(&adapterDesc);
-	std::wstring adapterName = adapterDesc.Description;
-#endif
-
-	D3D_FEATURE_LEVEL fl = D3D_FEATURE_LEVEL_9_1;
-	HRESULT hr = 0;
-
-	hr = D3D11CreateDevice(g_pAdapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
-		createDeviceFlags, 0, 0,
-		D3D11_SDK_VERSION, &g_d3dDevice, &fl, &g_d3dDeviceContext);
-
-	if (g_d3dDevice == nullptr)
-	{
-		// here is the codes to make it run on a WARP device(Windows DirectX CPU - based emulation).
-		if (g_pAdapter)
-		{
-			g_pAdapter->Release();
-			g_pAdapter = nullptr;
-		}
-		hr = D3D11CreateDevice(g_pAdapter, D3D_DRIVER_TYPE_WARP, nullptr,
-			createDeviceFlags, 0, 0,
-			D3D11_SDK_VERSION, &g_d3dDevice, &fl, &g_d3dDeviceContext);
-	}
-
-	if(g_d3dDevice)
-	{
-		IDXGIDevice* dxgiDevice = nullptr;
-		hr = g_d3dDevice->QueryInterface(__uuidof(IDXGIDevice), reinterpret_cast<void**>(&dxgiDevice));
-		if (SUCCEEDED(hr))
-		{
-			g_dxgiDevice = dxgiDevice;
-			if (g_pAdapter == nullptr)
-			{
-				// when running on WARP device, need find out adapter.
-				hr = dxgiDevice->GetAdapter(&g_pAdapter);
-			}
-			return hr;
-		}
-		else
-		{
-			SAFE_RELEASE(g_d3dDevice);
-			SAFE_RELEASE(g_pAdapter);
-			SAFE_RELEASE(g_pDXGIFactory1);
-		}
-	}
-	return hr;
-#endif // USE_11ON12_WRAPPER
-}
-
-bool InitDevice(int deviceID)
-{
-#ifdef USE_11ON12_WRAPPER
-	D3D11on12Wrapper::InitDevice();
-#else
-	if (deviceID == -1)
-	{
-		HRESULT hResult = UseGoodGPUDevice();
-		if (FAILED(hResult))
-			return false;
-
-		return true;
-	}
-
-	D3D_FEATURE_LEVEL featureLvl;
-
-	// create factory
-	if (g_pDXGIFactory1 == NV_NULL)
-	{
-		HRESULT hr = CreateDXGIFactory(__uuidof(IDXGIFactory), (void**)(&g_pDXGIFactory1));
-		if (FAILED(hr))
-			return false;
-	}
-
-	// create adapter for selected device
-	if (g_pAdapter == NV_NULL)
-	{
-		HRESULT hr = g_pDXGIFactory1->EnumAdapters(deviceID, &g_pAdapter);
-		if (FAILED(hr))
-			return false;
-	}
-
-	UINT deviceFlags = D3D11_CREATE_DEVICE_SINGLETHREADED;
-#ifdef _DEBUG
-	deviceFlags |= D3D11_CREATE_DEVICE_DEBUG;
-#endif
-	
-	// create device
-	HRESULT hResult = D3D11CreateDevice(
-		g_pAdapter,
-		D3D_DRIVER_TYPE_UNKNOWN, //D3D_DRIVER_TYPE_HARDWARE, 
-		0, 
-		deviceFlags, 
-		NV_NULL,
-		0, 
-		D3D11_SDK_VERSION, 
-		&g_d3dDevice, 
-		&featureLvl, 
-		&g_d3dDeviceContext);
-	
-	if(FAILED(hResult)) 
-		return false;
-#endif // USE_11ON12_WRAPPER
-
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Initialize()
-{
-	if (!GetDevice() || !GetDeviceContext())
-		return false;
-
-	D3D11_COMPARISON_FUNC depthFunc = D3D11_COMPARISON_LESS;
-
-	InitializeShadersD3D11();
-	InitializeRenderStates();
-	
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void Shutdown()
-{
-	DestroyShadersD3D11();
-	ClearRenderStates();
-
-	// release d3d resources
-	IDXGIFactory1* pDxgiFactory = GetDXGIFactory();
-	SAFE_RELEASE(pDxgiFactory);
-
-	IDXGIAdapter* pAdapter = GetAdapter();
-	SAFE_RELEASE(pAdapter);
-
-	IDXGIDevice* pDXGIDevice = GetDXGIDevice();
-	SAFE_RELEASE(pDXGIDevice);
-
-	ID3D11DeviceContext* pContext = GetDeviceContext();
-	SAFE_RELEASE(pContext);
-
-	ID3D11Device* pDevice = GetDevice();
-#if defined(DEBUG) || defined(_DEBUG)
-	// output d3d leak
-	ID3D11Debug *d3dDebug;
-	HRESULT hr = pDevice->QueryInterface(__uuidof(ID3D11Debug), reinterpret_cast<void**>(&d3dDebug));
-	if (SUCCEEDED(hr))
-	{
-		hr = d3dDebug->ReportLiveDeviceObjects(D3D11_RLDO_DETAIL);
-	}
-	if (d3dDebug != nullptr)
-		d3dDebug->Release();
-#endif
-
-	SAFE_RELEASE(pDevice);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void InitializeRenderStates()
-{
-	ID3D11Device* pDevice = GetDevice();
-	if (!pDevice)
-		return;
-
-	/////////////////////////////////////////////////////////////////////////////////////////
-	// alpha blending state descriptors
-	/////////////////////////////////////////////////////////////////////////////////////////
-
-	// alpha blending enabled
-	{
-		D3D11_BLEND_DESC desc;
-		desc.AlphaToCoverageEnable = false;
-		desc.IndependentBlendEnable = false;
-
-		D3D11_RENDER_TARGET_BLEND_DESC &rtDesc = desc.RenderTarget[0];
-		{
-			rtDesc.BlendEnable		= true;
-			rtDesc.SrcBlend			= D3D11_BLEND_SRC_ALPHA;
-			rtDesc.DestBlend		= D3D11_BLEND_INV_SRC_ALPHA;
-			rtDesc.BlendOp			= D3D11_BLEND_OP_ADD;
-			rtDesc.SrcBlendAlpha	= D3D11_BLEND_ZERO;
-			rtDesc.DestBlendAlpha	= D3D11_BLEND_ONE;
-			rtDesc.BlendOpAlpha		= D3D11_BLEND_OP_ADD;
-			rtDesc.RenderTargetWriteMask = 0x0f;
-		}
-		pDevice->CreateBlendState(&desc, &m_pBlendStates[BLEND_STATE_ALPHA]);
-	}
-
-	// no alpha blending
-	{
-		D3D11_BLEND_DESC desc;
-		desc.AlphaToCoverageEnable = false;
-		desc.IndependentBlendEnable = false;
-
-		D3D11_RENDER_TARGET_BLEND_DESC &rtDesc = desc.RenderTarget[0];
-		{
-			rtDesc.BlendEnable		= false;
-			rtDesc.SrcBlend			= D3D11_BLEND_SRC_ALPHA;
-			rtDesc.DestBlend		= D3D11_BLEND_INV_SRC_ALPHA;
-			rtDesc.BlendOp			= D3D11_BLEND_OP_ADD;
-			rtDesc.SrcBlendAlpha	= D3D11_BLEND_ZERO;
-			rtDesc.DestBlendAlpha	= D3D11_BLEND_ONE;
-			rtDesc.BlendOpAlpha		= D3D11_BLEND_OP_ADD;
-			rtDesc.RenderTargetWriteMask = 0x0f;
-		}
-		pDevice->CreateBlendState(&desc, &m_pBlendStates[BLEND_STATE_NONE]);
-	}
-	
-
-	//////////////////////////////////////////////////////////////////////////////////////////////
-	// depth and stencil
-	///////////////////////////////////////////////////////////////////////////////////////////////
-	D3D11_DEPTH_STENCIL_DESC depthTestDesc;
-	{
-		depthTestDesc.DepthEnable	= true;
-		depthTestDesc.DepthFunc		= D3D11_COMPARISON_LESS;
-		depthTestDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
-		depthTestDesc.StencilEnable = false;
-		depthTestDesc.StencilReadMask = 0xff;
-		depthTestDesc.StencilWriteMask = 0xff;
-	}
-
-	pDevice->CreateDepthStencilState(&depthTestDesc, &m_pDepthStencilStates[DEPTH_STENCIL_DEPTH_TEST]);
-
-	D3D11_DEPTH_STENCIL_DESC depthNone;
-	{
-		depthNone.DepthEnable	= false;
-		depthNone.DepthFunc		= D3D11_COMPARISON_LESS;
-		depthNone.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO;
-		depthNone.StencilEnable = false;
-		depthNone.StencilReadMask = 0xff;
-		depthNone.StencilWriteMask = 0xff;
-	}
-
-	pDevice->CreateDepthStencilState(&depthNone, &m_pDepthStencilStates[DEPTH_STENCIL_DEPTH_NONE]);
-
-	//////////////////////////////////////////////////////////////////////////////////////////////
-	// rasterizer
-	///////////////////////////////////////////////////////////////////////////////////////////////
-	D3D11_RASTERIZER_DESC rsDesc;
-
-	// solid cull front
-	{
-		rsDesc.FillMode	= D3D11_FILL_SOLID;
-		rsDesc.CullMode	= D3D11_CULL_FRONT;
-		rsDesc.AntialiasedLineEnable = false;
-		rsDesc.MultisampleEnable = true;
-		rsDesc.FrontCounterClockwise = true;
-		rsDesc.DepthBias = 10;
-		rsDesc.DepthBiasClamp = 0;
-		rsDesc.SlopeScaledDepthBias = 0;
-		rsDesc.DepthClipEnable = true;
-		rsDesc.ScissorEnable = 0;
-
-		pDevice->CreateRasterizerState(&rsDesc, &m_pRasterizerStates[RASTERIZER_STATE_FILL_CULL_FRONT]);
-	};
-
-	// solid cull back
-	{
-		rsDesc.FillMode	= D3D11_FILL_SOLID;
-		rsDesc.CullMode	= D3D11_CULL_BACK;
-		rsDesc.AntialiasedLineEnable = false;
-		rsDesc.MultisampleEnable = true;
-		rsDesc.FrontCounterClockwise = true;
-		rsDesc.DepthBias = 10;
-		rsDesc.DepthBiasClamp = 0;
-		rsDesc.SlopeScaledDepthBias = 0;
-		rsDesc.DepthClipEnable = true;
-		rsDesc.ScissorEnable = 0;
-
-		pDevice->CreateRasterizerState(&rsDesc, &m_pRasterizerStates[RASTERIZER_STATE_FILL_CULL_BACK]);
-	}
-
-	// solid cull none
-	{
-		rsDesc.FillMode	= D3D11_FILL_SOLID;
-		rsDesc.CullMode	= D3D11_CULL_NONE;
-		rsDesc.AntialiasedLineEnable = false;
-		rsDesc.MultisampleEnable = true;
-		rsDesc.FrontCounterClockwise = true;
-		rsDesc.DepthBias = 10;
-		rsDesc.DepthBiasClamp = 0;
-		rsDesc.SlopeScaledDepthBias = 0;
-		rsDesc.DepthClipEnable = true;
-		rsDesc.ScissorEnable = 0;
-
-		pDevice->CreateRasterizerState(&rsDesc, &m_pRasterizerStates[RASTERIZER_STATE_FILL_CULL_NONE]);
-
-	}
-
-	// wireframe cull none
-	{
-		rsDesc.FillMode	= D3D11_FILL_WIREFRAME;
-		rsDesc.CullMode	= D3D11_CULL_NONE;
-		rsDesc.AntialiasedLineEnable = false;
-		rsDesc.MultisampleEnable = true;
-		rsDesc.FrontCounterClockwise = 0;
-		rsDesc.DepthBias = 0;
-		rsDesc.DepthBiasClamp = 0;
-		rsDesc.SlopeScaledDepthBias = 0;
-		rsDesc.DepthClipEnable = true;
-		rsDesc.ScissorEnable = 0;
-	};
-
-	pDevice->CreateRasterizerState(&rsDesc, &m_pRasterizerStates[RASTERIZER_STATE_WIRE]);
-
-	// samplers
-
-	D3D11_SAMPLER_DESC linearSamplerDesc[1] = { 
-		D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT, 
-		D3D11_TEXTURE_ADDRESS_WRAP, 
-		D3D11_TEXTURE_ADDRESS_WRAP, 
-		D3D11_TEXTURE_ADDRESS_WRAP, 
-		0.0, 0, D3D11_COMPARISON_NEVER, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, D3D11_FLOAT32_MAX,
-	};
-	pDevice->CreateSamplerState(linearSamplerDesc, &m_pSamplerStates[SAMPLER_TYPE_LINEAR]);
-
-	// create point clamp sampler for PCF sampling for hair
-	D3D11_SAMPLER_DESC pointClampSamplerDesc[1] = { 
-		D3D11_FILTER_MIN_MAG_MIP_POINT,
-		D3D11_TEXTURE_ADDRESS_CLAMP, 
-		D3D11_TEXTURE_ADDRESS_CLAMP, 
-		D3D11_TEXTURE_ADDRESS_CLAMP, 
-		0.0, 0, D3D11_COMPARISON_NEVER,
-		0.0f, 0.0f, 0.0f, 0.0f,
-		0.0f, D3D11_FLOAT32_MAX,
-	};
-	pDevice->CreateSamplerState(pointClampSamplerDesc, &m_pSamplerStates[SAMPLER_TYPE_POINTCLAMP]);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void ClearRenderStates()
-{
-	for (int i = 0; i < RASTERIZER_STATE_END; i++)
-		SAFE_RELEASE(m_pRasterizerStates[i]);
-
-	for (int i = 0; i < DEPTH_STENCIL_STATE_END; i++)
-		SAFE_RELEASE(m_pDepthStencilStates[i]);
-
-	for (int i = 0; i < SAMPLER_TYPE_END; i++)
-		SAFE_RELEASE(m_pSamplerStates[i]);
-
-	for (int i = 0; i < BLEND_STATE_END; i++)
-		SAFE_RELEASE(m_pBlendStates[i]);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void BindVertexShaderResources( int startSlot, int numSRVs, ID3D11ShaderResourceView** ppSRVs)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	pDeviceContext->VSSetShaderResources( startSlot, numSRVs, ppSRVs);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void BindPixelShaderResources( int startSlot, int numSRVs, ID3D11ShaderResourceView** ppSRVs)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	pDeviceContext->PSSetShaderResources( startSlot, numSRVs, ppSRVs);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void BindVertexShaderResources( int startSlot, int numSRVs, GPUShaderResource** ppSRVs)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	for (int i = startSlot; i < (startSlot + numSRVs); i++)
-	{
-		ID3D11ShaderResourceView* pSRV = D3D11TextureResource::GetResource(ppSRVs[i]);
-		pDeviceContext->VSSetShaderResources( i, 1, &pSRV);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void BindPixelShaderResources( int startSlot, int numSRVs, GPUShaderResource** ppSRVs)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	for (int i = startSlot; i < (startSlot + numSRVs); i++)
-	{
-		ID3D11ShaderResourceView* pSRV = D3D11TextureResource::GetResource(ppSRVs[i]);
-		pDeviceContext->PSSetShaderResources( i, 1, &pSRV);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void ClearPixelShaderResources( int startSlot, int numSRVs)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	// clean up
-	ID3D11ShaderResourceView* ppSRVNull[128];
-	memset(&ppSRVNull, 0, sizeof(ID3D11ShaderResourceView*)*128);
-
-	pDeviceContext->PSSetShaderResources( startSlot, numSRVs, ppSRVNull);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void ClearVertexShaderResources( int startSlot, int numSRVs)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	// clean up
-	ID3D11ShaderResourceView* ppSRVNull[128];
-	memset(&ppSRVNull, 0, sizeof(ID3D11ShaderResourceView*)*128);
-
-	pDeviceContext->VSSetShaderResources( startSlot, numSRVs, ppSRVNull);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void ClearInputLayout()
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	pDeviceContext->IASetInputLayout(nullptr);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void SetPrimitiveTopologyTriangleStrip()
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	 pDeviceContext->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP );
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void SetPrimitiveTopologyTriangleList()
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	 pDeviceContext->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST );
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void SetPrimitiveTopologyLineList()
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	 pDeviceContext->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_LINELIST );
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void SetVertexBuffer(GPUBufferResource* pBuffer, UINT stride, UINT offset)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	ID3D11Buffer* pD3D11Buffer = GPUBufferD3D11::GetResource(pBuffer);
-	if (!pD3D11Buffer)
-		return;
-
-	pDeviceContext->IASetVertexBuffers( 0, 1, &pD3D11Buffer, &stride, &offset );
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void ApplySampler(int slot, RenderInterface::SAMPLER_TYPE st)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	pDeviceContext->PSSetSamplers(slot, 1, &m_pSamplerStates[st] );
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyDepthStencilState(DEPTH_STENCIL_STATE state)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	pDeviceContext->OMSetDepthStencilState(m_pDepthStencilStates[state], 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyRasterizerState(RASTERIZER_STATE state)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	pDeviceContext->RSSetState(m_pRasterizerStates[state]);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyBlendState(BLEND_STATE st)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	float zerov[] = {0,0,0,0};
-
-	pDeviceContext->OMSetBlendState(m_pBlendStates[st], zerov, 0xffffffff);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-void SetViewport(const RenderInterface::Viewport& vp)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	D3D11_VIEWPORT d3dViewport;
-
-	d3dViewport.TopLeftX = vp.TopLeftX;
-	d3dViewport.TopLeftY = vp.TopLeftY;
-
-	d3dViewport.Width = vp.Width;
-	d3dViewport.Height = vp.Height;
-
-	d3dViewport.MinDepth = vp.MinDepth;
-	d3dViewport.MaxDepth = vp.MaxDepth;
-
-	pDeviceContext->RSSetViewports(1, &d3dViewport);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-void GetViewport(RenderInterface::Viewport& vp)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	UINT numViewports = 1;
-	D3D11_VIEWPORT d3dViewport;
-	pDeviceContext->RSGetViewports(&numViewports, &d3dViewport);
-
-	vp.TopLeftX = d3dViewport.TopLeftX;
-	vp.TopLeftY = d3dViewport.TopLeftY;
-
-	vp.Width = d3dViewport.Width;
-	vp.Height = d3dViewport.Height;
-
-	vp.MinDepth = d3dViewport.MinDepth;
-	vp.MaxDepth = d3dViewport.MaxDepth;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void Draw(unsigned int vertexCount, unsigned int startCount)
-{
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	pDeviceContext->Draw(vertexCount, startCount);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// gpu buffer management
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-ID3D11Buffer* CreateD3D11Buffer( 
-	D3D11_USAGE Usage, UINT ByteWidth, UINT StructureByteStride, 
-	UINT BindFlags, UINT MiscFlags, 
-	UINT CPUAccessFlags, void *pSysMem)
-{
-	ID3D11Device* pDevice = RenderInterfaceD3D11::GetDevice();
-	if (!pDevice)
-		return 0;
-
-	D3D11_BUFFER_DESC desc;
-
-	desc.Usage					= Usage;
-	desc.ByteWidth				= ByteWidth;
-	desc.StructureByteStride	= StructureByteStride;
-	desc.BindFlags				= BindFlags;
-	desc.MiscFlags				= MiscFlags;
-	desc.CPUAccessFlags			= CPUAccessFlags;
-
-	D3D11_SUBRESOURCE_DATA InitData;
-	
-	InitData.pSysMem = pSysMem;
-	InitData.SysMemPitch = 0;
-	InitData.SysMemSlicePitch = 0;
-
-	ID3D11Buffer* pBuffer = 0;
-
-	HRESULT hr = pSysMem ? pDevice->CreateBuffer( &desc, &InitData, &pBuffer)
-		: pDevice->CreateBuffer( &desc, 0, &pBuffer);
-
-	if( FAILED(hr) )
-		return 0;
-
-	return pBuffer;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-ID3D11ShaderResourceView* 
-CreateD3D11ShaderResourceView( 
-	ID3D11Buffer*		pBuffer, 
-	DXGI_FORMAT			Format, 
-	D3D11_SRV_DIMENSION ViewDimension, 
-	UINT				NumElements,
-	UINT				FirstElement = 0
-	)
-{
-	ID3D11Device* pDevice = RenderInterfaceD3D11::GetDevice();
-	if (!pDevice)
-		return 0;
-
-	ID3D11ShaderResourceView* pSRV = 0;
-
-	D3D11_SHADER_RESOURCE_VIEW_DESC desc;
-	{
-		desc.Format                    = Format;
-		desc.ViewDimension             = ViewDimension;
-		desc.Buffer.FirstElement	   = FirstElement; 
-		desc.Buffer.NumElements        = NumElements; 
-	}
-
-	pDevice->CreateShaderResourceView( pBuffer, &desc, &pSRV);
-
-	return pSRV;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-GPUBufferResource* CreateVertexBuffer( 
-	unsigned int ByteWidth, void* pSysMem)
-{
-	ID3D11Buffer* pD3D11Buffer = CreateD3D11Buffer(D3D11_USAGE_DEFAULT,
-		ByteWidth, 0, D3D11_BIND_VERTEX_BUFFER, 0, 0, pSysMem);
-
-	return GPUBufferD3D11::Create(pD3D11Buffer);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-GPUShaderResource* CreateShaderResource( unsigned int stride, unsigned int numElements, void* pSysMem)
-{
-	unsigned int byteWidth = numElements * stride;
-
-	ID3D11Buffer* pBuffer = CreateD3D11Buffer( 
-		D3D11_USAGE_DEFAULT, byteWidth, 0,
-		D3D11_BIND_SHADER_RESOURCE, 0, 0, pSysMem);
-
-	// create SRV for bone indices
-	ID3D11ShaderResourceView* pSRV =  CreateD3D11ShaderResourceView(
-		pBuffer,
-		DXGI_FORMAT_R32G32B32A32_FLOAT, 
-		D3D11_SRV_DIMENSION_BUFFER, 
-		numElements);
-
-	SAFE_RELEASE(pBuffer); // dec ref count as this is not explicitly used later
-
-	return D3D11TextureResource::Create(pSRV);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// create read only shader resource buffer
-///////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-void CopyToDevice(
-	GPUBufferResource *pDevicePtr, 	void* pSysMem, 	unsigned int	ByteWidth)
-{
-	ID3D11Buffer* pBuffer = GPUBufferD3D11::GetResource(pDevicePtr);
-	if (!pBuffer)
-		return;
-
-	ID3D11DeviceContext* pDeviceContext = GetDeviceContext();
-	if (!pDeviceContext)
-		return;
-
-	pDeviceContext->UpdateSubresource(pBuffer, 0, NV_NULL, pSysMem, ByteWidth, 0);
-}
-
-} // end namespace
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderInterface.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderInterface.h
deleted file mode 100644
index e5f3c02..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderInterface.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "d3d11.h"
-
-#include "RenderInterface.h"
-
-#include "RenderPlugin.h"
-
-#ifdef NV_ARTISTTOOLS
-enum HAIR_SHADER_TYPE
-{
-	SHADER_TYPE_HAIR_SHADER_DEFAULT = RenderInterface::SHADER_TYPE_SIMPLE_COLOR + 1,
-	SHADER_TYPE_HAIR_SHADER_SHADOW,
-};
-#endif
-
-// abstract interface to D3D calls
-namespace RenderInterfaceD3D11
-{
-	CORERENDER_EXPORT bool InitDevice(int deviceID);
-	CORERENDER_EXPORT bool Initialize();
-	CORERENDER_EXPORT void Shutdown();
-
-	CORERENDER_EXPORT ID3D11DeviceContext* GetDeviceContext();
-	CORERENDER_EXPORT ID3D11Device* GetDevice();
-	IDXGIFactory1* GetDXGIFactory();
-	IDXGIAdapter* GetAdapter();
-
-	CORERENDER_EXPORT void InitializeRenderStates();
-	CORERENDER_EXPORT void ClearRenderStates();
-
-	CORERENDER_EXPORT void ApplySampler(int slot, RenderInterface::SAMPLER_TYPE st);
-	CORERENDER_EXPORT void ApplyDepthStencilState(RenderInterface::DEPTH_STENCIL_STATE st);
-	CORERENDER_EXPORT void ApplyRasterizerState(RenderInterface::RASTERIZER_STATE st);
-	CORERENDER_EXPORT void ApplyBlendState(RenderInterface::BLEND_STATE st);
-
-	CORERENDER_EXPORT void GetViewport(RenderInterface::Viewport& vp);
-	CORERENDER_EXPORT void SetViewport(const RenderInterface::Viewport& vp);
-
-	CORERENDER_EXPORT void BindVertexShaderResources( int startSlot, int numSRVs, GPUShaderResource** ppSRVs);
-	CORERENDER_EXPORT void BindPixelShaderResources( int startSlot, int numSRVs, GPUShaderResource** ppSRVs);
-
-	CORERENDER_EXPORT void ClearVertexShaderResources( int startSlot, int numSRVs);
-	CORERENDER_EXPORT void ClearPixelShaderResources( int startSlot, int numSRVs);
-
-	CORERENDER_EXPORT GPUBufferResource* CreateVertexBuffer( unsigned int ByteWidth, void* pSysMem);
-	CORERENDER_EXPORT GPUShaderResource* CreateShaderResource( unsigned int stride, unsigned int numElements, void* pSysMem );
-
-	CORERENDER_EXPORT void CopyToDevice(GPUBufferResource *pDevicePtr, void* pSysMem, unsigned int ByteWidth);
-
-	CORERENDER_EXPORT void ClearInputLayout();
-
-	CORERENDER_EXPORT void SetVertexBuffer(GPUBufferResource* pBuffer, UINT stride, UINT offset = 0);
-
-	CORERENDER_EXPORT void SetPrimitiveTopologyTriangleStrip();
-	CORERENDER_EXPORT void SetPrimitiveTopologyTriangleList();
-	CORERENDER_EXPORT void SetPrimitiveTopologyLineList();
-
-	
-	CORERENDER_EXPORT void Draw(unsigned int vertexCount, unsigned int startCount = 0);
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderShader.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderShader.cpp
deleted file mode 100644
index 3a4d27e..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderShader.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#include "D3D11RenderShader.h"
-
-#include "D3D11RenderInterface.h"
-#include "D3D11Wrapper.h"
-#include "Nv.h"
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(x) { if (x) x->Release(); }
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-D3D11RenderShader::D3D11RenderShader() :
-	m_pVertexShader(0),
-	m_pPixelShader(0),
-	m_pInputLayout(0)
-{
-	for (int i = 0; i < D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT; i++)
-	{
-		m_pParamBuffers[i] = nullptr;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-D3D11RenderShader::~D3D11RenderShader()
-{
-	SAFE_RELEASE(m_pVertexShader);
-	SAFE_RELEASE(m_pPixelShader);
-	SAFE_RELEASE(m_pInputLayout);
-
-	for (int i = 0; i < D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT; i++)
-		SAFE_RELEASE(m_pParamBuffers[i]);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-D3D11RenderShader* D3D11RenderShader::Create(
-	const char *name, 
-	void* pVSBlob, size_t vsBlobSize, 
-	void* pPSBlob, size_t psBlobSize, 
-	UINT  cbufferSize0,	UINT  cbufferSize1,
-	D3D11_INPUT_ELEMENT_DESC* pElemDesc, UINT numElements)
-{
-	D3D11RenderShader* pShader = new D3D11RenderShader;
-
-	pShader->CreateVSFromBlob(pVSBlob, vsBlobSize, pElemDesc, numElements);
-	pShader->CreatePSFromBlob(pPSBlob, psBlobSize);
-
-	if (cbufferSize0 > 0)
-	{
-		pShader->CreateParamBuffer(cbufferSize0, 0);
-		SET_D3D_DEBUG_NAME(pShader->getParamBuffer(0), name);
-	}
-
-	if (cbufferSize1 > 0)
-	{
-		pShader->CreateParamBuffer(cbufferSize1, 1);
-		SET_D3D_DEBUG_NAME(pShader->getParamBuffer(1), name);
-	}
-
-	if (pShader->getVertexShader())
-		SET_D3D_DEBUG_NAME(pShader->getVertexShader(), name);
-
-	if (pShader->getPixelShader())
-		SET_D3D_DEBUG_NAME(pShader->getPixelShader(), name);
-
-	if (pShader->getInputLayout())
-		SET_D3D_DEBUG_NAME(pShader->getInputLayout(), name);
-
-	return pShader;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool D3D11RenderShader::CreateVSFromBlob(
-	void* pBlob, size_t blobSize, 
-	D3D11_INPUT_ELEMENT_DESC *desc, int elemCount)
-{
-	ID3D11Device *pDevice = RenderInterfaceD3D11::GetDevice();
-	if (!pDevice)
-		return false;
-
-	if (!pBlob || (blobSize == 0))
-		return false;
-
-	SAFE_RELEASE(m_pVertexShader);
-	SAFE_RELEASE(m_pInputLayout);
-
-	HRESULT res = pDevice->CreateVertexShader(pBlob, blobSize, NV_NULL, &m_pVertexShader);
-
-	if(FAILED(res)) return false;
-
-	if (desc)
-	{
-		res = pDevice->CreateInputLayout(desc, elemCount, 
-			pBlob, blobSize, &m_pInputLayout);
-
-		if(FAILED(res)) return false;
-	}
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool D3D11RenderShader::CreatePSFromBlob(void* pBlob, size_t blobSize)
-{
-	ID3D11Device* pDevice = RenderInterfaceD3D11::GetDevice();
-	if (!pDevice)
-		return false;
-
-	if (!pBlob || (blobSize == 0))
-		return false;
-
-	SAFE_RELEASE(m_pPixelShader);
-
-	HRESULT res = pDevice->CreatePixelShader(pBlob, blobSize, NV_NULL, &m_pPixelShader);
-
-	if (FAILED(res)) 
-		return false;
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D11RenderShader::SetConstantBuffer()
-{
-	ID3D11DeviceContext* pContext = RenderInterfaceD3D11::GetDeviceContext();
-
-	//for (int i = 0; i < D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT; i++)
-	for (int i = 0; i < 2; i++)
-	{
-		pContext->PSSetConstantBuffers(i, 1, &m_pParamBuffers[i]);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D11RenderShader::MakeCurrent()
-{
-	ID3D11DeviceContext* pContext = RenderInterfaceD3D11::GetDeviceContext();
-
-	if (m_pInputLayout)
-		pContext->IASetInputLayout(m_pInputLayout);
-	else
-		pContext->IASetInputLayout(NV_NULL);
-
-
-	if	(m_pVertexShader)
-	{
-		pContext->VSSetShader( m_pVertexShader, NV_NULL, 0);
-		if (m_pParamBuffers[0])
-			pContext->VSSetConstantBuffers(0, 1, &m_pParamBuffers[0]);
-	}
-
-	if (m_pPixelShader)
-	{
-		pContext->PSSetShader( m_pPixelShader, NV_NULL, 0);
-		if (m_pParamBuffers[0])
-			pContext->PSSetConstantBuffers(0, 1, &m_pParamBuffers[0]);
-		if (m_pParamBuffers[1])
-			pContext->PSSetConstantBuffers(1, 1, &m_pParamBuffers[1]);
-	}
-
-	pContext->GSSetShader( 0, 0, 0);
-	pContext->DSSetShader( 0, 0, 0);
-	pContext->HSSetShader( 0, 0, 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D11RenderShader::Disable()
-{
-	ID3D11DeviceContext* pContext = RenderInterfaceD3D11::GetDeviceContext();
-
-	pContext->IASetInputLayout(NV_NULL);
-
-	pContext->VSSetShader( 0, NV_NULL, 0);
-	pContext->PSSetShader( 0, NV_NULL, 0);
-	pContext->GSSetShader( 0, 0, 0);
-	pContext->DSSetShader( 0, 0, 0);
-	pContext->HSSetShader( 0, 0, 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool D3D11RenderShader::CreateParamBuffer( UINT sizeBuffer, UINT slot )
-{
-	ID3D11Device* pDevice = RenderInterfaceD3D11::GetDevice();
-	if (!pDevice)
-		return false;
-
-	SAFE_RELEASE(m_pParamBuffers[slot]);
-
-	D3D11_BUFFER_DESC Desc;
-	{
-		Desc.Usage = D3D11_USAGE_DYNAMIC;
-		Desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-		Desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-		Desc.MiscFlags = 0;
-		Desc.ByteWidth = sizeBuffer;
-	}
-
-	HRESULT hr = pDevice->CreateBuffer( &Desc, NV_NULL, &m_pParamBuffers[slot] );
-	if( FAILED(hr) )
-		false;
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void* D3D11RenderShader::MapParam(UINT slot)
-{
-	ID3D11DeviceContext* pContext = RenderInterfaceD3D11::GetDeviceContext();
-
-	if (!m_pParamBuffers[slot] || !pContext)
-		return 0;
-
-	D3D11_MAPPED_SUBRESOURCE mappedResource;
-	HRESULT hr = pContext->Map(m_pParamBuffers[slot], 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-	
-	if ( FAILED(hr))
-		return 0;
-
-	return mappedResource.pData;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D11RenderShader::UnmapParam( UINT slot )
-{
-	ID3D11DeviceContext* pContext = RenderInterfaceD3D11::GetDeviceContext();
-
-	if (pContext && m_pParamBuffers[slot])
-		pContext->Unmap( m_pParamBuffers[slot], 0);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderShader.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderShader.h
deleted file mode 100644
index 1aad045..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RenderShader.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include <d3d11.h>
-#include "RenderPlugin.h"
-
-class CORERENDER_EXPORT D3D11RenderShader
-{
-public:
-	D3D11RenderShader();
-	~D3D11RenderShader();
-
-	static D3D11RenderShader* Create(
-		const char *name, 
-		void* pVSBlob, size_t vsBlobSize, 
-		void* pPSBlob, size_t psBlobSize, 
-		UINT  cbufferSize0 = 0,	UINT  cbufferSize1 = 0,
-		D3D11_INPUT_ELEMENT_DESC* pElemDesc = 0, UINT numElements = 0);
-
-	void MakeCurrent();
-	void Disable();
-	void SetConstantBuffer();
-
-	void* MapParam(UINT slot = 0);
-	void  UnmapParam(UINT slot = 0);
-
-	ID3D11VertexShader*		getVertexShader() { return m_pVertexShader; }
-	ID3D11PixelShader*		getPixelShader() { return m_pPixelShader; }
-	ID3D11InputLayout*		getInputLayout() { return m_pInputLayout; }
-	ID3D11Buffer*			getParamBuffer(UINT slot = 0) { return m_pParamBuffers[slot]; }
-
-protected:
-	bool CreateVSFromBlob(void* pBlob, size_t blobSize, 
-	D3D11_INPUT_ELEMENT_DESC *desc, int elemCount);
-	bool CreatePSFromBlob(void* pBlob, size_t blobSize);
-	bool CreateParamBuffer(UINT sizeBuffer, UINT slot = 0);
-
-private:
-
-	ID3D11VertexShader*		m_pVertexShader;
-	ID3D11PixelShader*		m_pPixelShader;
-	ID3D11InputLayout*		m_pInputLayout;
-	ID3D11Buffer*			m_pParamBuffers[D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT];
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RendererWindow.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RendererWindow.cpp
deleted file mode 100644
index 1274ed5..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RendererWindow.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D11RendererWindow.h"
-
-#include "windows.h"
-
-#include "DXUT.h"
-#include "DXUTgui.h"
-#include "sdkmisc.h"
-
-#include "D3D11RenderInterface.h"
-#include "Nv.h"
-#ifdef USE_11ON12_WRAPPER
-#include "D3D11on12Wrapper.h"
-#endif // USE_11ON12_WRAPPER
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(x) { if (x) x->Release(); x = 0; }
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-D3D11RenderWindow::D3D11RenderWindow() :
-	 m_sampleCount(8)
-	, m_sampleQuality(0)
-#ifdef USE_11ON12_WRAPPER
-#else
-	, m_pDXGISwapChain(NV_NULL)
-	, m_pD3D11BackBuffer(NV_NULL)
-	, m_pD3D11DepthBuffer(NV_NULL)
-	, m_pD3D11RenderTargetView(NV_NULL)
-	, m_pD3D11DepthStencilView(NV_NULL)
-#endif // USE_11ON12_WRAPPER
-{
-	
-}
-
-///////////////////////////////////////////////////////////////////////////////
-D3D11RenderWindow::~D3D11RenderWindow()
-{
-	Free();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool D3D11RenderWindow::Create( HWND hWnd, unsigned int nSamples )
-{
-#ifdef USE_11ON12_WRAPPER
-#else
-	if (m_pD3D11BackBuffer != NV_NULL || m_pD3D11RenderTargetView != NV_NULL)
-		Free();
-#endif // USE_11ON12_WRAPPER
-
-	ID3D11Device *pDevice = RenderInterfaceD3D11::GetDevice();
-	if (!pDevice)
-		return false;
-
-	ID3D11DeviceContext* pDeviceContext = RenderInterfaceD3D11::GetDeviceContext();
-	if (!pDeviceContext)
-		return false;
-
-	if(nSamples > D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT)
-		nSamples = D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT;
-
-	m_sampleCount = nSamples;
-	m_sampleQuality = 0;
-	if(nSamples > 1)
-	{
-		pDevice->CheckMultisampleQualityLevels(DXGI_FORMAT_R8G8B8A8_UNORM, nSamples, &m_sampleQuality);
-		assert(m_sampleQuality > 0);
-		m_sampleQuality--;
-	}
-
-	RECT rc;
-	GetClientRect((HWND)hWnd, &rc);
-	int wBuf = rc.right - rc.left;
-	int hBuf = rc.bottom- rc.top;
-
-#ifdef USE_11ON12_WRAPPER
-	D3D11on12Wrapper::InitSwapchain(wBuf, hBuf, hWnd);
-#else
-	DXGI_SWAP_CHAIN_DESC	swapChainDesc;
-	{
-		memset(&swapChainDesc, 0, sizeof(DXGI_SWAP_CHAIN_DESC));
-		swapChainDesc.BufferDesc.Width = wBuf;
-		swapChainDesc.BufferDesc.Height= hBuf;
-		swapChainDesc.BufferDesc.Format= DXGI_FORMAT_R8G8B8A8_UNORM;
-		swapChainDesc.BufferDesc.RefreshRate.Numerator = 60;
-		swapChainDesc.BufferDesc.RefreshRate.Denominator = 1;
-		swapChainDesc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
-		swapChainDesc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
-	
-		swapChainDesc.BufferCount = 1;
-		swapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-		swapChainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
-		swapChainDesc.OutputWindow = (HWND)hWnd;
-		swapChainDesc.SampleDesc.Count = m_sampleCount;
-		swapChainDesc.SampleDesc.Quality = m_sampleQuality;
-		swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
-		swapChainDesc.Windowed = true;
-	}
-
-	// Create the swap chain
-	IDXGIFactory1* pDXGIFactory = RenderInterfaceD3D11::GetDXGIFactory();
-	HRESULT res = pDXGIFactory->CreateSwapChain(pDevice, &swapChainDesc, &m_pDXGISwapChain);
-	if (FAILED(res)) return false;
-#endif // USE_11ON12_WRAPPER
-
-	// create DXUT text rendering class
-	m_pDialogResourceManager = new CDXUTDialogResourceManager;
-	m_pDialogResourceManager->OnD3D11CreateDevice(pDevice, pDeviceContext);
-	m_pTextHelper = new CDXUTTextHelper( pDevice, pDeviceContext, m_pDialogResourceManager, 15 );
-
-	CreateRenderTarget();
-	Resize(wBuf, hBuf);
-	return true;// SUCCEEDED(res);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D11RenderWindow::Free()
-{
-	FreeBuffer();
-
-	SAFE_DELETE(m_pTextHelper);
-
-#ifdef USE_11ON12_WRAPPER
-#else
-	SAFE_RELEASE(m_pDXGISwapChain);
-#endif // USE_11ON12_WRAPPER
-
-	if (m_pDialogResourceManager)
-	{
-		m_pDialogResourceManager->OnD3D11DestroyDevice();
-		SAFE_DELETE(m_pDialogResourceManager);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D11RenderWindow::FreeBuffer()
-{
-#ifdef USE_11ON12_WRAPPER
-#else
-	SAFE_RELEASE(m_pD3D11RenderTargetView);
-	SAFE_RELEASE(m_pD3D11BackBuffer);
-	SAFE_RELEASE(m_pD3D11DepthStencilView);
-	SAFE_RELEASE(m_pD3D11DepthBuffer);
-#endif // USE_11ON12_WRAPPER
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D11RenderWindow::Present()
-{
-#ifdef USE_11ON12_WRAPPER
-	D3D11on12Wrapper::EndScene();
-#else
-	assert(m_pDXGISwapChain);
-
-	if(m_pDXGISwapChain)
-	{
-		//m_pDXGISwapChain->Present(1, 0);	// present in vsync
-		m_pDXGISwapChain->Present(0, 0);	// present in vsync off
-	}
-#endif // USE_11ON12_WRAPPER
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D11RenderWindow::Clear(float r, float g, float b)
-{
-#ifdef USE_11ON12_WRAPPER
-	D3D11on12Wrapper::BeginScene();
-	D3D11on12Wrapper::ClearScene(r, g, b);
-#else
-	const float clearColor[4] = {r, g, b, 1.0f}; 
-
-	ID3D11DeviceContext* pD3DContext = RenderInterfaceD3D11::GetDeviceContext();
-	pD3DContext->ClearRenderTargetView(m_pD3D11RenderTargetView, clearColor);
-	pD3DContext->ClearDepthStencilView(m_pD3D11DepthStencilView, D3D11_CLEAR_DEPTH|D3D11_CLEAR_STENCIL, 1.0f, 0);
-#endif // USE_11ON12_WRAPPER
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool D3D11RenderWindow::Resize(int w, int h)
-{
-	assert(w > 0 && h > 0);
-	DXGI_SWAP_CHAIN_DESC swapChainDesc;
-	HRESULT res0 = m_pDXGISwapChain->GetDesc(&swapChainDesc);
-	if (w == (LONG)swapChainDesc.BufferDesc.Width &&
-		h == (LONG)swapChainDesc.BufferDesc.Height)
-		return true;
-
-#ifdef USE_11ON12_WRAPPER
-#else
-	//ID3D11DeviceContext* pD3DContext = RenderInterfaceD3D11::GetDeviceContext();
-	//ID3D11RenderTargetView *nullRTV = NULL;
-	//pD3DContext->OMSetRenderTargets(1, &nullRTV, NULL);
-	FreeBuffer();
-	swapChainDesc.BufferDesc.Width = w;
-	swapChainDesc.BufferDesc.Height = h;
-	//HRESULT res = m_pDXGISwapChain->ResizeBuffers(1, w, h, DXGI_FORMAT_R8G8B8A8_UNORM, 0);
-	HRESULT res = m_pDXGISwapChain->ResizeBuffers(swapChainDesc.BufferCount, swapChainDesc.BufferDesc.Width,
-		swapChainDesc.BufferDesc.Height, swapChainDesc.BufferDesc.Format,
-		swapChainDesc.Flags);
-	assert(SUCCEEDED(res));
-#endif
-	return CreateRenderTarget();
-}
-
-bool D3D11RenderWindow::CreateRenderTarget()
-{
-#ifdef USE_11ON12_WRAPPER
-	D3D11on12Wrapper::ResizeScene(w, h);
-#else
-	ID3D11Device* pDevice = RenderInterfaceD3D11::GetDevice();
-	// Retrieve the 2D back buffer 
-	HRESULT res = m_pDXGISwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (void**)&m_pD3D11BackBuffer);
-	assert(SUCCEEDED(res));
-
-	D3D11_TEXTURE2D_DESC descTex2D;
-	m_pD3D11BackBuffer->GetDesc(&descTex2D);
-
-	// Create the render target view
-	D3D11_RENDER_TARGET_VIEW_DESC descRenderTargetView;
-	{
-		memset(&descRenderTargetView, 0, sizeof(D3D11_RENDER_TARGET_VIEW_DESC));
-		descRenderTargetView.Format				= descTex2D.Format;
-		descRenderTargetView.ViewDimension		= D3D11_RTV_DIMENSION_TEXTURE2DMS;	// -MS dimension to support MSAA
-		descRenderTargetView.Texture2D.MipSlice	= 0;
-	}
-
-	res = pDevice->CreateRenderTargetView(m_pD3D11BackBuffer, &descRenderTargetView, &m_pD3D11RenderTargetView);
-
-	assert(SUCCEEDED(res));
-
-	DXGI_SWAP_CHAIN_DESC swapChainDesc;
-	HRESULT res0 = m_pDXGISwapChain->GetDesc(&swapChainDesc);
-	// Create the depth/stencil buffer and view
-	D3D11_TEXTURE2D_DESC depthStencilDesc;
-
-	depthStencilDesc.Width     = swapChainDesc.BufferDesc.Width;
-	depthStencilDesc.Height    = swapChainDesc.BufferDesc.Height;
-	depthStencilDesc.MipLevels = 1;
-	depthStencilDesc.ArraySize = 1;
-	depthStencilDesc.Format    = DXGI_FORMAT_R24G8_TYPELESS;
-	depthStencilDesc.SampleDesc.Count   = m_sampleCount;
-	depthStencilDesc.SampleDesc.Quality = m_sampleQuality;
-	depthStencilDesc.Usage          = D3D11_USAGE_DEFAULT;
-	depthStencilDesc.BindFlags      = D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_SHADER_RESOURCE;
-	depthStencilDesc.CPUAccessFlags = 0; 
-	depthStencilDesc.MiscFlags      = 0;
-
-	res = pDevice->CreateTexture2D(&depthStencilDesc, 0, &m_pD3D11DepthBuffer);
-	assert(SUCCEEDED(res));
-
-	D3D11_DEPTH_STENCIL_VIEW_DESC descDepthStencilView;
-	memset(&descDepthStencilView, 0, sizeof(D3D11_DEPTH_STENCIL_VIEW_DESC));
-	descDepthStencilView.Format = DXGI_FORMAT_D24_UNORM_S8_UINT;
-	descDepthStencilView.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMS;	// -MS dimension to support MSAA
-	descDepthStencilView.Texture2D.MipSlice = 0;
-
-	res = pDevice->CreateDepthStencilView(m_pD3D11DepthBuffer, &descDepthStencilView, &m_pD3D11DepthStencilView);
-	assert(SUCCEEDED(res));
-
-	m_Width = swapChainDesc.BufferDesc.Width;
-	m_Height= swapChainDesc.BufferDesc.Height;
-
-	/////////////////////////////////////////
-	if (m_pDialogResourceManager)
-	{
-		DXGI_SURFACE_DESC backbufferDesc;
-		backbufferDesc.Width = descTex2D.Width;
-		backbufferDesc.Height = descTex2D.Height;
-		backbufferDesc.Format = descTex2D.Format;
-		backbufferDesc.SampleDesc = descTex2D.SampleDesc;
-
-		m_pDialogResourceManager->OnD3D11ResizedSwapChain(pDevice, &backbufferDesc);
-	}
-
-	// assume always the current render window, bind to render context immediately
-	ID3D11DeviceContext* pD3DContext = RenderInterfaceD3D11::GetDeviceContext();
-	pD3DContext->OMSetRenderTargets(1, &m_pD3D11RenderTargetView, m_pD3D11DepthStencilView);
-
-	// set the viewport transform
-	D3D11_VIEWPORT vp;
-	{
-		vp.TopLeftX = 0;
-		vp.TopLeftY = 0;
-		vp.Width    = (float)m_Width;
-		vp.Height   = (float)m_Height;
-		vp.MinDepth = 0.0f;
-		vp.MaxDepth = 1.0f;
-	}
-	pD3DContext->RSSetViewports(1, &vp);
-#endif // USE_11ON12_WRAPPER
-
-	return true;
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RendererWindow.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RendererWindow.h
deleted file mode 100644
index 88d5c8f..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11RendererWindow.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <d3d11.h>
-
-// DXUT stuffs for text rendering
-class CDXUTDialogResourceManager;
-class CDXUTTextHelper;
-
-struct D3D11RenderWindow
-{
-public:
-	D3D11RenderWindow();
-	~D3D11RenderWindow();
-
-	bool Create(HWND hWnd, unsigned int nSamples = 1);
-	bool Resize(int w, int h);
-	void Present();
-	void Clear(float r, float g, float b);
-	bool CreateRenderTarget();
-
-	// sample desc
-	UINT						m_sampleCount;
-	UINT						m_sampleQuality;
-#ifdef USE_11ON12_WRAPPER
-#else
-	int							m_Height, m_Width;
-
-	IDXGISwapChain*				m_pDXGISwapChain;
-	ID3D11Texture2D*			m_pD3D11BackBuffer;
-	ID3D11Texture2D*			m_pD3D11DepthBuffer;
-	ID3D11RenderTargetView*		m_pD3D11RenderTargetView;
-	ID3D11DepthStencilView*		m_pD3D11DepthStencilView;
-#endif // USE_11ON12_WRAPPER
-
-	CDXUTDialogResourceManager*	m_pDialogResourceManager;
-	CDXUTTextHelper*			m_pTextHelper;
-
-private:
-	void Free();
-	void FreeBuffer();
-
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Shaders.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Shaders.cpp
deleted file mode 100644
index f3e210b..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Shaders.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D11Shaders.h"
-
-#include "MeshShaderParam.h"
-#include "LightShaderParam.h"
-
-#include "D3D11RenderShader.h"
-
-using namespace RenderInterface;
-
-/////////////////////////////////////////////////////////////////////////////////////
-// Common shader settings
-//static D3D11RenderShader*	g_pShaders[SHADER_TYPE_END];
-static std::map<int, D3D11RenderShader*> g_pShaders;
-
-namespace BodyShaderBlobs
-{
-	#include "Shaders/BodyShader_VS.h"
-	#include "Shaders/BodyShader_PS.h"
-}
-
-namespace BodyShadowBlobs
-{
-	#include "Shaders/BodyShadow_VS.h"
-	#include "Shaders/BodyShadow_PS.h"
-}
-
-namespace ScreenQuadBlobs
-{
-	#include "Shaders/ScreenQuad_VS.h"
-	#include "Shaders/ScreenQuad_PS.h"
-}
-
-namespace ScreenQuadColorBlobs
-{
-	#include "Shaders/ScreenQuadColor_VS.h"
-	#include "Shaders/ScreenQuadColor_PS.h"
-}
-
-namespace VisualizeShadowBlobs
-{
-	#include "Shaders/VisualizeShadow_VS.h"
-	#include "Shaders/VisualizeShadow_PS.h"
-}
-
-namespace ColorBlobs
-{
-	#include "Shaders/Color_VS.h"
-	#include "Shaders/Color_PS.h"
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool InitializeShadersD3D11()
-{
-	D3D11_INPUT_ELEMENT_DESC layoutBodyRender[] =
-	{
-		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-	    { "VERTEX_NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-		{ "FACE_NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-		{ "TANGENT", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 36, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-		{ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 48, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-		{ "VERTEX_ID", 0, DXGI_FORMAT_R32_FLOAT, 0, 56, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-	};
-
-	UINT numElements = sizeof(layoutBodyRender)/sizeof(D3D11_INPUT_ELEMENT_DESC);
-
-	g_pShaders[SHADER_TYPE_MESH_RENDERING] = D3D11RenderShader::Create( "MeshRenderShader",
-		(void*)BodyShaderBlobs::g_vs_main, sizeof(BodyShaderBlobs::g_vs_main),
-		(void*)BodyShaderBlobs::g_ps_main, sizeof(BodyShaderBlobs::g_ps_main),
-		sizeof(MeshShaderParam), 0,
-		&layoutBodyRender[0], numElements);
-
-	g_pShaders[SHADER_TYPE_MESH_SHADOW] = D3D11RenderShader::Create( "MeshShadowShader",
-		(void*)BodyShadowBlobs::g_vs_main, sizeof(BodyShadowBlobs::g_vs_main),
-		(void*)BodyShadowBlobs::g_ps_main, sizeof(BodyShadowBlobs::g_ps_main),
-		sizeof(MeshShadowShaderParam), 0,
-		&layoutBodyRender[0], numElements);
-
-	g_pShaders[SHADER_TYPE_SCREEN_QUAD] = D3D11RenderShader::Create( "ScreenQuadShader",
-		(void*)ScreenQuadBlobs::g_vs_main, sizeof(ScreenQuadBlobs::g_vs_main),
-		(void*)ScreenQuadBlobs::g_ps_main, sizeof(ScreenQuadBlobs::g_ps_main));
-
-	g_pShaders[SHADER_TYPE_SCREEN_QUAD_COLOR] = D3D11RenderShader::Create( "ScreenQuadColorShader",
-		(void*)ScreenQuadColorBlobs::g_vs_main, sizeof(ScreenQuadColorBlobs::g_vs_main),
-		(void*)ScreenQuadColorBlobs::g_ps_main, sizeof(ScreenQuadColorBlobs::g_ps_main));
-
-	g_pShaders[SHADER_TYPE_VISUALIZE_SHADOW] = D3D11RenderShader::Create( "VisualizeShadowShader",
-		(void*)VisualizeShadowBlobs::g_vs_main, sizeof(VisualizeShadowBlobs::g_vs_main),
-		(void*)VisualizeShadowBlobs::g_ps_main, sizeof(VisualizeShadowBlobs::g_ps_main),
-		sizeof(ShadowVizParam));
-
-	D3D11_INPUT_ELEMENT_DESC layout_Position_And_Color[] = 
-	{
-		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-	    { "COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-	};
-	UINT numElements2 = sizeof(layout_Position_And_Color)/sizeof(D3D11_INPUT_ELEMENT_DESC);
-
-	g_pShaders[SHADER_TYPE_SIMPLE_COLOR] = D3D11RenderShader::Create( "Color",
-		(void*)ColorBlobs::g_vs_main, sizeof(ColorBlobs::g_vs_main),
-		(void*)ColorBlobs::g_ps_main, sizeof(ColorBlobs::g_ps_main),
-		sizeof(SimpleShaderParam), 0,
-		&layout_Position_And_Color[0], numElements2);
-
-	return true;
-}
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(x) { if (x) x->Release(); x = 0; }
-#endif
-
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(x) { if (x) delete x; x = 0; }
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-void DestroyShadersD3D11()
-{
-	for (int i = 0; i < g_pShaders.size(); i++)
-	{
-		D3D11RenderShader*& pShader = g_pShaders[i];
-		if (pShader)
-		{
-			delete pShader;
-			pShader = 0;
-		}
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-D3D11RenderShader* GetShaderD3D11(SHADER_TYPE st)
-{
-	return g_pShaders[st];
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyShaderD3D11(SHADER_TYPE st)
-{
-	D3D11RenderShader* pD3D11Shader = GetShaderD3D11(st);
-	if (!pD3D11Shader)
-		return;
-
-	pD3D11Shader->MakeCurrent();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DisableShaderD3D11(RenderInterface::SHADER_TYPE st)
-{
-	D3D11RenderShader* pD3D11Shader = GetShaderD3D11(st);
-	if (!pD3D11Shader)
-		return;
-
-	pD3D11Shader->Disable();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CopyShaderParamD3D11(SHADER_TYPE st, void* pSysMem, unsigned int bytes, unsigned int slot)
-{
-	D3D11RenderShader* pD3D11Shader = GetShaderD3D11(st);
-	if (!pD3D11Shader)
-		return;
-
-	void* mappedParam = pD3D11Shader->MapParam(slot);
-
-	memcpy(mappedParam, pSysMem, bytes);
-
-	pD3D11Shader->UnmapParam(slot);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Shaders.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Shaders.h
deleted file mode 100644
index b1d4929..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Shaders.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "RenderInterface.h"
-
-#include "RenderPlugin.h"
-
-///////////////////////////////////////////////////////////////////
-// default shaders
-///////////////////////////////////////////////////////////////////
-CORERENDER_EXPORT bool InitializeShadersD3D11();
-CORERENDER_EXPORT void DestroyShadersD3D11();
-
-CORERENDER_EXPORT void ApplyShaderD3D11(RenderInterface::SHADER_TYPE st);
-CORERENDER_EXPORT void DisableShaderD3D11(RenderInterface::SHADER_TYPE st);
-CORERENDER_EXPORT void CopyShaderParamD3D11(RenderInterface::SHADER_TYPE st, void* pSysMem, unsigned int bytes, unsigned int slot = 0);
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11ShadowMap.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11ShadowMap.cpp
deleted file mode 100644
index 90e30b2..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11ShadowMap.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D11ShadowMap.h"
-
-#include "RenderResources.h"
-
-#include "D3D11RenderInterface.h"
-#include "D3D11TextureResource.h"
-
-namespace
-{
-//////////////////////////////////////////////////////////////////////////////////////////////////
-D3D11_TEXTURE2D_DESC CreateD3D11TextureDesc(
-	DXGI_FORMAT Format, UINT Width, UINT Height,
-	UINT BindFlags, UINT SampleCount = 1, D3D11_USAGE Usage = D3D11_USAGE_DEFAULT, UINT CPUAccessFlags = 0,
-	UINT MiscFlags = 0, UINT ArraySize = 1, UINT MipLevels = 1)
-{
-
-	D3D11_TEXTURE2D_DESC desc;
-	
-	desc.Format                 = Format;
-	desc.Width					= Width;
-	desc.Height					= Height;
-
-	desc.ArraySize				= ArraySize;
-	desc.MiscFlags				= MiscFlags;
-	desc.MipLevels				= MipLevels;
-
-	desc.SampleDesc.Count		= SampleCount;
-	desc.SampleDesc.Quality		= 0;
-	desc.BindFlags				= BindFlags;
-	desc.Usage					= Usage;
-	desc.CPUAccessFlags			= CPUAccessFlags;
-
-	return desc;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-D3D11_DEPTH_STENCIL_VIEW_DESC CreateD3D11DSVDesc(
-	DXGI_FORMAT Format, D3D11_DSV_DIMENSION ViewDimension,  
-	UINT Flags = 0, UINT MipSlice = 0)
-{
-	D3D11_DEPTH_STENCIL_VIEW_DESC desc;
-	
-	desc.Format                    = Format;
-	desc.ViewDimension             = ViewDimension;
-	desc.Flags					   = Flags;
-	desc.Texture2D.MipSlice        = MipSlice;
-
-	return desc;
-}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-D3D11ShadowMap::D3D11ShadowMap(int resolution)
-{
-	m_pShadowTexture = nullptr;
-	m_pShadowRTV = nullptr;
-	m_pShadowSRV = nullptr;
-
-	m_pDepthTexture = nullptr;
-	m_pDepthDSV = nullptr;
-
-	ID3D11Device* pd3dDevice = RenderInterfaceD3D11::GetDevice();
-	if (!pd3dDevice)
-		return;
-
-	{
-		m_viewport.Width  = float(resolution);
-		m_viewport.Height = float(resolution);
-		m_viewport.MinDepth = 0;
-		m_viewport.MaxDepth = 1;
-		m_viewport.TopLeftX = 0;
-		m_viewport.TopLeftY = 0;
-	}
-
-	HRESULT hr;
-
-	// create shadow render target
-	{
-		D3D11_TEXTURE2D_DESC texDesc = CreateD3D11TextureDesc(
-			DXGI_FORMAT_R32_FLOAT, UINT(m_viewport.Width), UINT(m_viewport.Height),
-			D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE);
-	
-		hr = pd3dDevice->CreateTexture2D( &texDesc, NULL, &m_pShadowTexture );
-		hr = pd3dDevice->CreateShaderResourceView( m_pShadowTexture, NULL, &m_pShadowSRV );
-		hr = pd3dDevice->CreateRenderTargetView(m_pShadowTexture, NULL, &m_pShadowRTV);
-
-		m_shadowResource.m_pD3D11Resource = m_pShadowSRV;
-	}
-
-	// create shadow depth stencil
-	{
-		D3D11_TEXTURE2D_DESC texDesc = CreateD3D11TextureDesc(
-			DXGI_FORMAT_R32_TYPELESS, UINT(m_viewport.Width), UINT(m_viewport.Height),
-			D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_SHADER_RESOURCE); 
-
-		hr = pd3dDevice->CreateTexture2D( &texDesc, NULL, &m_pDepthTexture );
-
-		D3D11_DEPTH_STENCIL_VIEW_DESC dsvDesc = CreateD3D11DSVDesc(
-			DXGI_FORMAT_D32_FLOAT, D3D11_DSV_DIMENSION_TEXTURE2D);
-
-		hr = pd3dDevice->CreateDepthStencilView(m_pDepthTexture, &dsvDesc, &m_pDepthDSV);		
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-D3D11ShadowMap::~D3D11ShadowMap()
-{
-	Release();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void D3D11ShadowMap::Release()
-{
-	SAFE_RELEASE(m_pShadowTexture);
-	SAFE_RELEASE(m_pShadowRTV);
-	SAFE_RELEASE(m_pShadowSRV);
-	SAFE_RELEASE(m_pDepthTexture);
-	SAFE_RELEASE(m_pDepthDSV);
-
-	m_shadowResource.m_pD3D11Resource = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-GPUShaderResource* D3D11ShadowMap::GetShadowSRV()
-{
-	return &m_shadowResource;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-bool D3D11ShadowMap::isValid()
-{
-	return m_pShadowTexture && m_pShadowRTV && m_pShadowSRV && m_pDepthTexture && m_pDepthDSV;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void D3D11ShadowMap::BeginRendering(float clearDepth)
-{
-	if (!isValid())
-		return;
-
-	ID3D11DeviceContext* pd3dContext = RenderInterfaceD3D11::GetDeviceContext();
-	if (!pd3dContext)
-		return;
-
-	pd3dContext->OMGetRenderTargets(1, &m_pPreviousRTV, &m_pPreviousDSV);
-	m_numPreviousViewports = 1;
-	pd3dContext->RSGetViewports(&m_numPreviousViewports, m_previousViewport);
-
-	pd3dContext->OMSetRenderTargets( 1, &m_pShadowRTV, m_pDepthDSV);
-	pd3dContext->RSSetViewports(1, &m_viewport);
-
-	float ClearColor[4] = { clearDepth, clearDepth, clearDepth, clearDepth};
-
-	pd3dContext->ClearRenderTargetView( m_pShadowRTV, ClearColor );		
-	pd3dContext->ClearDepthStencilView( m_pDepthDSV, D3D11_CLEAR_DEPTH, 1.0, 0 );
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void D3D11ShadowMap::EndRendering()
-{
-	if (!isValid())
-		return;
-
-	ID3D11DeviceContext* pd3dContext = RenderInterfaceD3D11::GetDeviceContext();
-	if (!pd3dContext)
-		return;
-
-	pd3dContext->OMSetRenderTargets(0, NULL, NULL);
-
-	if (m_pPreviousRTV)
-	{
-		pd3dContext->OMSetRenderTargets(1, &m_pPreviousRTV, m_pPreviousDSV);
-		m_pPreviousRTV->Release();
-		if (m_pPreviousDSV) m_pPreviousDSV->Release();
-	}
-
-	if (m_numPreviousViewports)
-		pd3dContext->RSSetViewports(m_numPreviousViewports, m_previousViewport);
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11ShadowMap.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11ShadowMap.h
deleted file mode 100644
index fc9fe79..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11ShadowMap.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "ShadowMap.h"
-
-#include "d3d11.h"
-#include "D3D11TextureResource.h"
-
-class GPUShaderResource;
-class D3D11TextureResource;
-
-struct D3D11ShadowMap : public ShadowMap
-{
-	D3D11_VIEWPORT				m_viewport;
-
-	ID3D11Texture2D*			m_pShadowTexture;
-	ID3D11RenderTargetView*		m_pShadowRTV;
-	ID3D11ShaderResourceView*	m_pShadowSRV;
-
-	ID3D11Texture2D*			m_pDepthTexture;
-	ID3D11DepthStencilView*		m_pDepthDSV;
-	ID3D11ShaderResourceView*	m_pDepthSRV;
-
-	D3D11TextureResource		m_shadowResource;
-	
-public:
-	D3D11ShadowMap(int resolution );
-	~D3D11ShadowMap();
-
-	void Release();
-	void BeginRendering(float clearDepth);
-	void EndRendering();
-
-	GPUShaderResource* GetShadowSRV();
-
-protected:
-
-	bool isValid();
-
-	ID3D11RenderTargetView*	m_pPreviousRTV;
-	ID3D11DepthStencilView*	m_pPreviousDSV;
-	UINT					m_numPreviousViewports;
-	D3D11_VIEWPORT			m_previousViewport[D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE];
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11TextureResource.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11TextureResource.cpp
deleted file mode 100644
index 2a8f7ee..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11TextureResource.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D11TextureResource.h"
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11TextureResource.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11TextureResource.h
deleted file mode 100644
index 91d6539..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11TextureResource.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "RenderResources.h"
-
-#include "d3d11.h"
-
-// GPU resources for texture 
-struct D3D11TextureResource : public GPUShaderResource
-{
-	ID3D11ShaderResourceView*	m_pD3D11Resource;
-
-public:
-	static GPUShaderResource* Create(ID3D11ShaderResourceView* pResource) { 
-		D3D11TextureResource* pBuffer = new D3D11TextureResource; 
-		pBuffer->m_pD3D11Resource = pResource;
-		return pBuffer;
-	}
-
-	static ID3D11ShaderResourceView* GetResource(GPUShaderResource* pBuffer)
-	{
-		D3D11TextureResource* pD3D11Buffer = dynamic_cast<D3D11TextureResource*>(pBuffer);
-		if (!pD3D11Buffer)
-			return 0;
-		return pD3D11Buffer->m_pD3D11Resource;
-	}
-
-	~D3D11TextureResource()
-	{
-	}
-
-	void Release()
-	{
-		SAFE_RELEASE(m_pD3D11Resource);
-	}
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Util.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Util.cpp
deleted file mode 100644
index b13c8e3..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Util.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D11Util.h"
-
-#include "D3D11Shaders.h"
-#include "D3D11RenderShader.h"
-
-#include "D3DX10tex.h"
-#include "D3DX11tex.h"
-
-#include "D3D11Wrapper.h"
-#include "DXUT.h"
-#include "DXUTgui.h"
-#include "sdkmisc.h"
-#include "D3D11RendererWindow.h"
-#include "SimpleRenderable.h"
-//#include "MeshShaderParam.h"
-#include "D3D11RenderInterface.h"
-#include "D3D11TextureResource.h"
-
-namespace D3D11Util
-{
-	using namespace RenderInterface;
-
-	// D3D hook to render window
-	D3D11RenderWindow*		g_pRenderWindow = 0;
-
-///////////////////////////////////////////////////////////////////////////////
-#include "../../../../../../external/stb_image/stb_image.c"
-
-GPUShaderResource* 
-CreateTextureSRV(const char* texturename)
-{
-	ID3D11Device* pDevice = RenderInterfaceD3D11::GetDevice();
-	if (!pDevice)
-		return 0;
-
-	D3DX11_IMAGE_LOAD_INFO texLoadInfo;
-	
-	texLoadInfo.MipLevels = 8;
-	texLoadInfo.MipFilter = D3DX10_FILTER_TRIANGLE;
-	texLoadInfo.Filter = D3DX10_FILTER_TRIANGLE;
-
-	ID3D11Resource *pRes = 0;
-
-	HRESULT hr;
-	D3DX11CreateTextureFromFileA(pDevice, texturename, &texLoadInfo, NULL, &pRes, &hr);
-
-	ID3D11Texture2D* texture = NULL;
-
-	if (!pRes)
-	{
-		// Try stb_image for .TGA
-		int width = 0;
-		int height = 0;
-		int numComponents = 0;
-		unsigned char *pSTBIRes = stbi_load(texturename, &width, &height, &numComponents, 4);
-
-		if (!pSTBIRes)
-			return 0;
-
-		const int requestedMipLevels = texLoadInfo.MipLevels;
-
-		D3D11_SUBRESOURCE_DATA* initData = new D3D11_SUBRESOURCE_DATA[requestedMipLevels];
-		ZeroMemory(initData, sizeof(D3D11_SUBRESOURCE_DATA)*requestedMipLevels);
-
-		struct Pixel
-		{
-			unsigned char rgba[4];
-		};
-
-		// prepare target buffer just large enough to include all the mip levels
-		Pixel* targets = new Pixel[width*height*2];
-		
-		// copy the first mip level
-		memcpy(targets, pSTBIRes, width*height*4);
-		
-		// now it's OK to delete the original
-		if (pSTBIRes)
-			stbi_image_free(pSTBIRes);
-
-		// current mip level width and height
-		int mipWidth = width;
-		int mipHeight = height;
-		
-		// actual mip levels
-		int mipLevels = 0;
-
-		// current data
-		Pixel* source = targets;
-		Pixel* target = nullptr;
-
-		for (int idx = 0; idx < requestedMipLevels; ++idx)
-		{
-			// set initData
-			initData[idx].pSysMem = source;
-			initData[idx].SysMemPitch = mipWidth*4;
-			mipLevels++;
-
-			// skip generating mip for 1x1
-			if ((mipWidth == 1) && (mipHeight == 1))
-				break;
-
-			// skip generating mip for the last level
-			if (idx == (requestedMipLevels-1))
-				break;
-
-			// buffer for the next mip level
-			target = &source[mipWidth*mipHeight];
-
-			const int prevWidth = mipWidth; // previous mip's width
-
-			// generate the next mip level
-			mipWidth = max(1, mipWidth >> 1);
-			mipHeight = max(1, mipHeight >> 1);
-
-			Pixel samples[4];
-
-			for (int y = 0; y < mipHeight; ++y)
-			{
-				for (int x = 0; x < mipWidth; ++x)
-				{
-					const int px = x*2; // x in previous mip
-					const int py = y*2; // y in previous mip
-
-					samples[0] = source[py*prevWidth + px]; // left top
-					samples[1] = source[py*prevWidth + px+1]; // right top
-					samples[2] = source[(py+1)*prevWidth + px]; // left bottom
-					samples[3] = source[(py+1)*prevWidth + px+1]; // right bottom
-
-					// for each component
-					for (int comp = 0; comp < 4; ++comp)
-					{
-						// do the linear box filter for lower mip level
-						target[y*mipWidth + x].rgba[comp] = (samples[0].rgba[comp] + samples[1].rgba[comp] + samples[2].rgba[comp] + samples[3].rgba[comp])/4;
-					}
-				}
-			}
-
-			// update source
-			source = target;
-		}
-
-		D3D11_TEXTURE2D_DESC desc;
-		ZeroMemory(&desc, sizeof(D3D11_TEXTURE2D_DESC));
-		desc.ArraySize = 1;
-		desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-		desc.CPUAccessFlags = 0;
-		desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-		desc.Height = height;
-		desc.Width = width;
-		desc.MipLevels = mipLevels;
-		desc.MiscFlags = 0;
-		desc.SampleDesc.Count = 1;
-		desc.SampleDesc.Quality = 0;
-		desc.Usage = D3D11_USAGE_DEFAULT;
-
-		HRESULT ret = pDevice->CreateTexture2D(&desc, initData, &texture);
-	
-		delete initData;
-		delete targets;
-		
-		if (ret != S_OK)
-			return 0;
-	}
-	else
-	{
-		pRes->QueryInterface(__uuidof( ID3D11Texture2D ), (LPVOID*)&texture);
-	}
-
-	D3D11_TEXTURE2D_DESC desc;
-	texture->GetDesc( &desc );
-
-	ID3D11ShaderResourceView* pTextureSRV = 0;
-
-	D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc;
-	ZeroMemory( &SRVDesc, sizeof(SRVDesc) );
-	SRVDesc.Format = desc.Format;
-	SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-	SRVDesc.Texture2D.MostDetailedMip = 0;
-	SRVDesc.Texture2D.MipLevels = desc.MipLevels;
-	pDevice->CreateShaderResourceView(texture, &SRVDesc, &pTextureSRV);
-
-	if (texture) texture->Release();
-
-	if (pRes)
-		pRes->Release();
-
-	return D3D11TextureResource::Create(pTextureSRV);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-bool GetDeviceInfoString(wchar_t *str)
-{
-	IDXGIAdapter* pAdapter = RenderInterfaceD3D11::GetAdapter();
-	if (!pAdapter)
-		return false;
-
-	auto adapterDescription = DXGI_ADAPTER_DESC();
-	pAdapter->GetDesc(&adapterDescription);
-
-	WCHAR* pDescStr = adapterDescription.Description;
-	float memInGB = float(adapterDescription.DedicatedVideoMemory) / 1e9f;
-	swprintf_s(str, 1000, L"%s(%.1fGb)\n", pDescStr, memInGB);
-
-	return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// Render window interafce
-/////////////////////////////////////////////////////////////////////////////////////////
-bool CreateRenderWindow(HWND hWnd, int nSamples)
-{
-	SAFE_DELETE(g_pRenderWindow);
-
-	g_pRenderWindow = new D3D11RenderWindow;
-	return g_pRenderWindow->Create(hWnd, nSamples);
-}
-
-D3DHandles& GetDeviceHandles(D3DHandles& deviceHandles)
-{
-	deviceHandles.pAdapter = RenderInterfaceD3D11::GetAdapter();
-	deviceHandles.pFactory = RenderInterfaceD3D11::GetDXGIFactory();
-	deviceHandles.pDevice = RenderInterfaceD3D11::GetDevice();
-	deviceHandles.pDeviceContext = RenderInterfaceD3D11::GetDeviceContext();
-
-	deviceHandles.pDXGISwapChain = g_pRenderWindow->m_pDXGISwapChain;
-	deviceHandles.pD3D11BackBuffer = g_pRenderWindow->m_pD3D11BackBuffer;
-	deviceHandles.pD3D11RenderTargetView = g_pRenderWindow->m_pD3D11RenderTargetView;
-	deviceHandles.pD3D11DepthBuffer = g_pRenderWindow->m_pD3D11DepthBuffer;
-	deviceHandles.pD3D11DepthStencilView = g_pRenderWindow->m_pD3D11DepthStencilView;
-	return deviceHandles;
-}
-
-void DestroyRenderWindow()
-{
-	SAFE_DELETE(g_pRenderWindow);
-}
-
-bool ResizeRenderWindow(int w, int h)
-{
-	if (!g_pRenderWindow)
-		return false;
-
-	return g_pRenderWindow->Resize(w,h);
-}
-
-void PresentRenderWindow()
-{
-	if (!g_pRenderWindow)
-		return;
-	
-	g_pRenderWindow->Present();
-}
-
-void ClearRenderWindow(float r, float g, float b)
-{
-	if (!g_pRenderWindow)
-		return;
-	
-	g_pRenderWindow->Clear(r,g,b);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// Text draw helper functions (using DXUT)
-/////////////////////////////////////////////////////////////////////////////////////////
-void TxtHelperBegin()
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-		
-	g_pRenderWindow->m_pTextHelper->Begin();
-}
-
-void TxtHelperEnd()
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-
-	g_pRenderWindow->m_pTextHelper->End();
-}
-
-void TxtHelperSetInsertionPos(int x, int y)
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-
-	g_pRenderWindow->m_pTextHelper->SetInsertionPos(x, y);
-}
-
-void TxtHelperSetForegroundColor(float r, float g, float b, float a)
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-
-	g_pRenderWindow->m_pTextHelper->SetForegroundColor(DirectX::XMFLOAT4(r,g,b,a));
-}
-
-void TxtHelperDrawTextLine(wchar_t* str)
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-
-	g_pRenderWindow->m_pTextHelper->DrawTextLine(str);
-}
-
-} // end namespace
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Util.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Util.h
deleted file mode 100644
index 8a9176e..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Util.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "d3d11.h"
-
-#include "RenderPlugin.h"
-
-class GPUShaderResource;
-class IDXGISwapChain;
-
-namespace D3D11Util
-{
-	///////////////////////////////////////////////////////////////////
-	// render window management
-	///////////////////////////////////////////////////////////////////
-	D3DHandles& GetDeviceHandles(D3DHandles& deviceHandles);
-	bool CreateRenderWindow(HWND hWnd, int nSamples);
-	void DestroyRenderWindow();
-	bool ResizeRenderWindow(int w, int h);
-	void PresentRenderWindow();
-	void ClearRenderWindow(float r, float g, float b);
-
-	///////////////////////////////////////////////////////////////////
-	// background textures
-	bool LoadBackgroundTexture(const char* filePath);
-	void RenderBackgroundTexture();
-	void ClearBackgroundTexture();
-	GPUShaderResource* CreateTextureSRV(const char* texturename);
-
-	///////////////////////////////////////////////////////////////////
-	CORERENDER_EXPORT bool GetDeviceInfoString(wchar_t *str);
-
-	///////////////////////////////////////////////////////////////////
-	// text helpers
-	CORERENDER_EXPORT void TxtHelperBegin();
-	CORERENDER_EXPORT void TxtHelperEnd();
-	CORERENDER_EXPORT void TxtHelperSetInsertionPos(int x, int y);
-	CORERENDER_EXPORT void TxtHelperSetForegroundColor(float r, float g, float b, float a = 1.0f);
-	CORERENDER_EXPORT void TxtHelperDrawTextLine(wchar_t* str);
-
-
-}
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Wrapper.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Wrapper.cpp
deleted file mode 100644
index 5a117f1..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Wrapper.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D11Wrapper.h"
-
-namespace D3DWrapper
-{
-
-} // end namespace
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Wrapper.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Wrapper.h
deleted file mode 100644
index 0d752d8..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/D3D11Wrapper.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "d3d11.h"
-
-namespace D3DWrapper
-{
-	inline void SetDebugName(ID3D11DeviceChild* pResource, const char *name)
-	{
-		if (pResource) pResource->SetPrivateData( WKPDID_D3DDebugObjectName, strlen(name), name);
-	}
-}
-
-#define SET_D3D_DEBUG_NAME(x, name) D3DWrapper::SetDebugName(x, name);
-#define SET_D3D_DEBUG_NAME_VAR(x) D3DWrapper::SetDebugName(x, #x);
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/RenderPluginDx11.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D11/RenderPluginDx11.cpp
deleted file mode 100644
index 93d3fdf..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/RenderPluginDx11.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-#include "RenderPluginDx11.h"
-
-#include "D3D11RenderInterface.h"
-#include "D3D11Util.h"
-#include "D3D11Shaders.h"
-#include "D3D11GPUProfiler.h"
-#include "D3D11ShadowMap.h"
-
-RenderPlugin* CreateRenderPlugin(void)
-{
-	return new RenderPluginDx11;
-}
-
-RenderPluginDx11::RenderPluginDx11()
-{
-	m_RenderApi = "Dx11";
-}
-
-RenderPluginDx11::~RenderPluginDx11()
-{
-}
-
-// interface
-bool RenderPluginDx11::InitDevice(int deviceID)
-{
-	return RenderInterfaceD3D11::InitDevice(deviceID);
-}
-
-bool RenderPluginDx11::Initialize()
-{
-	return RenderInterfaceD3D11::Initialize();
-}
-
-void RenderPluginDx11::Shutdown()
-{
-	D3D11Util::DestroyRenderWindow();
-	RenderInterfaceD3D11::Shutdown();
-}
-
-void RenderPluginDx11::CopyToDevice(GPUBufferResource *pDevicePtr,
-	void* pSysMem, unsigned int	ByteWidth)
-{
-	RenderInterfaceD3D11::CopyToDevice(pDevicePtr, pSysMem, ByteWidth);
-}
-
-void RenderPluginDx11::ApplyDepthStencilState(DEPTH_STENCIL_STATE state)
-{
-	RenderInterfaceD3D11::ApplyDepthStencilState(state);
-}
-
-void RenderPluginDx11::ApplyRasterizerState(RASTERIZER_STATE state)
-{
-	RenderInterfaceD3D11::ApplyRasterizerState(state);
-}
-
-void RenderPluginDx11::ApplySampler(int slot, SAMPLER_TYPE state)
-{
-	RenderInterfaceD3D11::ApplySampler(slot, state);
-}
-
-void RenderPluginDx11::ApplyBlendState(BLEND_STATE state)
-{
-	RenderInterfaceD3D11::ApplyBlendState(state);
-}
-
-void RenderPluginDx11::GetViewport(Viewport& vp)
-{
-	RenderInterfaceD3D11::GetViewport(vp);
-}
-
-void RenderPluginDx11::SetViewport(const Viewport& vp)
-{
-	RenderInterfaceD3D11::SetViewport(vp);
-}
-
-void RenderPluginDx11::BindVertexShaderResources(int startSlot,
-	int numSRVs, GPUShaderResource** ppSRVs)
-{
-	RenderInterfaceD3D11::BindVertexShaderResources(startSlot, numSRVs, ppSRVs);
-}
-
-void RenderPluginDx11::BindPixelShaderResources(int startSlot,
-	int numSRVs, GPUShaderResource** ppSRVs)
-{
-	RenderInterfaceD3D11::BindPixelShaderResources(startSlot, numSRVs, ppSRVs);
-}
-
-void RenderPluginDx11::ClearVertexShaderResources(int startSlot, int numSRVs)
-{
-	RenderInterfaceD3D11::ClearVertexShaderResources(startSlot, numSRVs);
-}
-
-void RenderPluginDx11::ClearPixelShaderResources(int startSlot, int numSRVs)
-{
-	RenderInterfaceD3D11::ClearPixelShaderResources(startSlot, numSRVs);
-}
-
-void RenderPluginDx11::ClearInputLayout()
-{
-	RenderInterfaceD3D11::ClearInputLayout();
-}
-
-void RenderPluginDx11::SetVertexBuffer(GPUBufferResource* pBuffer, UINT stride, UINT offset)
-{
-	RenderInterfaceD3D11::SetVertexBuffer(pBuffer, stride, offset);
-}
-
-void RenderPluginDx11::SetPrimitiveTopologyTriangleStrip()
-{
-	RenderInterfaceD3D11::SetPrimitiveTopologyTriangleStrip();
-}
-
-void RenderPluginDx11::SetPrimitiveTopologyTriangleList()
-{
-	RenderInterfaceD3D11::SetPrimitiveTopologyTriangleList();
-}
-
-void RenderPluginDx11::SetPrimitiveTopologyLineList()
-{
-	RenderInterfaceD3D11::SetPrimitiveTopologyLineList();
-}
-
-void RenderPluginDx11::Draw(unsigned int vertexCount, unsigned int startCount)
-{
-	RenderInterfaceD3D11::Draw(vertexCount, startCount);
-}
-
-GPUBufferResource* RenderPluginDx11::CreateVertexBuffer(unsigned int ByteWidth, void* pSysMem)
-{
-	return RenderInterfaceD3D11::CreateVertexBuffer(ByteWidth, pSysMem);
-}
-
-GPUShaderResource* RenderPluginDx11::CreateShaderResource(unsigned int stride,
-	unsigned int numElements, void* pSysMem, NVHairReadOnlyBuffer* pReadOnlyBuffer)
-{
-	return RenderInterfaceD3D11::CreateShaderResource(stride, numElements, pSysMem);
-}
-
-void RenderPluginDx11::ApplyForShadow(int ForShadow)
-{
-}
-
-void RenderPluginDx11::SwitchToDX11()
-{
-}
-
-void RenderPluginDx11::FlushDX11()
-{
-}
-
-void RenderPluginDx11::FlushDX12()
-{
-}
-
-void RenderPluginDx11::ApplyPrimitiveTopologyLine()
-{
-}
-
-void RenderPluginDx11::ApplyPrimitiveTopologyTriangle()
-{
-}
-
-void RenderPluginDx11::SubmitGpuWork()
-{
-}
-
-void RenderPluginDx11::WaitForGpu()
-{
-}
-
-// util
-bool RenderPluginDx11::CreateRenderWindow(HWND hWnd, int nSamples)
-{
-	return D3D11Util::CreateRenderWindow(hWnd, nSamples);
-}
-
-bool RenderPluginDx11::ResizeRenderWindow(int w, int h)
-{
-	return D3D11Util::ResizeRenderWindow(w, h);
-}
-
-void RenderPluginDx11::PresentRenderWindow()
-{
-	D3D11Util::PresentRenderWindow();
-}
-
-void RenderPluginDx11::ClearRenderWindow(float r, float g, float b)
-{
-	D3D11Util::ClearRenderWindow(r, g, b);
-}
-
-bool RenderPluginDx11::GetDeviceInfoString(wchar_t *str)
-{
-	return D3D11Util::GetDeviceInfoString(str);
-}
-
-GPUShaderResource* RenderPluginDx11::CreateTextureSRV(const char* texturename)
-{
-	return D3D11Util::CreateTextureSRV(texturename);
-}
-
-void RenderPluginDx11::TxtHelperBegin()
-{
-	D3D11Util::TxtHelperBegin();
-}
-
-void RenderPluginDx11::TxtHelperEnd()
-{
-	D3D11Util::TxtHelperEnd();
-}
-
-void RenderPluginDx11::TxtHelperSetInsertionPos(int x, int y)
-{
-	D3D11Util::TxtHelperSetInsertionPos(x, y);
-}
-
-void RenderPluginDx11::TxtHelperSetForegroundColor(float r, float g, float b, float a)
-{
-	D3D11Util::TxtHelperSetForegroundColor(r, g, b, a);
-}
-
-void RenderPluginDx11::TxtHelperDrawTextLine(wchar_t* str)
-{
-	D3D11Util::TxtHelperDrawTextLine(str);
-}
-
-// shader
-bool RenderPluginDx11::InitializeShaders()
-{
-	return InitializeShadersD3D11();
-}
-
-void RenderPluginDx11::DestroyShaders()
-{
-	DestroyShadersD3D11();
-}
-
-void RenderPluginDx11::ApplyShader(SHADER_TYPE st)
-{
-	ApplyShaderD3D11(st);
-}
-
-void RenderPluginDx11::DisableShader(SHADER_TYPE st)
-{
-	DisableShaderD3D11(st);
-}
-
-void RenderPluginDx11::BindShaderResources(SHADER_TYPE st, int numSRVs, GPUShaderResource** ppSRVs)
-{
-}
-
-void RenderPluginDx11::CopyShaderParam(SHADER_TYPE st,
-	void* pSysMem, unsigned int bytes, unsigned int slot)
-{
-	CopyShaderParamD3D11(st, pSysMem, bytes, slot);
-}
-
-// GPUProfiler
-GPUProfiler* RenderPluginDx11::CreateGPUProfiler()
-{
-	GPUProfiler* pProfiler = new D3D11GPUProfiler;
-	pProfiler->Initialize();
-	return pProfiler;
-}
-
-// ShadowMap
-ShadowMap* RenderPluginDx11::CreateShadowMap(int resolution)
-{
-	return new D3D11ShadowMap(resolution);
-}
-
-// D3D12RenderContext
-void RenderPluginDx11::PreRender()
-{
-}
-
-void RenderPluginDx11::PostRender()
-{
-}
-
-// GPUMeshResources
-
-#include "MeshData.h"
-#include "AnimUtil.h"
-
-GPUMeshResources* RenderPluginDx11::GPUMeshResourcesCreate(MeshData* pMeshData, const SkinData& skinData)
-{
-	GPUMeshResources* resources = new GPUMeshResources;
-
-	int numIndices = pMeshData->m_NumIndices;
-	int numVertices = pMeshData->m_NumVertices;
-
-	resources->m_pVertexBuffer = CreateVertexBuffer(
-		sizeof(MeshData::MeshVertex) * numIndices, pMeshData->m_pMeshVertices);
-
-	resources->m_pBoneIndicesSRV = CreateShaderResource(
-		sizeof(atcore_float4), numVertices, skinData.m_pBoneIndices);
-
-	resources->m_pBoneWeightsSRV = CreateShaderResource(
-		sizeof(atcore_float4), numVertices, skinData.m_pBoneWeights);
-
-	return resources;
-}
-
-void RenderPluginDx11::GPUMeshResourcesRelease(GPUMeshResources* pResource)
-{
-	SAFE_RELEASE(pResource->m_pVertexBuffer);
-	SAFE_RELEASE(pResource->m_pBoneIndicesSRV);
-	SAFE_RELEASE(pResource->m_pBoneWeightsSRV);
-}
-
-D3DHandles& RenderPluginDx11::GetDeviceHandles(D3DHandles& deviceHandles)
-{
-	return D3D11Util::GetDeviceHandles(deviceHandles);
-}
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D11/RenderPluginDx11.h b/tools/ArtistTools/source/CoreLib/Render/D3D11/RenderPluginDx11.h
deleted file mode 100644
index a43eb94..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D11/RenderPluginDx11.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#pragma once
-
-#include "RenderPlugin.h"
-
-extern "C" CORERENDER_EXPORT RenderPlugin* CreateRenderPlugin(void);
-
-class CORERENDER_EXPORT RenderPluginDx11 : public RenderPlugin
-{
-public:
-	RenderPluginDx11();
-	~RenderPluginDx11();
-
-	// interface
-	virtual bool InitDevice(int deviceID);
-	virtual bool Initialize();
-	virtual void Shutdown();
-	virtual void CopyToDevice(GPUBufferResource *pDevicePtr, void* pSysMem, unsigned int	ByteWidth);
-	virtual void ApplyDepthStencilState(DEPTH_STENCIL_STATE state);
-	virtual void ApplyRasterizerState(RASTERIZER_STATE state);
-	virtual void ApplySampler(int slot, SAMPLER_TYPE st);
-	virtual void ApplyBlendState(BLEND_STATE st);
-	virtual void GetViewport(Viewport& vp);
-	virtual void SetViewport(const Viewport& vp);
-	virtual void BindVertexShaderResources(int startSlot, int numSRVs, GPUShaderResource** ppSRVs);
-	virtual void BindPixelShaderResources(int startSlot, int numSRVs, GPUShaderResource** ppSRVs);
-	virtual void ClearVertexShaderResources(int startSlot, int numSRVs);
-	virtual void ClearPixelShaderResources(int startSlot, int numSRVs);
-	virtual void ClearInputLayout();
-	virtual void SetVertexBuffer(GPUBufferResource* pBuffer, UINT stride, UINT offset = 0);
-	virtual void SetPrimitiveTopologyTriangleStrip();
-	virtual void SetPrimitiveTopologyTriangleList();
-	virtual void SetPrimitiveTopologyLineList();
-	virtual void Draw(unsigned int vertexCount, unsigned int startCount = 0);
-	virtual GPUBufferResource* CreateVertexBuffer(unsigned int ByteWidth, void* pSysMem = 0);
-	virtual GPUShaderResource* CreateShaderResource(unsigned int stride, unsigned int numElements, void* pSysMem, NVHairReadOnlyBuffer* pReadOnlyBuffer = NULL);
-	virtual void ApplyForShadow(int ForShadow);
-	virtual void SwitchToDX11();
-	virtual void FlushDX11();
-	virtual void FlushDX12();
-	virtual void ApplyPrimitiveTopologyLine();
-	virtual void ApplyPrimitiveTopologyTriangle();
-	virtual void SubmitGpuWork();
-	virtual void WaitForGpu();
-
-	// util
-	virtual bool CreateRenderWindow(HWND hWnd, int nSamples);
-	virtual bool ResizeRenderWindow(int w, int h);
-	virtual void PresentRenderWindow();
-	virtual void ClearRenderWindow(float r, float g, float b);
-	virtual bool GetDeviceInfoString(wchar_t *str);
-	virtual GPUShaderResource* CreateTextureSRV(const char* texturename);
-	virtual void TxtHelperBegin();
-	virtual void TxtHelperEnd();
-	virtual void TxtHelperSetInsertionPos(int x, int y);
-	virtual void TxtHelperSetForegroundColor(float r, float g, float b, float a = 1.0f);
-	virtual void TxtHelperDrawTextLine(wchar_t* str);
-
-	// shader
-	virtual bool InitializeShaders();
-	virtual void DestroyShaders();
-	virtual void ApplyShader(SHADER_TYPE st);
-	virtual void DisableShader(SHADER_TYPE st);
-	virtual void BindShaderResources(SHADER_TYPE st, int numSRVs, GPUShaderResource** ppSRVs);
-	virtual void CopyShaderParam(SHADER_TYPE st, void* pSysMem, unsigned int bytes, unsigned int slot = 0);
-
-	// GPUProfiler
-	virtual GPUProfiler* CreateGPUProfiler();
-
-	// ShadowMap
-	virtual ShadowMap* CreateShadowMap(int resolution);
-
-	// D3D12RenderContext
-	virtual void PreRender();
-	virtual void PostRender();
-
-	// GPUMeshResources
-	virtual GPUMeshResources* GPUMeshResourcesCreate(MeshData* pMeshData, const SkinData& skinData);
-	virtual void GPUMeshResourcesRelease(GPUMeshResources* pResource);
-
-	// Get devices related
-	virtual D3DHandles& GetDeviceHandles(D3DHandles& deviceHandles);
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Buffer.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Buffer.cpp
deleted file mode 100644
index 0421792..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Buffer.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D12Buffer.h"
-
-// shared path
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Buffer.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Buffer.h
deleted file mode 100644
index ccf636b..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Buffer.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "RenderResources.h"
-
-#include <d3d12.h>
-
-// GPU resources for texture 
-struct GPUBufferD3D12 : public GPUBufferResource
-{
-	ID3D12Resource*	m_pBuffer;
-	UINT m_pBufferSize;
-
-	D3D12_VERTEX_BUFFER_VIEW m_vertexBufferView;
-
-public:
-	static GPUBufferResource* Create(ID3D12Resource* pResource, int nSize) {
-		GPUBufferD3D12* pBuffer = new GPUBufferD3D12; 
-		pBuffer->m_pBuffer = pResource;
-		pBuffer->m_pBufferSize = nSize;
-		return pBuffer;
-	}
-
-	static ID3D12Resource* GetResource(GPUBufferResource* pBuffer)
-	{
-		GPUBufferD3D12* pD3D12Buffer = dynamic_cast<GPUBufferD3D12*>(pBuffer);
-		if (!pD3D12Buffer)
-			return 0;
-		return pD3D12Buffer->m_pBuffer;
-	}
-
-	static D3D12_VERTEX_BUFFER_VIEW* GetVertexView(GPUBufferResource* pBuffer)
-	{
-		GPUBufferD3D12* pD3D12Buffer = dynamic_cast<GPUBufferD3D12*>(pBuffer);
-		if (!pD3D12Buffer)
-			return 0;
-
-		pD3D12Buffer->m_vertexBufferView.BufferLocation = pD3D12Buffer->m_pBuffer->GetGPUVirtualAddress();
-		pD3D12Buffer->m_vertexBufferView.StrideInBytes = 0;
-		pD3D12Buffer->m_vertexBufferView.SizeInBytes = pD3D12Buffer->m_pBufferSize;
-		return &pD3D12Buffer->m_vertexBufferView;
-	}
-
-	~GPUBufferD3D12()
-	{
-		Release();
-	}
-
-	void Release()
-	{
-		SAFE_RELEASE(m_pBuffer);
-	}
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12GPUProfiler.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12GPUProfiler.cpp
deleted file mode 100644
index b434c3c..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12GPUProfiler.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D12GPUProfiler.h"
-
-#include "D3D12RenderInterface.h"
-#include "D3D12RenderContext.h"
-///////////////////////////////////////////////////////////////
-// factory function to create D3D12 GPU profiler
-/*
-GPUProfiler* GPUProfiler::CreateD3D12()
-{
-	GPUProfiler* pProfiler = new D3D12GPUProfiler;
-	pProfiler->Initialize();
-	return pProfiler;
-}
-*/
-
-///////////////////////////////////////////////////////////////
-D3D12GPUProfiler::~D3D12GPUProfiler()
-{
-	Release();
-}
-
-///////////////////////////////////////////////////////////////
-void D3D12GPUProfiler::Initialize()
-{
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-
-	/*
-	ID3D12Device* pDevice12 = pContext->GetDevice();
-
-	D3D12_QUERY_HEAP_DESC queryHeapDesc = {};
-	queryHeapDesc.Count = MAX_QUERY_COUNT * 2;
-	queryHeapDesc.Type = D3D12_QUERY_HEAP_TYPE_TIMESTAMP;
-	ThrowIfFailed(pDevice12->CreateQueryHeap(&queryHeapDesc, IID_PPV_ARGS(&query_heap)));
-
-	D3D12_HEAP_PROPERTIES heap_prop;
-	heap_prop.Type = D3D12_HEAP_TYPE_DEFAULT;
-	heap_prop.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
-	heap_prop.MemoryPoolPreference = D3D12_MEMORY_POOL_UNKNOWN;
-	heap_prop.CreationNodeMask = 0;
-	heap_prop.VisibleNodeMask = 0;
-
-	D3D12_RESOURCE_DESC res_desc;
-	res_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
-	res_desc.Alignment = 0;
-	res_desc.Width = sizeof(UINT64) * 2;
-	res_desc.Height = 1;
-	res_desc.DepthOrArraySize = 1;
-	res_desc.MipLevels = 1;
-	res_desc.Format = DXGI_FORMAT_UNKNOWN;
-	res_desc.SampleDesc.Count = 1;
-	res_desc.SampleDesc.Quality = 0;
-	res_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
-	res_desc.Flags = D3D12_RESOURCE_FLAG_NONE;
-
-	ThrowIfFailed(pDevice12->CreateCommittedResource(&heap_prop, D3D12_HEAP_FLAG_NONE,
-		&res_desc, D3D12_RESOURCE_STATE_COMMON, nullptr,
-		IID_ID3D12Resource, reinterpret_cast<void**>(&query_result)));
-
-	heap_prop.Type = D3D12_HEAP_TYPE_READBACK;
-	ThrowIfFailed(pDevice12->CreateCommittedResource(&heap_prop, D3D12_HEAP_FLAG_NONE,
-		&res_desc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr,
-		IID_ID3D12Resource, reinterpret_cast<void**>(&query_result_readback)));
-	*/
-
-	m_pContext = pContext->GetDeviceContext();
-
-	D3D11_QUERY_DESC desc;
-	memset(&desc, 0, sizeof(D3D11_QUERY_DESC)); 
-	desc.Query = D3D11_QUERY_TIMESTAMP_DISJOINT;
-	desc.MiscFlags = 0;
-	
-	ID3D11Device* pDevice = pContext->GetDevice11();
-	pDevice->CreateQuery(&desc, &m_pQueryDisjoint);
-
-	desc.Query = D3D11_QUERY_TIMESTAMP;
-
-	for (int i = 0; i < MAX_QUERY_COUNT; i++)
-	{
-		pDevice->CreateQuery(&desc, &m_pQueryStart[i]);
-		pDevice->CreateQuery(&desc, &m_pQueryEnd[i]);
-	}
-	m_enable = true;
-}
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(x) { if (x) x->Release(); x = 0; }
-#endif
-
-///////////////////////////////////////////////////////////////
-void D3D12GPUProfiler::Release()
-{
-	for (int i = 0; i < MAX_QUERY_COUNT; i++)
-	{
-		SAFE_RELEASE(m_pQueryStart[i]);
-		SAFE_RELEASE(m_pQueryEnd[i]);
-	}
-
-	SAFE_RELEASE(m_pQueryDisjoint);
-}
-
-///////////////////////////////////////////////////////////////
-void D3D12GPUProfiler::StartProfile(int id)
-{
-	if (!m_enable) return;
-
-	/*
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	ID3D12GraphicsCommandList* pCommandList = pContext->GetGraphicsCommandList();
-	pCommandList->EndQuery(query_heap, D3D12_QUERY_TYPE_TIMESTAMP, id * 2);
-	*/
-
-	ID3D11Query* pQuery = m_pQueryStart[id];	
-	m_pContext->End(pQuery);
-}
-
-///////////////////////////////////////////////////////////////
-void D3D12GPUProfiler::EndProfile(int id)
-{
-	if (!m_enable) return;
-
-	/*
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	ID3D12GraphicsCommandList* pCommandList = pContext->GetGraphicsCommandList();
-	pCommandList->EndQuery(query_heap, D3D12_QUERY_TYPE_TIMESTAMP, id * 2 + 1);
-	*/
-
-	ID3D11Query* pQuery = m_pQueryEnd[id];	
-	m_pContext->End(pQuery);
-}
-
-///////////////////////////////////////////////////////////////
-void D3D12GPUProfiler::StartFrame()
-{
-	if (!m_enable) return;
-
-	m_pContext->Begin(m_pQueryDisjoint);
-}
-
-///////////////////////////////////////////////////////////////
-void D3D12GPUProfiler::EndFrame()
-{
-	if (!m_enable) return;
-
-	m_pContext->End(m_pQueryDisjoint);
-		
-	while(m_pContext->GetData(m_pQueryDisjoint, &m_disjointData, sizeof(D3D11_QUERY_DATA_TIMESTAMP_DISJOINT), 0) != S_OK);
-}
-
-///////////////////////////////////////////////////////////////
-float D3D12GPUProfiler::GetProfileData(int id)
-{
-	if (!m_enable) 
-		return 0.0f;
-
-	/*
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	ID3D12GraphicsCommandList* pCommandList = pContext->GetGraphicsCommandList();
-
-	UINT64 times[2];
-	D3D12_RESOURCE_BARRIER barrier;
-	barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
-	barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
-	barrier.Transition.pResource = query_result;
-	barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_COMMON;
-	barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_DEST;
-	barrier.Transition.Subresource = 0;
-	pCommandList->ResourceBarrier(1, &barrier);
-
-	pCommandList->ResolveQueryData(query_heap, D3D12_QUERY_TYPE_TIMESTAMP, id * 2, 2, query_result, 0);
-
-	barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_DEST;
-	barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_SOURCE;
-	pCommandList->ResourceBarrier(1, &barrier);
-
-	pCommandList->CopyResource(query_result_readback, query_result);
-
-	barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_SOURCE;
-	barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_COMMON;
-	pCommandList->ResourceBarrier(1, &barrier);
-
-	void* pData;
-	ThrowIfFailed(query_result_readback->Map(0, 0, &pData));
-	memcpy(times, pData, sizeof(UINT64) * 2);
-	query_result_readback->Unmap(0, 0);
-	*/
-
-	UINT64 startTime = 0;
-	while(m_pContext->GetData(m_pQueryStart[id], &startTime, sizeof(UINT64), 0) != S_OK);
-
-	UINT64 endTime = 0;
-	while(m_pContext->GetData(m_pQueryEnd[id], &endTime, sizeof(UINT64), 0) != S_OK);
-	
-	float frequency = static_cast<float>(m_disjointData.Frequency);
-	return (endTime - startTime) / frequency * 1000.0f;
-}
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12GPUProfiler.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12GPUProfiler.h
deleted file mode 100644
index 721b8a9..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12GPUProfiler.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include <d3d11.h>
-/*
-#include <d3d12.h>
-*/
-#include "GPUProfiler.h"
-
-#define MAX_QUERY_COUNT 64
-struct D3D12GPUProfiler : public GPUProfiler
-{
-public:
-	~D3D12GPUProfiler();
-
-	void Initialize();
-	void Release();
-	void StartProfile(int id);
-	void EndProfile(int id);
-	void StartFrame();
-	void EndFrame();
-	float GetProfileData(int id);
-
-protected:
-	ID3D11Query*	m_pQueryDisjoint;
-	ID3D11Query*	m_pQueryStart[MAX_QUERY_COUNT];
-	ID3D11Query*	m_pQueryEnd[MAX_QUERY_COUNT];
-	D3D11_QUERY_DATA_TIMESTAMP_DISJOINT m_disjointData;
-	ID3D11DeviceContext* m_pContext;
-	/*
-	ID3D12QueryHeap* query_heap;
-	ID3D12Resource* query_result;
-	ID3D12Resource* query_result_readback;
-	*/
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderContext.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderContext.cpp
deleted file mode 100644
index 8202139..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderContext.cpp
+++ /dev/null
@@ -1,564 +0,0 @@
-#include "D3D12RenderContext.h"
-
-const int nBufferCount = 2;
-//const int nBufferCount = 5;
-
-int nRenderTargetIndex = 1;
-//int nRenderTargetIndex = 4;
-
-D3D12RenderContext::D3D12RenderContext()
-{
-	m_sampleCount = 1;
-}
-
-D3D12RenderContext::~D3D12RenderContext()
-{
-}
-
-D3D12RenderContext* D3D12RenderContext::Instance()
-{
-	static D3D12RenderContext ri;
-	return &ri;
-}
-
-void GetHardwareAdapter(IDXGIFactory2* pFactory, IDXGIAdapter1** ppAdapter)
-{
-	IDXGIAdapter1* pAdapter = nullptr;
-	*ppAdapter = nullptr;
-
-	for (UINT adapterIndex = 0; DXGI_ERROR_NOT_FOUND != pFactory->EnumAdapters1(adapterIndex, &pAdapter); ++adapterIndex)
-	{
-		DXGI_ADAPTER_DESC1 desc;
-		pAdapter->GetDesc1(&desc);
-
-		if (desc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE)
-		{
-			// Don't select the Basic Render Driver adapter.
-			// If you want a software adapter, pass in "/warp" on the command line.
-			continue;
-		}
-
-		// Check to see if the adapter supports Direct3D 12, but don't create the
-		// actual device yet.
-		if (SUCCEEDED(D3D12CreateDevice(pAdapter, D3D_FEATURE_LEVEL_11_0, _uuidof(ID3D12Device), nullptr)))
-		{
-			break;
-		}
-	}
-
-	*ppAdapter = pAdapter;
-}
-
-void D3D12RenderContext::InitDevice()
-{
-	UINT d3d11DeviceFlags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
-#if defined(_DEBUG)
-	// Enable the D3D11 debug layer.
-	d3d11DeviceFlags |= D3D11_CREATE_DEVICE_DEBUG;
-	// Enable the D3D12 debug layer.
-	{
-		ComPtr<ID3D12Debug> debugController;
-		if (SUCCEEDED(D3D12GetDebugInterface(IID_PPV_ARGS(&debugController))))
-		{
-			debugController->EnableDebugLayer();
-		}
-	}
-#endif
-
-	ThrowIfFailed(CreateDXGIFactory1(IID_PPV_ARGS(&m_factory)));
-
-	GetHardwareAdapter(m_factory.Get(), &m_adapter);
-
-	auto adapterDescription = DXGI_ADAPTER_DESC();
-	m_adapter->GetDesc(&adapterDescription);
-
-	D3D12CreateDevice(m_adapter.Get(), D3D_FEATURE_LEVEL_11_0, IID_PPV_ARGS(&m_device));
-	if (nullptr == m_device)
-	{
-		ComPtr<IDXGIAdapter> warpAdapter;
-		ThrowIfFailed(m_factory->EnumWarpAdapter(IID_PPV_ARGS(&warpAdapter)));
-		ThrowIfFailed(D3D12CreateDevice(warpAdapter.Get(), D3D_FEATURE_LEVEL_11_0, IID_PPV_ARGS(&m_device)));
-	}
-
-	// Describe and create the command queue.
-	D3D12_COMMAND_QUEUE_DESC queueDesc = {};
-	queueDesc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
-	queueDesc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
-
-	ThrowIfFailed(m_device->CreateCommandQueue(&queueDesc, IID_PPV_ARGS(&m_commandQueue)));
-
-	ThrowIfFailed(D3D11On12CreateDevice(
-		m_device.Get(),
-		d3d11DeviceFlags, nullptr, 0,
-		reinterpret_cast<IUnknown**>(m_commandQueue.GetAddressOf()), 1, 0,
-		&m_d3d11Device,
-		&m_d3d11DeviceContext,
-		nullptr ));
-
-	ThrowIfFailed(m_d3d11Device.As(&m_d3d11On12Device));
-}
-
-void D3D12RenderContext::InitSwapchain(int nWidth, int nHeight, HWND hWnd)
-{
-	// Describe and create the swap chain.
-	DXGI_SWAP_CHAIN_DESC swapChainDesc = {};
-	swapChainDesc.BufferCount = nBufferCount;
-	swapChainDesc.BufferDesc.Width = nWidth;
-	swapChainDesc.BufferDesc.Height = nHeight;
-	swapChainDesc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-	swapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-	swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
-	swapChainDesc.OutputWindow = hWnd;
-	swapChainDesc.SampleDesc.Count = 1;
-	swapChainDesc.Windowed = TRUE;
-
-	ComPtr<IDXGISwapChain> swapChain;
-	ThrowIfFailed(m_factory->CreateSwapChain(
-		m_commandQueue.Get(),		// Swap chain needs the queue so that it can force a flush on it.
-		&swapChainDesc,
-		&swapChain
-		));
-
-	ThrowIfFailed(swapChain.As(&m_swapChain));
-
-	// This sample does not support fullscreen transitions.
-	// ThrowIfFailed(m_factory->MakeWindowAssociation(hWnd, DXGI_MWA_NO_ALT_ENTER));
-
-	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
-
-	ThrowIfFailed(m_device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(&m_commandAllocator)));
-
-	// Create the command list.
-	ThrowIfFailed(m_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, m_commandAllocator.Get(), nullptr, IID_PPV_ARGS(&m_commandList)));
-
-	m_pCurrentRenderTarget = new D3D12RenderTarget(0, nBufferCount);
-	m_pCurrentRenderTarget->OnCreate(nWidth, nHeight);
-	m_pCurrentRenderTarget->SetClearColor(0.5, 0.5, 0.5);
-	m_RenderTargetMap[0] = m_pCurrentRenderTarget;
-
-	m_pD3D11RenderTargetView = new ID3D11RenderTargetView*[nBufferCount];
-	m_wrappedBackBuffers = new ID3D11Resource*[nBufferCount];
-	for (int n = 0; n < nBufferCount; n++)
-	{
-		m_pD3D11RenderTargetView[n] = nullptr;
-		m_wrappedBackBuffers[n] = nullptr;
-	}
-
-	PostCreate();
-}
-
-#ifndef Safe_Release
-#define Safe_Release(p)       { if (p) { p->Release();     (p) = nullptr; } }
-#endif // !Safe_Delete
-
-void D3D12RenderContext::ResizeSwapchain(int width, int height)
-{	
-	D3D12RenderTarget* rt = m_RenderTargetMap[0];
-
-	for (int n = 0; n < nBufferCount; n++)
-	{
-		Safe_Release(m_pD3D11RenderTargetView[n]);
-		Safe_Release(m_wrappedBackBuffers[n]);
-	}
-	m_d3d11DeviceContext->Flush();
-
-	rt->OnDestroy();
-
-	ThrowIfFailed(m_swapChain->ResizeBuffers(nBufferCount, width, height, DXGI_FORMAT_R8G8B8A8_UNORM, 0));
-
-	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
-
-	rt->OnResize(width, height);
-
-	for (int n = 0; n < nBufferCount; n++)
-	{
-		ID3D11On12Device* pDevice11On12 = GetDevice11On12();
-
-		D3D11_RESOURCE_FLAGS d3d11Flags = { D3D11_BIND_RENDER_TARGET };
-		ThrowIfFailed(pDevice11On12->CreateWrappedResource(
-			rt->GetTexture(n, false),
-			&d3d11Flags,
-			D3D12_RESOURCE_STATE_RENDER_TARGET,
-			D3D12_RESOURCE_STATE_PRESENT,
-			IID_PPV_ARGS(&m_wrappedBackBuffers[n])));
-
-		ThrowIfFailed(m_d3d11Device->CreateRenderTargetView(m_wrappedBackBuffers[n],
-			NULL, &m_pD3D11RenderTargetView[n]));
-	}
-}
-
-void D3D12RenderContext::PostCreate()
-{
-	m_srvUavHeap.Init(m_device.Get(), 256, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, D3D12_DESCRIPTOR_HEAP_FLAG_NONE);
-
-	{
-		ThrowIfFailed(m_commandList->Close());
-		ID3D12CommandList* ppCommandLists[] = { m_commandList.Get() };
-		m_commandQueue->ExecuteCommandLists(_countof(ppCommandLists), ppCommandLists);
-	}
-
-	{
-		ThrowIfFailed(m_device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&m_fence)));
-		m_fenceValue = 1;
-
-		// Create an event handle to use for frame synchronization.
-		m_fenceEvent = CreateEvent(nullptr, FALSE, FALSE, nullptr);
-		if (m_fenceEvent == nullptr)
-		{
-			ThrowIfFailed(HRESULT_FROM_WIN32(GetLastError()));
-		}
-
-		WaitForGpu();
-	}
-}
-
-void D3D12RenderContext::OnDestroy()
-{
-	WaitForGpu();
-	if (nullptr != m_fenceEvent)
-	{
-		CloseHandle(m_fenceEvent);
-		m_fenceEvent = nullptr;
-	}
-
-#if 0
-	ID3D12DebugDevice* debugInterface;
-	if (SUCCEEDED(m_device.Get()->QueryInterface(&debugInterface)))
-	{
-		debugInterface->ReportLiveDeviceObjects(D3D12_RLDO_DETAIL | D3D12_RLDO_IGNORE_INTERNAL);
-		debugInterface->Release();
-	}
-#endif // 0
-}
-
-void D3D12RenderContext::PreRender()
-{
-	ThrowIfFailed(m_commandAllocator->Reset());
-	ThrowIfFailed(m_commandList->Reset(m_commandAllocator.Get(), nullptr));
-}
-
-void D3D12RenderContext::PostRender()
-{
-	ThrowIfFailed(m_commandList->Close());
-	ID3D12CommandList* ppCommandLists[] = { m_commandList.Get() };
-	m_commandQueue->ExecuteCommandLists(_countof(ppCommandLists), ppCommandLists);
-
-	OnGpuWorkSubmitted(m_commandQueue.Get());
-
-	WaitForGpu();
-}
-
-void D3D12RenderContext::SubmitGpuWork()
-{
-	ThrowIfFailed(m_commandList->Close());
-	ID3D12CommandList* ppCommandLists[] = { m_commandList.Get() };
-	m_commandQueue->ExecuteCommandLists(_countof(ppCommandLists), ppCommandLists);
-
-	ThrowIfFailed(m_commandList->Reset(m_commandAllocator.Get(), nullptr));
-
-	OnGpuWorkSubmitted(m_commandQueue.Get());
-}
-
-
-void D3D12RenderContext::Flush()
-{
-	m_pCurrentRenderTarget->PostRender();
-	PostRender();
-	PreRender();
-	m_pCurrentRenderTarget->PreRender();
-}
-
-void D3D12RenderContext::Present()
-{
-	ThrowIfFailed(m_swapChain->Present(1, 0));
-	//ThrowIfFailed(m_swapChain->Present(0, 0));
-	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();
-
-	//OnGpuWorkSubmitted(m_commandQueue.Get(), true);
-	//WaitForGpu();
-}
-
-int D3D12RenderContext::AllocRenderTargetIndex()
-{
-	return nRenderTargetIndex++;
-}
-
-
-void D3D12RenderContext::AddGpuInterface(GpuInterface* gpuIntf)
-{
-	m_gpuInterfaces.push_back(gpuIntf);
-}
-
-
-void D3D12RenderContext::OnGpuWorkSubmitted(ID3D12CommandQueue* queue)
-{
-	std::vector<GpuInterface*>::const_iterator cur = m_gpuInterfaces.begin();
-	std::vector<GpuInterface*>::const_iterator end = m_gpuInterfaces.end();
-
-	for (; cur != end; cur++)
-	{
-		(*cur)->onGpuWorkSubmitted(queue);
-	}
-}
-
-void D3D12RenderContext::UpdateGpuWorkCompleted()
-{
-	std::vector<GpuInterface*>::const_iterator cur = m_gpuInterfaces.begin();
-	std::vector<GpuInterface*>::const_iterator end = m_gpuInterfaces.end();
-
-	for (; cur != end; cur++)
-	{
-		(*cur)->updateGpuWorkCompleted();
-	}
-}
-
-D3D12RenderTarget* D3D12RenderContext::CreateRenderTarget(int renderTargetIndex, int nWidth, int nHeight)
-{
-	D3D12RenderTarget* pRenderTarget = new D3D12RenderTarget(renderTargetIndex);
-	pRenderTarget->OnCreate(nWidth, nHeight);
-	m_RenderTargetMap[renderTargetIndex] = pRenderTarget;
-	return pRenderTarget;
-}
-
-ID3D12Resource* D3D12RenderContext::GetTexture(int renderTargetIndex, int index)
-{
-	D3D12RenderTarget* pRenderTarget = m_RenderTargetMap[renderTargetIndex];
-	ID3D12Resource* pTexture = pRenderTarget->GetTexture(index);
-	return pTexture;
-}
-
-void D3D12RenderContext::SetViewport(D3D12_VIEWPORT& vp)
-{
-	m_pCurrentRenderTarget->m_viewport = vp;
-	m_commandList->RSSetViewports(1, &vp);
-}
-
-void D3D12RenderContext::GetViewport(D3D12_VIEWPORT& vp)
-{
-	vp = m_pCurrentRenderTarget->m_viewport;
-}
-
-D3D12_RESOURCE_DESC D3D12RenderContext::GetBackBufferDesc()
-{
-	D3D12RenderTarget* pRenderTarget = m_RenderTargetMap[0];
-	ID3D12Resource* pResource = pRenderTarget->GetTexture();
-	return pResource->GetDesc();
-}
-
-void D3D12RenderContext::SwitchToDX11()
-{
-	ReleaseRenderTarget();
-	PostRender();
-
-	if (nullptr == m_wrappedBackBuffers[m_frameIndex])
-	{
-		return;
-	}
-
-	m_d3d11On12Device->AcquireWrappedResources(&m_wrappedBackBuffers[m_frameIndex], 1);
-
-	m_d3d11DeviceContext->OMSetRenderTargets(1, &m_pD3D11RenderTargetView[m_frameIndex], nullptr);
-	D3D12RenderTarget* pRenderTarget = m_RenderTargetMap[0];	
-	D3D11_VIEWPORT vp;
-	{
-		vp.TopLeftX = 0;
-		vp.TopLeftY = 0;
-		vp.Width = (float)pRenderTarget->m_viewport.Width;
-		vp.Height = (float)pRenderTarget->m_viewport.Height;
-		vp.MinDepth = 0.0f;
-		vp.MaxDepth = 1.0f;
-	}
-	m_d3d11DeviceContext->RSSetViewports(1, &vp);
-}
-
-void D3D12RenderContext::FlushDX11()
-{
-	if (nullptr == m_wrappedBackBuffers[m_frameIndex])
-	{
-		return;
-	}
-
-	m_d3d11On12Device->ReleaseWrappedResources(&m_wrappedBackBuffers[m_frameIndex], 1);
-	m_d3d11DeviceContext->Flush();
-}
-
-ID3D12Resource* D3D12RenderContext::GetDepthStencilResource()
-{
-	D3D12RenderTarget* pRenderTarget = m_RenderTargetMap[0];
-	return pRenderTarget->GetDepthStencilResource();
-}
-
-D3D12_CPU_DESCRIPTOR_HANDLE D3D12RenderContext::GetRenderTargetViewHandle()
-{
-	D3D12RenderTarget* pRenderTarget = m_RenderTargetMap[0];
-	return pRenderTarget->GetRenderTargetViewHandle();
-}
-
-D3D12_CPU_DESCRIPTOR_HANDLE D3D12RenderContext::GetDepthStencilViewHandle()
-{
-	D3D12RenderTarget* pRenderTarget = m_RenderTargetMap[0];
-	return pRenderTarget->GetDepthStencilViewHandle();
-}
-
-void D3D12RenderContext::AcquireRenderTarget(bool doClear, int renderTargetIndex)
-{
-	m_pCurrentRenderTarget = m_RenderTargetMap[renderTargetIndex];
-	m_pCurrentRenderTarget->PreRender(doClear);
-}
-
-void D3D12RenderContext::ReleaseRenderTarget(int renderTargetIndex)
-{
-	D3D12RenderTarget* pRenderTarget = m_RenderTargetMap[renderTargetIndex];
-	pRenderTarget->PostRender();
-}
-
-void D3D12RenderContext::SetClearColor(int renderTargetIndex, float r, float g, float b, float a, float depth, float stencil)
-{
-	D3D12RenderTarget* pRenderTarget = m_RenderTargetMap[renderTargetIndex];
-	pRenderTarget->SetClearColor(r, g, b, a, depth, stencil);
-}
-
-void D3D12RenderContext::WaitForGpu()
-{
-	const UINT64 fence = m_fenceValue;
-	ThrowIfFailed(m_commandQueue->Signal(m_fence.Get(), fence));
-	m_fenceValue++;
-
-	// Wait until the previous frame is finished.
-	if (m_fence->GetCompletedValue() < fence)
-	{
-		ThrowIfFailed(m_fence->SetEventOnCompletion(fence, m_fenceEvent));
-		WaitForSingleObject(m_fenceEvent, INFINITE);
-	}
-}
-
-void D3D12RenderContext::InitBuffer(NVHairReadOnlyBuffer& buffer)
-{
-	buffer.Init(&m_srvUavHeap);
-}
-
-void D3D12RenderContext::DestroyBuffer(NVHairReadOnlyBuffer& buffer)
-{
-	buffer.Release();
-}
-
-CD3DX12_CPU_DESCRIPTOR_HANDLE D3D12RenderContext::NVHairINT_CreateD3D12ReadOnlyBuffer(
-	UINT						stride,
-	UINT						numElements,
-	NVHairReadOnlyBuffer*		pReadOnlyBuffer,
-	void*						pSysMem)
-{
-	ID3D12Device*				pd3dDevice = m_device.Get();
-	ID3D12GraphicsCommandList*	pCommandList = m_commandList.Get();
-
-	UINT bufferSize = numElements * stride;
-
-	HRESULT hr;
-	hr = pd3dDevice->CreateCommittedResource(
-		&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT),
-		D3D12_HEAP_FLAG_NONE,
-		&CD3DX12_RESOURCE_DESC::Buffer(bufferSize),
-		D3D12_RESOURCE_STATE_COPY_DEST,
-		nullptr,
-		IID_PPV_ARGS(pReadOnlyBuffer->m_pBuffer.ReleaseAndGetAddressOf()));
-
-	hr = pd3dDevice->CreateCommittedResource(
-		&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD),
-		D3D12_HEAP_FLAG_NONE,
-		&CD3DX12_RESOURCE_DESC::Buffer(bufferSize),
-		D3D12_RESOURCE_STATE_GENERIC_READ,
-		nullptr,
-		IID_PPV_ARGS(pReadOnlyBuffer->m_pBufferUpload.ReleaseAndGetAddressOf()));
-
-	D3D12_SUBRESOURCE_DATA data = {};
-	data.pData = reinterpret_cast<UINT8*>(pSysMem);
-	data.RowPitch = bufferSize;
-	data.SlicePitch = data.RowPitch;
-
-	PreRender();
-	UpdateSubresources<1>(pCommandList, pReadOnlyBuffer->m_pBuffer.Get(), pReadOnlyBuffer->m_pBufferUpload.Get(), 0, 0, 1, &data);
-	pCommandList->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(pReadOnlyBuffer->m_pBuffer.Get(), D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE));
-	PostRender();
-
-	CD3DX12_CPU_DESCRIPTOR_HANDLE srvHandle(pReadOnlyBuffer->m_pSrvUavHeap->m_pHeap.Get()->GetCPUDescriptorHandleForHeapStart(), pReadOnlyBuffer->m_srvIndex, pReadOnlyBuffer->m_pSrvUavHeap->m_sizeDescriptor);
-	D3D12_SHADER_RESOURCE_VIEW_DESC srvDesc = {};
-	srvDesc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
-	srvDesc.Format = DXGI_FORMAT_UNKNOWN;
-	srvDesc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
-	srvDesc.Buffer.FirstElement = 0;
-	srvDesc.Buffer.NumElements = numElements;
-	srvDesc.Buffer.StructureByteStride = stride;
-	srvDesc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_NONE;
-	pd3dDevice->CreateShaderResourceView(pReadOnlyBuffer->m_pBuffer.Get(), &srvDesc, srvHandle);
-
-	return srvHandle;
-}
-
-CD3DX12_CPU_DESCRIPTOR_HANDLE D3D12RenderContext::NVHairINT_CreateD3D12Texture(ID3D12Resource* pTexture, int& nIndexInHeap)
-{
-	CD3DX12_CPU_DESCRIPTOR_HANDLE handle = {};
-
-	if (!pTexture)
-		return handle;
-
-	ID3D12Device* pDevice = m_device.Get();
-	if (!pDevice)
-		return handle;
-
-	nIndexInHeap = m_srvUavHeap.allocate();
-	if(nIndexInHeap == -1)
-		return handle;
-
-	CD3DX12_CPU_DESCRIPTOR_HANDLE srvHandle(m_srvUavHeap.m_pHeap.Get()->GetCPUDescriptorHandleForHeapStart(), 
-		nIndexInHeap, m_srvUavHeap.m_sizeDescriptor);
-
-	D3D12_RESOURCE_DESC desc = pTexture->GetDesc();
-
-	D3D12_SHADER_RESOURCE_VIEW_DESC srvDesc = {};
-	srvDesc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
-	srvDesc.Format = desc.Format;
-	srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
-	srvDesc.Texture2D.MipLevels = 1;
-
-	pDevice->CreateShaderResourceView(pTexture, &srvDesc, srvHandle);
-
-	return srvHandle;
-}
-
-void D3D12RenderContext::NVHairINT_DestroyD3D12Texture(int& nIndexInHeap)
-{
-	if (nIndexInHeap != -1)
-	{
-		m_srvUavHeap.deallocate(nIndexInHeap);
-	}
-}
-
-void D3D12RenderContext::SetSampleCount(int nSampleCount)
-{
-	m_sampleCount = 1;
-
-	if (nSampleCount > D3D12_MAX_MULTISAMPLE_SAMPLE_COUNT)
-		nSampleCount = D3D12_MAX_MULTISAMPLE_SAMPLE_COUNT;
-
-	if (nSampleCount > 1)
-	{
-		D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS qualityLevels;
-		qualityLevels.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-		qualityLevels.Flags = D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_NONE;
-		qualityLevels.NumQualityLevels = 0;
-		qualityLevels.SampleCount = nSampleCount;
-
-		ID3D12Device *pDevice = GetDevice();
-		pDevice->CheckFeatureSupport(D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, &qualityLevels, sizeof(qualityLevels));
-
-		if (qualityLevels.NumQualityLevels > 0)
-		{
-			m_sampleCount = qualityLevels.SampleCount;
-		}
-	}
-}
-
-int D3D12RenderContext::GetSampleCount()
-{
-	return m_sampleCount;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderContext.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderContext.h
deleted file mode 100644
index 2e0b393..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderContext.h
+++ /dev/null
@@ -1,254 +0,0 @@
-#pragma once
-
-#include "D3D12RenderTarget.h"
-#include "RenderPlugin.h"
-
-#include "d3dx12.h"
-#include <wrl.h>
-using namespace Microsoft::WRL;
-
-struct NVHairHeap
-{
-	ComPtr<ID3D12DescriptorHeap> m_pHeap;
-	UINT m_sizeHeap;
-	UINT m_currentIndex;
-	UINT m_sizeDescriptor;
-	std::vector<UINT> m_availableIndexes;
-
-	void Init(ID3D12Device* pd3dDevice, UINT size, D3D12_DESCRIPTOR_HEAP_TYPE type, D3D12_DESCRIPTOR_HEAP_FLAGS flags)
-	{
-		HRESULT hr;
-
-		D3D12_DESCRIPTOR_HEAP_DESC srvHeapDesc = {};
-		srvHeapDesc.NumDescriptors = size;
-		srvHeapDesc.Flags = flags;
-		srvHeapDesc.Type = type;
-		hr = pd3dDevice->CreateDescriptorHeap(&srvHeapDesc, IID_PPV_ARGS(m_pHeap.ReleaseAndGetAddressOf()));
-
-		if (SUCCEEDED(hr))
-		{
-			m_sizeHeap = size;
-			m_sizeDescriptor = pd3dDevice->GetDescriptorHandleIncrementSize(type);
-		}
-		else
-		{
-			m_sizeHeap = 0;
-			m_sizeDescriptor = 0;
-		}
-		m_currentIndex = 0;
-		m_availableIndexes.clear();
-	}
-
-	UINT allocate()
-	{
-		int availables = m_availableIndexes.size();
-		if (availables > 0)
-		{
-			UINT index = m_availableIndexes[availables - 1];
-			m_availableIndexes.pop_back();
-			return index;
-		}
-		UINT index = m_currentIndex++;
-		if (m_sizeHeap > m_currentIndex)
-			return index;
-		return (UINT)-1;
-	}
-
-	void deallocate(UINT availableIndex)
-	{
-		m_availableIndexes.push_back(availableIndex);
-	}
-
-	void Release()
-	{
-		if (m_pHeap) m_pHeap = nullptr;
-		m_sizeHeap = 0;
-		m_currentIndex = 0;
-		m_sizeDescriptor = 0;
-		m_availableIndexes.clear();
-	}
-};
-
-struct NVHairVertexBuffer
-{
-	ComPtr<ID3D12Resource> m_pBuffer;
-	ComPtr<ID3D12Resource> m_pBufferUpload;
-	D3D12_VERTEX_BUFFER_VIEW m_vertexBufferView;
-	NVHairHeap* m_pSrvUavHeap;
-	UINT m_uavIndex;
-
-	void Init(NVHairHeap* pHeap)
-	{
-		m_pBuffer = nullptr;
-		m_pBufferUpload = nullptr;
-		memset(&m_vertexBufferView, 0, sizeof(D3D12_VERTEX_BUFFER_VIEW));
-		m_pSrvUavHeap = pHeap;
-
-		m_uavIndex = m_pSrvUavHeap->allocate();
-	}
-
-	D3D12_CPU_DESCRIPTOR_HANDLE getUavCpuHandle()
-	{
-		CD3DX12_CPU_DESCRIPTOR_HANDLE uavHandle(m_pSrvUavHeap->m_pHeap.Get()->GetCPUDescriptorHandleForHeapStart(), m_uavIndex, m_pSrvUavHeap->m_sizeDescriptor);
-		return uavHandle;
-	}
-
-	void Release()
-	{
-		if (m_pBuffer) m_pBuffer = nullptr;
-		if (m_pBufferUpload) m_pBufferUpload = nullptr;
-		memset(&m_vertexBufferView, 0, sizeof(D3D12_VERTEX_BUFFER_VIEW));
-		if (m_pSrvUavHeap) m_pSrvUavHeap = nullptr;
-		m_uavIndex = (UINT)-1;
-	}
-};
-
-struct NVHairReadOnlyBuffer
-{
-	ComPtr<ID3D12Resource> m_pBuffer;
-	ComPtr<ID3D12Resource> m_pBufferUpload;
-	NVHairHeap* m_pSrvUavHeap;
-	UINT m_srvIndex;
-
-	void Init(NVHairHeap* pHeap)
-	{
-		m_pBuffer = nullptr;
-		m_pBufferUpload = nullptr;
-		m_pSrvUavHeap = pHeap;
-
-		m_srvIndex = m_pSrvUavHeap->allocate();
-	}
-
-	CD3DX12_CPU_DESCRIPTOR_HANDLE getSrvCpuHandle()
-	{
-		CD3DX12_CPU_DESCRIPTOR_HANDLE srvHandle(m_pSrvUavHeap->m_pHeap.Get()->GetCPUDescriptorHandleForHeapStart(), m_srvIndex, m_pSrvUavHeap->m_sizeDescriptor);
-		return srvHandle;
-	}
-
-	void Release()
-	{
-		m_pSrvUavHeap->deallocate(m_srvIndex);
-
-		if (m_pBuffer) m_pBuffer = nullptr;
-		if (m_pBufferUpload) m_pBufferUpload = nullptr;
-		if (m_pSrvUavHeap) m_pSrvUavHeap = nullptr;
-		m_srvIndex = (UINT)-1;
-	}
-};
-
-class CORERENDER_EXPORT D3D12RenderContext
-{
-public:
-	~D3D12RenderContext();
-	static D3D12RenderContext* Instance();
-
-	class GpuInterface
-	{
-		public:
-		virtual void onGpuWorkSubmitted(ID3D12CommandQueue* queue) = 0;
-		virtual void updateGpuWorkCompleted() = 0;
-		virtual ~GpuInterface() {}
-	};
-
-	typedef void (*GpuWorkSubmitFunc)(ID3D12CommandQueue* queue, void* data);
-	typedef void (*GpuUpdateCompletedFunc)(void* data);
-
-	void InitDevice();
-	void InitSwapchain(int width, int height, HWND hWnd);
-	void ResizeSwapchain(int width, int height);
-	void PostCreate();
-
-	void OnDestroy();
-
-	void PreRender();
-	void PostRender();
-	void Flush();
-	
-	void SubmitGpuWork();
-	void WaitForGpu();
-
-	void UpdateGpuWorkCompleted();
-
-	void Present();
-
-	int AllocRenderTargetIndex();
-	D3D12RenderTarget* CreateRenderTarget(int renderTargetIndex, int nWidth, int nHeight);
-	void SetClearColor(int renderTargetIndex, float r, float g, float b, float a = 1.0, float depth = 1.0, float stencil = 0.0);
-	void AcquireRenderTarget(bool doClear = false, int renderTargetIndex = 0);
-	void ReleaseRenderTarget(int renderTargetIndex = 0);
-	ID3D12Resource* GetTexture(int renderTargetIndex, int index = 0);
-	void SetViewport(D3D12_VIEWPORT& vp);
-	void GetViewport(D3D12_VIEWPORT& vp);
-
-	ID3D12Device* GetDevice() { return m_device.Get(); }
-	ID3D12GraphicsCommandList* GetGraphicsCommandList() { return m_commandList.Get(); }
-	ID3D12CommandQueue* GetCommandQueue() const { return m_commandQueue.Get(); }
-
-	IDXGISwapChain3* GetSwapChain() { return m_swapChain.Get(); }
-	UINT GetFrameIndex() { return m_frameIndex; }
-
-	ID3D11Device* GetDevice11() { return m_d3d11Device.Get(); }
-	ID3D11On12Device* GetDevice11On12() { return m_d3d11On12Device.Get(); }
-	ID3D11DeviceContext* GetDeviceContext() { return m_d3d11DeviceContext.Get(); }
-	
-	D3D12_RESOURCE_DESC GetBackBufferDesc();
-	void SwitchToDX11();
-	void FlushDX11();
-
-	ID3D12Resource* GetDepthStencilResource();
-	D3D12_CPU_DESCRIPTOR_HANDLE GetRenderTargetViewHandle();
-	D3D12_CPU_DESCRIPTOR_HANDLE GetDepthStencilViewHandle();
-
-	void InitBuffer(NVHairReadOnlyBuffer& buffer);
-	void DestroyBuffer(NVHairReadOnlyBuffer& buffer);
-
-	CD3DX12_CPU_DESCRIPTOR_HANDLE NVHairINT_CreateD3D12ReadOnlyBuffer(
-		UINT						stride,
-		UINT						numElements,
-		NVHairReadOnlyBuffer*		pReadOnlyBuffer,
-		void*						pSysMem);
-
-	CD3DX12_CPU_DESCRIPTOR_HANDLE NVHairINT_CreateD3D12Texture(ID3D12Resource* pTexture, int& nIndexInHeap);
-	void NVHairINT_DestroyD3D12Texture(int& nIndexInHeap);
-
-	void SetSampleCount(int nSampleCount);
-	int GetSampleCount();
-
-	void AddGpuInterface(GpuInterface* intf);
-
-private:
-	void OnGpuWorkSubmitted(ID3D12CommandQueue* queue);
-	
-	D3D12RenderContext();
-	
-	ComPtr<IDXGIFactory4> m_factory;
-	ComPtr<IDXGIAdapter1> m_adapter;
-
-	ComPtr<ID3D12Device> m_device;
-	ComPtr<ID3D12CommandQueue> m_commandQueue;
-	ComPtr<ID3D12CommandAllocator> m_commandAllocator;
-	ComPtr<ID3D12GraphicsCommandList> m_commandList;
-	ComPtr<IDXGISwapChain3> m_swapChain;
-
-	ComPtr<ID3D11Device> m_d3d11Device;
-	ComPtr<ID3D11On12Device> m_d3d11On12Device;
-	ComPtr<ID3D11DeviceContext> m_d3d11DeviceContext;
-	ID3D11Resource** m_wrappedBackBuffers;
-	ID3D11RenderTargetView** m_pD3D11RenderTargetView;
-
-	UINT m_frameIndex;
-	HANDLE m_fenceEvent;
-	ComPtr<ID3D12Fence> m_fence;
-	UINT64 m_fenceValue;
-
-	D3D12RenderTarget* m_pCurrentRenderTarget;
-	map<int, D3D12RenderTarget*> m_RenderTargetMap;
-
-	std::vector<GpuInterface*> m_gpuInterfaces;
-
-	NVHairHeap					m_srvUavHeap;
-
-	// sample desc
-	UINT						m_sampleCount;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderInterface.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderInterface.cpp
deleted file mode 100644
index 2346683..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderInterface.cpp
+++ /dev/null
@@ -1,467 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D12RenderInterface.h"
-
-#include "D3D12TextureResource.h"
-#include "D3D12Shaders.h"
-#include "D3D12Buffer.h"
-
-#include "D3D12RenderContext.h"
-
-namespace RenderInterfaceD3D12
-{
-	using namespace RenderInterface;
-
-	D3D12_BLEND_DESC			m_BlendStates[BLEND_STATE_END];
-	D3D12_DEPTH_STENCIL_DESC	m_DepthStencilStates[DEPTH_STENCIL_STATE_END];
-	D3D12_RASTERIZER_DESC		m_RasterizerStates[RASTERIZER_STATE_END];
-
-	D3D12RenderContext *pRenderContext = D3D12RenderContext::Instance();
-
-	SHADER_TYPE m_ShaderType;
-	RenderShaderStateKey m_ShaderStateKey;
-
-	map<RenderShaderStateKey, RenderShaderState*> m_RenderShaderStates;
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool InitDevice(int deviceID)
-{
-	pRenderContext->InitDevice();
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Initialize()
-{
-	if (!pRenderContext)
-		return false;
-
-	InitializeShadersD3D12();
-	InitializeRenderStates();
-	
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void Shutdown()
-{
-	DestroyShadersD3D12();
-}
-
-RenderShaderState* GetShaderState()
-{
-	RenderShaderState* pShaderState = nullptr;
-	map<RenderShaderStateKey, RenderShaderState*>::iterator it = m_RenderShaderStates.find(m_ShaderStateKey);
-	if (it != m_RenderShaderStates.end())
-	{
-		pShaderState = it->second;
-	}
-	else
-	{
-		pShaderState = new RenderShaderState;
-		pShaderState->BlendState = m_BlendStates[m_ShaderStateKey.BlendState];
-		pShaderState->DepthStencilState = m_DepthStencilStates[m_ShaderStateKey.DepthStencilState];
-		pShaderState->RasterizerState = m_RasterizerStates[m_ShaderStateKey.RasterizerState];
-		pShaderState->PrimitiveTopologyType = m_ShaderStateKey.PrimitiveTopologyType;
-		if (m_ShaderStateKey.ForShadow)
-		{
-			pShaderState->RTVFormat = DXGI_FORMAT_R32_FLOAT;
-			pShaderState->DSVFormat = DXGI_FORMAT_D32_FLOAT;
-		}
-		else
-		{
-			pShaderState->RTVFormat = DXGI_FORMAT_R8G8B8A8_UNORM;
-			pShaderState->DSVFormat = DXGI_FORMAT_D24_UNORM_S8_UINT;
-			pShaderState->SampleCount = D3D12RenderContext::Instance()->GetSampleCount();
-		}
-
-		m_RenderShaderStates[m_ShaderStateKey] = pShaderState;
-	}
-	return pShaderState;
-}
-//////////////////////////////////////////////////////////////////////////////////////
-void InitializeRenderStates()
-{
-	/////////////////////////////////////////////////////////////////////////////////////////
-	// alpha blending state descriptors
-	/////////////////////////////////////////////////////////////////////////////////////////
-
-	// alpha blending enabled
-	{
-		D3D12_BLEND_DESC desc = CD3DX12_BLEND_DESC(D3D12_DEFAULT);
-		desc.AlphaToCoverageEnable = false;
-		desc.IndependentBlendEnable = false;
-
-		D3D12_RENDER_TARGET_BLEND_DESC &rtDesc = desc.RenderTarget[0];
-		{
-			rtDesc.BlendEnable = true;
-			rtDesc.SrcBlend = D3D12_BLEND_SRC_ALPHA;
-			rtDesc.DestBlend = D3D12_BLEND_INV_SRC_ALPHA;
-			rtDesc.BlendOp = D3D12_BLEND_OP_ADD;
-			rtDesc.SrcBlendAlpha = D3D12_BLEND_ZERO;
-			rtDesc.DestBlendAlpha = D3D12_BLEND_ONE;
-			rtDesc.BlendOpAlpha = D3D12_BLEND_OP_ADD;
-			rtDesc.RenderTargetWriteMask = 0x0f;
-		}
-		m_BlendStates[BLEND_STATE_ALPHA] = desc;
-	}
-
-	// no alpha blending
-	{
-		D3D12_BLEND_DESC desc = CD3DX12_BLEND_DESC(D3D12_DEFAULT);
-		desc.AlphaToCoverageEnable = false;
-		desc.IndependentBlendEnable = false;
-
-		D3D12_RENDER_TARGET_BLEND_DESC &rtDesc = desc.RenderTarget[0];
-		{
-			rtDesc.BlendEnable = false;
-			rtDesc.SrcBlend = D3D12_BLEND_SRC_ALPHA;
-			rtDesc.DestBlend = D3D12_BLEND_INV_SRC_ALPHA;
-			rtDesc.BlendOp = D3D12_BLEND_OP_ADD;
-			rtDesc.SrcBlendAlpha = D3D12_BLEND_ZERO;
-			rtDesc.DestBlendAlpha = D3D12_BLEND_ONE;
-			rtDesc.BlendOpAlpha = D3D12_BLEND_OP_ADD;
-			rtDesc.RenderTargetWriteMask = 0x0f;
-		}
-		m_BlendStates[BLEND_STATE_NONE] = desc;
-	}
-
-	//////////////////////////////////////////////////////////////////////////////////////////////
-	// depth and stencil
-	///////////////////////////////////////////////////////////////////////////////////////////////
-	D3D12_DEPTH_STENCIL_DESC depthTestDesc = CD3DX12_DEPTH_STENCIL_DESC(D3D12_DEFAULT);
-	{
-		depthTestDesc.DepthEnable = true;
-		depthTestDesc.DepthFunc = D3D12_COMPARISON_FUNC_LESS;
-		depthTestDesc.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL;
-		depthTestDesc.StencilEnable = false;
-		depthTestDesc.StencilReadMask = 0xff;
-		depthTestDesc.StencilWriteMask = 0xff;
-	}
-
-	m_DepthStencilStates[DEPTH_STENCIL_DEPTH_TEST] = depthTestDesc;
-
-	D3D12_DEPTH_STENCIL_DESC depthNone = CD3DX12_DEPTH_STENCIL_DESC(D3D12_DEFAULT);
-	{
-		depthNone.DepthEnable = false;
-		depthNone.DepthFunc = D3D12_COMPARISON_FUNC_LESS;
-		depthNone.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ZERO;
-		depthNone.StencilEnable = false;
-		depthNone.StencilReadMask = 0xff;
-		depthNone.StencilWriteMask = 0xff;
-	}
-
-	m_DepthStencilStates[DEPTH_STENCIL_DEPTH_NONE] = depthNone;
-
-	//////////////////////////////////////////////////////////////////////////////////////////////
-	// rasterizer
-	///////////////////////////////////////////////////////////////////////////////////////////////
-	D3D12_RASTERIZER_DESC rsDesc = CD3DX12_RASTERIZER_DESC(D3D12_DEFAULT);
-
-	// solid cull front
-	{
-		rsDesc.FillMode = D3D12_FILL_MODE_SOLID;
-		rsDesc.CullMode = D3D12_CULL_MODE_FRONT;
-		rsDesc.AntialiasedLineEnable = false;
-		rsDesc.MultisampleEnable = true;
-		rsDesc.FrontCounterClockwise = true;
-		rsDesc.DepthBias = 10;
-		rsDesc.DepthBiasClamp = 0;
-		rsDesc.SlopeScaledDepthBias = 0;
-		rsDesc.DepthClipEnable = true;
-		rsDesc.ForcedSampleCount = 0;
-
-		m_RasterizerStates[RASTERIZER_STATE_FILL_CULL_FRONT] = rsDesc;
-	};
-
-	// solid cull back
-	{
-		rsDesc.FillMode = D3D12_FILL_MODE_SOLID;
-		rsDesc.CullMode = D3D12_CULL_MODE_BACK;
-		rsDesc.AntialiasedLineEnable = false;
-		rsDesc.MultisampleEnable = true;
-		rsDesc.FrontCounterClockwise = true;
-		rsDesc.DepthBias = 10;
-		rsDesc.DepthBiasClamp = 0;
-		rsDesc.SlopeScaledDepthBias = 0;
-		rsDesc.DepthClipEnable = true;
-		rsDesc.ForcedSampleCount = 0;
-
-		m_RasterizerStates[RASTERIZER_STATE_FILL_CULL_BACK] = rsDesc;
-	}
-
-	// solid cull none
-	{
-		rsDesc.FillMode = D3D12_FILL_MODE_SOLID;
-		rsDesc.CullMode = D3D12_CULL_MODE_NONE;
-		rsDesc.AntialiasedLineEnable = false;
-		rsDesc.MultisampleEnable = true;
-		rsDesc.FrontCounterClockwise = true;
-		rsDesc.DepthBias = 10;
-		rsDesc.DepthBiasClamp = 0;
-		rsDesc.SlopeScaledDepthBias = 0;
-		rsDesc.DepthClipEnable = true;
-		rsDesc.ForcedSampleCount = 0;
-
-		m_RasterizerStates[RASTERIZER_STATE_FILL_CULL_NONE] = rsDesc;
-	}
-
-	// wireframe cull none
-	{
-		rsDesc.FillMode = D3D12_FILL_MODE_WIREFRAME;
-		rsDesc.CullMode = D3D12_CULL_MODE_NONE;
-		rsDesc.AntialiasedLineEnable = false;
-		rsDesc.MultisampleEnable = true;
-		rsDesc.FrontCounterClockwise = 0;
-		rsDesc.DepthBias = 0;
-		rsDesc.DepthBiasClamp = 0;
-		rsDesc.SlopeScaledDepthBias = 0;
-		rsDesc.DepthClipEnable = true;
-		rsDesc.ForcedSampleCount = 0;
-	};
-
-	m_RasterizerStates[RASTERIZER_STATE_WIRE] = rsDesc;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void SetPrimitiveTopologyTriangleStrip()
-{
-	ID3D12GraphicsCommandList* pCommandList = pRenderContext->GetGraphicsCommandList();
-	pCommandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void SetPrimitiveTopologyTriangleList()
-{
-	ID3D12GraphicsCommandList* pCommandList = pRenderContext->GetGraphicsCommandList();
-	pCommandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void SetPrimitiveTopologyLineList()
-{
-	ID3D12GraphicsCommandList* pCommandList = pRenderContext->GetGraphicsCommandList();
-	pCommandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_LINELIST);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-void SetVertexBuffer(GPUBufferResource* pBuffer, UINT stride, UINT offset)
-{
-	D3D12_VERTEX_BUFFER_VIEW* vertexView = GPUBufferD3D12::GetVertexView(pBuffer);
-	if (!vertexView)
-		return;
-
-	vertexView->StrideInBytes = stride;
-	ID3D12GraphicsCommandList* m_commandList = pRenderContext->GetGraphicsCommandList();
-	m_commandList->IASetVertexBuffers(0, 1, vertexView);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyDepthStencilState(DEPTH_STENCIL_STATE state)
-{
-	m_ShaderStateKey.DepthStencilState = state;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyRasterizerState(RASTERIZER_STATE state)
-{
-	m_ShaderStateKey.RasterizerState = state;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyBlendState(BLEND_STATE state)
-{
-	m_ShaderStateKey.BlendState = state;
-}
-
-void ApplyPrimitiveTopologyType(D3D12_PRIMITIVE_TOPOLOGY_TYPE PrimitiveTopologyType)
-{
-	m_ShaderStateKey.PrimitiveTopologyType = PrimitiveTopologyType;
-}
-
-void ApplyForShadow(int ForShadow)
-{
-	m_ShaderStateKey.ForShadow = ForShadow;
-}
-
-void SwitchToDX11()
-{
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	pContext->SwitchToDX11();
-}
-
-void FlushDX11()
-{
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	pContext->FlushDX11();
-}
-
-void FlushDX12()
-{
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	pContext->Flush();
-}
-
-void SubmitGpuWork()
-{
-	D3D12RenderContext::Instance()->SubmitGpuWork();
-}
-
-void WaitForGpu()
-{
-	D3D12RenderContext* context = D3D12RenderContext::Instance();
-	context->WaitForGpu();
-	context->UpdateGpuWorkCompleted();
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-void SetViewport(const RenderInterface::Viewport& vp)
-{
-	ID3D12GraphicsCommandList* pCommandList = pRenderContext->GetGraphicsCommandList();
-
-	D3D12_VIEWPORT d3dViewport;
-
-	d3dViewport.TopLeftX = vp.TopLeftX;
-	d3dViewport.TopLeftY = vp.TopLeftY;
-
-	d3dViewport.Width = vp.Width;
-	d3dViewport.Height = vp.Height;
-
-	d3dViewport.MinDepth = vp.MinDepth;
-	d3dViewport.MaxDepth = vp.MaxDepth;
-
-	pRenderContext->SetViewport(d3dViewport);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-void GetViewport(RenderInterface::Viewport& vp)
-{
-	D3D12_VIEWPORT d3dViewport;
-	pRenderContext->GetViewport(d3dViewport);
-
-	vp.TopLeftX = d3dViewport.TopLeftX;
-	vp.TopLeftY = d3dViewport.TopLeftY;
-
-	vp.Width = d3dViewport.Width;
-	vp.Height = d3dViewport.Height;
-
-	vp.MinDepth = d3dViewport.MinDepth;
-	vp.MaxDepth = d3dViewport.MaxDepth;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void Draw(unsigned int vertexCount, unsigned int startCount)
-{
-	ID3D12GraphicsCommandList* pCommandList = pRenderContext->GetGraphicsCommandList();
-	pCommandList->DrawInstanced(vertexCount, 1, startCount, 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-GPUBufferResource* CreateVertexBuffer( 
-	unsigned int ByteWidth, void* pSysMem)
-{
-	ID3D12Device* pDevice = D3D12RenderContext::Instance()->GetDevice();
-	if (!pDevice)
-		return false;
-
-	ID3D12Resource* pBuffer = nullptr;
-	ThrowIfFailed(pDevice->CreateCommittedResource(
-		&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD),
-		D3D12_HEAP_FLAG_NONE,
-		&CD3DX12_RESOURCE_DESC::Buffer(ByteWidth),
-		D3D12_RESOURCE_STATE_GENERIC_READ,
-		nullptr,
-		IID_PPV_ARGS(&pBuffer)));
-	if (nullptr == pBuffer)
-	{
-		return false;
-	}
-
-	void* pData;
-	ThrowIfFailed(pBuffer->Map(0, nullptr, &pData));
-	memcpy(pData, pSysMem, ByteWidth);
-	pBuffer->Unmap(0, nullptr);
-
-	return GPUBufferD3D12::Create(pBuffer, ByteWidth);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-GPUShaderResource* CreateShaderResource(unsigned int stride, 
-	unsigned int numElements, void* pSysMem, NVHairReadOnlyBuffer* pReadOnlyBuffer)
-{
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	if (!pContext)
-		return false;
-
-	ID3D12Device* pDevice = pContext->GetDevice();
-	ID3D12GraphicsCommandList* pCommandList = pContext->GetGraphicsCommandList();
-
-	pContext->NVHairINT_CreateD3D12ReadOnlyBuffer(stride, numElements, pReadOnlyBuffer, pSysMem);
-
-	int nIndexInHeap = -1;
-	return D3D12TextureResource::Create(pReadOnlyBuffer->m_pBuffer.Get(), pReadOnlyBuffer->getSrvCpuHandle(), nIndexInHeap);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// create read only shader resource buffer
-///////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-void CopyToDevice(
-	GPUBufferResource *pGPUBuffer, 	void* pSysMem, 	unsigned int	ByteWidth)
-{
-	ID3D12Resource* pBuffer = GPUBufferD3D12::GetResource(pGPUBuffer);
-	if (!pBuffer)
-		return;
-
-	void* pData;
-	ThrowIfFailed(pBuffer->Map(0, nullptr, &pData));
-	memcpy(pData, pSysMem, ByteWidth);
-	pBuffer->Unmap(0, nullptr);
-
-	/*
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	if (!pContext)
-		return;
-
-	ID3D12Device* pDevice = pContext->GetDevice();
-	ID3D12GraphicsCommandList* pCommandList = pContext->GetGraphicsCommandList();
-
-	D3D12_SUBRESOURCE_DATA data = {};
-	data.pData = reinterpret_cast<UINT8*>(pSysMem);
-	data.RowPitch = ByteWidth;
-	data.SlicePitch = data.RowPitch;
-
-	ID3D12Resource* m_pBufferUpload = GPUBufferD3D12::GetResourceUpload(pGPUBuffer, pDevice, ByteWidth);
-
-	UpdateSubresources<1>(pCommandList, pBuffer, m_pBufferUpload, 0, 0, 1, &data);
-	pCommandList->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(pBuffer,
-		D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE));
-	*/
-}
-} // end namespace
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderInterface.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderInterface.h
deleted file mode 100644
index 8168936..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderInterface.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-#include <d3d11.h>
-#include <d3d12.h>
-#include <dxgi1_4.h>
-#include "RenderInterface.h"
-#include "RenderPlugin.h"
-class RenderShaderState;
-// abstract interface to D3D calls
-namespace RenderInterfaceD3D12
-{
-	CORERENDER_EXPORT bool InitDevice(int deviceID);
-	CORERENDER_EXPORT bool Initialize();
-	CORERENDER_EXPORT void Shutdown();
-
-	RenderShaderState* GetShaderState();
-	void InitializeRenderStates();
-
-	CORERENDER_EXPORT void ApplyDepthStencilState(RenderInterface::DEPTH_STENCIL_STATE st);
-	CORERENDER_EXPORT void ApplyRasterizerState(RenderInterface::RASTERIZER_STATE st);
-	CORERENDER_EXPORT void ApplyBlendState(RenderInterface::BLEND_STATE st);
-	CORERENDER_EXPORT void ApplyPrimitiveTopologyType(D3D12_PRIMITIVE_TOPOLOGY_TYPE PrimitiveTopologyType);
-	CORERENDER_EXPORT void ApplyForShadow(int ForShadow);	
-	CORERENDER_EXPORT void SwitchToDX11();
-	CORERENDER_EXPORT void FlushDX11();
-	CORERENDER_EXPORT void FlushDX12();
-	CORERENDER_EXPORT void SubmitGpuWork();
-	CORERENDER_EXPORT void WaitForGpu();
-
-	CORERENDER_EXPORT void GetViewport(RenderInterface::Viewport& vp);
-	CORERENDER_EXPORT void SetViewport(const RenderInterface::Viewport& vp);
-
-	CORERENDER_EXPORT GPUBufferResource* CreateVertexBuffer( unsigned int ByteWidth, void* pSysMem);
-	CORERENDER_EXPORT GPUShaderResource* CreateShaderResource( unsigned int stride, unsigned int numElements, void* pSysMem, NVHairReadOnlyBuffer* pReadOnlyBuffer);
-
-	CORERENDER_EXPORT void CopyToDevice(GPUBufferResource *pDevicePtr, void* pSysMem, unsigned int ByteWidth);
-	
-	CORERENDER_EXPORT void SetVertexBuffer(GPUBufferResource* pBuffer, UINT stride, UINT offset = 0);
-
-	CORERENDER_EXPORT void SetPrimitiveTopologyTriangleStrip();
-	CORERENDER_EXPORT void SetPrimitiveTopologyTriangleList();
-	CORERENDER_EXPORT void SetPrimitiveTopologyLineList();
-
-	
-	CORERENDER_EXPORT void Draw(unsigned int vertexCount, unsigned int startCount = 0);
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderShader.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderShader.cpp
deleted file mode 100644
index f115349..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderShader.cpp
+++ /dev/null
@@ -1,384 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#include "D3D12RenderShader.h"
-
-#include "D3D12RenderInterface.h"
-#include "D3D12Wrapper.h"
-#include "D3D12RenderContext.h"
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(x) { if (x) x->Release(); }
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-D3D12RenderShader::D3D12RenderShader()
-{
-	m_vertexShader = 0;
-	m_vertexShaderSize = 0;
-	m_pixelShader = 0;
-	m_pixelShaderSize = 0;
-
-	m_inputElementDescs = 0;
-	m_inputElementDescsNum = 0;
-
-	m_pRootSignature = 0;
-
-	m_scuHeap = 0;
-	m_scuDescriptorSize = 0;
-
-	m_samplerHeap = 0;
-	m_samplerDescriptorSize = 0;
-
-	m_PipelineStates.clear();
-
-	for (int i = 0; i < 2; i++)
-	{
-		m_ConstantBuffer[i] = nullptr;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-D3D12RenderShader::~D3D12RenderShader()
-{
-	for (int i = 0; i < 1; i++)
-	{
-		SAFE_RELEASE(m_ConstantBuffer[i]);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-D3D12RenderShader* D3D12RenderShader::Create(
-	const char *name, 
-	void* vertexShader, size_t vertexShaderSize, void* pixelShader, size_t pixelShaderSize,
-	UINT  cbufferSize0, UINT  cbufferSize1,
-	D3D12_INPUT_ELEMENT_DESC* pElemDesc, UINT numElements,
-	int ShaderResourceNum, int UnorderedAccessNum, int SamplerNum)
-{
-	D3D12RenderContext* pAdapter = D3D12RenderContext::Instance();
-	ID3D12Device* m_device = pAdapter->GetDevice();
-
-	D3D12RenderShader* pShader = new D3D12RenderShader;
-
-	int sizeofuint = sizeof(UINT8);
-	pShader->m_vertexShaderSize = vertexShaderSize;
-	if (vertexShaderSize > 0)
-	{
-		pShader->m_vertexShader = new UINT8[vertexShaderSize / sizeofuint];
-		memcpy(pShader->m_vertexShader, vertexShader, vertexShaderSize);
-	}
-	pShader->m_pixelShaderSize = pixelShaderSize;
-	if (pixelShaderSize > 0)
-	{
-		pShader->m_pixelShader = new UINT8[pixelShaderSize / sizeofuint];
-		memcpy(pShader->m_pixelShader, pixelShader, pixelShaderSize);
-	}
-
-	pShader->m_inputElementDescsNum = numElements;
-	pShader->m_inputElementDescs = pElemDesc;
-
-	CD3DX12_DESCRIPTOR_RANGE ranges[3];
-	CD3DX12_ROOT_PARAMETER rootParameters[2];
-
-	int rangesindex = 0;
-	int rootParametersindex = 0;
-
-	if (ShaderResourceNum > 0)
-	{
-		ranges[rangesindex++].Init(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, ShaderResourceNum, 0);
-	}
-	int ConstantBufferNum = 0;
-	if (cbufferSize0 > 0)
-	{
-		ConstantBufferNum++;
-	}
-	if (cbufferSize1 > 0)
-	{
-		ConstantBufferNum++;
-	}
-	if (ConstantBufferNum > 0)
-	{
-		ranges[rangesindex++].Init(D3D12_DESCRIPTOR_RANGE_TYPE_CBV, ConstantBufferNum, 0);
-	}
-	if (UnorderedAccessNum > 0)
-	{
-		ranges[rangesindex++].Init(D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UnorderedAccessNum, 0);
-	}
-	if (rangesindex > 0)
-	{
-		rootParameters[rootParametersindex++].InitAsDescriptorTable(rangesindex, &ranges[0], D3D12_SHADER_VISIBILITY_ALL);
-	}
-
-	if (SamplerNum > 0)
-	{
-		ranges[rangesindex].Init(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, SamplerNum, 0);
-		rootParameters[rootParametersindex++].InitAsDescriptorTable(1, &ranges[rangesindex], D3D12_SHADER_VISIBILITY_ALL);
-	}
-
-	D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags =
-		D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT |
-		D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS |
-		D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS |
-		D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS;
-	CD3DX12_ROOT_SIGNATURE_DESC rootSignatureDesc;
-	rootSignatureDesc.Init(rootParametersindex, rootParameters, 0, nullptr, rootSignatureFlags);
-
-	ComPtr<ID3DBlob> signature;
-	ComPtr<ID3DBlob> error;
-	ThrowIfFailed(D3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &signature, &error));
-	ThrowIfFailed(m_device->CreateRootSignature(0, signature->GetBufferPointer(), signature->GetBufferSize(), IID_PPV_ARGS(&pShader->m_pRootSignature)));
-
-	int numSCU = ShaderResourceNum + ConstantBufferNum + UnorderedAccessNum;
-	if (numSCU > 0)
-	{
-		D3D12_DESCRIPTOR_HEAP_DESC scuHeapDesc = {};
-		scuHeapDesc.NumDescriptors = numSCU;
-		scuHeapDesc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
-		scuHeapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
-		ThrowIfFailed(m_device->CreateDescriptorHeap(&scuHeapDesc, IID_PPV_ARGS(&pShader->m_scuHeap)));
-		pShader->m_scuDescriptorSize = m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-
-		if (ConstantBufferNum > 0)
-		{
-			CD3DX12_CPU_DESCRIPTOR_HANDLE scuHandle(pShader->m_scuHeap->GetCPUDescriptorHandleForHeapStart(),
-				ShaderResourceNum, pShader->m_scuDescriptorSize);
-
-			if (cbufferSize0 > 0)
-			{
-				pShader->CreateParamBuffer(cbufferSize0, 0);
-
-				// Describe and create a constant buffer view.
-				D3D12_CONSTANT_BUFFER_VIEW_DESC cbvDesc = {};
-				// CB size is required to be 256-byte aligned.
-				cbvDesc.SizeInBytes = (cbufferSize0 + 255) & ~255;
-				cbvDesc.BufferLocation = pShader->m_ConstantBuffer[0]->GetGPUVirtualAddress();
-				m_device->CreateConstantBufferView(&cbvDesc, scuHandle);
-				scuHandle.Offset(pShader->m_scuDescriptorSize);
-			}
-			if (cbufferSize1 > 0)
-			{
-				pShader->CreateParamBuffer(cbufferSize1, 1);
-
-				// Describe and create a constant buffer view.
-				D3D12_CONSTANT_BUFFER_VIEW_DESC cbvDesc = {};
-				// CB size is required to be 256-byte aligned.
-				cbvDesc.SizeInBytes = (cbufferSize1 + 255) & ~255;
-				cbvDesc.BufferLocation = pShader->m_ConstantBuffer[1]->GetGPUVirtualAddress();
-				m_device->CreateConstantBufferView(&cbvDesc, scuHandle);
-			}
-		}
-	}
-
-	if (SamplerNum > 0)
-	{
-		D3D12_DESCRIPTOR_HEAP_DESC samplerHeapDesc = {};
-		samplerHeapDesc.NumDescriptors = SamplerNum;
-		samplerHeapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER;
-		samplerHeapDesc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
-		ThrowIfFailed(m_device->CreateDescriptorHeap(&samplerHeapDesc, IID_PPV_ARGS(&pShader->m_samplerHeap)));
-		pShader->m_samplerDescriptorSize = m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER);
-
-		CD3DX12_CPU_DESCRIPTOR_HANDLE samplerHandle(pShader->m_samplerHeap->GetCPUDescriptorHandleForHeapStart());
-
-		if(SamplerNum == 1)
-		{ 
-			D3D12_SAMPLER_DESC pointClampSamplerDesc[1] = {
-				D3D12_FILTER_MIN_MAG_MIP_POINT,
-				D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
-				D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
-				D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
-				0.0, 0, D3D12_COMPARISON_FUNC_NEVER,
-				0.0f, 0.0f, 0.0f, 0.0f,
-				0.0f, D3D12_FLOAT32_MAX,
-			};
-			m_device->CreateSampler(pointClampSamplerDesc, samplerHandle);
-		}
-		else if(SamplerNum == 2)
-		{
-			D3D12_SAMPLER_DESC linearSamplerDesc[1] = {
-				D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT,
-				D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-				D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-				D3D12_TEXTURE_ADDRESS_MODE_WRAP,
-				0.0, 0, D3D12_COMPARISON_FUNC_NEVER, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, D3D12_FLOAT32_MAX,
-			};
-			m_device->CreateSampler(linearSamplerDesc, samplerHandle);
-			samplerHandle.Offset(pShader->m_samplerDescriptorSize);
-
-			D3D12_SAMPLER_DESC pointClampSamplerDesc[1] = {
-				D3D12_FILTER_MIN_MAG_MIP_POINT,
-				D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
-				D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
-				D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
-				0.0, 0, D3D12_COMPARISON_FUNC_NEVER,
-				0.0f, 0.0f, 0.0f, 0.0f,
-				0.0f, D3D12_FLOAT32_MAX,
-			};
-			m_device->CreateSampler(pointClampSamplerDesc, samplerHandle);
-		}
-	}
-
-	return pShader;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D12RenderShader::SetConstantBuffer()
-{
-	return;
-}
-
-ID3D12PipelineState* D3D12RenderShader::GetPipelineState(RenderShaderState* pShaderState)
-{
-	ID3D12PipelineState* pPipelineState = nullptr;
-	map<RenderShaderState*, ID3D12PipelineState*>::iterator it = m_PipelineStates.find(pShaderState);
-	if (it == m_PipelineStates.end())
-	{
-		D3D12_GRAPHICS_PIPELINE_STATE_DESC psoDesc = {};
-		psoDesc.InputLayout = { m_inputElementDescs, m_inputElementDescsNum };
-		psoDesc.pRootSignature = m_pRootSignature;
-		psoDesc.VS = { reinterpret_cast<UINT8*>(m_vertexShader), m_vertexShaderSize };
-		psoDesc.PS = { reinterpret_cast<UINT8*>(m_pixelShader), m_pixelShaderSize };
-		psoDesc.BlendState = pShaderState->BlendState;
-		psoDesc.RasterizerState = pShaderState->RasterizerState;
-		psoDesc.DepthStencilState = pShaderState->DepthStencilState;
-		psoDesc.SampleMask = UINT_MAX;
-		psoDesc.PrimitiveTopologyType = pShaderState->PrimitiveTopologyType;
-		psoDesc.NumRenderTargets = 1;
-		psoDesc.RTVFormats[0] = pShaderState->RTVFormat;
-		psoDesc.DSVFormat = pShaderState->DSVFormat;
-		psoDesc.SampleDesc.Count = pShaderState->SampleCount;
-
-		ID3D12Device* pDevice = D3D12RenderContext::Instance()->GetDevice();
-		ThrowIfFailed(pDevice->CreateGraphicsPipelineState(&psoDesc, IID_PPV_ARGS(&pPipelineState)));
-
-		m_PipelineStates[pShaderState] = pPipelineState;
-	}
-	else
-	{
-		pPipelineState = it->second;
-	}
-	return pPipelineState;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D12RenderShader::MakeCurrent()
-{
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	ID3D12GraphicsCommandList* m_commandList = pContext->GetGraphicsCommandList();
-
-	RenderShaderState* pShaderState = RenderInterfaceD3D12::GetShaderState();
-	if (nullptr == pShaderState)
-	{
-		return;
-	}
-
-	ID3D12PipelineState* pPipelineState = GetPipelineState(pShaderState);
-
-	m_commandList->SetGraphicsRootSignature(m_pRootSignature);
-	m_commandList->SetPipelineState(pPipelineState);
-
-	vector<ID3D12DescriptorHeap*> heaps;
-	if (nullptr != m_scuHeap)
-	{
-		heaps.push_back(m_scuHeap);
-	}
-	if (nullptr != m_samplerHeap)
-	{
-		heaps.push_back(m_samplerHeap);
-	}
-	if (heaps.size() > 0)
-	{
-		m_commandList->SetDescriptorHeaps(heaps.size(), heaps.data());
-	}
-	int heapindex = 0;
-	if (nullptr != m_scuHeap)
-	{
-		m_commandList->SetGraphicsRootDescriptorTable(heapindex++, m_scuHeap->GetGPUDescriptorHandleForHeapStart());
-	}
-	if (nullptr != m_samplerHeap)
-	{
-		m_commandList->SetGraphicsRootDescriptorTable(heapindex++, m_samplerHeap->GetGPUDescriptorHandleForHeapStart());
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D12RenderShader::Disable()
-{
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool D3D12RenderShader::CreateParamBuffer( UINT sizeBuffer, UINT slot )
-{
-	ID3D12Device* pDevice = D3D12RenderContext::Instance()->GetDevice();
-	if (!pDevice)
-		return false;
-
-	SAFE_RELEASE(m_ConstantBuffer[slot]);
-
-	ThrowIfFailed(pDevice->CreateCommittedResource(
-		&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD),
-		D3D12_HEAP_FLAG_NONE,
-		&CD3DX12_RESOURCE_DESC::Buffer(sizeBuffer),
-		D3D12_RESOURCE_STATE_GENERIC_READ,
-		nullptr,
-		IID_PPV_ARGS(&m_ConstantBuffer[slot])));
-	
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void* D3D12RenderShader::MapParam(UINT slot)
-{
-	if (!m_ConstantBuffer[slot])
-		return 0;
-
-	void* pData;
-	ThrowIfFailed(m_ConstantBuffer[slot]->Map(0, nullptr, &pData));
-	return pData;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D12RenderShader::UnmapParam( UINT slot )
-{
-	if (!m_ConstantBuffer[slot])
-		return;
-
-	m_ConstantBuffer[slot]->Unmap(0, nullptr);
-}
-
-void D3D12RenderShader::BindShaderResource(UINT slot, CD3DX12_CPU_DESCRIPTOR_HANDLE& handle)
-{
-	ID3D12Device* pDevice = D3D12RenderContext::Instance()->GetDevice();
-	if (!pDevice)
-		return;
-
-	CD3DX12_CPU_DESCRIPTOR_HANDLE destHandle(m_scuHeap->GetCPUDescriptorHandleForHeapStart(), slot, m_scuDescriptorSize);
-	if (handle.ptr != 0)
-	{
-		pDevice->CopyDescriptorsSimple(1, destHandle, handle, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
-	}
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderShader.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderShader.h
deleted file mode 100644
index d43783c..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderShader.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include <d3d11.h>
-#include <d3d12.h>
-
-#include "D3D12RenderTarget.h"
-
-class D3D12RenderShader
-{
-public:
-	D3D12RenderShader();
-	~D3D12RenderShader();
-
-	static D3D12RenderShader* Create(
-		const char *name, 
-		void* pVSBlob, size_t vsBlobSize, 
-		void* pPSBlob, size_t psBlobSize, 
-		UINT  cbufferSize0 = 0,	UINT  cbufferSize1 = 0,
-		D3D12_INPUT_ELEMENT_DESC* pElemDesc = 0, UINT numElements = 0,
-		int ShaderResourceNum = 0, int UnorderedAccessNum = 0, int SamplerNum = 0);
-
-	void MakeCurrent();
-	void Disable();
-	void SetConstantBuffer();
-
-	void* MapParam(UINT slot = 0);
-	void  UnmapParam(UINT slot = 0);
-
-	void BindShaderResource(UINT slot, CD3DX12_CPU_DESCRIPTOR_HANDLE& handle);
-
-protected:
-	bool CreateParamBuffer(UINT sizeBuffer, UINT slot = 0);
-
-private:
-	ID3D12PipelineState* GetPipelineState(RenderShaderState* pShaderState);
-
-	void* m_vertexShader;
-	SIZE_T m_vertexShaderSize;
-	void* m_pixelShader;
-	SIZE_T m_pixelShaderSize;
-
-	D3D12_INPUT_ELEMENT_DESC* m_inputElementDescs;
-	UINT m_inputElementDescsNum;
-
-	ID3D12RootSignature* m_pRootSignature;
-
-	ID3D12DescriptorHeap* m_scuHeap;
-	int m_scuDescriptorSize;
-
-	ID3D12Resource* m_ConstantBuffer[2];
-
-	ID3D12DescriptorHeap* m_samplerHeap;
-	int m_samplerDescriptorSize;
-
-	map<RenderShaderState*, ID3D12PipelineState*> m_PipelineStates;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderTarget.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderTarget.cpp
deleted file mode 100644
index 301cad6..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderTarget.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-#include "D3D12RenderTarget.h"
-#include "D3D12RenderContext.h"
-
-D3D12RenderTarget::D3D12RenderTarget(int renderTargetIndex, int nRenderTargetCount)
-{
-	m_RenderTargetIndex = renderTargetIndex;
-
-	m_RenderTargetCount = nRenderTargetCount;
-
-	m_BackBuffers = nullptr;
-	m_RenderTargets = nullptr;
-	m_DepthStencil = nullptr;
-
-	m_pRenderContext = D3D12RenderContext::Instance();
-
-	if (m_RenderTargetCount > 0)
-	{
-		m_BackBuffers = new ID3D12Resource*[m_RenderTargetCount];
-
-		for (int n = 0; n < m_RenderTargetCount; n++)
-		{
-			m_BackBuffers[n] = nullptr;
-		}
-
-		m_RenderTargets = new ID3D12Resource*[m_RenderTargetCount];
-
-		for (int n = 0; n < m_RenderTargetCount; n++)
-		{
-			m_RenderTargets[n] = nullptr;
-		}
-	}
-
-	if (renderTargetIndex == 0)
-	{
-		m_rtvClearValue.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-		m_rtvClearValue.Color[0] = 0.0;
-		m_rtvClearValue.Color[1] = 0.0;
-		m_rtvClearValue.Color[2] = 0.0;
-		m_rtvClearValue.Color[3] = 1.0;
-	}
-	else
-	{
-		m_rtvClearValue.Format = DXGI_FORMAT_R32_FLOAT;
-		m_rtvClearValue.Color[0] = FLT_MAX;
-		m_rtvClearValue.Color[1] = FLT_MAX;
-		m_rtvClearValue.Color[2] = FLT_MAX;
-		m_rtvClearValue.Color[3] = FLT_MAX;
-	}
-
-	if (renderTargetIndex == 0)
-	{
-		m_dsvClearValue.Format = DXGI_FORMAT_D24_UNORM_S8_UINT;
-	}
-	else
-	{
-		m_dsvClearValue.Format = DXGI_FORMAT_D32_FLOAT;
-	}
-	m_dsvClearValue.DepthStencil.Depth = 1.0f;
-	m_dsvClearValue.DepthStencil.Stencil = 0;
-}
-
-D3D12RenderTarget::~D3D12RenderTarget()
-{
-	if (nullptr != m_BackBuffers)
-	{
-		delete[] m_BackBuffers;
-		m_BackBuffers = nullptr;
-	}
-
-	if (nullptr != m_RenderTargets)
-	{
-		delete[] m_RenderTargets;
-		m_RenderTargets = nullptr;
-	}
-}
-
-ID3D12Resource* D3D12RenderTarget::GetDepthStencilResource()
-{
-	return m_DepthStencil;
-}
-
-D3D12_CPU_DESCRIPTOR_HANDLE D3D12RenderTarget::GetRenderTargetViewHandle()
-{
-	CD3DX12_CPU_DESCRIPTOR_HANDLE rtvHandle(m_rtvHeap->GetCPUDescriptorHandleForHeapStart());
-	return rtvHandle;
-}
-
-D3D12_CPU_DESCRIPTOR_HANDLE D3D12RenderTarget::GetDepthStencilViewHandle()
-{
-	CD3DX12_CPU_DESCRIPTOR_HANDLE dsvHandle(m_dsvHeap->GetCPUDescriptorHandleForHeapStart());
-	return dsvHandle;
-}
-
-void D3D12RenderTarget::CreateResource(int nWidth, int nHeight)
-{
-	ID3D12Device* m_device = m_pRenderContext->GetDevice();
-	int nSampleCount = m_pRenderContext->GetSampleCount();
-
-	CD3DX12_CPU_DESCRIPTOR_HANDLE rtvHandle(m_rtvHeap->GetCPUDescriptorHandleForHeapStart());
-
-	if (m_RenderTargetIndex == 0)
-	{
-		IDXGISwapChain3* m_swapChain = m_pRenderContext->GetSwapChain();
-		
-		// Create a RTV for each frame.
-		for (int n = 0; n < m_RenderTargetCount; n++)
-		{
-			ThrowIfFailed(m_swapChain->GetBuffer(n, IID_PPV_ARGS(&m_BackBuffers[n])));
-
-			if (nSampleCount > 1)
-			{
-				// If we are multi-sampling - create a render target separate from the back buffer
-				CD3DX12_HEAP_PROPERTIES heapProps(D3D12_HEAP_TYPE_DEFAULT);
-				D3D12_RESOURCE_DESC desc = m_BackBuffers[n]->GetDesc();
-
-				desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
-				desc.SampleDesc.Count = nSampleCount;
-				desc.SampleDesc.Quality = 0;
-				desc.Alignment = 0;
-
-				ThrowIfFailed(m_device->CreateCommittedResource(&heapProps, D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_RENDER_TARGET,
-					&m_rtvClearValue, IID_PPV_ARGS(&m_RenderTargets[n])));
-			}
-			else
-			{
-				// The render targets and back buffers are the same thing
-				m_RenderTargets[n] = m_BackBuffers[n];
-			}
-
-			m_device->CreateRenderTargetView(m_RenderTargets[n], nullptr, rtvHandle);
-			rtvHandle.Offset(1, m_rtvDescriptorSize);
-		}
-
-		{
-			auto resourceDesc = CD3DX12_RESOURCE_DESC::Tex2D(m_dsvClearValue.Format,
-				nWidth, nHeight, 1, 1, nSampleCount, 0,
-				D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL);
-
-			ThrowIfFailed(m_device->CreateCommittedResource(
-				&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT), // No need to read/write by CPU
-				D3D12_HEAP_FLAG_NONE,
-				&resourceDesc,
-				D3D12_RESOURCE_STATE_DEPTH_WRITE,
-				&m_dsvClearValue,
-				IID_PPV_ARGS(&m_DepthStencil)));
-
-			D3D12_DEPTH_STENCIL_VIEW_DESC dsvDesc = {};
-			dsvDesc.ViewDimension = nSampleCount <= 1 ? D3D12_DSV_DIMENSION_TEXTURE2D : D3D12_DSV_DIMENSION_TEXTURE2DMS;
-			dsvDesc.Format = m_dsvClearValue.Format;
-			dsvDesc.Texture2D.MipSlice = 0;
-			dsvDesc.Flags = D3D12_DSV_FLAG_NONE;
-			m_device->CreateDepthStencilView(m_DepthStencil, &dsvDesc, m_dsvHeap->GetCPUDescriptorHandleForHeapStart());
-		}
-	}
-	else
-	{
-		{
-			auto resourceDesc = CD3DX12_RESOURCE_DESC::Tex2D(m_rtvClearValue.Format,
-				nWidth, nHeight, 1, 1, 1, 0,
-				D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET);
-
-			D3D12_RENDER_TARGET_VIEW_DESC rtvDesc = {};
-			rtvDesc.Format = m_rtvClearValue.Format;
-			rtvDesc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
-			rtvDesc.Texture2D.MipSlice = 0;
-			rtvDesc.Texture2D.PlaneSlice = 0;
-
-			for (int n = 0; n < m_RenderTargetCount; n++)
-			{
-				m_device->CreateCommittedResource(
-					&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT),
-					D3D12_HEAP_FLAG_NONE,
-					&resourceDesc,
-					D3D12_RESOURCE_STATE_RENDER_TARGET,
-					&m_rtvClearValue,
-					IID_PPV_ARGS(&m_RenderTargets[n]));
-				m_device->CreateRenderTargetView(m_RenderTargets[n], &rtvDesc, rtvHandle);
-				rtvHandle.Offset(1, m_rtvDescriptorSize);
-			}
-		}
-
-		{
-			auto resourceDesc = CD3DX12_RESOURCE_DESC::Tex2D(m_dsvClearValue.Format,
-				nWidth, nHeight, 1, 1, 1, 0, 
-				D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL);
-
-			m_device->CreateCommittedResource(
-				&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT),
-				D3D12_HEAP_FLAG_NONE,
-				&resourceDesc,
-				D3D12_RESOURCE_STATE_DEPTH_WRITE,
-				&m_dsvClearValue,
-				IID_PPV_ARGS(&m_DepthStencil));
-
-			D3D12_DEPTH_STENCIL_VIEW_DESC dsvDesc = {};
-			dsvDesc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2D;
-			dsvDesc.Format = m_dsvClearValue.Format;
-			dsvDesc.Texture2D.MipSlice = 0;
-			dsvDesc.Flags = D3D12_DSV_FLAG_NONE;
-			m_device->CreateDepthStencilView(m_DepthStencil, &dsvDesc, m_dsvHeap.Get()->GetCPUDescriptorHandleForHeapStart());
-		}
-	}
-}
-
-void D3D12RenderTarget::OnCreate(int nWidth, int nHeight)
-{
-	ID3D12Device* m_device = m_pRenderContext->GetDevice();
-
-	// Create descriptor heaps.
-	{
-		// Describe and create a render target view (RTV) descriptor heap.
-		D3D12_DESCRIPTOR_HEAP_DESC rtvHeapDesc = {};
-		rtvHeapDesc.NumDescriptors = m_RenderTargetCount;
-		rtvHeapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV;
-		rtvHeapDesc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
-		ThrowIfFailed(m_device->CreateDescriptorHeap(&rtvHeapDesc, IID_PPV_ARGS(&m_rtvHeap)));
-
-		m_rtvDescriptorSize = m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
-
-		// Describe and create a render target view (RTV) descriptor heap.
-		D3D12_DESCRIPTOR_HEAP_DESC dsvHeapDesc = {};
-		dsvHeapDesc.NumDescriptors = 1;
-		dsvHeapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_DSV;
-		dsvHeapDesc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
-		ThrowIfFailed(m_device->CreateDescriptorHeap(&dsvHeapDesc, IID_PPV_ARGS(&m_dsvHeap)));
-
-		m_dsvDescriptorSize = m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_DSV);
-	}
-
-	OnResize(nWidth, nHeight);
-}
-
-void D3D12RenderTarget::OnResize(int nWidth, int nHeight)
-{
-	CreateResource(nWidth, nHeight);
-
-	// viewport and scissor rect
-	{
-		memset(&m_viewport, 0, sizeof(m_viewport));
-		m_viewport.Width = nWidth;
-		m_viewport.Height = nHeight;
-		m_viewport.MaxDepth = 1.0;
-
-		memset(&m_scissorRect, 0, sizeof(m_scissorRect));
-		m_scissorRect.right = nWidth;
-		m_scissorRect.bottom = nHeight;
-	}
-}
-
-void D3D12RenderTarget::OnDestroy()
-{
-	for (int n = 0; n < m_RenderTargetCount; n++)
-	{
-		Safe_Release(m_RenderTargets[n]);
-
-		if (m_pRenderContext->GetSampleCount() > 1)
-		{
-			Safe_Release(m_BackBuffers[n]);
-		}
-	}
-	Safe_Release(m_DepthStencil);
-}
-
-void D3D12RenderTarget::PreRender(bool doClear)
-{
-	ID3D12GraphicsCommandList* m_commandList = m_pRenderContext->GetGraphicsCommandList();
-	m_commandList->RSSetViewports(1, &m_viewport);
-	m_commandList->RSSetScissorRects(1, &m_scissorRect);
-
-	int numSamples = 1;
-	UINT m_frameIndex = 0;	
-	D3D12_RESOURCE_STATES state = D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
-	if (m_RenderTargetIndex == 0)
-	{
-		numSamples = m_pRenderContext->GetSampleCount();
-		m_frameIndex = m_pRenderContext->GetFrameIndex();
-		if (numSamples <= 1)
-		{
-			state = D3D12_RESOURCE_STATE_PRESENT;
-		}
-		else
-		{
-			state = D3D12_RESOURCE_STATE_RESOLVE_SOURCE;
-		}
-	}
-
-	ID3D12Resource* pRenderTarget = m_RenderTargets[m_frameIndex];
-	
-	m_commandList->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(pRenderTarget, state, D3D12_RESOURCE_STATE_RENDER_TARGET));
-	
-	CD3DX12_CPU_DESCRIPTOR_HANDLE rtvHandle(m_rtvHeap->GetCPUDescriptorHandleForHeapStart(), m_frameIndex, m_rtvDescriptorSize);
-	CD3DX12_CPU_DESCRIPTOR_HANDLE dsvHandle(m_dsvHeap->GetCPUDescriptorHandleForHeapStart());
-	m_commandList->OMSetRenderTargets(1, &rtvHandle, FALSE, &dsvHandle);
-
-	if (doClear)
-	{				
-		m_commandList->ClearRenderTargetView(rtvHandle, m_rtvClearValue.Color, 0, nullptr);
-		m_commandList->ClearDepthStencilView(dsvHandle, D3D12_CLEAR_FLAG_DEPTH, 
-			m_dsvClearValue.DepthStencil.Depth, m_dsvClearValue.DepthStencil.Stencil, 0, nullptr);
-	}
-}
-
-void D3D12RenderTarget::PostRender()
-{
-	ID3D12GraphicsCommandList* m_commandList = m_pRenderContext->GetGraphicsCommandList();
-
-	int numSamples = 1;
-	UINT m_frameIndex = 0;
-	D3D12_RESOURCE_STATES state = D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
-	if (m_RenderTargetIndex == 0)
-	{
-		numSamples = m_pRenderContext->GetSampleCount();
-		m_frameIndex = m_pRenderContext->GetFrameIndex();
-		state = D3D12_RESOURCE_STATE_PRESENT;
-	}
-
-	if (numSamples <= 1)
-	{
-		ID3D12Resource* renderTarget = m_RenderTargets[m_frameIndex];
-		CD3DX12_RESOURCE_BARRIER barrier(CD3DX12_RESOURCE_BARRIER::Transition(renderTarget, D3D12_RESOURCE_STATE_RENDER_TARGET, state));
-		m_commandList->ResourceBarrier(1, &barrier);
-	}
-	else
-	{
-		ID3D12Resource* backBuffer = m_BackBuffers[m_frameIndex];
-		ID3D12Resource* renderTarget = m_RenderTargets[m_frameIndex];
-
-		// Barriers to wait for the render target, and the backbuffer to be in correct state
-		{
-			D3D12_RESOURCE_BARRIER barriers[] =
-			{
-				CD3DX12_RESOURCE_BARRIER::Transition(renderTarget, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE),
-				CD3DX12_RESOURCE_BARRIER::Transition(backBuffer, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RESOLVE_DEST),
-			};
-			m_commandList->ResourceBarrier(2, barriers);
-		}
-		// Do the resolve...
-		m_commandList->ResolveSubresource(backBuffer, 0, renderTarget, 0, m_rtvClearValue.Format);
-		// Barrier until can present
-		{
-			CD3DX12_RESOURCE_BARRIER barrier(CD3DX12_RESOURCE_BARRIER::Transition(backBuffer, D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_PRESENT));
-			m_commandList->ResourceBarrier(1, &barrier);
-		}
-	}
-}
-
-void D3D12RenderTarget::SetClearColor(float r, float g, float b, float a, float depth, float stencil)
-{
-	m_rtvClearValue.Color[0] = r;
-	m_rtvClearValue.Color[1] = g;
-	m_rtvClearValue.Color[2] = b;
-	m_rtvClearValue.Color[3] = a;
-
-	m_dsvClearValue.DepthStencil.Depth = depth;
-	m_dsvClearValue.DepthStencil.Stencil = stencil;
-}
-
-ID3D12Resource* D3D12RenderTarget::GetTexture(int nIndex, bool bRenderTarget)
-{
-	if (nIndex < 0 || nIndex > m_RenderTargetCount)
-		return nullptr;
-
-	if (bRenderTarget)
-	{
-		return m_RenderTargets[nIndex];
-	}
-	else
-	{
-		return m_BackBuffers[nIndex];
-	}
-}
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderTarget.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderTarget.h
deleted file mode 100644
index 8ae0b7d..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RenderTarget.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma once
-
-class D3D12RenderContext;
-
-#include "RenderInterface.h"
-using namespace RenderInterface;
-
-#include <d3d12.h>
-#include <d3d11on12.h>
-#include <dxgi1_4.h>
-#include <D3Dcompiler.h>
-#include <DirectXMath.h>
-#include "d3dx12.h"
-#include <string>
-#include <vector>
-#include <map>
-#include <wrl.h>
-#include <shellapi.h>
-using namespace std;
-using namespace DirectX;
-using namespace Microsoft::WRL;
-
-#ifndef Safe_Delete
-#define Safe_Delete(p)       { if (p) { delete (p);     (p) = nullptr; } }
-#endif // !Safe_Delete
-#ifndef Safe_Release
-#define Safe_Release(p)       { if (p) { p->Release();     (p) = nullptr; } }
-#endif // !Safe_Delete
-
-inline void ThrowIfFailed(HRESULT hr)
-{
-	if (FAILED(hr))
-	{
-		throw;
-	}
-}
-
-typedef struct RenderShaderStateKey
-{
-	BLEND_STATE BlendState = BLEND_STATE_NONE;
-	RASTERIZER_STATE RasterizerState = RASTERIZER_STATE_FILL_CULL_NONE;
-	DEPTH_STENCIL_STATE DepthStencilState = DEPTH_STENCIL_DEPTH_TEST;
-	D3D12_PRIMITIVE_TOPOLOGY_TYPE PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
-	int ForShadow = 0;
-
-	bool operator <(const RenderShaderStateKey &other) const
-	{
-		int key = (((BlendState * 10 + RasterizerState) * 10 + DepthStencilState) * 10 + PrimitiveTopologyType) * 10 + ForShadow;
-		int otherkey = (((other.BlendState * 10 + other.RasterizerState) * 10 + other.DepthStencilState) * 10 + other.PrimitiveTopologyType) * 10 + other.ForShadow;
-		return key < otherkey;
-	}
-} RenderShaderStateKey;
-
-typedef struct RenderShaderState
-{
-	D3D12_BLEND_DESC BlendState = CD3DX12_BLEND_DESC(D3D12_DEFAULT);
-	D3D12_RASTERIZER_DESC RasterizerState = CD3DX12_RASTERIZER_DESC(D3D12_DEFAULT);
-	D3D12_DEPTH_STENCIL_DESC DepthStencilState = CD3DX12_DEPTH_STENCIL_DESC(D3D12_DEFAULT);
-	D3D12_PRIMITIVE_TOPOLOGY_TYPE PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
-	DXGI_FORMAT RTVFormat = DXGI_FORMAT_R8G8B8A8_UNORM;
-	DXGI_FORMAT DSVFormat = DXGI_FORMAT_D24_UNORM_S8_UINT;
-	int SampleCount = 1;
-} RenderShaderState;
-
-class D3D12RenderTarget
-{
-public:
-	D3D12RenderTarget(int renderTargetIndex, int nRenderTargetCount = 1);
-	~D3D12RenderTarget();
-
-	void OnCreate(int nWidth, int nHeight);
-	void OnResize(int nWidth, int nHeight);
-	void OnDestroy();
-
-	void PreRender(bool doClear = false);
-	void PostRender();
-
-	void SetClearColor(float r, float g, float b, float a = 1.0, float depth = 1.0, float stencil = 0.0);
-	
-	ID3D12Resource* GetTexture(int nIndex = 0, bool bRenderTarget = true);
-
-	D3D12_VIEWPORT m_viewport;
-
-	ID3D12Resource* GetDepthStencilResource();
-	D3D12_CPU_DESCRIPTOR_HANDLE GetRenderTargetViewHandle();
-	D3D12_CPU_DESCRIPTOR_HANDLE GetDepthStencilViewHandle();
-
-private:
-	void CreateResource(int nWidth, int nHeight);
-
-	int m_RenderTargetIndex;
-	int m_RenderTargetCount;
-
-	ID3D12Resource** m_BackBuffers;
-	ID3D12Resource** m_RenderTargets;
-	ID3D12Resource*	m_DepthStencil;
-
-	ComPtr<ID3D12DescriptorHeap> m_rtvHeap;
-	UINT m_rtvDescriptorSize;
-	ComPtr<ID3D12DescriptorHeap> m_dsvHeap;
-	UINT m_dsvDescriptorSize;
-
-	D3D12_RECT m_scissorRect;
-
-	D3D12RenderContext* m_pRenderContext;
-
-	D3D12_CLEAR_VALUE m_rtvClearValue;
-	D3D12_CLEAR_VALUE m_dsvClearValue;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RendererWindow.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RendererWindow.cpp
deleted file mode 100644
index b640ebd..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RendererWindow.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D12RendererWindow.h"
-
-#include "DXUT.h"
-#include "DXUTgui.h"
-#include "sdkmisc.h"
-
-#include "D3D12RenderInterface.h"
-#include "D3D12RenderContext.h"
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(x) { if (x) x->Release(); x = 0; }
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-D3D12RenderWindow::D3D12RenderWindow()
-{
-	m_pRenderContext = D3D12RenderContext::Instance();
-
-	m_pDialogResourceManager = 0;
-	m_pTextHelper = 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-D3D12RenderWindow::~D3D12RenderWindow()
-{
-	Free();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool D3D12RenderWindow::Create( HWND hWnd, unsigned int nSamples )
-{
-	m_pRenderContext->SetSampleCount(nSamples);
-
-	RECT rc;
-	GetClientRect((HWND)hWnd, &rc);
-	int wBuf = rc.right - rc.left;
-	int hBuf = rc.bottom- rc.top;
-
-	ID3D11Device *pDevice = m_pRenderContext->GetDevice11();
-	ID3D11DeviceContext* pDeviceContext = m_pRenderContext->GetDeviceContext();
-	if (nullptr != pDevice && nullptr != pDeviceContext)
-	{
-		m_pDialogResourceManager = new CDXUTDialogResourceManager;
-		m_pDialogResourceManager->OnD3D11CreateDevice(pDevice, pDeviceContext);
-		m_pTextHelper = new CDXUTTextHelper(pDevice, pDeviceContext, m_pDialogResourceManager, 15);
-	}
-
-	m_pRenderContext->InitSwapchain(wBuf, hBuf, hWnd);
-	Resize(wBuf, hBuf);
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D12RenderWindow::Free()
-{
-	FreeBuffer();
-
-	SAFE_DELETE(m_pTextHelper);
-
-	if (m_pDialogResourceManager)
-	{
-		m_pDialogResourceManager->OnD3D11DestroyDevice();
-		SAFE_DELETE(m_pDialogResourceManager);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D12RenderWindow::FreeBuffer()
-{
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D12RenderWindow::Present()
-{
-//	m_pRenderContext->ReleaseRenderTarget();
-
-//	m_pRenderContext->PostRender();
-
-	m_pRenderContext->Present();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void D3D12RenderWindow::Clear(float r, float g, float b)
-{
-	m_pRenderContext->PreRender();
-
-	m_pRenderContext->SetClearColor(0, r, g, b);
-	m_pRenderContext->AcquireRenderTarget(true);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool D3D12RenderWindow::Resize( int w, int h )
-{
-	assert(w > 0 && h > 0);
-
-	m_pRenderContext->ResizeSwapchain(w, h);
-
-	if (m_pDialogResourceManager)
-	{
-		ID3D11Device *pDevice = m_pRenderContext->GetDevice11();
-		D3D12_RESOURCE_DESC descTex2D = m_pRenderContext->GetBackBufferDesc();
-
-		DXGI_SURFACE_DESC backbufferDesc;
-		backbufferDesc.Width = descTex2D.Width;
-		backbufferDesc.Height = descTex2D.Height;
-		backbufferDesc.Format = descTex2D.Format;
-		backbufferDesc.SampleDesc = descTex2D.SampleDesc;
-
-		m_pDialogResourceManager->OnD3D11ResizedSwapChain(pDevice, &backbufferDesc);
-	}
-
-	return true;
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RendererWindow.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RendererWindow.h
deleted file mode 100644
index abd5d9b..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12RendererWindow.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <d3d12.h>
-class D3D12RenderContext;
-// DXUT stuffs for text rendering
-class CDXUTDialogResourceManager;
-class CDXUTTextHelper;
-
-struct D3D12RenderWindow
-{
-public:
-	D3D12RenderWindow();
-	~D3D12RenderWindow();
-
-	bool Create(HWND hWnd, unsigned int nSamples = 1);
-	bool Resize(int w, int h);
-	void Present();
-	void Clear(float r, float g, float b);
-
-	CDXUTDialogResourceManager*	m_pDialogResourceManager;
-	CDXUTTextHelper*			m_pTextHelper;
-
-private:
-	void Free();
-	void FreeBuffer();
-
-	D3D12RenderContext* m_pRenderContext;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Shaders.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Shaders.cpp
deleted file mode 100644
index 0c07409..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Shaders.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D12Shaders.h"
-
-#include "MeshShaderParam.h"
-#include "LightShaderParam.h"
-
-//#include <Nv/Blast/NvHairSdk.h>
-#include "D3D12RenderShader.h"
-#include "D3D12RenderContext.h"
-#include "D3D12TextureResource.h"
-using namespace RenderInterface;
-
-D3D12_INPUT_ELEMENT_DESC layoutBodyRender[] =
-{
-	{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
-	{ "VERTEX_NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
-	{ "FACE_NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 24, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
-	{ "TANGENT", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 36, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
-	{ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 48, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
-	{ "VERTEX_ID", 0, DXGI_FORMAT_R32_FLOAT, 0, 56, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
-};
-
-D3D12_INPUT_ELEMENT_DESC layout_Position_And_Color[] =
-{
-	{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
-	{ "COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 12, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-// Common shader settings
-//static D3D12RenderShader*	g_pShaders[SHADER_TYPE_END];
-static std::map<int, D3D12RenderShader*> g_pShaders;
-/*
-namespace BodyShaderBlobs
-{
-	#include "Shaders/BodyShader_VS.h"
-	#include "Shaders/BodyShader_PS.h"
-}
-
-namespace BodyShadowBlobs
-{
-	#include "Shaders/BodyShadow_VS.h"
-	#include "Shaders/BodyShadow_PS.h"
-}
-
-namespace ScreenQuadBlobs
-{
-	#include "Shaders/ScreenQuad_VS.h"
-	#include "Shaders/ScreenQuad_PS.h"
-}
-
-namespace ScreenQuadColorBlobs
-{
-	#include "Shaders/ScreenQuadColor_VS.h"
-	#include "Shaders/ScreenQuadColor_PS.h"
-}
-
-namespace VisualizeShadowBlobs
-{
-	#include "Shaders/VisualizeShadow_VS.h"
-	#include "Shaders/VisualizeShadow_PS.h"
-}
-
-namespace ColorBlobs
-{
-	#include "Shaders/Color_VS.h"
-	#include "Shaders/Color_PS.h"
-}
-*/
-//////////////////////////////////////////////////////////////////////////
-bool InitializeShadersD3D12()
-{
-	/*
-	UINT numElements = sizeof(layoutBodyRender) / sizeof(D3D11_INPUT_ELEMENT_DESC);
-
-	g_pShaders[SHADER_TYPE_MESH_RENDERING] = D3D12RenderShader::Create("MeshRenderShader",
-		(void*)BodyShaderBlobs::g_vs_main, sizeof(BodyShaderBlobs::g_vs_main),
-		(void*)BodyShaderBlobs::g_ps_main, sizeof(BodyShaderBlobs::g_ps_main),
-		sizeof(MeshShaderParam), 0,
-		&layoutBodyRender[0], numElements,
-		10, 0, 2);
-
-	g_pShaders[SHADER_TYPE_MESH_SHADOW] = D3D12RenderShader::Create("MeshShadowShader",
-		(void*)BodyShadowBlobs::g_vs_main, sizeof(BodyShadowBlobs::g_vs_main),
-		(void*)BodyShadowBlobs::g_ps_main, sizeof(BodyShadowBlobs::g_ps_main),
-		sizeof(MeshShadowShaderParam), 0,
-		&layoutBodyRender[0], numElements,
-		2);
-
-	g_pShaders[SHADER_TYPE_SCREEN_QUAD] = D3D12RenderShader::Create("ScreenQuadShader",
-		(void*)ScreenQuadBlobs::g_vs_main, sizeof(ScreenQuadBlobs::g_vs_main),
-		(void*)ScreenQuadBlobs::g_ps_main, sizeof(ScreenQuadBlobs::g_ps_main),
-		0, 0,
-		0, 0,
-		1, 0, 1);
-
-	g_pShaders[SHADER_TYPE_SCREEN_QUAD_COLOR] = D3D12RenderShader::Create("ScreenQuadColorShader",
-		(void*)ScreenQuadColorBlobs::g_vs_main, sizeof(ScreenQuadColorBlobs::g_vs_main),
-		(void*)ScreenQuadColorBlobs::g_ps_main, sizeof(ScreenQuadColorBlobs::g_ps_main));
-
-	g_pShaders[SHADER_TYPE_VISUALIZE_SHADOW] = D3D12RenderShader::Create("VisualizeShadowShader",
-		(void*)VisualizeShadowBlobs::g_vs_main, sizeof(VisualizeShadowBlobs::g_vs_main),
-		(void*)VisualizeShadowBlobs::g_ps_main, sizeof(VisualizeShadowBlobs::g_ps_main),
-		sizeof(ShadowVizParam), 0,
-		0, 0,
-		1, 0, 1);
-
-	UINT numElements2 = sizeof(layout_Position_And_Color) / sizeof(D3D11_INPUT_ELEMENT_DESC);
-
-	g_pShaders[SHADER_TYPE_SIMPLE_COLOR] = D3D12RenderShader::Create("Color",
-		(void*)ColorBlobs::g_vs_main, sizeof(ColorBlobs::g_vs_main),
-		(void*)ColorBlobs::g_ps_main, sizeof(ColorBlobs::g_ps_main),
-		sizeof(SimpleShaderParam), 0,
-		&layout_Position_And_Color[0], numElements2);
-	
-	g_pShaders[SHADER_TYPE_HAIR_SHADER_DEFAULT] = D3D12RenderShader::Create(
-		"hairShaderDefault", 0, 0,
-		(void*)BlastShaderBlobs::g_ps_main, sizeof(BlastShaderBlobs::g_ps_main),
-		sizeof(NvHair::ShaderConstantBuffer),
-		sizeof(LightShaderParam)
-		);
-
-	g_pShaders[SHADER_TYPE_HAIR_SHADER_SHADOW] = D3D12RenderShader::Create(
-		"hairShadow", 0, 0,
-		(void*)BlastShadowBlobs::g_ps_main, sizeof(BlastShadowBlobs::g_ps_main),
-		sizeof(NvHair::ShaderConstantBuffer),
-		0);
-	*/
-	return true;
-}
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(x) { if (x) x->Release(); x = 0; }
-#endif
-
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(x) { if (x) delete x; x = 0; }
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-void DestroyShadersD3D12()
-{
-	for (int i = 0; i < g_pShaders.size(); i++)
-	{
-		D3D12RenderShader*& pShader = g_pShaders[i];
-		if (pShader)
-		{
-			delete pShader;
-			pShader = 0;
-		}
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-D3D12RenderShader* GetShaderD3D12(SHADER_TYPE st)
-{
-	return g_pShaders[st];
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyShaderD3D12(SHADER_TYPE st)
-{
-	D3D12RenderShader* pD3D12Shader = GetShaderD3D12(st);
-	if (!pD3D12Shader)
-		return;
-
-	pD3D12Shader->MakeCurrent();
-}
-
-void BindShaderResourcesD3D12(SHADER_TYPE st, int numSRVs, GPUShaderResource** ppSRVs)
-{
-	D3D12RenderShader* pD3D12Shader = GetShaderD3D12(st);
-	if (!pD3D12Shader)
-		return;
-
-	for (int i = 0; i < numSRVs; i++)
-	{
-		CD3DX12_CPU_DESCRIPTOR_HANDLE handle = D3D12TextureResource::GetHandle(ppSRVs[i]);
-		pD3D12Shader->BindShaderResource(i, handle);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void DisableShaderD3D12(RenderInterface::SHADER_TYPE st)
-{
-	D3D12RenderShader* pD3D12Shader = GetShaderD3D12(st);
-	if (!pD3D12Shader)
-		return;
-
-	pD3D12Shader->Disable();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CopyShaderParamD3D12(SHADER_TYPE st, void* pSysMem, unsigned int bytes, unsigned int slot)
-{
-	D3D12RenderShader* pD3D12Shader = GetShaderD3D12(st);
-	if (!pD3D12Shader)
-		return;
-	
-	void* mappedParam = pD3D12Shader->MapParam(slot);
-
-	memcpy(mappedParam, pSysMem, bytes);
-
-	pD3D12Shader->UnmapParam(slot);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Shaders.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Shaders.h
deleted file mode 100644
index 29b0e1b..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Shaders.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "RenderInterface.h"
-#include "RenderPlugin.h"
-///////////////////////////////////////////////////////////////////
-// default shaders
-///////////////////////////////////////////////////////////////////
-CORERENDER_EXPORT bool InitializeShadersD3D12();
-CORERENDER_EXPORT void DestroyShadersD3D12();
-
-CORERENDER_EXPORT void ApplyShaderD3D12(RenderInterface::SHADER_TYPE st);
-CORERENDER_EXPORT void DisableShaderD3D12(RenderInterface::SHADER_TYPE st);
-CORERENDER_EXPORT void BindShaderResourcesD3D12(RenderInterface::SHADER_TYPE st, int numSRVs, GPUShaderResource** ppSRVs);
-CORERENDER_EXPORT void CopyShaderParamD3D12(RenderInterface::SHADER_TYPE st, void* pSysMem, unsigned int bytes, unsigned int slot = 0);
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12ShadowMap.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12ShadowMap.cpp
deleted file mode 100644
index 342c6f3..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12ShadowMap.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D12ShadowMap.h"
-
-#include "RenderResources.h"
-
-#include "D3D12RenderInterface.h"
-#include "D3D12TextureResource.h"
-#include "D3D12RenderContext.h"
-
-//////////////////////////////////////////////////////////////////////////////
-D3D12ShadowMap::D3D12ShadowMap(int resolution)
-{
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	m_nIndex = pContext->AllocRenderTargetIndex();
-	m_pRenderTarget = pContext->CreateRenderTarget(m_nIndex, resolution, resolution);
-	ID3D12Resource* pTexture = pContext->GetTexture(m_nIndex);
-	int nIndexInHeap = -1;
-	CD3DX12_CPU_DESCRIPTOR_HANDLE handle = pContext->NVHairINT_CreateD3D12Texture(pTexture, nIndexInHeap);
-	m_ShadowResource.m_pResource = pTexture;
-	m_ShadowResource.m_Handle = handle;
-	m_ShadowResource.m_nIndexInHeap = nIndexInHeap;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-D3D12ShadowMap::~D3D12ShadowMap()
-{
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	pContext->NVHairINT_DestroyD3D12Texture(m_ShadowResource.m_nIndexInHeap);
-
-	Release();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void D3D12ShadowMap::Release()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////
-GPUShaderResource* D3D12ShadowMap::GetShadowSRV()
-{
-	return &m_ShadowResource;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-bool D3D12ShadowMap::isValid()
-{
-	return m_pRenderTarget != nullptr;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void D3D12ShadowMap::BeginRendering(float clearDepth)
-{
-	if (!isValid())
-		return;
-
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	pContext->ReleaseRenderTarget();
-
-	pContext->AcquireRenderTarget(true, m_nIndex);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void D3D12ShadowMap::EndRendering()
-{
-	if (!isValid())
-		return;
-
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	pContext->ReleaseRenderTarget(m_nIndex);
-
-	pContext->AcquireRenderTarget();
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12ShadowMap.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12ShadowMap.h
deleted file mode 100644
index dabf9a1..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12ShadowMap.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "ShadowMap.h"
-
-#include <d3d11.h>
-#include <d3d12.h>
-#include "D3D12TextureResource.h"
-
-#include "DXUT.h" // DXUT header
-#include "d3dx12.h"
-
-#include "D3D12RenderTarget.h"
-
-using namespace Microsoft::WRL;
-
-class GPUShaderResource;
-class D3D12TextureResource;
-
-struct D3D12ShadowMap : public ShadowMap
-{
-	D3D12TextureResource m_ShadowResource;
-
-	D3D12RenderTarget* m_pRenderTarget;
-	
-public:
-	D3D12ShadowMap(int resolution );
-	~D3D12ShadowMap();
-
-	void Release();
-	void BeginRendering(float clearDepth);
-	void EndRendering();
-
-	GPUShaderResource* GetShadowSRV();
-
-protected:
-
-	bool isValid();
-	int m_nIndex;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12TextureResource.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12TextureResource.cpp
deleted file mode 100644
index 0247895..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12TextureResource.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D12TextureResource.h"
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12TextureResource.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12TextureResource.h
deleted file mode 100644
index b6c7584..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12TextureResource.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "RenderResources.h"
-
-#include "d3d12.h"
-#include "d3dx12.h"
-
-// GPU resources for texture 
-struct D3D12TextureResource : public GPUShaderResource
-{
-	ID3D12Resource* m_pResource;
-	CD3DX12_CPU_DESCRIPTOR_HANDLE m_Handle;
-	int m_nIndexInHeap;
-
-public:
-	static GPUShaderResource* Create(
-		ID3D12Resource* pResource, 
-		CD3DX12_CPU_DESCRIPTOR_HANDLE handle,
-		int nIndexInHeap) {
-		D3D12TextureResource* pBuffer = new D3D12TextureResource; 
-		pBuffer->m_pResource = pResource;
-		pBuffer->m_Handle = handle;
-		pBuffer->m_nIndexInHeap = nIndexInHeap;
-		return pBuffer;
-	}
-
-	static ID3D12Resource* GetResource(GPUShaderResource* pBuffer)
-	{
-		D3D12TextureResource* pD3D12Buffer = dynamic_cast<D3D12TextureResource*>(pBuffer);
-		if (!pD3D12Buffer)
-			return 0;
-		return pD3D12Buffer->m_pResource;
-	}
-
-	static CD3DX12_CPU_DESCRIPTOR_HANDLE GetHandle(GPUShaderResource* pBuffer)
-	{
-		CD3DX12_CPU_DESCRIPTOR_HANDLE handle = {};
-		D3D12TextureResource* pD3D12Buffer = dynamic_cast<D3D12TextureResource*>(pBuffer);
-		if (pD3D12Buffer)
-			handle = pD3D12Buffer->m_Handle;
-		else
-			handle.ptr = 0;
-		return handle;
-	}
-
-	D3D12TextureResource()
-	{
-		m_pResource = 0;
-	}
-
-	void Release()
-	{
-		SAFE_RELEASE(m_pResource);
-	}
-
-	~D3D12TextureResource()
-	{
-		Release();
-	}
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Util.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Util.cpp
deleted file mode 100644
index 695bb41..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Util.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include <DirectXTex.h>
-#include "D3D12Util.h"
-
-#include "D3D12Shaders.h"
-#include "D3D12RenderShader.h"
-
-#include "D3DX10tex.h"
-#include "D3DX11tex.h"
-
-#include "D3D12Wrapper.h"
-#include "DXUT.h"
-#include "DXUTgui.h"
-#include "sdkmisc.h"
-#include "D3D12RendererWindow.h"
-#include "SimpleRenderable.h"
-//#include "MeshShaderParam.h"
-#include "D3D12RenderInterface.h"
-#include "D3D12TextureResource.h"
-#include "D3D12RenderContext.h"
-namespace D3D12Util
-{
-	using namespace RenderInterface;
-
-	// D3D hook to render window
-	D3D12RenderWindow*		g_pRenderWindow = 0;
-
-///////////////////////////////////////////////////////////////////////////////
-GPUShaderResource*
-	CreateTextureSRV(const char* texturename)
-{
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	if (!pContext)
-		return 0;
-	ID3D12Device* pDevice = pContext->GetDevice();
-	if (!pDevice)
-		return 0;
-	ID3D12GraphicsCommandList* pCommandList = pContext->GetGraphicsCommandList();
-	if (!pCommandList)
-		return 0;
-
-	unsigned char *pSTBIRes = 0;
-	int width = 0;
-	int height = 0;
-
-	size_t nu = strlen(texturename);
-	size_t n = (size_t)MultiByteToWideChar(CP_ACP, 0, (const char *)texturename, (int)nu, NULL, 0);
-	wchar_t* pwstr = new wchar_t[n];
-	MultiByteToWideChar(CP_ACP, 0, (const char *)texturename, (int)nu, pwstr, (int)n);
-	pwstr[n] = 0;
-
-	TexMetadata texMetadata;
-	ScratchImage scratchImage;
-	HRESULT loaded = LoadFromTGAFile(pwstr, &texMetadata, scratchImage);
-
-	if (loaded != S_OK)
-	{
-		loaded = LoadFromWICFile(pwstr, TEX_FILTER_DEFAULT | WIC_FLAGS_ALL_FRAMES, &texMetadata, scratchImage);
-	}
-
-	if (loaded != S_OK)
-	{
-		loaded = LoadFromDDSFile(pwstr, DDS_FLAGS_NONE, &texMetadata, scratchImage);
-	}
-
-	if (loaded == S_OK)
-	{
-		pSTBIRes = scratchImage.GetPixels();
-		width = texMetadata.width;
-		height = texMetadata.height;
-	}
-
-	if (!pSTBIRes)
-		return 0;
-
-	int numMipMaps = 0;
-	{
-		int mipWidth = width;
-		int mipHeight = height;
-		while (mipWidth > 1 || mipHeight > 1)
-		{
-			numMipMaps++;
-			mipWidth >>= 1;
-			mipHeight >>= 1;
-
-			if ((mipWidth * sizeof(uint32_t)) < D3D12_TEXTURE_DATA_PITCH_ALIGNMENT)
-				break;
-		}
-	}
-
-	std::vector<D3D12_PLACED_SUBRESOURCE_FOOTPRINT> layouts(numMipMaps);
-	std::vector<uint64_t> row_sizes_in_bytes(numMipMaps);
-	std::vector<uint32_t> num_rows(numMipMaps);
-
-	auto resourceDesc = CD3DX12_RESOURCE_DESC::Tex2D(
-		DXGI_FORMAT_R8G8B8A8_UNORM, width, height, 1, (UINT16)numMipMaps, 1, 0, D3D12_RESOURCE_FLAG_NONE,
-		D3D12_TEXTURE_LAYOUT_UNKNOWN, 0);
-
-	uint64_t required_size = 0;
-	pDevice->GetCopyableFootprints(&resourceDesc, 0, numMipMaps, 0, &layouts[0], &num_rows[0], &row_sizes_in_bytes[0], &required_size);
-
-	HRESULT hr;
-	ID3D12Resource* mTextureUpload;
-	ID3D12Resource* mTexture;
-
-	hr = pDevice->CreateCommittedResource(
-		&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT),
-		D3D12_HEAP_FLAG_NONE,
-		&resourceDesc,
-		D3D12_RESOURCE_STATE_COPY_DEST,
-		nullptr,
-		IID_PPV_ARGS(&mTexture));
-	mTexture->SetName(L"Texture");
-	hr = pDevice->CreateCommittedResource(
-		&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD),
-		D3D12_HEAP_FLAG_NONE,
-		&CD3DX12_RESOURCE_DESC::Buffer(required_size),
-		D3D12_RESOURCE_STATE_GENERIC_READ,
-		nullptr,
-		IID_PPV_ARGS(&mTextureUpload));
-	mTextureUpload->SetName(L"TextureUpload");
-
-	const int requestedMipLevels = numMipMaps;
-	D3D12_SUBRESOURCE_DATA* initData = new D3D12_SUBRESOURCE_DATA[requestedMipLevels];
-	ZeroMemory(initData, sizeof(D3D12_SUBRESOURCE_DATA)*requestedMipLevels);
-
-	struct Pixel
-	{
-		unsigned char rgba[4];
-	};
-
-	// prepare target buffer just large enough to include all the mip levels
-	Pixel* targets = new Pixel[width*height * 2];
-
-	// copy the first mip level
-	memcpy(targets, pSTBIRes, width*height * 4);
-
-	// current mip level width and height
-	int mipWidth = width;
-	int mipHeight = height;
-
-	// actual mip levels
-	int mipLevels = 0;
-
-	// current data
-	Pixel* source = targets;
-	Pixel* target = nullptr;
-
-	for (int idx = 0; idx < requestedMipLevels; ++idx)
-	{
-		// set initData
-		initData[idx].pData = source;
-		initData[idx].RowPitch = mipWidth * 4;
-		mipLevels++;
-
-		// skip generating mip for 1x1
-		if ((mipWidth == 1) && (mipHeight == 1))
-			break;
-
-		// skip generating mip for the last level
-		if (idx == (requestedMipLevels - 1))
-			break;
-
-		// buffer for the next mip level
-		target = &source[mipWidth*mipHeight];
-
-		const int prevWidth = mipWidth; // previous mip's width
-
-										// generate the next mip level
-		mipWidth = max(1, mipWidth >> 1);
-		mipHeight = max(1, mipHeight >> 1);
-
-		Pixel samples[4];
-
-		for (int y = 0; y < mipHeight; ++y)
-		{
-			for (int x = 0; x < mipWidth; ++x)
-			{
-				const int px = x * 2; // x in previous mip
-				const int py = y * 2; // y in previous mip
-
-				samples[0] = source[py*prevWidth + px]; // left top
-				samples[1] = source[py*prevWidth + px + 1]; // right top
-				samples[2] = source[(py + 1)*prevWidth + px]; // left bottom
-				samples[3] = source[(py + 1)*prevWidth + px + 1]; // right bottom
-
-																	// for each component
-				for (int comp = 0; comp < 4; ++comp)
-				{
-					// do the linear box filter for lower mip level
-					target[y*mipWidth + x].rgba[comp] = (samples[0].rgba[comp] + samples[1].rgba[comp] + samples[2].rgba[comp] + samples[3].rgba[comp]) / 4;
-				}
-			}
-		}
-
-		// update source
-		source = target;
-	}
-
-	uint8_t* p;
-	mTextureUpload->Map(0, nullptr, reinterpret_cast<void**>(&p));
-	for (uint32_t i = 0; i < numMipMaps; ++i)
-	{
-		memcpy(p + layouts[i].Offset, initData[i].pData, layouts[i].Footprint.RowPitch * num_rows[i]);
-	}
-	mTextureUpload->Unmap(0, nullptr);
-
-	for (uint32_t i = 0; i < numMipMaps; ++i)
-	{
-		D3D12_TEXTURE_COPY_LOCATION src;
-		src.pResource = mTextureUpload;
-		src.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
-		src.PlacedFootprint = layouts[i];
-
-		D3D12_TEXTURE_COPY_LOCATION dst;
-		dst.pResource = mTexture;
-		dst.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
-		dst.SubresourceIndex = i;
-		pCommandList->CopyTextureRegion(&dst, 0, 0, 0, &src, nullptr);
-	}
-	pCommandList->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(mTexture, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE));
-
-	delete initData;
-	delete targets;
-
-	int nIndexInHeap = -1;
-	CD3DX12_CPU_DESCRIPTOR_HANDLE handle = pContext->NVHairINT_CreateD3D12Texture(mTexture, nIndexInHeap);
-	return D3D12TextureResource::Create(mTexture, handle, nIndexInHeap);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-bool GetDeviceInfoString(wchar_t *str)
-{
-	ID3D11Device* pDevice = nullptr;// RenderInterfaceD3D12::GetDevice();
-	if (!pDevice)
-		return false;
-
-	{
-		IDXGIDevice1 *pDXGIDevice1 = NULL;
-		pDevice->QueryInterface(__uuidof(IDXGIDevice1), reinterpret_cast<void **>(&pDXGIDevice1));
-
-		IDXGIAdapter1 *pDXGIAdapter1 = NULL;
-		pDXGIDevice1->GetParent(__uuidof(IDXGIAdapter1), reinterpret_cast<void **>(&pDXGIAdapter1));
-
-		if (pDXGIAdapter1)
-		{
-			auto adapterDescription = DXGI_ADAPTER_DESC1();
-			pDXGIAdapter1->GetDesc1(&adapterDescription);
-
-			WCHAR* pDescStr = adapterDescription.Description;
-			float memInGB = float(adapterDescription.DedicatedVideoMemory) / 1e9f;
-			swprintf_s(str, 1000, L"%s(%.1fGb)\n", pDescStr, memInGB);
-		}
-	}
-
-	return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// Render window interafce
-/////////////////////////////////////////////////////////////////////////////////////////
-bool CreateRenderWindow(HWND hWnd, int nSamples)
-{
-	SAFE_DELETE(g_pRenderWindow);
-
-	g_pRenderWindow = new D3D12RenderWindow;
-	return g_pRenderWindow->Create(hWnd, nSamples);
-}
-
-D3DHandles& GetDeviceHandles(D3DHandles& deviceHandles)
-{
-	/*
-	deviceHandles.pAdapter = RenderInterfaceD3D11::GetAdapter();
-	deviceHandles.pFactory = RenderInterfaceD3D11::GetDXGIFactory();
-	deviceHandles.pDevice = RenderInterfaceD3D11::GetDevice();
-	deviceHandles.pDeviceContext = RenderInterfaceD3D11::GetDeviceContext();
-
-	deviceHandles.pDXGISwapChain = g_pRenderWindow->m_pDXGISwapChain;
-	deviceHandles.pD3D11BackBuffer = g_pRenderWindow->m_pD3D11BackBuffer;
-	deviceHandles.pD3D11RenderTargetView = g_pRenderWindow->m_pD3D11RenderTargetView;
-	deviceHandles.pD3D11DepthBuffer = g_pRenderWindow->m_pD3D11DepthBuffer;
-	deviceHandles.pD3D11DepthStencilView = g_pRenderWindow->m_pD3D11DepthStencilView;
-	*/
-	return deviceHandles;
-}
-
-void DestroyRenderWindow()
-{
-	SAFE_DELETE(g_pRenderWindow);
-}
-
-bool ResizeRenderWindow(int w, int h)
-{
-	if (!g_pRenderWindow)
-		return false;
-
-	return g_pRenderWindow->Resize(w,h);
-}
-
-void PresentRenderWindow()
-{
-	if (!g_pRenderWindow)
-		return;
-	
-	g_pRenderWindow->Present();
-}
-
-void ClearRenderWindow(float r, float g, float b)
-{
-	if (!g_pRenderWindow)
-		return;
-	
-	g_pRenderWindow->Clear(r,g,b);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// Text draw helper functions (using DXUT)
-/////////////////////////////////////////////////////////////////////////////////////////
-void TxtHelperBegin()
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-		
-	g_pRenderWindow->m_pTextHelper->Begin();
-}
-
-void TxtHelperEnd()
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-
-	g_pRenderWindow->m_pTextHelper->End();
-}
-
-void TxtHelperSetInsertionPos(int x, int y)
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-
-	g_pRenderWindow->m_pTextHelper->SetInsertionPos(x, y);
-}
-
-void TxtHelperSetForegroundColor(float r, float g, float b, float a)
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-
-	g_pRenderWindow->m_pTextHelper->SetForegroundColor(DirectX::XMFLOAT4(r,g,b,a));
-}
-
-void TxtHelperDrawTextLine(wchar_t* str)
-{
-	if (!g_pRenderWindow || !g_pRenderWindow->m_pTextHelper)
-		return;
-
-	g_pRenderWindow->m_pTextHelper->DrawTextLine(str);
-}
-
-} // end namespace
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Util.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Util.h
deleted file mode 100644
index f83b063..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Util.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include <d3d12.h>
-
-#include "RenderPlugin.h"
-
-class GPUShaderResource;
-
-namespace D3D12Util
-{
-	///////////////////////////////////////////////////////////////////
-	// render window management
-	///////////////////////////////////////////////////////////////////
-	D3DHandles& GetDeviceHandles(D3DHandles& deviceHandles);
-	bool CreateRenderWindow(HWND hWnd, int nSamples);
-	void DestroyRenderWindow();
-	bool ResizeRenderWindow(int w, int h);
-	void PresentRenderWindow();
-	void ClearRenderWindow(float r, float g, float b);
-
-	///////////////////////////////////////////////////////////////////
-	// background textures
-	bool LoadBackgroundTexture(const char* filePath);
-	void RenderBackgroundTexture();
-	void ClearBackgroundTexture();
-	GPUShaderResource* CreateTextureSRV(const char* texturename);
-
-	///////////////////////////////////////////////////////////////////
-	bool GetDeviceInfoString(wchar_t *str);
-
-	///////////////////////////////////////////////////////////////////
-	// text helpers
-	void TxtHelperBegin();
-	void TxtHelperEnd();
-	void TxtHelperSetInsertionPos(int x, int y);
-	void TxtHelperSetForegroundColor(float r, float g, float b, float a = 1.0f);
-	void TxtHelperDrawTextLine(wchar_t* str);
-
-
-}
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Wrapper.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Wrapper.cpp
deleted file mode 100644
index b534a36..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Wrapper.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "D3D12Wrapper.h"
-
-namespace D3DWrapper
-{
-
-} // end namespace
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Wrapper.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Wrapper.h
deleted file mode 100644
index dc81e34..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/D3D12Wrapper.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <d3d11.h>
-
-namespace D3DWrapper
-{
-	inline void SetDebugName(ID3D11DeviceChild* pResource, const char *name)
-	{
-		if (pResource) pResource->SetPrivateData( WKPDID_D3DDebugObjectName, strlen(name), name);
-	}
-}
-
-#define SET_D3D_DEBUG_NAME(x, name) D3DWrapper::SetDebugName(x, name);
-#define SET_D3D_DEBUG_NAME_VAR(x) D3DWrapper::SetDebugName(x, #x);
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/RenderPluginDx12.cpp b/tools/ArtistTools/source/CoreLib/Render/D3D12/RenderPluginDx12.cpp
deleted file mode 100644
index 9945d7c..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/RenderPluginDx12.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-#include "RenderPluginDx12.h"
-
-#include "D3D12RenderInterface.h"
-#include "D3D12Util.h"
-#include "D3D12Shaders.h"
-#include "D3D12GPUProfiler.h"
-#include "D3D12ShadowMap.h"
-#include "D3D12RenderContext.h"
-
-RenderPlugin* CreateRenderPlugin(void)
-{
-	return new RenderPluginDx12;
-}
-
-RenderPluginDx12::RenderPluginDx12()
-{
-	m_RenderApi = "Dx12";
-}
-
-RenderPluginDx12::~RenderPluginDx12()
-{
-}
-
-// interface
-bool RenderPluginDx12::InitDevice(int deviceID) 
-{ 
-	return RenderInterfaceD3D12::InitDevice(deviceID);
-}
-
-bool RenderPluginDx12::Initialize() 
-{ 
-	return RenderInterfaceD3D12::Initialize();
-}
-
-void RenderPluginDx12::Shutdown() 
-{
-	D3D12Util::DestroyRenderWindow();
-	RenderInterfaceD3D12::Shutdown();
-}
-
-void RenderPluginDx12::CopyToDevice(GPUBufferResource *pDevicePtr, 
-	void* pSysMem, unsigned int	ByteWidth) 
-{
-	RenderInterfaceD3D12::CopyToDevice(pDevicePtr, pSysMem, ByteWidth);
-}
-
-void RenderPluginDx12::ApplyDepthStencilState(DEPTH_STENCIL_STATE state) 
-{
-	RenderInterfaceD3D12::ApplyDepthStencilState(state);
-}
-
-void RenderPluginDx12::ApplyRasterizerState(RASTERIZER_STATE state) 
-{
-	RenderInterfaceD3D12::ApplyRasterizerState(state);
-}
-
-void RenderPluginDx12::ApplySampler(int slot, SAMPLER_TYPE state)
-{
-}
-
-void RenderPluginDx12::ApplyBlendState(BLEND_STATE state)
-{
-	RenderInterfaceD3D12::ApplyBlendState(state);
-}
-
-void RenderPluginDx12::GetViewport(Viewport& vp)
-{
-	RenderInterfaceD3D12::GetViewport(vp);
-}
-
-void RenderPluginDx12::SetViewport(const Viewport& vp)
-{
-	RenderInterfaceD3D12::SetViewport(vp);
-}
-
-void RenderPluginDx12::BindVertexShaderResources(int startSlot, 
-	int numSRVs, GPUShaderResource** ppSRVs) 
-{
-}
-
-void RenderPluginDx12::BindPixelShaderResources(int startSlot, 
-	int numSRVs, GPUShaderResource** ppSRVs) 
-{
-}
-
-void RenderPluginDx12::ClearVertexShaderResources(int startSlot, int numSRVs) 
-{
-}
-
-void RenderPluginDx12::ClearPixelShaderResources(int startSlot, int numSRVs) 
-{
-}
-
-void RenderPluginDx12::ClearInputLayout() 
-{
-}
-
-void RenderPluginDx12::SetVertexBuffer(GPUBufferResource* pBuffer, UINT stride, UINT offset) 
-{
-	RenderInterfaceD3D12::SetVertexBuffer(pBuffer, stride, offset);
-}
-
-void RenderPluginDx12::SetPrimitiveTopologyTriangleStrip() 
-{
-	RenderInterfaceD3D12::SetPrimitiveTopologyTriangleStrip();
-}
-
-void RenderPluginDx12::SetPrimitiveTopologyTriangleList() 
-{
-	RenderInterfaceD3D12::SetPrimitiveTopologyTriangleList();
-}
-
-void RenderPluginDx12::SetPrimitiveTopologyLineList() 
-{
-	RenderInterfaceD3D12::SetPrimitiveTopologyLineList();
-}
-
-void RenderPluginDx12::Draw(unsigned int vertexCount, unsigned int startCount)
-{
-	RenderInterfaceD3D12::Draw(vertexCount, startCount);
-}
-
-GPUBufferResource* RenderPluginDx12::CreateVertexBuffer(unsigned int ByteWidth, void* pSysMem)
-{ 
-	return RenderInterfaceD3D12::CreateVertexBuffer(ByteWidth, pSysMem);
-}
-
-GPUShaderResource* RenderPluginDx12::CreateShaderResource(unsigned int stride, 
-	unsigned int numElements, void* pSysMem, NVHairReadOnlyBuffer* pReadOnlyBuffer)
-{ 
-	return RenderInterfaceD3D12::CreateShaderResource(stride, numElements, pSysMem, pReadOnlyBuffer);
-}
-
-void RenderPluginDx12::ApplyForShadow(int ForShadow) 
-{
-	RenderInterfaceD3D12::ApplyForShadow(ForShadow);
-}
-
-void RenderPluginDx12::SwitchToDX11()
-{
-	RenderInterfaceD3D12::SwitchToDX11();
-}
-
-void RenderPluginDx12::FlushDX11()
-{
-	RenderInterfaceD3D12::FlushDX11();
-}
-
-void RenderPluginDx12::FlushDX12()
-{
-	RenderInterfaceD3D12::FlushDX12();
-}
-
-void RenderPluginDx12::ApplyPrimitiveTopologyLine()
-{
-	RenderInterfaceD3D12::ApplyPrimitiveTopologyType(D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE);
-}
-
-void RenderPluginDx12::ApplyPrimitiveTopologyTriangle()
-{
-	RenderInterfaceD3D12::ApplyPrimitiveTopologyType(D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE);
-}
-
-void RenderPluginDx12::SubmitGpuWork()
-{
-	RenderInterfaceD3D12::SubmitGpuWork();
-}
-
-void RenderPluginDx12::WaitForGpu()
-{
-	RenderInterfaceD3D12::WaitForGpu();
-}
-
-// util
-bool RenderPluginDx12::CreateRenderWindow(HWND hWnd, int nSamples) 
-{ 	
-	return D3D12Util::CreateRenderWindow(hWnd, nSamples);
-}
-
-bool RenderPluginDx12::ResizeRenderWindow(int w, int h) 
-{
-	return D3D12Util::ResizeRenderWindow(w, h);
-}
-
-void RenderPluginDx12::PresentRenderWindow() 
-{
-	D3D12Util::PresentRenderWindow();
-}
-
-void RenderPluginDx12::ClearRenderWindow(float r, float g, float b) 
-{
-	D3D12Util::ClearRenderWindow(r, g, b);
-}
-
-bool RenderPluginDx12::GetDeviceInfoString(wchar_t *str) 
-{
-	return D3D12Util::GetDeviceInfoString(str);
-}
-
-GPUShaderResource* RenderPluginDx12::CreateTextureSRV(const char* texturename)
-{ 
-	return D3D12Util::CreateTextureSRV(texturename);
-}
-
-void RenderPluginDx12::TxtHelperBegin()
-{
-	D3D12Util::TxtHelperBegin();
-}
-
-void RenderPluginDx12::TxtHelperEnd() 
-{
-	D3D12Util::TxtHelperEnd();
-}
-
-void RenderPluginDx12::TxtHelperSetInsertionPos(int x, int y)
-{
-	D3D12Util::TxtHelperSetInsertionPos(x, y);
-}
-
-void RenderPluginDx12::TxtHelperSetForegroundColor(float r, float g, float b, float a)
-{
-	D3D12Util::TxtHelperSetForegroundColor(r, g, b, a);
-}
-
-void RenderPluginDx12::TxtHelperDrawTextLine(wchar_t* str)
-{
-	D3D12Util::TxtHelperDrawTextLine(str);
-}
-
-// shader
-bool RenderPluginDx12::InitializeShaders() 
-{ 
-	return InitializeShadersD3D12();
-}
-
-void RenderPluginDx12::DestroyShaders() 
-{
-	DestroyShadersD3D12();
-}
-
-void RenderPluginDx12::ApplyShader(SHADER_TYPE st) 
-{
-	ApplyShaderD3D12(st);
-}
-
-void RenderPluginDx12::DisableShader(SHADER_TYPE st) 
-{
-	DisableShaderD3D12(st);
-}
-
-void RenderPluginDx12::BindShaderResources(SHADER_TYPE st, int numSRVs, GPUShaderResource** ppSRVs)
-{
-	BindShaderResourcesD3D12(st, numSRVs, ppSRVs);
-}
-
-void RenderPluginDx12::CopyShaderParam(SHADER_TYPE st, 
-	void* pSysMem, unsigned int bytes, unsigned int slot) 
-{
-	CopyShaderParamD3D12(st, pSysMem, bytes, slot);
-}
-
-// GPUProfiler
-GPUProfiler* RenderPluginDx12::CreateGPUProfiler()
-{
-	GPUProfiler* pProfiler = new D3D12GPUProfiler;
-	pProfiler->Initialize();
-	return pProfiler;
-}
-
-// ShadowMap
-ShadowMap* RenderPluginDx12::CreateShadowMap(int resolution)
-{
-	return new D3D12ShadowMap(resolution);
-}
-
-// D3D12RenderContext
-void RenderPluginDx12::PreRender()
-{
-	D3D12RenderContext::Instance()->PreRender();
-}
-
-void RenderPluginDx12::PostRender()
-{
-	D3D12RenderContext::Instance()->PostRender();
-}
-
-// GPUMeshResources
-#include "MeshData.h"
-#include "AnimUtil.h"
-
-class GPUMeshResourcesDx12 : public GPUMeshResources
-{
-public:
-	NVHairReadOnlyBuffer		m_BoneIndicesBuffer;
-	NVHairReadOnlyBuffer		m_BoneWeightsBuffer;
-};
-
-GPUMeshResources* RenderPluginDx12::GPUMeshResourcesCreate(MeshData* pMeshData, const SkinData& skinData)
-{
-	GPUMeshResources* resources = new GPUMeshResourcesDx12;
-
-	int numIndices = pMeshData->m_NumIndices;
-	int numVertices = pMeshData->m_NumVertices;
-
-	resources->m_pVertexBuffer = CreateVertexBuffer(
-		sizeof(MeshData::MeshVertex) * numIndices, pMeshData->m_pMeshVertices);
-
-	GPUMeshResourcesDx12* resourceDx12 = (GPUMeshResourcesDx12*)resources;
-	if (NULL != resourceDx12)
-	{
-		D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-		pContext->InitBuffer(resourceDx12->m_BoneIndicesBuffer);
-		pContext->InitBuffer(resourceDx12->m_BoneWeightsBuffer);
-		resources->m_pBoneIndicesSRV = CreateShaderResource(
-			sizeof(atcore_float4), numVertices, skinData.m_pBoneIndices, &resourceDx12->m_BoneIndicesBuffer);
-		resources->m_pBoneWeightsSRV = CreateShaderResource(
-			sizeof(atcore_float4), numVertices, skinData.m_pBoneWeights, &resourceDx12->m_BoneWeightsBuffer);
-	}
-
-	return resources;
-}
-
-void RenderPluginDx12::GPUMeshResourcesRelease(GPUMeshResources* pResource)
-{
-	SAFE_RELEASE(pResource->m_pVertexBuffer);
-	SAFE_RELEASE(pResource->m_pBoneIndicesSRV);
-	SAFE_RELEASE(pResource->m_pBoneWeightsSRV);
-
-	GPUMeshResourcesDx12* pResourceDx12 = (GPUMeshResourcesDx12*)pResource;
-	if (NULL == pResourceDx12)
-	{
-		return;
-	}
-
-	D3D12RenderContext* pContext = D3D12RenderContext::Instance();
-	pContext->DestroyBuffer(pResourceDx12->m_BoneIndicesBuffer);
-	pContext->DestroyBuffer(pResourceDx12->m_BoneWeightsBuffer);
-}
-
-D3DHandles& RenderPluginDx12::GetDeviceHandles(D3DHandles& deviceHandles)
-{
-	return D3D12Util::GetDeviceHandles(deviceHandles);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/D3D12/RenderPluginDx12.h b/tools/ArtistTools/source/CoreLib/Render/D3D12/RenderPluginDx12.h
deleted file mode 100644
index a88dfbf..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/D3D12/RenderPluginDx12.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#pragma once
-
-#include "RenderPlugin.h"
-
-extern "C" CORERENDER_EXPORT RenderPlugin* CreateRenderPlugin(void);
-
-class CORERENDER_EXPORT RenderPluginDx12 : public RenderPlugin
-{
-public:
-	RenderPluginDx12();
-	~RenderPluginDx12();
-
-	// interface
-	virtual bool InitDevice(int deviceID);
-	virtual bool Initialize();
-	virtual void Shutdown();
-	virtual void CopyToDevice(GPUBufferResource *pDevicePtr, void* pSysMem, unsigned int	ByteWidth);
-	virtual void ApplyDepthStencilState(DEPTH_STENCIL_STATE state);
-	virtual void ApplyRasterizerState(RASTERIZER_STATE state);
-	virtual void ApplySampler(int slot, SAMPLER_TYPE st);
-	virtual void ApplyBlendState(BLEND_STATE st);
-	virtual void GetViewport(Viewport& vp);
-	virtual void SetViewport(const Viewport& vp);
-	virtual void BindVertexShaderResources(int startSlot, int numSRVs, GPUShaderResource** ppSRVs);
-	virtual void BindPixelShaderResources(int startSlot, int numSRVs, GPUShaderResource** ppSRVs);
-	virtual void ClearVertexShaderResources(int startSlot, int numSRVs);
-	virtual void ClearPixelShaderResources(int startSlot, int numSRVs);
-	virtual void ClearInputLayout();
-	virtual void SetVertexBuffer(GPUBufferResource* pBuffer, UINT stride, UINT offset = 0);
-	virtual void SetPrimitiveTopologyTriangleStrip();
-	virtual void SetPrimitiveTopologyTriangleList();
-	virtual void SetPrimitiveTopologyLineList();
-	virtual void Draw(unsigned int vertexCount, unsigned int startCount = 0);
-	virtual GPUBufferResource* CreateVertexBuffer(unsigned int ByteWidth, void* pSysMem = 0);
-	virtual GPUShaderResource* CreateShaderResource(unsigned int stride, unsigned int numElements, void* pSysMem, NVHairReadOnlyBuffer* pReadOnlyBuffer = NULL);
-	virtual void ApplyForShadow(int ForShadow);
-	virtual void SwitchToDX11();
-	virtual void FlushDX11();
-	virtual void FlushDX12();
-	virtual void ApplyPrimitiveTopologyLine();
-	virtual void ApplyPrimitiveTopologyTriangle();
-	virtual void SubmitGpuWork();
-	virtual void WaitForGpu();
-
-	// util
-	virtual bool CreateRenderWindow(HWND hWnd, int nSamples);
-	virtual bool ResizeRenderWindow(int w, int h);
-	virtual void PresentRenderWindow();
-	virtual void ClearRenderWindow(float r, float g, float b);
-	virtual bool GetDeviceInfoString(wchar_t *str);
-	virtual GPUShaderResource* CreateTextureSRV(const char* texturename);
-	virtual void TxtHelperBegin();
-	virtual void TxtHelperEnd();
-	virtual void TxtHelperSetInsertionPos(int x, int y);
-	virtual void TxtHelperSetForegroundColor(float r, float g, float b, float a = 1.0f);
-	virtual void TxtHelperDrawTextLine(wchar_t* str);
-
-	// shader
-	virtual bool InitializeShaders();
-	virtual void DestroyShaders();
-	virtual void ApplyShader(SHADER_TYPE st);
-	virtual void DisableShader(SHADER_TYPE st);
-	virtual void BindShaderResources(SHADER_TYPE st, int numSRVs, GPUShaderResource** ppSRVs);
-	virtual void CopyShaderParam(SHADER_TYPE st, void* pSysMem, unsigned int bytes, unsigned int slot = 0);
-
-	// GPUProfiler
-	virtual GPUProfiler* CreateGPUProfiler();
-
-	// ShadowMap
-	virtual ShadowMap* CreateShadowMap(int resolution);
-
-	// D3D12RenderContext
-	virtual void PreRender();
-	virtual void PostRender();
-
-	// GPUMeshResources
-	virtual GPUMeshResources* GPUMeshResourcesCreate(MeshData* pMeshData, const SkinData& skinData);
-	virtual void GPUMeshResourcesRelease(GPUMeshResources* pResource);
-
-	// Get devices related
-	virtual D3DHandles& GetDeviceHandles(D3DHandles& deviceHandles);
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/GPUProfiler.cpp b/tools/ArtistTools/source/CoreLib/Render/GPUProfiler.cpp
deleted file mode 100644
index 08a3497..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/GPUProfiler.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "GPUProfiler.h"
-
-#include "RenderPlugin.h"
-
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(x) {if(x){delete x;	x=nullptr;}}
-#endif
-
-GPUProfiler* g_pGPUProfiler = 0;
-
-void GPUProfiler_Initialize()
-{
-	g_pGPUProfiler = RenderPlugin::Instance()->CreateGPUProfiler();
-}
-
-void GPUProfiler_Shutdown()
-{
-	SAFE_DELETE(g_pGPUProfiler);
-}
-
-void GPUProfiler_Enable(bool b)
-{
-	if (g_pGPUProfiler)
-		g_pGPUProfiler->Enable(b);
-}
-
-void GPUProfiler_StartFrame()
-{
-	if (g_pGPUProfiler)
-		g_pGPUProfiler->StartFrame();
-}
-
-void GPUProfiler_EndFrame()
-{
-	if (g_pGPUProfiler)
-		g_pGPUProfiler->EndFrame();
-}
-
-void GPUProfiler_StartProfile(int id)
-{
-	if (g_pGPUProfiler)
-		g_pGPUProfiler->StartProfile(id);
-}
-
-void GPUProfiler_EndProfile(int id)
-{
-	if (g_pGPUProfiler)
-		g_pGPUProfiler->EndProfile(id);
-}
-
-float GPUProfiler_GetProfileData(int id)
-{
-	if (!g_pGPUProfiler)
-		return 0;
-	
-	return g_pGPUProfiler->GetProfileData(id);
-}
-
-
-	
diff --git a/tools/ArtistTools/source/CoreLib/Render/GPUProfiler.h b/tools/ArtistTools/source/CoreLib/Render/GPUProfiler.h
deleted file mode 100644
index 65bb602..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/GPUProfiler.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "corelib_global.h"
-
-struct CORELIB_EXPORT GPUProfiler
-{
-	bool	m_enable;
-
-public:
-	// define base class virtual destructor to make sure child classes call destructor right.
-	virtual ~GPUProfiler() {}
-
-	void Enable(bool b) { m_enable = b; }
-
-	virtual void Initialize() = 0;
-	virtual void Release() = 0;
-	virtual void StartFrame() = 0;
-	virtual void EndFrame() = 0;
-	virtual void StartProfile(int id) = 0;
-	virtual void EndProfile(int id) = 0;
-	virtual float GetProfileData(int id) = 0;
-};
-
-// helper functions
-CORELIB_EXPORT void GPUProfiler_Initialize();
-CORELIB_EXPORT void GPUProfiler_Enable(bool);
-CORELIB_EXPORT void GPUProfiler_Shutdown();
-CORELIB_EXPORT void GPUProfiler_StartFrame();
-CORELIB_EXPORT void GPUProfiler_EndFrame();
-CORELIB_EXPORT void GPUProfiler_StartProfile(int id);
-CORELIB_EXPORT void GPUProfiler_EndProfile(int id);
-CORELIB_EXPORT float GPUProfiler_GetProfileData(int id);
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/GeometryData/BoneGeometryData.h b/tools/ArtistTools/source/CoreLib/Render/GeometryData/BoneGeometryData.h
deleted file mode 100644
index 4a6ea37..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/GeometryData/BoneGeometryData.h
+++ /dev/null
@@ -1,305 +0,0 @@
-const int num_faces = 100;
-
-// pos.xyz, uv.uv, normal.xyz
-float vertices[100*3*8] = {
-0.250000, -0.951057, -0.181636, 	0.000000, 0.900000, 	0.277578, -0.881468, -0.382053, 
-0.095491, -0.951057, -0.293893, 	0.100000, 0.900000, 	0.277578, -0.881468, -0.382053, 
-0.181636, -0.809017, -0.559017, 	0.100000, 0.800000, 	0.277578, -0.881468, -0.382053, 
-0.095491, -0.951057, -0.293893, 	0.100000, 0.900000, 	-0.000000, -0.881468, -0.472244, 
--0.095492, -0.951057, -0.293893, 	0.200000, 0.900000, 	-0.000000, -0.881468, -0.472244, 
--0.181636, -0.809017, -0.559017, 	0.200000, 0.800000, 	-0.000000, -0.881468, -0.472244, 
--0.095492, -0.951057, -0.293893, 	0.200000, 0.900000, 	-0.277578, -0.881468, -0.382053, 
--0.250000, -0.951057, -0.181636, 	0.300000, 0.900000, 	-0.277578, -0.881468, -0.382053, 
--0.475528, -0.809017, -0.345491, 	0.300000, 0.800000, 	-0.277578, -0.881468, -0.382053, 
--0.250000, -0.951057, -0.181636, 	0.300000, 0.900000, 	-0.449130, -0.881468, -0.145931, 
--0.309017, -0.951057, 0.000000, 	0.400000, 0.900000, 	-0.449130, -0.881468, -0.145931, 
--0.587785, -0.809017, 0.000000, 	0.400000, 0.800000, 	-0.449130, -0.881468, -0.145931, 
--0.309017, -0.951057, 0.000000, 	0.400000, 0.900000, 	-0.449130, -0.881468, 0.145931, 
--0.250000, -0.951057, 0.181636, 	0.500000, 0.900000, 	-0.449130, -0.881468, 0.145931, 
--0.475528, -0.809017, 0.345492, 	0.500000, 0.800000, 	-0.449130, -0.881468, 0.145931, 
--0.250000, -0.951057, 0.181636, 	0.500000, 0.900000, 	-0.277578, -0.881468, 0.382053, 
--0.095491, -0.951057, 0.293893, 	0.600000, 0.900000, 	-0.277578, -0.881468, 0.382053, 
--0.181636, -0.809017, 0.559017, 	0.600000, 0.800000, 	-0.277578, -0.881468, 0.382053, 
--0.095491, -0.951057, 0.293893, 	0.600000, 0.900000, 	0.000000, -0.881468, 0.472244, 
-0.095492, -0.951057, 0.293893, 	0.700000, 0.900000, 	0.000000, -0.881468, 0.472244, 
-0.181636, -0.809017, 0.559017, 	0.700000, 0.800000, 	0.000000, -0.881468, 0.472244, 
-0.095492, -0.951057, 0.293893, 	0.700000, 0.900000, 	0.277578, -0.881468, 0.382053, 
-0.250000, -0.951057, 0.181636, 	0.800000, 0.900000, 	0.277578, -0.881468, 0.382053, 
-0.475528, -0.809017, 0.345491, 	0.800000, 0.800000, 	0.277578, -0.881468, 0.382053, 
-0.250000, -0.951057, 0.181636, 	0.800000, 0.900000, 	0.449130, -0.881468, 0.145931, 
-0.309017, -0.951057, 0.000000, 	0.900000, 0.900000, 	0.449130, -0.881468, 0.145931, 
-0.587785, -0.809017, 0.000000, 	0.900000, 0.800000, 	0.449131, -0.881468, 0.145931, 
-0.309017, -0.951057, 0.000000, 	0.900000, 0.900000, 	0.449131, -0.881468, -0.145931, 
-0.250000, -0.951057, -0.181636, 	1.000000, 0.900000, 	0.449131, -0.881468, -0.145931, 
-0.475528, -0.809017, -0.345492, 	1.000000, 0.800000, 	0.449131, -0.881468, -0.145931, 
-0.475528, -0.809017, -0.345492, 	0.000000, 0.800000, 	0.425919, -0.689152, -0.586227, 
-0.181636, -0.809017, -0.559017, 	0.100000, 0.800000, 	0.425919, -0.689152, -0.586227, 
-0.250000, -0.587785, -0.769421, 	0.100000, 0.700000, 	0.425919, -0.689152, -0.586227, 
-0.181636, -0.809017, -0.559017, 	0.100000, 0.800000, 	-0.000000, -0.689152, -0.724617, 
--0.181636, -0.809017, -0.559017, 	0.200000, 0.800000, 	-0.000000, -0.689152, -0.724617, 
--0.250000, -0.587785, -0.769421, 	0.200000, 0.700000, 	-0.000000, -0.689152, -0.724617, 
--0.181636, -0.809017, -0.559017, 	0.200000, 0.800000, 	-0.425919, -0.689152, -0.586228, 
--0.475528, -0.809017, -0.345491, 	0.300000, 0.800000, 	-0.425919, -0.689152, -0.586228, 
--0.654509, -0.587785, -0.475528, 	0.300000, 0.700000, 	-0.425919, -0.689152, -0.586228, 
--0.475528, -0.809017, -0.345491, 	0.300000, 0.800000, 	-0.689152, -0.689152, -0.223919, 
--0.587785, -0.809017, 0.000000, 	0.400000, 0.800000, 	-0.689152, -0.689152, -0.223919, 
--0.809017, -0.587785, 0.000000, 	0.400000, 0.700000, 	-0.689152, -0.689152, -0.223919, 
--0.587785, -0.809017, 0.000000, 	0.400000, 0.800000, 	-0.689152, -0.689152, 0.223919, 
--0.475528, -0.809017, 0.345492, 	0.500000, 0.800000, 	-0.689152, -0.689152, 0.223919, 
--0.654509, -0.587785, 0.475528, 	0.500000, 0.700000, 	-0.689152, -0.689152, 0.223919, 
--0.475528, -0.809017, 0.345492, 	0.500000, 0.800000, 	-0.425919, -0.689152, 0.586228, 
--0.181636, -0.809017, 0.559017, 	0.600000, 0.800000, 	-0.425919, -0.689152, 0.586228, 
--0.250000, -0.587785, 0.769421, 	0.600000, 0.700000, 	-0.425919, -0.689152, 0.586228, 
--0.181636, -0.809017, 0.559017, 	0.600000, 0.800000, 	0.000000, -0.689152, 0.724617, 
-0.181636, -0.809017, 0.559017, 	0.700000, 0.800000, 	0.000000, -0.689152, 0.724617, 
-0.250000, -0.587785, 0.769421, 	0.700000, 0.700000, 	0.000000, -0.689152, 0.724617, 
-0.181636, -0.809017, 0.559017, 	0.700000, 0.800000, 	0.425919, -0.689152, 0.586227, 
-0.475528, -0.809017, 0.345491, 	0.800000, 0.800000, 	0.425919, -0.689152, 0.586227, 
-0.654509, -0.587785, 0.475528, 	0.800000, 0.700000, 	0.425919, -0.689152, 0.586227, 
-0.475528, -0.809017, 0.345491, 	0.800000, 0.800000, 	0.689152, -0.689152, 0.223919, 
-0.587785, -0.809017, 0.000000, 	0.900000, 0.800000, 	0.689152, -0.689152, 0.223919, 
-0.809017, -0.587785, 0.000000, 	0.900000, 0.700000, 	0.689152, -0.689152, 0.223919, 
-0.587785, -0.809017, 0.000000, 	0.900000, 0.800000, 	0.689152, -0.689152, -0.223919, 
-0.475528, -0.809017, -0.345492, 	1.000000, 0.800000, 	0.689152, -0.689152, -0.223919, 
-0.654509, -0.587785, -0.475528, 	1.000000, 0.700000, 	0.689152, -0.689152, -0.223919, 
-0.654509, -0.587785, -0.475528, 	0.000000, 0.700000, 	0.528952, -0.436083, -0.728040, 
-0.250000, -0.587785, -0.769421, 	0.100000, 0.700000, 	0.528952, -0.436083, -0.728040, 
-0.293893, -0.309017, -0.904509, 	0.100000, 0.600000, 	0.528952, -0.436083, -0.728040, 
-0.250000, -0.587785, -0.769421, 	0.100000, 0.700000, 	-0.000000, -0.436083, -0.899906, 
--0.250000, -0.587785, -0.769421, 	0.200000, 0.700000, 	-0.000000, -0.436083, -0.899906, 
--0.293893, -0.309017, -0.904509, 	0.200000, 0.600000, 	-0.000000, -0.436083, -0.899906, 
--0.250000, -0.587785, -0.769421, 	0.200000, 0.700000, 	-0.528952, -0.436083, -0.728040, 
--0.654509, -0.587785, -0.475528, 	0.300000, 0.700000, 	-0.528952, -0.436083, -0.728040, 
--0.769421, -0.309017, -0.559017, 	0.300000, 0.600000, 	-0.528952, -0.436083, -0.728040, 
--0.654509, -0.587785, -0.475528, 	0.300000, 0.700000, 	-0.855862, -0.436083, -0.278086, 
--0.809017, -0.587785, 0.000000, 	0.400000, 0.700000, 	-0.855862, -0.436083, -0.278086, 
--0.951057, -0.309017, 0.000000, 	0.400000, 0.600000, 	-0.855862, -0.436083, -0.278086, 
--0.809017, -0.587785, 0.000000, 	0.400000, 0.700000, 	-0.855862, -0.436083, 0.278086, 
--0.654509, -0.587785, 0.475528, 	0.500000, 0.700000, 	-0.855862, -0.436083, 0.278086, 
--0.769421, -0.309017, 0.559017, 	0.500000, 0.600000, 	-0.855862, -0.436083, 0.278086, 
--0.654509, -0.587785, 0.475528, 	0.500000, 0.700000, 	-0.528952, -0.436083, 0.728040, 
--0.250000, -0.587785, 0.769421, 	0.600000, 0.700000, 	-0.528952, -0.436083, 0.728039, 
--0.293893, -0.309017, 0.904509, 	0.600000, 0.600000, 	-0.528952, -0.436083, 0.728039, 
--0.250000, -0.587785, 0.769421, 	0.600000, 0.700000, 	0.000000, -0.436083, 0.899906, 
-0.250000, -0.587785, 0.769421, 	0.700000, 0.700000, 	0.000000, -0.436083, 0.899906, 
-0.293893, -0.309017, 0.904509, 	0.700000, 0.600000, 	0.000000, -0.436083, 0.899906, 
-0.250000, -0.587785, 0.769421, 	0.700000, 0.700000, 	0.528952, -0.436083, 0.728039, 
-0.654509, -0.587785, 0.475528, 	0.800000, 0.700000, 	0.528952, -0.436083, 0.728040, 
-0.769421, -0.309017, 0.559017, 	0.800000, 0.600000, 	0.528952, -0.436083, 0.728040, 
-0.654509, -0.587785, 0.475528, 	0.800000, 0.700000, 	0.855862, -0.436083, 0.278086, 
-0.809017, -0.587785, 0.000000, 	0.900000, 0.700000, 	0.855862, -0.436083, 0.278086, 
-0.951057, -0.309017, 0.000000, 	0.900000, 0.600000, 	0.855862, -0.436083, 0.278086, 
-0.809017, -0.587785, 0.000000, 	0.900000, 0.700000, 	0.855862, -0.436084, -0.278086, 
-0.654509, -0.587785, -0.475528, 	1.000000, 0.700000, 	0.855862, -0.436084, -0.278086, 
-0.769421, -0.309017, -0.559017, 	1.000000, 0.600000, 	0.855862, -0.436084, -0.278086, 
-0.769421, -0.309017, -0.559017, 	0.000000, 0.600000, 	0.581228, -0.148952, -0.799992, 
-0.293893, -0.309017, -0.904509, 	0.100000, 0.600000, 	0.581228, -0.148952, -0.799992, 
-0.309017, 0.000000, -0.951057, 	0.100000, 0.500000, 	0.581228, -0.148952, -0.799992, 
-0.293893, -0.309017, -0.904509, 	0.100000, 0.600000, 	-0.000000, -0.148952, -0.988844, 
--0.293893, -0.309017, -0.904509, 	0.200000, 0.600000, 	-0.000000, -0.148952, -0.988844, 
--0.309017, 0.000000, -0.951057, 	0.200000, 0.500000, 	-0.000000, -0.148952, -0.988844, 
--0.293893, -0.309017, -0.904509, 	0.200000, 0.600000, 	-0.581228, -0.148952, -0.799992, 
--0.769421, -0.309017, -0.559017, 	0.300000, 0.600000, 	-0.581228, -0.148952, -0.799992, 
--0.809017, 0.000000, -0.587785, 	0.300000, 0.500000, 	-0.581228, -0.148952, -0.799992, 
--0.769421, -0.309017, -0.559017, 	0.300000, 0.600000, 	-0.940447, -0.148952, -0.305570, 
--0.951057, -0.309017, 0.000000, 	0.400000, 0.600000, 	-0.940447, -0.148952, -0.305570, 
--1.000000, 0.000000, 0.000000, 	0.400000, 0.500000, 	-0.940447, -0.148952, -0.305570, 
--0.951057, -0.309017, 0.000000, 	0.400000, 0.600000, 	-0.940447, -0.148952, 0.305570, 
--0.769421, -0.309017, 0.559017, 	0.500000, 0.600000, 	-0.940447, -0.148952, 0.305570, 
--0.809017, 0.000000, 0.587785, 	0.500000, 0.500000, 	-0.940447, -0.148952, 0.305570, 
--0.769421, -0.309017, 0.559017, 	0.500000, 0.600000, 	-0.581228, -0.148952, 0.799992, 
--0.293893, -0.309017, 0.904509, 	0.600000, 0.600000, 	-0.581228, -0.148952, 0.799992, 
--0.309017, 0.000000, 0.951057, 	0.600000, 0.500000, 	-0.581228, -0.148952, 0.799992, 
--0.293893, -0.309017, 0.904509, 	0.600000, 0.600000, 	0.000000, -0.148952, 0.988844, 
-0.293893, -0.309017, 0.904509, 	0.700000, 0.600000, 	0.000000, -0.148952, 0.988844, 
-0.309017, 0.000000, 0.951057, 	0.700000, 0.500000, 	0.000000, -0.148952, 0.988844, 
-0.293893, -0.309017, 0.904509, 	0.700000, 0.600000, 	0.581228, -0.148952, 0.799992, 
-0.769421, -0.309017, 0.559017, 	0.800000, 0.600000, 	0.581228, -0.148952, 0.799992, 
-0.809017, 0.000000, 0.587785, 	0.800000, 0.500000, 	0.581228, -0.148952, 0.799992, 
-0.769421, -0.309017, 0.559017, 	0.800000, 0.600000, 	0.940447, -0.148952, 0.305570, 
-0.951057, -0.309017, 0.000000, 	0.900000, 0.600000, 	0.940447, -0.148952, 0.305570, 
-1.000000, 0.000000, 0.000000, 	0.900000, 0.500000, 	0.940447, -0.148952, 0.305570, 
-0.951057, -0.309017, 0.000000, 	0.900000, 0.600000, 	0.940447, -0.148952, -0.305570, 
-0.769421, -0.309017, -0.559017, 	1.000000, 0.600000, 	0.940447, -0.148952, -0.305570, 
-0.809017, 0.000000, -0.587785, 	1.000000, 0.500000, 	0.940447, -0.148952, -0.305570, 
-0.809017, 0.000000, -0.587785, 	0.000000, 0.500000, 	0.581228, 0.148952, -0.799992, 
-0.309017, 0.000000, -0.951057, 	0.100000, 0.500000, 	0.581228, 0.148952, -0.799992, 
-0.293893, 0.309017, -0.904509, 	0.100000, 0.400000, 	0.581228, 0.148952, -0.799992, 
-0.309017, 0.000000, -0.951057, 	0.100000, 0.500000, 	-0.000000, 0.148952, -0.988844, 
--0.309017, 0.000000, -0.951057, 	0.200000, 0.500000, 	-0.000000, 0.148952, -0.988844, 
--0.293893, 0.309017, -0.904509, 	0.200000, 0.400000, 	-0.000000, 0.148952, -0.988844, 
--0.309017, 0.000000, -0.951057, 	0.200000, 0.500000, 	-0.581228, 0.148952, -0.799992, 
--0.809017, 0.000000, -0.587785, 	0.300000, 0.500000, 	-0.581228, 0.148952, -0.799992, 
--0.769421, 0.309017, -0.559017, 	0.300000, 0.400000, 	-0.581228, 0.148952, -0.799992, 
--0.809017, 0.000000, -0.587785, 	0.300000, 0.500000, 	-0.940447, 0.148952, -0.305570, 
--1.000000, 0.000000, 0.000000, 	0.400000, 0.500000, 	-0.940447, 0.148952, -0.305570, 
--0.951057, 0.309017, 0.000000, 	0.400000, 0.400000, 	-0.940447, 0.148952, -0.305570, 
--1.000000, 0.000000, 0.000000, 	0.400000, 0.500000, 	-0.940447, 0.148952, 0.305570, 
--0.809017, 0.000000, 0.587785, 	0.500000, 0.500000, 	-0.940447, 0.148952, 0.305570, 
--0.769421, 0.309017, 0.559017, 	0.500000, 0.400000, 	-0.940447, 0.148952, 0.305570, 
--0.809017, 0.000000, 0.587785, 	0.500000, 0.500000, 	-0.581228, 0.148952, 0.799992, 
--0.309017, 0.000000, 0.951057, 	0.600000, 0.500000, 	-0.581228, 0.148952, 0.799992, 
--0.293893, 0.309017, 0.904509, 	0.600000, 0.400000, 	-0.581228, 0.148952, 0.799992, 
--0.309017, 0.000000, 0.951057, 	0.600000, 0.500000, 	0.000000, 0.148952, 0.988844, 
-0.309017, 0.000000, 0.951057, 	0.700000, 0.500000, 	0.000000, 0.148952, 0.988844, 
-0.293893, 0.309017, 0.904509, 	0.700000, 0.400000, 	0.000000, 0.148952, 0.988844, 
-0.309017, 0.000000, 0.951057, 	0.700000, 0.500000, 	0.581228, 0.148952, 0.799992, 
-0.809017, 0.000000, 0.587785, 	0.800000, 0.500000, 	0.581228, 0.148952, 0.799992, 
-0.769421, 0.309017, 0.559017, 	0.800000, 0.400000, 	0.581228, 0.148952, 0.799992, 
-0.809017, 0.000000, 0.587785, 	0.800000, 0.500000, 	0.940447, 0.148952, 0.305570, 
-1.000000, 0.000000, 0.000000, 	0.900000, 0.500000, 	0.940447, 0.148952, 0.305570, 
-0.951057, 0.309017, 0.000000, 	0.900000, 0.400000, 	0.940447, 0.148952, 0.305570, 
-1.000000, 0.000000, 0.000000, 	0.900000, 0.500000, 	0.940447, 0.148952, -0.305570, 
-0.809017, 0.000000, -0.587785, 	1.000000, 0.500000, 	0.940447, 0.148952, -0.305570, 
-0.769421, 0.309017, -0.559017, 	1.000000, 0.400000, 	0.940447, 0.148952, -0.305569, 
-0.769421, 0.309017, -0.559017, 	0.000000, 0.400000, 	0.528952, 0.436083, -0.728040, 
-0.293893, 0.309017, -0.904509, 	0.100000, 0.400000, 	0.528952, 0.436083, -0.728040, 
-0.250000, 0.587785, -0.769421, 	0.100000, 0.300000, 	0.528952, 0.436083, -0.728040, 
-0.293893, 0.309017, -0.904509, 	0.100000, 0.400000, 	-0.000000, 0.436083, -0.899906, 
--0.293893, 0.309017, -0.904509, 	0.200000, 0.400000, 	-0.000000, 0.436083, -0.899906, 
--0.250000, 0.587785, -0.769421, 	0.200000, 0.300000, 	-0.000000, 0.436083, -0.899906, 
--0.293893, 0.309017, -0.904509, 	0.200000, 0.400000, 	-0.528952, 0.436083, -0.728039, 
--0.769421, 0.309017, -0.559017, 	0.300000, 0.400000, 	-0.528952, 0.436083, -0.728039, 
--0.654509, 0.587785, -0.475528, 	0.300000, 0.300000, 	-0.528952, 0.436083, -0.728039, 
--0.769421, 0.309017, -0.559017, 	0.300000, 0.400000, 	-0.855862, 0.436083, -0.278086, 
--0.951057, 0.309017, 0.000000, 	0.400000, 0.400000, 	-0.855862, 0.436083, -0.278086, 
--0.809017, 0.587785, 0.000000, 	0.400000, 0.300000, 	-0.855862, 0.436083, -0.278086, 
--0.951057, 0.309017, 0.000000, 	0.400000, 0.400000, 	-0.855862, 0.436083, 0.278086, 
--0.769421, 0.309017, 0.559017, 	0.500000, 0.400000, 	-0.855862, 0.436083, 0.278086, 
--0.654509, 0.587785, 0.475528, 	0.500000, 0.300000, 	-0.855862, 0.436083, 0.278086, 
--0.769421, 0.309017, 0.559017, 	0.500000, 0.400000, 	-0.528952, 0.436083, 0.728039, 
--0.293893, 0.309017, 0.904509, 	0.600000, 0.400000, 	-0.528952, 0.436083, 0.728039, 
--0.250000, 0.587785, 0.769421, 	0.600000, 0.300000, 	-0.528952, 0.436083, 0.728039, 
--0.293893, 0.309017, 0.904509, 	0.600000, 0.400000, 	0.000000, 0.436083, 0.899906, 
-0.293893, 0.309017, 0.904509, 	0.700000, 0.400000, 	0.000000, 0.436083, 0.899906, 
-0.250000, 0.587785, 0.769421, 	0.700000, 0.300000, 	0.000000, 0.436083, 0.899906, 
-0.293893, 0.309017, 0.904509, 	0.700000, 0.400000, 	0.528952, 0.436083, 0.728040, 
-0.769421, 0.309017, 0.559017, 	0.800000, 0.400000, 	0.528952, 0.436083, 0.728040, 
-0.654509, 0.587785, 0.475528, 	0.800000, 0.300000, 	0.528952, 0.436083, 0.728040, 
-0.769421, 0.309017, 0.559017, 	0.800000, 0.400000, 	0.855862, 0.436083, 0.278086, 
-0.951057, 0.309017, 0.000000, 	0.900000, 0.400000, 	0.855862, 0.436083, 0.278086, 
-0.809017, 0.587785, 0.000000, 	0.900000, 0.300000, 	0.855862, 0.436083, 0.278086, 
-0.951057, 0.309017, 0.000000, 	0.900000, 0.400000, 	0.855862, 0.436084, -0.278086, 
-0.769421, 0.309017, -0.559017, 	1.000000, 0.400000, 	0.855862, 0.436084, -0.278086, 
-0.654509, 0.587785, -0.475528, 	1.000000, 0.300000, 	0.855862, 0.436084, -0.278086, 
-0.654509, 0.587785, -0.475528, 	0.000000, 0.300000, 	0.425919, 0.689152, -0.586227, 
-0.250000, 0.587785, -0.769421, 	0.100000, 0.300000, 	0.425919, 0.689152, -0.586227, 
-0.181636, 0.809017, -0.559017, 	0.100000, 0.200000, 	0.425919, 0.689152, -0.586227, 
-0.250000, 0.587785, -0.769421, 	0.100000, 0.300000, 	-0.000000, 0.689152, -0.724617, 
--0.250000, 0.587785, -0.769421, 	0.200000, 0.300000, 	-0.000000, 0.689152, -0.724617, 
--0.181636, 0.809017, -0.559017, 	0.200000, 0.200000, 	-0.000000, 0.689152, -0.724617, 
--0.250000, 0.587785, -0.769421, 	0.200000, 0.300000, 	-0.425919, 0.689152, -0.586227, 
--0.654509, 0.587785, -0.475528, 	0.300000, 0.300000, 	-0.425919, 0.689152, -0.586227, 
--0.475528, 0.809017, -0.345491, 	0.300000, 0.200000, 	-0.425919, 0.689152, -0.586227, 
--0.654509, 0.587785, -0.475528, 	0.300000, 0.300000, 	-0.689152, 0.689152, -0.223919, 
--0.809017, 0.587785, 0.000000, 	0.400000, 0.300000, 	-0.689152, 0.689152, -0.223919, 
--0.587785, 0.809017, 0.000000, 	0.400000, 0.200000, 	-0.689152, 0.689152, -0.223919, 
--0.809017, 0.587785, 0.000000, 	0.400000, 0.300000, 	-0.689152, 0.689152, 0.223919, 
--0.654509, 0.587785, 0.475528, 	0.500000, 0.300000, 	-0.689152, 0.689152, 0.223919, 
--0.475528, 0.809017, 0.345492, 	0.500000, 0.200000, 	-0.689152, 0.689152, 0.223919, 
--0.654509, 0.587785, 0.475528, 	0.500000, 0.300000, 	-0.425919, 0.689152, 0.586228, 
--0.250000, 0.587785, 0.769421, 	0.600000, 0.300000, 	-0.425919, 0.689152, 0.586228, 
--0.181636, 0.809017, 0.559017, 	0.600000, 0.200000, 	-0.425919, 0.689152, 0.586228, 
--0.250000, 0.587785, 0.769421, 	0.600000, 0.300000, 	0.000000, 0.689152, 0.724617, 
-0.250000, 0.587785, 0.769421, 	0.700000, 0.300000, 	0.000000, 0.689152, 0.724617, 
-0.181636, 0.809017, 0.559017, 	0.700000, 0.200000, 	0.000000, 0.689152, 0.724617, 
-0.250000, 0.587785, 0.769421, 	0.700000, 0.300000, 	0.425919, 0.689152, 0.586227, 
-0.654509, 0.587785, 0.475528, 	0.800000, 0.300000, 	0.425919, 0.689152, 0.586227, 
-0.475528, 0.809017, 0.345491, 	0.800000, 0.200000, 	0.425919, 0.689152, 0.586227, 
-0.654509, 0.587785, 0.475528, 	0.800000, 0.300000, 	0.689152, 0.689152, 0.223919, 
-0.809017, 0.587785, 0.000000, 	0.900000, 0.300000, 	0.689152, 0.689152, 0.223919, 
-0.587785, 0.809017, 0.000000, 	0.900000, 0.200000, 	0.689152, 0.689152, 0.223919, 
-0.809017, 0.587785, 0.000000, 	0.900000, 0.300000, 	0.689152, 0.689152, -0.223919, 
-0.654509, 0.587785, -0.475528, 	1.000000, 0.300000, 	0.689152, 0.689152, -0.223919, 
-0.475528, 0.809017, -0.345492, 	1.000000, 0.200000, 	0.689152, 0.689152, -0.223919, 
-0.475528, 0.809017, -0.345492, 	0.000000, 0.200000, 	0.277578, 0.881468, -0.382053, 
-0.181636, 0.809017, -0.559017, 	0.100000, 0.200000, 	0.277578, 0.881468, -0.382053, 
-0.095491, 0.951057, -0.293893, 	0.100000, 0.100000, 	0.277578, 0.881468, -0.382053, 
-0.181636, 0.809017, -0.559017, 	0.100000, 0.200000, 	-0.000000, 0.881468, -0.472244, 
--0.181636, 0.809017, -0.559017, 	0.200000, 0.200000, 	-0.000000, 0.881468, -0.472244, 
--0.095492, 0.951057, -0.293893, 	0.200000, 0.100000, 	-0.000000, 0.881468, -0.472244, 
--0.181636, 0.809017, -0.559017, 	0.200000, 0.200000, 	-0.277578, 0.881468, -0.382053, 
--0.475528, 0.809017, -0.345491, 	0.300000, 0.200000, 	-0.277578, 0.881468, -0.382053, 
--0.250000, 0.951057, -0.181636, 	0.300000, 0.100000, 	-0.277578, 0.881468, -0.382053, 
--0.475528, 0.809017, -0.345491, 	0.300000, 0.200000, 	-0.449130, 0.881468, -0.145931, 
--0.587785, 0.809017, 0.000000, 	0.400000, 0.200000, 	-0.449130, 0.881468, -0.145931, 
--0.309017, 0.951057, 0.000000, 	0.400000, 0.100000, 	-0.449130, 0.881468, -0.145931, 
--0.587785, 0.809017, 0.000000, 	0.400000, 0.200000, 	-0.449130, 0.881468, 0.145931, 
--0.475528, 0.809017, 0.345492, 	0.500000, 0.200000, 	-0.449130, 0.881468, 0.145931, 
--0.250000, 0.951057, 0.181636, 	0.500000, 0.100000, 	-0.449131, 0.881468, 0.145931, 
--0.475528, 0.809017, 0.345492, 	0.500000, 0.200000, 	-0.277578, 0.881468, 0.382053, 
--0.181636, 0.809017, 0.559017, 	0.600000, 0.200000, 	-0.277578, 0.881468, 0.382053, 
--0.095491, 0.951057, 0.293893, 	0.600000, 0.100000, 	-0.277578, 0.881468, 0.382053, 
--0.181636, 0.809017, 0.559017, 	0.600000, 0.200000, 	0.000000, 0.881468, 0.472244, 
-0.181636, 0.809017, 0.559017, 	0.700000, 0.200000, 	0.000000, 0.881468, 0.472244, 
-0.095492, 0.951057, 0.293893, 	0.700000, 0.100000, 	0.000000, 0.881468, 0.472244, 
-0.181636, 0.809017, 0.559017, 	0.700000, 0.200000, 	0.277578, 0.881468, 0.382053, 
-0.475528, 0.809017, 0.345491, 	0.800000, 0.200000, 	0.277578, 0.881468, 0.382053, 
-0.250000, 0.951057, 0.181636, 	0.800000, 0.100000, 	0.277578, 0.881468, 0.382053, 
-0.475528, 0.809017, 0.345491, 	0.800000, 0.200000, 	0.449131, 0.881468, 0.145931, 
-0.587785, 0.809017, 0.000000, 	0.900000, 0.200000, 	0.449131, 0.881468, 0.145931, 
-0.309017, 0.951057, 0.000000, 	0.900000, 0.100000, 	0.449130, 0.881468, 0.145931, 
-0.587785, 0.809017, 0.000000, 	0.900000, 0.200000, 	0.449131, 0.881468, -0.145931, 
-0.475528, 0.809017, -0.345492, 	1.000000, 0.200000, 	0.449131, 0.881468, -0.145931, 
-0.250000, 0.951057, -0.181636, 	1.000000, 0.100000, 	0.449131, 0.881468, -0.145931, 
-0.095491, -0.951057, -0.293893, 	0.100000, 0.900000, 	0.096557, -0.986415, -0.132899, 
-0.250000, -0.951057, -0.181636, 	0.000000, 0.900000, 	0.096557, -0.986415, -0.132899, 
-0.000000, -1.000000, 0.000000, 	0.050000, 1.000000, 	0.096557, -0.986415, -0.132899, 
--0.095492, -0.951057, -0.293893, 	0.200000, 0.900000, 	-0.000000, -0.986415, -0.164272, 
-0.095491, -0.951057, -0.293893, 	0.100000, 0.900000, 	-0.000000, -0.986415, -0.164272, 
-0.000000, -1.000000, 0.000000, 	0.150000, 1.000000, 	-0.000000, -0.986415, -0.164272, 
--0.250000, -0.951057, -0.181636, 	0.300000, 0.900000, 	-0.096557, -0.986415, -0.132899, 
--0.095492, -0.951057, -0.293893, 	0.200000, 0.900000, 	-0.096557, -0.986415, -0.132899, 
-0.000000, -1.000000, 0.000000, 	0.250000, 1.000000, 	-0.096557, -0.986415, -0.132899, 
--0.309017, -0.951057, 0.000000, 	0.400000, 0.900000, 	-0.156233, -0.986415, -0.050763, 
--0.250000, -0.951057, -0.181636, 	0.300000, 0.900000, 	-0.156233, -0.986415, -0.050763, 
-0.000000, -1.000000, 0.000000, 	0.350000, 1.000000, 	-0.156233, -0.986415, -0.050763, 
--0.250000, -0.951057, 0.181636, 	0.500000, 0.900000, 	-0.156233, -0.986415, 0.050763, 
--0.309017, -0.951057, 0.000000, 	0.400000, 0.900000, 	-0.156233, -0.986415, 0.050763, 
-0.000000, -1.000000, 0.000000, 	0.450000, 1.000000, 	-0.156233, -0.986415, 0.050763, 
--0.095491, -0.951057, 0.293893, 	0.600000, 0.900000, 	-0.096557, -0.986415, 0.132899, 
--0.250000, -0.951057, 0.181636, 	0.500000, 0.900000, 	-0.096557, -0.986415, 0.132899, 
-0.000000, -1.000000, 0.000000, 	0.550000, 1.000000, 	-0.096557, -0.986415, 0.132899, 
-0.095492, -0.951057, 0.293893, 	0.700000, 0.900000, 	0.000000, -0.986415, 0.164272, 
--0.095491, -0.951057, 0.293893, 	0.600000, 0.900000, 	0.000000, -0.986415, 0.164272, 
-0.000000, -1.000000, 0.000000, 	0.650000, 1.000000, 	0.000000, -0.986415, 0.164272, 
-0.250000, -0.951057, 0.181636, 	0.800000, 0.900000, 	0.096557, -0.986415, 0.132899, 
-0.095492, -0.951057, 0.293893, 	0.700000, 0.900000, 	0.096557, -0.986415, 0.132899, 
-0.000000, -1.000000, 0.000000, 	0.750000, 1.000000, 	0.096557, -0.986415, 0.132899, 
-0.309017, -0.951057, 0.000000, 	0.900000, 0.900000, 	0.156233, -0.986415, 0.050763, 
-0.250000, -0.951057, 0.181636, 	0.800000, 0.900000, 	0.156233, -0.986415, 0.050763, 
-0.000000, -1.000000, 0.000000, 	0.850000, 1.000000, 	0.156233, -0.986415, 0.050763, 
-0.250000, -0.951057, -0.181636, 	1.000000, 0.900000, 	0.156233, -0.986415, -0.050763, 
-0.309017, -0.951057, 0.000000, 	0.900000, 0.900000, 	0.156233, -0.986415, -0.050763, 
-0.000000, -1.000000, 0.000000, 	0.950000, 1.000000, 	0.156233, -0.986415, -0.050763, 
-0.250000, 0.951057, -0.181636, 	0.000000, 0.100000, 	0.096557, 0.986415, -0.132899, 
-0.095491, 0.951057, -0.293893, 	0.100000, 0.100000, 	0.096557, 0.986415, -0.132899, 
-0.000000, 1.000000, 0.000000, 	0.050000, 0.000000, 	0.096557, 0.986415, -0.132899, 
-0.095491, 0.951057, -0.293893, 	0.100000, 0.100000, 	-0.000000, 0.986415, -0.164272, 
--0.095492, 0.951057, -0.293893, 	0.200000, 0.100000, 	-0.000000, 0.986415, -0.164272, 
-0.000000, 1.000000, 0.000000, 	0.150000, 0.000000, 	-0.000000, 0.986415, -0.164272, 
--0.095492, 0.951057, -0.293893, 	0.200000, 0.100000, 	-0.096557, 0.986415, -0.132899, 
--0.250000, 0.951057, -0.181636, 	0.300000, 0.100000, 	-0.096557, 0.986415, -0.132899, 
-0.000000, 1.000000, 0.000000, 	0.250000, 0.000000, 	-0.096557, 0.986415, -0.132899, 
--0.250000, 0.951057, -0.181636, 	0.300000, 0.100000, 	-0.156233, 0.986415, -0.050763, 
--0.309017, 0.951057, 0.000000, 	0.400000, 0.100000, 	-0.156233, 0.986415, -0.050763, 
-0.000000, 1.000000, 0.000000, 	0.350000, 0.000000, 	-0.156233, 0.986415, -0.050763, 
--0.309017, 0.951057, 0.000000, 	0.400000, 0.100000, 	-0.156233, 0.986415, 0.050763, 
--0.250000, 0.951057, 0.181636, 	0.500000, 0.100000, 	-0.156233, 0.986415, 0.050763, 
-0.000000, 1.000000, 0.000000, 	0.450000, 0.000000, 	-0.156233, 0.986415, 0.050763, 
--0.250000, 0.951057, 0.181636, 	0.500000, 0.100000, 	-0.096557, 0.986415, 0.132899, 
--0.095491, 0.951057, 0.293893, 	0.600000, 0.100000, 	-0.096557, 0.986415, 0.132899, 
-0.000000, 1.000000, 0.000000, 	0.550000, 0.000000, 	-0.096557, 0.986415, 0.132899, 
--0.095491, 0.951057, 0.293893, 	0.600000, 0.100000, 	0.000000, 0.986415, 0.164272, 
-0.095492, 0.951057, 0.293893, 	0.700000, 0.100000, 	0.000000, 0.986415, 0.164272, 
-0.000000, 1.000000, 0.000000, 	0.650000, 0.000000, 	0.000000, 0.986415, 0.164272, 
-0.095492, 0.951057, 0.293893, 	0.700000, 0.100000, 	0.096557, 0.986415, 0.132899, 
-0.250000, 0.951057, 0.181636, 	0.800000, 0.100000, 	0.096557, 0.986415, 0.132899, 
-0.000000, 1.000000, 0.000000, 	0.750000, 0.000000, 	0.096557, 0.986415, 0.132899, 
-0.250000, 0.951057, 0.181636, 	0.800000, 0.100000, 	0.156233, 0.986415, 0.050763, 
-0.309017, 0.951057, 0.000000, 	0.900000, 0.100000, 	0.156233, 0.986415, 0.050763, 
-0.000000, 1.000000, 0.000000, 	0.850000, 0.000000, 	0.156233, 0.986415, 0.050763, 
-0.309017, 0.951057, 0.000000, 	0.900000, 0.100000, 	0.156233, 0.986415, -0.050763, 
-0.250000, 0.951057, -0.181636, 	1.000000, 0.100000, 	0.156233, 0.986415, -0.050763, 
-0.000000, 1.000000, 0.000000, 	0.950000, 0.000000, 	0.156233, 0.986415, -0.050763, 
-};
diff --git a/tools/ArtistTools/source/CoreLib/Render/GeometryData/LightGeometryData.h b/tools/ArtistTools/source/CoreLib/Render/GeometryData/LightGeometryData.h
deleted file mode 100644
index ed21841..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/GeometryData/LightGeometryData.h
+++ /dev/null
@@ -1,269 +0,0 @@
-const int num_faces = 88;
-
-// pos.xyz, uv.uv, normal.xyz
-float vertices[88*3*8] = {
-2.977119, 2.977121, -34.306633, 	0.375000, 0.687500, 	0.177861, 0.429396, -0.885429, 
-0.000000, 4.210287, -34.306633, 	0.406250, 0.687500, 	0.177861, 0.429396, -0.885429, 
-0.000000, 9.084861, -31.942669, 	0.406250, 0.640508, 	0.177861, 0.429396, -0.885429, 
-0.000000, 4.210287, -34.306633, 	0.406250, 0.687500, 	-0.177861, 0.429396, -0.885429, 
--2.977119, 2.977121, -34.306633, 	0.437500, 0.687500, 	-0.177861, 0.429396, -0.885429, 
--6.423970, 6.423968, -31.942669, 	0.437500, 0.640508, 	-0.177861, 0.429396, -0.885429, 
--2.977119, 2.977121, -34.306633, 	0.437500, 0.687500, 	-0.429395, 0.177862, -0.885430, 
--4.210285, 0.000002, -34.306633, 	0.468750, 0.687500, 	-0.429395, 0.177862, -0.885430, 
--9.084864, -0.000001, -31.942669, 	0.468750, 0.640508, 	-0.429395, 0.177862, -0.885429, 
--4.210285, 0.000002, -34.306633, 	0.468750, 0.687500, 	-0.429395, -0.177862, -0.885430, 
--2.977119, -2.977118, -34.306633, 	0.500000, 0.687500, 	-0.429395, -0.177862, -0.885430, 
--6.423970, -6.423972, -31.942667, 	0.500000, 0.640508, 	-0.429395, -0.177862, -0.885430, 
--2.977119, -2.977118, -34.306633, 	0.500000, 0.687500, 	-0.177861, -0.429395, -0.885429, 
-0.000000, -4.210283, -34.306633, 	0.531250, 0.687500, 	-0.177861, -0.429395, -0.885429, 
-0.000000, -9.084865, -31.942671, 	0.531250, 0.640508, 	-0.177861, -0.429395, -0.885429, 
-0.000000, -4.210283, -34.306633, 	0.531250, 0.687500, 	0.177862, -0.429395, -0.885429, 
-2.977120, -2.977118, -34.306633, 	0.562500, 0.687500, 	0.177862, -0.429395, -0.885429, 
-6.423971, -6.423972, -31.942667, 	0.562500, 0.640508, 	0.177862, -0.429395, -0.885429, 
-2.977120, -2.977118, -34.306633, 	0.562500, 0.687500, 	0.429395, -0.177862, -0.885430, 
-4.210286, 0.000002, -34.306633, 	0.593750, 0.687500, 	0.429395, -0.177862, -0.885430, 
-9.084865, -0.000001, -31.942669, 	0.593750, 0.640508, 	0.429395, -0.177862, -0.885429, 
-4.210286, 0.000002, -34.306633, 	0.593750, 0.687500, 	0.429395, 0.177862, -0.885429, 
-2.977119, 2.977121, -34.306633, 	0.625000, 0.687500, 	0.429395, 0.177862, -0.885429, 
-6.423971, 6.423968, -31.942669, 	0.625000, 0.640508, 	0.429395, 0.177862, -0.885429, 
--4.210285, 0.000002, -34.306633, 	0.343750, 0.843750, 	-0.124125, -0.051414, -0.990934, 
-0.000000, 0.000002, -34.834015, 	0.500000, 0.843750, 	-0.124125, -0.051414, -0.990934, 
--2.977119, -2.977118, -34.306633, 	0.389515, 0.733265, 	-0.124125, -0.051414, -0.990934, 
-10.861003, 0.000000, -10.002398, 	0.593750, 0.499530, 	0.791070, 0.327672, -0.516564, 
-7.679888, 7.679888, -10.002398, 	0.625000, 0.499530, 	0.791071, 0.327672, -0.516564, 
-12.349342, 12.349340, 0.110407, 	0.625000, 0.311560, 	0.791070, 0.327672, -0.516564, 
-7.679889, -7.679889, -10.002397, 	0.562500, 0.499530, 	0.791071, -0.327672, -0.516564, 
-10.861003, 0.000000, -10.002398, 	0.593750, 0.499530, 	0.791070, -0.327672, -0.516564, 
-17.464600, 0.000000, 0.110407, 	0.593750, 0.311560, 	0.791070, -0.327672, -0.516564, 
-0.000000, -10.861002, -10.002398, 	0.531250, 0.499530, 	0.327672, -0.791071, -0.516564, 
-7.679889, -7.679889, -10.002397, 	0.562500, 0.499530, 	0.327672, -0.791071, -0.516564, 
-12.349343, -12.349342, 0.110407, 	0.562500, 0.311560, 	0.327672, -0.791071, -0.516564, 
--7.679888, -7.679888, -10.002398, 	0.500000, 0.499530, 	-0.327672, -0.791071, -0.516564, 
-0.000000, -10.861002, -10.002398, 	0.531250, 0.499530, 	-0.327672, -0.791071, -0.516564, 
-0.000001, -17.464596, 0.110407, 	0.531250, 0.311560, 	-0.327672, -0.791071, -0.516564, 
--10.861002, 0.000000, -10.002398, 	0.468750, 0.499530, 	-0.791071, -0.327672, -0.516564, 
--7.679888, -7.679888, -10.002398, 	0.500000, 0.499530, 	-0.791071, -0.327672, -0.516564, 
--12.349340, -12.349340, 0.110407, 	0.500000, 0.311560, 	-0.791071, -0.327672, -0.516564, 
--7.679888, 7.679888, -10.002398, 	0.437500, 0.499530, 	-0.791071, 0.327672, -0.516564, 
--10.861002, 0.000000, -10.002398, 	0.468750, 0.499530, 	-0.791071, 0.327672, -0.516564, 
--17.464596, 0.000000, 0.110407, 	0.468750, 0.311560, 	-0.791071, 0.327672, -0.516564, 
-0.000000, 10.861002, -10.002398, 	0.406250, 0.499530, 	-0.327672, 0.791071, -0.516564, 
--7.679888, 7.679888, -10.002398, 	0.437500, 0.499530, 	-0.327672, 0.791071, -0.516564, 
--12.349340, 12.349340, 0.110407, 	0.437500, 0.311560, 	-0.327672, 0.791071, -0.516564, 
-7.679888, 7.679888, -10.002398, 	0.375000, 0.499530, 	0.327672, 0.791071, -0.516564, 
-0.000000, 10.861002, -10.002398, 	0.406250, 0.499530, 	0.327672, 0.791071, -0.516564, 
-0.000001, 17.464598, 0.110407, 	0.406250, 0.311560, 	0.327672, 0.791071, -0.516564, 
-10.861003, -0.000001, -29.138687, 	0.593750, 0.593515, 	0.923880, 0.382683, 0.000000, 
-7.679888, 7.679889, -29.138687, 	0.625000, 0.593515, 	0.923880, 0.382683, 0.000000, 
-7.679888, 7.679888, -10.002398, 	0.625000, 0.499530, 	0.923880, 0.382683, 0.000000, 
-7.679889, -7.679891, -29.138687, 	0.562500, 0.593515, 	0.923880, -0.382683, 0.000000, 
-10.861003, -0.000001, -29.138687, 	0.593750, 0.593515, 	0.923880, -0.382683, 0.000000, 
-10.861003, 0.000000, -10.002398, 	0.593750, 0.499530, 	0.923880, -0.382683, 0.000000, 
-0.000000, -10.861003, -29.138685, 	0.531250, 0.593515, 	0.382683, -0.923880, 0.000000, 
-7.679889, -7.679891, -29.138687, 	0.562500, 0.593515, 	0.382683, -0.923880, 0.000000, 
-7.679889, -7.679889, -10.002397, 	0.562500, 0.499530, 	0.382683, -0.923880, 0.000000, 
--7.679888, -7.679889, -29.138689, 	0.500000, 0.593515, 	-0.382683, -0.923880, 0.000000, 
-0.000000, -10.861003, -29.138685, 	0.531250, 0.593515, 	-0.382683, -0.923880, 0.000000, 
-0.000000, -10.861002, -10.002398, 	0.531250, 0.499530, 	-0.382683, -0.923880, 0.000000, 
--10.861002, -0.000001, -29.138687, 	0.468750, 0.593515, 	-0.923880, -0.382683, 0.000000, 
--7.679888, -7.679889, -29.138689, 	0.500000, 0.593515, 	-0.923880, -0.382683, 0.000000, 
--7.679888, -7.679888, -10.002398, 	0.500000, 0.499530, 	-0.923880, -0.382683, 0.000000, 
--7.679888, 7.679889, -29.138687, 	0.437500, 0.593515, 	-0.923880, 0.382683, 0.000000, 
--10.861002, -0.000001, -29.138687, 	0.468750, 0.593515, 	-0.923880, 0.382683, 0.000000, 
--10.861002, 0.000000, -10.002398, 	0.468750, 0.499530, 	-0.923880, 0.382683, 0.000000, 
-0.000000, 10.860999, -29.138687, 	0.406250, 0.593515, 	-0.382683, 0.923880, -0.000000, 
--7.679888, 7.679889, -29.138687, 	0.437500, 0.593515, 	-0.382683, 0.923880, -0.000000, 
--7.679888, 7.679888, -10.002398, 	0.437500, 0.499530, 	-0.382683, 0.923880, -0.000000, 
-7.679888, 7.679889, -29.138687, 	0.375000, 0.593515, 	0.382683, 0.923880, -0.000000, 
-0.000000, 10.860999, -29.138687, 	0.406250, 0.593515, 	0.382683, 0.923880, -0.000000, 
-0.000000, 10.861002, -10.002398, 	0.406250, 0.499530, 	0.382683, 0.923880, -0.000000, 
-9.084865, -0.000001, -31.942669, 	0.593750, 0.640508, 	0.797373, 0.330283, -0.505083, 
-6.423971, 6.423968, -31.942669, 	0.625000, 0.640508, 	0.797373, 0.330283, -0.505083, 
-7.679888, 7.679889, -29.138687, 	0.625000, 0.593515, 	0.797373, 0.330283, -0.505083, 
-6.423971, -6.423972, -31.942667, 	0.562500, 0.640508, 	0.797373, -0.330283, -0.505083, 
-9.084865, -0.000001, -31.942669, 	0.593750, 0.640508, 	0.797373, -0.330283, -0.505083, 
-10.861003, -0.000001, -29.138687, 	0.593750, 0.593515, 	0.797373, -0.330283, -0.505083, 
-0.000000, -9.084865, -31.942671, 	0.531250, 0.640508, 	0.330283, -0.797373, -0.505083, 
-6.423971, -6.423972, -31.942667, 	0.562500, 0.640508, 	0.330283, -0.797373, -0.505083, 
-7.679889, -7.679891, -29.138687, 	0.562500, 0.593515, 	0.330283, -0.797373, -0.505083, 
--6.423970, -6.423972, -31.942667, 	0.500000, 0.640508, 	-0.330283, -0.797373, -0.505083, 
-0.000000, -9.084865, -31.942671, 	0.531250, 0.640508, 	-0.330283, -0.797373, -0.505083, 
-0.000000, -10.861003, -29.138685, 	0.531250, 0.593515, 	-0.330283, -0.797373, -0.505083, 
--9.084864, -0.000001, -31.942669, 	0.468750, 0.640508, 	-0.797373, -0.330283, -0.505083, 
--6.423970, -6.423972, -31.942667, 	0.500000, 0.640508, 	-0.797374, -0.330282, -0.505083, 
--7.679888, -7.679889, -29.138689, 	0.500000, 0.593515, 	-0.797374, -0.330282, -0.505083, 
--6.423970, 6.423968, -31.942669, 	0.437500, 0.640508, 	-0.797373, 0.330283, -0.505083, 
--9.084864, -0.000001, -31.942669, 	0.468750, 0.640508, 	-0.797373, 0.330283, -0.505083, 
--10.861002, -0.000001, -29.138687, 	0.468750, 0.593515, 	-0.797373, 0.330283, -0.505083, 
-0.000000, 9.084861, -31.942669, 	0.406250, 0.640508, 	-0.330282, 0.797373, -0.505084, 
--6.423970, 6.423968, -31.942669, 	0.437500, 0.640508, 	-0.330282, 0.797373, -0.505084, 
--7.679888, 7.679889, -29.138687, 	0.437500, 0.593515, 	-0.330282, 0.797373, -0.505084, 
-6.423971, 6.423968, -31.942669, 	0.375000, 0.640508, 	0.330282, 0.797373, -0.505084, 
-0.000000, 9.084861, -31.942669, 	0.406250, 0.640508, 	0.330282, 0.797373, -0.505084, 
-0.000000, 10.860999, -29.138687, 	0.406250, 0.593515, 	0.330282, 0.797373, -0.505084, 
-2.977119, 2.977121, -34.306633, 	0.610485, 0.954235, 	0.124125, 0.051414, -0.990934, 
-4.210286, 0.000002, -34.306633, 	0.656250, 0.843750, 	0.124125, 0.051414, -0.990934, 
-0.000000, 0.000002, -34.834015, 	0.500000, 0.843750, 	0.124125, 0.051414, -0.990934, 
-0.000000, 0.000002, -34.834015, 	0.500000, 0.843750, 	0.124125, -0.051414, -0.990934, 
-4.210286, 0.000002, -34.306633, 	0.656250, 0.843750, 	0.124125, -0.051414, -0.990934, 
-2.977120, -2.977118, -34.306633, 	0.610485, 0.733265, 	0.124125, -0.051414, -0.990934, 
-0.000000, 0.000002, -34.834015, 	0.500000, 0.843750, 	0.051415, -0.124125, -0.990934, 
-2.977120, -2.977118, -34.306633, 	0.610485, 0.733265, 	0.051415, -0.124125, -0.990934, 
-0.000000, -4.210283, -34.306633, 	0.500000, 0.687500, 	0.051415, -0.124125, -0.990934, 
-0.000000, 0.000002, -34.834015, 	0.500000, 0.843750, 	-0.051414, -0.124125, -0.990934, 
-0.000000, -4.210283, -34.306633, 	0.500000, 0.687500, 	-0.051414, -0.124125, -0.990934, 
--2.977119, -2.977118, -34.306633, 	0.389515, 0.733265, 	-0.051414, -0.124125, -0.990934, 
--2.977119, 2.977121, -34.306633, 	0.389515, 0.954235, 	-0.124125, 0.051414, -0.990934, 
-0.000000, 0.000002, -34.834015, 	0.500000, 0.843750, 	-0.124125, 0.051414, -0.990934, 
--4.210285, 0.000002, -34.306633, 	0.343750, 0.843750, 	-0.124125, 0.051414, -0.990934, 
-0.000000, 4.210287, -34.306633, 	0.500000, 1.000000, 	-0.051414, 0.124125, -0.990934, 
-0.000000, 0.000002, -34.834015, 	0.500000, 0.843750, 	-0.051414, 0.124125, -0.990934, 
--2.977119, 2.977121, -34.306633, 	0.389515, 0.954235, 	-0.051414, 0.124125, -0.990934, 
-2.977119, 2.977121, -34.306633, 	0.610485, 0.954235, 	0.051414, 0.124125, -0.990934, 
-0.000000, 0.000002, -34.834015, 	0.500000, 0.843750, 	0.051414, 0.124125, -0.990934, 
-0.000000, 4.210287, -34.306633, 	0.500000, 1.000000, 	0.051414, 0.124125, -0.990934, 
-12.349342, 12.349340, 0.110407, 	0.610485, 0.045765, 	0.382683, 0.923880, 0.000000, 
-0.000001, 17.464598, 0.110407, 	0.500000, 0.000000, 	0.382683, 0.923880, 0.000000, 
-0.000001, 17.464598, 1.144262, 	0.500000, 0.000000, 	0.382683, 0.923880, 0.000000, 
-0.000001, 17.464598, 0.110407, 	0.500000, 0.000000, 	-0.382683, 0.923880, -0.000000, 
--12.349340, 12.349340, 0.110407, 	0.389515, 0.045765, 	-0.382683, 0.923880, -0.000000, 
--12.349340, 12.349340, 1.144262, 	0.389515, 0.045765, 	-0.382683, 0.923880, -0.000000, 
--12.349340, 12.349340, 0.110407, 	0.389515, 0.045765, 	-0.923880, 0.382683, 0.000000, 
--17.464596, 0.000000, 0.110407, 	0.343750, 0.156250, 	-0.923880, 0.382683, 0.000000, 
--17.464596, 0.000000, 1.144262, 	0.343750, 0.156250, 	-0.923880, 0.382683, 0.000000, 
--17.464596, 0.000000, 0.110407, 	0.343750, 0.156250, 	-0.923880, -0.382683, 0.000000, 
--12.349340, -12.349340, 0.110407, 	0.389515, 0.266735, 	-0.923880, -0.382683, 0.000000, 
--12.349340, -12.349340, 1.144262, 	0.389515, 0.266735, 	-0.923880, -0.382683, 0.000000, 
--12.349340, -12.349340, 0.110407, 	0.389515, 0.266735, 	-0.382683, -0.923880, -0.000002, 
-0.000001, -17.464596, 0.110407, 	0.500000, 0.312500, 	-0.382683, -0.923880, -0.000002, 
-0.000001, -17.464600, 1.144262, 	0.500000, 0.312500, 	-0.382683, -0.923880, -0.000002, 
-0.000001, -17.464596, 0.110407, 	0.500000, 0.312500, 	0.382683, -0.923880, -0.000002, 
-12.349343, -12.349342, 0.110407, 	0.610485, 0.266735, 	0.382683, -0.923880, -0.000002, 
-12.349343, -12.349342, 1.144262, 	0.610485, 0.266735, 	0.382683, -0.923880, -0.000002, 
-12.349343, -12.349342, 0.110407, 	0.610485, 0.266735, 	0.923880, -0.382683, 0.000000, 
-17.464600, 0.000000, 0.110407, 	0.656250, 0.156250, 	0.923880, -0.382683, 0.000000, 
-17.464600, 0.000000, 1.144262, 	0.656250, 0.156250, 	0.923880, -0.382683, 0.000000, 
-17.464600, 0.000000, 0.110407, 	0.656250, 0.156250, 	0.923880, 0.382683, 0.000000, 
-12.349342, 12.349340, 0.110407, 	0.610485, 0.045765, 	0.923880, 0.382683, 0.000000, 
-12.349342, 12.349340, 1.144262, 	0.610485, 0.045765, 	0.923880, 0.382683, 0.000000, 
-12.349342, 12.349340, 1.144262, 	0.610485, 0.045765, 	-0.117337, -0.283277, 0.951833, 
-0.000001, 17.464598, 1.144262, 	0.500000, 0.000000, 	-0.117337, -0.283277, 0.951833, 
-0.000001, 15.735191, 0.629568, 	0.500000, 0.000000, 	-0.117337, -0.283277, 0.951833, 
-0.000001, 17.464598, 1.144262, 	0.500000, 0.000000, 	0.117337, -0.283277, 0.951833, 
--12.349340, 12.349340, 1.144262, 	0.389515, 0.045765, 	0.117337, -0.283277, 0.951833, 
--11.126453, 11.126453, 0.629568, 	0.389515, 0.045765, 	0.117337, -0.283277, 0.951833, 
--12.349340, 12.349340, 1.144262, 	0.389515, 0.045765, 	0.283277, -0.117337, 0.951833, 
--17.464596, 0.000000, 1.144262, 	0.343750, 0.156250, 	0.283277, -0.117337, 0.951833, 
--15.735189, 0.000000, 0.629568, 	0.343750, 0.156250, 	0.283277, -0.117337, 0.951833, 
--17.464596, 0.000000, 1.144262, 	0.343750, 0.156250, 	0.283277, 0.117337, 0.951833, 
--12.349340, -12.349340, 1.144262, 	0.389515, 0.266735, 	0.283277, 0.117337, 0.951833, 
--11.126453, -11.126453, 0.629568, 	0.389515, 0.266735, 	0.283277, 0.117337, 0.951833, 
--12.349340, -12.349340, 1.144262, 	0.389515, 0.266735, 	0.117337, 0.283277, 0.951833, 
-0.000001, -17.464600, 1.144262, 	0.500000, 0.312500, 	0.117337, 0.283277, 0.951833, 
-0.000001, -15.735191, 0.629568, 	0.500000, 0.312500, 	0.117337, 0.283277, 0.951833, 
-0.000001, -17.464600, 1.144262, 	0.500000, 0.312500, 	-0.117337, 0.283277, 0.951833, 
-12.349343, -12.349342, 1.144262, 	0.610485, 0.266735, 	-0.117337, 0.283277, 0.951833, 
-11.126457, -11.126455, 0.629568, 	0.610485, 0.266735, 	-0.117337, 0.283277, 0.951833, 
-12.349343, -12.349342, 1.144262, 	0.610485, 0.266735, 	-0.283277, 0.117337, 0.951833, 
-17.464600, 0.000000, 1.144262, 	0.656250, 0.156250, 	-0.283277, 0.117337, 0.951833, 
-15.735193, 0.000000, 0.629568, 	0.656250, 0.156250, 	-0.283277, 0.117337, 0.951833, 
-17.464600, 0.000000, 1.144262, 	0.656250, 0.156250, 	-0.283277, -0.117337, 0.951833, 
-12.349342, 12.349340, 1.144262, 	0.610485, 0.045765, 	-0.283277, -0.117337, 0.951833, 
-11.126455, 11.126453, 0.629568, 	0.610485, 0.045765, 	-0.283277, -0.117337, 0.951833, 
-15.735193, 0.000000, 0.629568, 	0.656250, 0.156250, 	-0.301379, -0.124836, 0.945297, 
-11.126455, 11.126453, 0.629568, 	0.610485, 0.045765, 	-0.301379, -0.124836, 0.945297, 
-1.172339, 1.172337, -3.858527, 	0.610485, 0.045765, 	-0.301379, -0.124836, 0.945297, 
-11.126455, 11.126453, 0.629568, 	0.610485, 0.045765, 	-0.124835, -0.301379, 0.945297, 
-0.000001, 15.735191, 0.629568, 	0.500000, 0.000000, 	-0.124835, -0.301379, 0.945297, 
-0.000001, 1.657940, -3.858527, 	0.500000, 0.000000, 	-0.124835, -0.301379, 0.945297, 
-0.000001, 15.735191, 0.629568, 	0.500000, 0.000000, 	0.124835, -0.301379, 0.945297, 
--11.126453, 11.126453, 0.629568, 	0.389515, 0.045765, 	0.124835, -0.301379, 0.945297, 
--1.172335, 1.172337, -3.858527, 	0.389515, 0.045765, 	0.124835, -0.301379, 0.945297, 
--11.126453, 11.126453, 0.629568, 	0.389515, 0.045765, 	0.301379, -0.124835, 0.945297, 
--15.735189, 0.000000, 0.629568, 	0.343750, 0.156250, 	0.301379, -0.124835, 0.945297, 
--1.657938, 0.000000, -3.858527, 	0.343750, 0.156250, 	0.301379, -0.124835, 0.945297, 
--15.735189, 0.000000, 0.629568, 	0.343750, 0.156250, 	0.301379, 0.124835, 0.945297, 
--11.126453, -11.126453, 0.629568, 	0.389515, 0.266735, 	0.301379, 0.124835, 0.945297, 
--1.172335, -1.172337, -3.858527, 	0.389515, 0.266735, 	0.301379, 0.124835, 0.945297, 
--11.126453, -11.126453, 0.629568, 	0.389515, 0.266735, 	0.124836, 0.301379, 0.945297, 
-0.000001, -15.735191, 0.629568, 	0.500000, 0.312500, 	0.124835, 0.301379, 0.945297, 
-0.000001, -1.657940, -3.858527, 	0.500000, 0.312500, 	0.124836, 0.301379, 0.945297, 
-0.000001, -15.735191, 0.629568, 	0.500000, 0.312500, 	-0.124835, 0.301379, 0.945297, 
-11.126457, -11.126455, 0.629568, 	0.610485, 0.266735, 	-0.124835, 0.301379, 0.945297, 
-1.172339, -1.172337, -3.858527, 	0.610485, 0.266735, 	-0.124835, 0.301379, 0.945297, 
-11.126457, -11.126455, 0.629568, 	0.610485, 0.266735, 	-0.301379, 0.124835, 0.945297, 
-15.735193, 0.000000, 0.629568, 	0.656250, 0.156250, 	-0.301379, 0.124835, 0.945297, 
-1.657941, 0.000000, -3.858527, 	0.656250, 0.156250, 	-0.301379, 0.124835, 0.945297, 
-1.657941, 0.000000, -3.858527, 	0.656250, 0.156250, 	0.923878, 0.382687, 0.000000, 
-1.172339, 1.172337, -3.858527, 	0.610485, 0.045765, 	0.923878, 0.382687, 0.000000, 
-1.172338, 1.172337, 18.507620, 	0.610485, 0.045765, 	0.890349, 0.368798, -0.266959, 
-1.172339, 1.172337, -3.858527, 	0.610485, 0.045765, 	0.382687, 0.923878, 0.000000, 
-0.000001, 1.657940, -3.858527, 	0.500000, 0.000000, 	0.382687, 0.923878, 0.000000, 
-0.000001, 1.657940, 18.507620, 	0.500000, 0.000000, 	0.368799, 0.890348, -0.266960, 
-0.000001, 1.657940, -3.858527, 	0.500000, 0.000000, 	-0.382687, 0.923878, -0.000000, 
--1.172335, 1.172337, -3.858527, 	0.389515, 0.045765, 	-0.382687, 0.923878, -0.000000, 
--1.172336, 1.172337, 18.507620, 	0.389515, 0.045765, 	-0.368799, 0.890348, -0.266959, 
--1.172335, 1.172337, -3.858527, 	0.389515, 0.045765, 	-0.923878, 0.382687, -0.000000, 
--1.657938, 0.000000, -3.858527, 	0.343750, 0.156250, 	-0.923878, 0.382687, -0.000000, 
--1.657939, 0.000000, 18.507620, 	0.343750, 0.156250, 	-0.890348, 0.368798, -0.266960, 
--1.657938, 0.000000, -3.858527, 	0.343750, 0.156250, 	-0.923878, -0.382687, -0.000000, 
--1.172335, -1.172337, -3.858527, 	0.389515, 0.266735, 	-0.923878, -0.382687, -0.000000, 
--1.172336, -1.172337, 18.507620, 	0.389515, 0.266735, 	-0.890348, -0.368798, -0.266959, 
--1.172335, -1.172337, -3.858527, 	0.389515, 0.266735, 	-0.382687, -0.923878, -0.000000, 
-0.000001, -1.657940, -3.858527, 	0.500000, 0.312500, 	-0.382687, -0.923878, -0.000000, 
-0.000001, -1.657940, 18.507620, 	0.500000, 0.312500, 	-0.368799, -0.890348, -0.266960, 
-0.000001, -1.657940, -3.858527, 	0.500000, 0.312500, 	0.382687, -0.923878, 0.000000, 
-1.172339, -1.172337, -3.858527, 	0.610485, 0.266735, 	0.382687, -0.923878, 0.000000, 
-1.172338, -1.172337, 18.507620, 	0.610485, 0.266735, 	0.368799, -0.890348, -0.266959, 
-1.172339, -1.172337, -3.858527, 	0.610485, 0.266735, 	0.923878, -0.382687, 0.000000, 
-1.657941, 0.000000, -3.858527, 	0.656250, 0.156250, 	0.923878, -0.382687, 0.000000, 
-1.657941, 0.000000, 18.507620, 	0.656250, 0.156250, 	0.890348, -0.368798, -0.266960, 
-1.657941, 0.000000, 18.507620, 	0.656250, 0.156250, 	0.890348, 0.368798, -0.266960, 
-1.172338, 1.172337, 18.507620, 	0.610485, 0.045765, 	0.890349, 0.368798, -0.266959, 
-3.204545, 3.204544, 18.507618, 	0.610485, 0.045765, 	0.916255, 0.379530, 0.128197, 
-1.172338, -1.172337, 18.507620, 	0.610485, 0.266735, 	0.890349, -0.368798, -0.266959, 
-1.657941, 0.000000, 18.507620, 	0.656250, 0.156250, 	0.890348, -0.368798, -0.266960, 
-4.531928, 0.000000, 18.507618, 	0.656250, 0.156250, 	0.916255, -0.379530, 0.128199, 
-0.000001, -1.657940, 18.507620, 	0.500000, 0.312500, 	0.368799, -0.890348, -0.266960, 
-1.172338, -1.172337, 18.507620, 	0.610485, 0.266735, 	0.368799, -0.890348, -0.266959, 
-3.204545, -3.204544, 18.507618, 	0.610485, 0.266735, 	0.379530, -0.916255, 0.128197, 
--1.172336, -1.172337, 18.507620, 	0.389515, 0.266735, 	-0.368799, -0.890348, -0.266959, 
-0.000001, -1.657940, 18.507620, 	0.500000, 0.312500, 	-0.368799, -0.890348, -0.266960, 
-0.000000, -4.531925, 18.507618, 	0.500000, 0.312500, 	-0.379530, -0.916255, 0.128199, 
--1.657939, 0.000000, 18.507620, 	0.343750, 0.156250, 	-0.890348, -0.368798, -0.266960, 
--1.172336, -1.172337, 18.507620, 	0.389515, 0.266735, 	-0.890348, -0.368798, -0.266959, 
--3.204544, -3.204544, 18.507618, 	0.389515, 0.266735, 	-0.916255, -0.379530, 0.128197, 
--1.172336, 1.172337, 18.507620, 	0.389515, 0.045765, 	-0.890348, 0.368798, -0.266959, 
--1.657939, 0.000000, 18.507620, 	0.343750, 0.156250, 	-0.890348, 0.368798, -0.266960, 
--4.531927, 0.000000, 18.507618, 	0.343750, 0.156250, 	-0.916254, 0.379530, 0.128199, 
-0.000001, 1.657940, 18.507620, 	0.500000, 0.000000, 	-0.368799, 0.890348, -0.266960, 
--1.172336, 1.172337, 18.507620, 	0.389515, 0.045765, 	-0.368799, 0.890348, -0.266959, 
--3.204544, 3.204544, 18.507618, 	0.389515, 0.045765, 	-0.379530, 0.916255, 0.128197, 
-1.172338, 1.172337, 18.507620, 	0.610485, 0.045765, 	0.368799, 0.890348, -0.266959, 
-0.000001, 1.657940, 18.507620, 	0.500000, 0.000000, 	0.368799, 0.890348, -0.266960, 
-0.000000, 4.531925, 18.507618, 	0.500000, 0.000000, 	0.379530, 0.916255, 0.128199, 
-3.204545, -3.204544, 18.507618, 	0.610485, 0.266735, 	0.916255, -0.379530, 0.128197, 
-4.531928, 0.000000, 18.507618, 	0.656250, 0.156250, 	0.916255, -0.379530, 0.128199, 
-0.000000, 0.000000, 27.158279, 	0.500000, 0.156250, 	0.831594, -0.344462, 0.435657, 
-0.000000, -4.531925, 18.507618, 	0.500000, 0.312500, 	0.379530, -0.916255, 0.128199, 
-3.204545, -3.204544, 18.507618, 	0.610485, 0.266735, 	0.379530, -0.916255, 0.128197, 
-0.000000, 0.000000, 27.158279, 	0.500000, 0.156250, 	0.344462, -0.831594, 0.435657, 
--3.204544, -3.204544, 18.507618, 	0.389515, 0.266735, 	-0.379530, -0.916255, 0.128197, 
-0.000000, -4.531925, 18.507618, 	0.500000, 0.312500, 	-0.379530, -0.916255, 0.128199, 
-0.000000, 0.000000, 27.158279, 	0.500000, 0.156250, 	-0.344462, -0.831594, 0.435657, 
--4.531927, 0.000000, 18.507618, 	0.343750, 0.156250, 	-0.916254, -0.379530, 0.128199, 
--3.204544, -3.204544, 18.507618, 	0.389515, 0.266735, 	-0.916255, -0.379530, 0.128197, 
-0.000000, 0.000000, 27.158279, 	0.500000, 0.156250, 	-0.831594, -0.344462, 0.435657, 
--3.204544, 3.204544, 18.507618, 	0.389515, 0.045765, 	-0.916255, 0.379530, 0.128197, 
--4.531927, 0.000000, 18.507618, 	0.343750, 0.156250, 	-0.916254, 0.379530, 0.128199, 
-0.000000, 0.000000, 27.158279, 	0.500000, 0.156250, 	-0.831594, 0.344462, 0.435657, 
-0.000000, 4.531925, 18.507618, 	0.500000, 0.000000, 	-0.379530, 0.916255, 0.128199, 
--3.204544, 3.204544, 18.507618, 	0.389515, 0.045765, 	-0.379530, 0.916255, 0.128197, 
-0.000000, 0.000000, 27.158279, 	0.500000, 0.156250, 	-0.344462, 0.831594, 0.435657, 
-3.204545, 3.204544, 18.507618, 	0.610485, 0.045765, 	0.379530, 0.916255, 0.128197, 
-0.000000, 4.531925, 18.507618, 	0.500000, 0.000000, 	0.379530, 0.916255, 0.128199, 
-0.000000, 0.000000, 27.158279, 	0.500000, 0.156250, 	0.344462, 0.831594, 0.435657, 
-4.531928, 0.000000, 18.507618, 	0.656250, 0.156250, 	0.916255, 0.379530, 0.128199, 
-3.204545, 3.204544, 18.507618, 	0.610485, 0.045765, 	0.916255, 0.379530, 0.128197, 
-0.000000, 0.000000, 27.158279, 	0.500000, 0.156250, 	0.831594, 0.344462, 0.435657, 
-};
diff --git a/tools/ArtistTools/source/CoreLib/Render/GeometryData/WindGeometryData.h b/tools/ArtistTools/source/CoreLib/Render/GeometryData/WindGeometryData.h
deleted file mode 100644
index 3d1390a..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/GeometryData/WindGeometryData.h
+++ /dev/null
@@ -1,2513 +0,0 @@
-const int num_faces = 836;
-
-// pos.xyz, uv.uv, normal.xyz
-float vertices[836*3*8] = {
--1.002737, 3.502487, -29.476650, 	1.000000, 0.966243, 	-0.570521, -0.819696, 0.051023, 
--1.002737, 3.589727, -28.074986, 	1.000000, 0.922656, 	-0.569426, -0.818637, 0.074745, 
--1.336982, 4.293425, -28.133030, 	0.500000, 0.922656, 	-0.999926, -0.012083, 0.001603, 
--1.336982, 4.293425, -28.133030, 	0.500000, 0.922656, 	-0.999926, -0.012083, 0.001603, 
--1.002737, 4.997122, -28.191074, 	0.000000, 0.932486, 	-0.582174, 0.810005, -0.070467, 
--1.002737, 4.921762, -29.530731, 	0.000000, 0.966243, 	-0.582241, 0.811733, -0.045666, 
--1.002737, 5.199909, -26.333269, 	0.000000, 0.859409, 	-0.582690, 0.803052, -0.124820, 
--1.002737, 4.997122, -28.191074, 	0.000000, 0.932486, 	-0.582174, 0.810005, -0.070467, 
--1.336982, 4.293425, -28.133030, 	0.500000, 0.922656, 	-0.999926, -0.012083, 0.001603, 
--1.336982, 4.293425, -28.133030, 	0.500000, 0.922656, 	-0.999926, -0.012083, 0.001603, 
--1.002737, 3.589727, -28.074986, 	1.000000, 0.922656, 	-0.569426, -0.818637, 0.074745, 
--1.002737, 3.807196, -26.139326, 	1.000000, 0.859409, 	-0.566467, -0.814177, 0.127399, 
--1.002737, 3.807196, -26.139326, 	1.000000, 0.859409, 	-0.566467, -0.814177, 0.127399, 
--1.002737, 4.261988, -23.779169, 	1.000000, 0.775297, 	-0.564634, -0.800896, 0.199384, 
--1.336982, 4.951294, -23.914915, 	0.500000, 0.775297, 	-0.999837, -0.017439, 0.004781, 
--1.336982, 4.951294, -23.914915, 	0.500000, 0.775297, 	-0.999837, -0.017439, 0.004781, 
--1.002737, 5.640600, -24.050657, 	0.000000, 0.786333, 	-0.583127, 0.787897, -0.197941, 
--1.002737, 5.199909, -26.333269, 	0.000000, 0.859409, 	-0.582690, 0.803052, -0.124820, 
--1.002737, 6.429670, -21.436577, 	0.000000, 0.669113, 	-0.579786, 0.770207, -0.265761, 
--1.002737, 5.640600, -24.050657, 	0.000000, 0.786333, 	-0.583127, 0.787897, -0.197941, 
--1.336982, 4.951294, -23.914915, 	0.500000, 0.775297, 	-0.999837, -0.017439, 0.004781, 
--1.336982, 4.951294, -23.914915, 	0.500000, 0.775297, 	-0.999837, -0.017439, 0.004781, 
--1.002737, 4.261988, -23.779169, 	1.000000, 0.775297, 	-0.564634, -0.800896, 0.199384, 
--1.002737, 5.061195, -21.104027, 	1.000000, 0.669113, 	-0.566458, -0.779905, 0.266220, 
--1.002737, 5.061195, -21.104027, 	1.000000, 0.669113, 	-0.566458, -0.779905, 0.266220, 
--1.002737, 6.120935, -18.335461, 	1.000000, 0.547971, 	-0.566613, -0.758528, 0.321845, 
--1.336982, 6.802818, -18.519814, 	0.500000, 0.547971, 	-0.999946, -0.009100, 0.005070, 
--1.336982, 6.802818, -18.519814, 	0.500000, 0.547971, 	-0.999946, -0.009100, 0.005070, 
--1.002737, 7.484703, -18.704168, 	0.000000, 0.551894, 	-0.576888, 0.751118, -0.320970, 
--1.002737, 6.429670, -21.436577, 	0.000000, 0.669113, 	-0.579786, 0.770207, -0.265761, 
--1.002737, 8.723274, -16.066572, 	0.000000, 0.418984, 	-0.570577, 0.739144, -0.357922, 
--1.002737, 7.484703, -18.704168, 	0.000000, 0.551894, 	-0.576888, 0.751118, -0.320970, 
--1.336982, 6.802818, -18.519814, 	0.500000, 0.547971, 	-0.999946, -0.009100, 0.005070, 
--1.336982, 6.802818, -18.519814, 	0.500000, 0.547971, 	-0.999946, -0.009100, 0.005070, 
--1.002737, 6.120935, -18.335461, 	1.000000, 0.547971, 	-0.566613, -0.758528, 0.321845, 
--1.002737, 7.357327, -15.695049, 	1.000000, 0.418984, 	-0.568348, -0.740553, 0.358555, 
--1.002737, 7.357327, -15.695049, 	1.000000, 0.418984, 	-0.568348, -0.740553, 0.358555, 
--1.002737, 8.627859, -13.158705, 	1.000000, 0.282904, 	-0.571429, -0.737705, 0.359528, 
--1.336982, 9.314625, -13.332255, 	0.500000, 0.282904, 	-0.999983, 0.005125, -0.002905, 
--1.336982, 9.314625, -13.332255, 	0.500000, 0.282904, 	-0.999983, 0.005125, -0.002905, 
--1.002737, 10.001389, -13.505806, 	0.000000, 0.286075, 	-0.565597, 0.742253, -0.359389, 
--1.002737, 8.723274, -16.066572, 	0.000000, 0.418984, 	-0.570577, 0.739144, -0.357922, 
--1.002737, 11.175043, -11.003893, 	0.000000, 0.140482, 	-0.562513, 0.757929, -0.330337, 
--1.002737, 10.001389, -13.505806, 	0.000000, 0.286075, 	-0.565597, 0.742253, -0.359389, 
--1.336982, 9.314625, -13.332255, 	0.500000, 0.282904, 	-0.999983, 0.005125, -0.002905, 
--1.336982, 9.314625, -13.332255, 	0.500000, 0.282904, 	-0.999983, 0.005125, -0.002905, 
--1.002737, 8.627859, -13.158705, 	1.000000, 0.282904, 	-0.571429, -0.737705, 0.359528, 
--1.002737, 9.790028, -10.702334, 	1.000000, 0.140482, 	-0.576949, -0.747604, 0.328966, 
--1.002737, 9.790028, -10.702334, 	1.000000, 0.140482, 	-0.576949, -0.747604, 0.328966, 
--1.003346, 10.657795, -8.543959, 	1.020833, -0.009381, 	-0.588551, -0.767718, 0.253411, 
--1.337592, 11.355911, -8.670841, 	0.583333, -0.069211, 	-0.999594, 0.026023, -0.011609, 
--1.337592, 11.355911, -8.670841, 	0.583333, -0.069211, 	-0.999594, 0.026023, -0.011609, 
--1.003346, 12.054029, -8.797724, 	0.000000, -0.005111, 	-0.560047, 0.787144, -0.258362, 
--1.002737, 11.175043, -11.003893, 	0.000000, 0.140482, 	-0.562513, 0.757929, -0.330337, 
--1.005175, 12.448139, -7.124194, 	0.666667, -0.726194, 	-0.564732, 0.815815, -0.124590, 
--1.003346, 12.054029, -8.797724, 	0.000000, -0.005111, 	-0.560047, 0.787144, -0.258362, 
--1.337592, 11.355911, -8.670841, 	0.583333, -0.069211, 	-0.999594, 0.026023, -0.011609, 
--1.337592, 11.355911, -8.670841, 	0.583333, -0.069211, 	-0.999594, 0.026023, -0.011609, 
--1.003346, 10.657795, -8.543959, 	1.020833, -0.009381, 	-0.588551, -0.767718, 0.253411, 
--1.005175, 11.045135, -6.901599, 	1.083333, -0.167786, 	-0.591577, -0.797310, 0.119726, 
--1.005175, 11.045135, -6.901599, 	1.083333, -0.167786, 	-0.591577, -0.797310, 0.119726, 
--1.006394, 11.114811, -5.517140, 	1.000000, -0.170915, 	-0.583093, -0.812392, -0.004755, 
--1.340640, 11.818584, -5.617008, 	1.166667, -0.809096, 	-0.999853, 0.017074, 0.001872, 
--1.340640, 11.818584, -5.617008, 	1.166667, -0.809096, 	-0.999853, 0.017074, 0.001872, 
--1.006394, 12.522362, -5.716876, 	1.333333, -1.447277, 	-0.566040, 0.824377, 0.001632, 
--1.005175, 12.448139, -7.124194, 	0.666667, -0.726194, 	-0.564732, 0.815815, -0.124590, 
--1.002737, 11.560024, -0.158328, 	0.000000, -0.503387, 	-0.548128, 0.812439, 0.198744, 
--1.003346, 12.142200, -2.567771, 	0.000000, -0.336720, 	-0.545383, 0.819886, 0.174196, 
--1.337592, 11.435898, -2.488622, 	0.500000, -0.336720, 	-0.999671, 0.024155, 0.008634, 
--1.337592, 11.435898, -2.488622, 	0.500000, -0.336720, 	-0.999671, 0.024155, 0.008634, 
--1.003346, 10.729588, -2.409474, 	1.000000, -0.336720, 	-0.568927, -0.804482, -0.170679, 
--1.002737, 10.154959, -0.010050, 	1.000000, -0.503387, 	-0.554465, -0.809442, -0.193318, 
--1.002737, 10.154959, -0.010050, 	1.000000, -0.503387, 	-0.554465, -0.809442, -0.193318, 
--1.002737, 9.503082, 2.725576, 	1.000000, -0.671927, 	-0.543427, -0.820485, -0.177458, 
--1.336982, 10.194935, 2.646095, 	0.500000, -0.671927, 	-0.999975, -0.006839, -0.001674, 
--1.336982, 10.194935, 2.646095, 	0.500000, -0.671927, 	-0.999975, -0.006839, -0.001674, 
--1.002737, 10.886791, 2.566613, 	0.000000, -0.670054, 	-0.549613, 0.814083, 0.187601, 
--1.002737, 11.560024, -0.158328, 	0.000000, -0.503387, 	-0.548128, 0.812439, 0.198744, 
--1.002737, 10.314148, 5.254678, 	0.000000, -0.844213, 	-0.550065, 0.824042, 0.135588, 
--1.002737, 10.886791, 2.566613, 	0.000000, -0.670054, 	-0.549613, 0.814083, 0.187601, 
--1.336982, 10.194935, 2.646095, 	0.500000, -0.671927, 	-0.999975, -0.006839, -0.001674, 
--1.336982, 10.194935, 2.646095, 	0.500000, -0.671927, 	-0.999975, -0.006839, -0.001674, 
--1.002737, 9.503082, 2.725576, 	1.000000, -0.671927, 	-0.543427, -0.820485, -0.177458, 
--1.002737, 8.971350, 5.457178, 	1.000000, -0.844213, 	-0.532911, -0.837943, -0.117722, 
--1.002737, 8.971350, 5.457178, 	1.000000, -0.844213, 	-0.532911, -0.837943, -0.117722, 
--1.002737, 8.743584, 8.108688, 	1.000000, -1.016250, 	-0.522039, -0.852900, 0.006099, 
--1.336982, 9.384014, 7.968127, 	0.500000, -1.016250, 	-0.999385, -0.034959, -0.002597, 
--1.336982, 9.384014, 7.968127, 	0.500000, -1.016250, 	-0.999385, -0.034959, -0.002597, 
--1.002737, 10.024443, 7.827566, 	0.000000, -1.018373, 	-0.552727, 0.833125, 0.019881, 
--1.002737, 10.314148, 5.254678, 	0.000000, -0.844213, 	-0.550065, 0.824042, 0.135588, 
--1.002737, 10.200031, 10.206976, 	0.000000, -1.184038, 	-0.545898, 0.826469, -0.137636, 
--1.002737, 10.024443, 7.827566, 	0.000000, -1.018373, 	-0.552727, 0.833125, 0.019881, 
--1.336982, 9.384014, 7.968127, 	0.500000, -1.016250, 	-0.999385, -0.034959, -0.002597, 
--1.336982, 9.384014, 7.968127, 	0.500000, -1.016250, 	-0.999385, -0.034959, -0.002597, 
--1.002737, 8.743584, 8.108688, 	1.000000, -1.016250, 	-0.522039, -0.852900, 0.006099, 
--1.002737, 9.003599, 10.604042, 	1.000000, -1.184038, 	-0.512969, -0.841946, 0.167304, 
--1.002737, 9.003599, 10.604042, 	1.000000, -1.184038, 	-0.512969, -0.841946, 0.167304, 
--1.002737, 9.694744, 12.910284, 	1.000000, -1.349954, 	-0.500990, -0.803388, 0.321833, 
--1.336982, 10.239292, 12.641662, 	0.500000, -1.349954, 	-0.999218, -0.036495, 0.015192, 
--1.336982, 10.239292, 12.641662, 	0.500000, -1.349954, 	-0.999218, -0.036495, 0.015192, 
--1.002737, 10.783842, 12.373039, 	0.000000, -1.349704, 	-0.535040, 0.792292, -0.293266, 
--1.002737, 10.200031, 10.206976, 	0.000000, -1.184038, 	-0.545898, 0.826469, -0.137636, 
--1.002737, 11.718807, 14.305887, 	0.000000, -1.516370, 	-0.524951, 0.731928, -0.434405, 
--1.002737, 10.783842, 12.373039, 	0.000000, -1.349704, 	-0.535040, 0.792292, -0.293266, 
--1.336982, 10.239292, 12.641662, 	0.500000, -1.349954, 	-0.999218, -0.036495, 0.015192, 
--1.336982, 10.239292, 12.641662, 	0.500000, -1.349954, 	-0.999218, -0.036495, 0.015192, 
--1.002737, 9.694744, 12.910284, 	1.000000, -1.349954, 	-0.500990, -0.803388, 0.321833, 
--1.002737, 10.760361, 14.994465, 	1.000000, -1.516370, 	-0.490912, -0.740187, 0.459488, 
--1.002737, 10.760361, 14.994465, 	1.000000, -1.516370, 	-0.490912, -0.740187, 0.459488, 
--1.002737, 12.090717, 16.772659, 	1.000000, -1.679268, 	-0.484165, -0.653669, 0.581636, 
--1.336982, 12.495934, 16.355419, 	0.500000, -1.679268, 	-0.999037, -0.033130, 0.028753, 
--1.336982, 12.495934, 16.355419, 	0.500000, -1.679268, 	-0.999037, -0.033130, 0.028753, 
--1.002737, 12.901150, 15.938179, 	0.000000, -1.683037, 	-0.520176, 0.645820, -0.558867, 
--1.002737, 11.718807, 14.305887, 	0.000000, -1.516370, 	-0.524951, 0.731928, -0.434405, 
--1.002737, 14.227100, 17.202572, 	0.000000, -1.834628, 	-0.519663, 0.527798, -0.671848, 
--1.002737, 12.901150, 15.938179, 	0.000000, -1.683037, 	-0.520176, 0.645820, -0.558867, 
--1.336982, 12.495934, 16.355419, 	0.500000, -1.679268, 	-0.999037, -0.033130, 0.028753, 
--1.336982, 12.495934, 16.355419, 	0.500000, -1.679268, 	-0.999037, -0.033130, 0.028753, 
--1.002737, 12.090717, 16.772659, 	1.000000, -1.679268, 	-0.484165, -0.653669, 0.581636, 
--1.002737, 13.576077, 18.160946, 	1.000000, -1.834628, 	-0.481336, -0.535363, 0.694048, 
--1.002737, 13.576077, 18.160946, 	1.000000, -1.834628, 	-0.481336, -0.535363, 0.694048, 
--1.002737, 15.212280, 19.181923, 	1.000000, -1.988039, 	-0.480827, -0.389724, 0.785443, 
--1.336982, 15.450417, 18.654261, 	0.500000, -1.988039, 	-0.998886, -0.021466, 0.042031, 
--1.336982, 15.450417, 18.654261, 	0.500000, -1.988039, 	-0.998886, -0.021466, 0.042031, 
--1.002737, 15.688553, 18.126600, 	0.000000, -1.986219, 	-0.519424, 0.384311, -0.763219, 
--1.002737, 14.227100, 17.202572, 	0.000000, -1.834628, 	-0.519663, 0.527798, -0.671848, 
--1.002737, 17.277420, 18.737804, 	0.000000, -2.145087, 	-0.519855, 0.222506, -0.824768, 
--1.002737, 15.688553, 18.126600, 	0.000000, -1.986219, 	-0.519424, 0.384311, -0.763219, 
--1.336982, 15.450417, 18.654261, 	0.500000, -1.988039, 	-0.998886, -0.021466, 0.042031, 
--1.336982, 15.450417, 18.654261, 	0.500000, -1.988039, 	-0.998886, -0.021466, 0.042031, 
--1.002737, 15.212280, 19.181923, 	1.000000, -1.988039, 	-0.480827, -0.389724, 0.785443, 
--1.002737, 16.995155, 19.858189, 	1.000000, -2.145087, 	-0.479530, -0.225145, 0.848151, 
--1.002737, 16.995155, 19.858189, 	1.000000, -2.145087, 	-0.479530, -0.225145, 0.848151, 
--1.002737, 18.890533, 20.158619, 	1.000000, -2.305904, 	-0.477686, -0.044014, 0.877427, 
--1.336982, 18.926823, 19.584188, 	0.500000, -2.305904, 	-0.998704, -0.001978, 0.050855, 
--1.336982, 18.926823, 19.584188, 	0.500000, -2.305904, 	-0.998704, -0.001978, 0.050855, 
--1.002737, 18.963112, 19.009758, 	0.000000, -2.303954, 	-0.519106, 0.044200, -0.853567, 
--1.002737, 17.277420, 18.737804, 	0.000000, -2.145087, 	-0.519855, 0.222506, -0.824768, 
--1.002737, 20.715042, 18.916035, 	0.000000, -2.470621, 	-0.518180, -0.147145, -0.842519, 
--1.002737, 18.963112, 19.009758, 	0.000000, -2.303954, 	-0.519106, 0.044200, -0.853567, 
--1.336982, 18.926823, 19.584188, 	0.500000, -2.305904, 	-0.998704, -0.001978, 0.050855, 
--1.336982, 18.926823, 19.584188, 	0.500000, -2.305904, 	-0.998704, -0.001978, 0.050855, 
--1.002737, 18.890533, 20.158619, 	1.000000, -2.305904, 	-0.477686, -0.044014, 0.877427, 
--1.002737, 20.864250, 20.052088, 	1.000000, -2.470621, 	-0.474232, 0.150976, 0.867358, 
--1.002737, 20.864250, 20.052088, 	1.000000, -2.470621, 	-0.474232, 0.150976, 0.867358, 
--1.002737, 22.911228, 19.457972, 	1.000000, -2.646001, 	-0.471248, 0.342725, 0.812690, 
--1.336982, 22.719658, 18.922981, 	0.500000, -2.646001, 	-0.998523, 0.022590, 0.049420, 
--1.336982, 22.719658, 18.922981, 	0.500000, -2.646001, 	-0.998523, 0.022590, 0.049420, 
--1.002737, 22.528088, 18.387989, 	0.000000, -2.637287, 	-0.514483, -0.334572, -0.789537, 
--1.002737, 20.715042, 18.916035, 	0.000000, -2.470621, 	-0.518180, -0.147145, -0.842519, 
--1.002737, 24.397125, 17.356983, 	0.000000, -2.838810, 	-0.512162, -0.495528, -0.701529, 
--1.002737, 22.528088, 18.387989, 	0.000000, -2.637287, 	-0.514483, -0.334572, -0.789537, 
--1.336982, 22.719658, 18.922981, 	0.500000, -2.646001, 	-0.998523, 0.022590, 0.049420, 
--1.336982, 22.719658, 18.922981, 	0.500000, -2.646001, 	-0.998523, 0.022590, 0.049420, 
--1.002737, 22.911228, 19.457972, 	1.000000, -2.646001, 	-0.471248, 0.342725, 0.812690, 
--1.002737, 25.026405, 18.295650, 	1.000000, -2.838810, 	-0.470077, 0.507995, 0.721781, 
--1.002737, 25.026405, 18.295650, 	1.000000, -2.838810, 	-0.470077, 0.507995, 0.721781, 
--1.002737, 26.982025, 16.592329, 	1.000000, -3.038383, 	-0.470672, 0.656259, 0.589739, 
--1.336982, 26.551086, 16.221825, 	0.500000, -3.038383, 	-0.998387, 0.041476, 0.038776, 
--1.336982, 26.551086, 16.221825, 	0.500000, -3.038383, 	-0.998387, 0.041476, 0.038776, 
--1.002737, 26.120163, 15.851318, 	0.000000, -3.040334, 	-0.515999, -0.637877, -0.571716, 
--1.002737, 24.397125, 17.356983, 	0.000000, -2.838810, 	-0.512162, -0.495528, -0.701529, 
--1.002737, 27.495193, 13.899298, 	0.000000, -3.234054, 	-0.529173, -0.759785, -0.377761, 
--1.002737, 26.120163, 15.851318, 	0.000000, -3.040334, 	-0.515999, -0.637877, -0.571716, 
--1.336982, 26.551086, 16.221825, 	0.500000, -3.038383, 	-0.998387, 0.041476, 0.038776, 
--1.336982, 26.551086, 16.221825, 	0.500000, -3.038383, 	-0.998387, 0.041476, 0.038776, 
--1.002737, 26.982025, 16.592329, 	1.000000, -3.038383, 	-0.470672, 0.656259, 0.589739, 
--1.002737, 28.550339, 14.375221, 	1.000000, -3.234054, 	-0.475606, 0.784875, 0.397203, 
--1.002737, 28.550339, 14.375221, 	1.000000, -3.234054, 	-0.475606, 0.784875, 0.397203, 
--1.002737, 29.425041, 11.768046, 	1.000000, -3.421010, 	-0.486094, 0.865825, 0.118573, 
--1.336982, 28.829937, 11.681159, 	0.500000, -3.421010, 	-0.997287, 0.072725, 0.011376, 
--1.336982, 28.829937, 11.681159, 	0.500000, -3.421010, 	-0.997287, 0.072725, 0.011376, 
--1.002737, 28.234837, 11.594271, 	0.000000, -3.427773, 	-0.549861, -0.829859, -0.094800, 
--1.002737, 27.495193, 13.899298, 	0.000000, -3.234054, 	-0.529173, -0.759785, -0.377761, 
--1.002737, 28.051701, 9.029581, 	0.000000, -3.594440, 	-0.552394, -0.818572, 0.157487, 
--1.002737, 28.234837, 11.594271, 	0.000000, -3.427773, 	-0.549861, -0.829859, -0.094800, 
--1.336982, 28.829937, 11.681159, 	0.500000, -3.421010, 	-0.997287, 0.072725, 0.011376, 
--1.336982, 28.829937, 11.681159, 	0.500000, -3.421010, 	-0.997287, 0.072725, 0.011376, 
--1.002737, 29.425041, 11.768046, 	1.000000, -3.421010, 	-0.486094, 0.865825, 0.118573, 
--1.002737, 29.299828, 8.894522, 	1.000000, -3.594440, 	-0.508085, 0.850361, -0.136877, 
--1.002737, 29.299828, 8.894522, 	1.000000, -3.594440, 	-0.508085, 0.850361, -0.136877, 
--1.002737, 28.522129, 6.172330, 	1.000000, -3.741287, 	-0.527924, 0.793569, -0.302563, 
--1.336982, 27.897224, 6.377859, 	0.500000, -3.741288, 	-0.999306, 0.035287, -0.011950, 
--1.336982, 27.897224, 6.377859, 	0.500000, -3.741288, 	-0.999306, 0.035287, -0.011950, 
--1.002737, 27.272324, 6.583387, 	0.000000, -3.761107, 	-0.563170, -0.762896, 0.317537, 
--1.002737, 28.051701, 9.029581, 	0.000000, -3.594440, 	-0.552394, -0.818572, 0.157487, 
--1.002737, 26.223228, 4.633848, 	0.000000, -3.848496, 	-0.571231, -0.699650, 0.429169, 
--1.002737, 27.272324, 6.583387, 	0.000000, -3.761107, 	-0.563170, -0.762896, 0.317537, 
--1.336982, 27.897224, 6.377859, 	0.500000, -3.741288, 	-0.999306, 0.035287, -0.011950, 
--1.336982, 27.897224, 6.377859, 	0.500000, -3.741288, 	-0.999306, 0.035287, -0.011950, 
--1.002737, 28.522129, 6.172330, 	1.000000, -3.741287, 	-0.527924, 0.793569, -0.302563, 
--1.002737, 27.439381, 4.019153, 	1.000000, -3.848496, 	-0.545786, 0.725589, -0.419091, 
--1.002737, 27.439381, 4.019153, 	1.000000, -3.848496, 	-0.545786, 0.725589, -0.419091, 
--1.002737, 26.363422, 2.436586, 	1.020833, -3.882167, 	-0.561369, 0.675750, -0.477732, 
--1.336982, 25.778152, 2.814326, 	0.583333, -3.762508, 	-0.999924, 0.011227, -0.005182, 
--1.336982, 25.778152, 2.814326, 	0.583333, -3.762508, 	-0.999924, 0.011227, -0.005182, 
--1.002737, 25.192875, 3.192066, 	0.000000, -3.935886, 	-0.573805, -0.657830, 0.487860, 
--1.002737, 26.223228, 4.633848, 	0.000000, -3.848496, 	-0.571231, -0.699650, 0.429169, 
--1.002737, 24.600067, 1.327282, 	1.166667, -2.723639, 	-0.595697, -0.491752, -0.635079, 
--0.742768, 24.296909, 1.783397, 	1.333333, -1.447277, 	-0.428917, -0.894621, -0.125234, 
--1.002737, 24.469711, 2.269146, 	0.666667, -2.691582, 	-0.583534, -0.710408, 0.393458, 
--1.002737, 24.469711, 2.269146, 	0.666667, -2.691582, 	-0.583534, -0.710408, 0.393458, 
--1.002737, 25.192875, 3.192066, 	0.000000, -3.935886, 	-0.573805, -0.657830, 0.487860, 
--1.336982, 25.778152, 2.814326, 	0.583333, -3.762508, 	-0.999924, 0.011227, -0.005182, 
--1.336982, 25.778152, 2.814326, 	0.583333, -3.762508, 	-0.999924, 0.011227, -0.005182, 
--1.002737, 26.363422, 2.436586, 	1.020833, -3.882167, 	-0.561369, 0.675750, -0.477732, 
--1.002737, 25.606094, 1.426226, 	1.083333, -3.808398, 	-0.572183, 0.564519, -0.594916, 
--1.002737, 25.606094, 1.426226, 	1.083333, -3.808398, 	-0.572183, 0.564519, -0.594916, 
--0.742768, 25.130249, 1.141007, 	1.000000, -4.000000, 	-0.424007, 0.088516, -0.901323, 
--1.002737, 24.600067, 1.327282, 	1.166667, -2.723639, 	-0.595697, -0.491752, -0.635079, 
-1.002737, 3.502487, -29.476650, 	2.000000, 0.966243, 	0.570521, -0.819696, 0.051023, 
-1.002737, 3.589725, -28.074989, 	2.000000, 0.922656, 	0.569426, -0.818637, 0.074745, 
-0.000000, 3.355162, -28.055641, 	1.500000, 0.922656, 	-0.000000, -0.995829, 0.091245, 
-0.000000, 3.355162, -28.055641, 	1.500000, 0.922656, 	-0.000000, -0.995829, 0.091245, 
--1.002737, 3.589727, -28.074986, 	1.000000, 0.922656, 	-0.569426, -0.818637, 0.074745, 
--1.002737, 3.502487, -29.476650, 	1.000000, 0.966243, 	-0.570521, -0.819696, 0.051023, 
--1.002737, 3.807196, -26.139326, 	1.000000, 0.859409, 	-0.566467, -0.814177, 0.127399, 
--1.002737, 3.589727, -28.074986, 	1.000000, 0.922656, 	-0.569426, -0.818637, 0.074745, 
-0.000000, 3.355162, -28.055641, 	1.500000, 0.922656, 	-0.000000, -0.995829, 0.091245, 
-0.000000, 3.355162, -28.055641, 	1.500000, 0.922656, 	-0.000000, -0.995829, 0.091245, 
-1.002737, 3.589725, -28.074989, 	2.000000, 0.922656, 	0.569426, -0.818637, 0.074745, 
-1.002737, 3.807196, -26.139326, 	2.000000, 0.859409, 	0.566467, -0.814178, 0.127399, 
-1.002737, 3.807196, -26.139326, 	2.000000, 0.859409, 	0.566467, -0.814178, 0.127399, 
-1.002737, 4.261988, -23.779171, 	2.000000, 0.775297, 	0.564634, -0.800896, 0.199384, 
-0.000000, 4.032219, -23.733923, 	1.500000, 0.775297, 	0.000000, -0.970479, 0.241185, 
-0.000000, 4.032219, -23.733923, 	1.500000, 0.775297, 	0.000000, -0.970479, 0.241185, 
--1.002737, 4.261988, -23.779169, 	1.000000, 0.775297, 	-0.564634, -0.800896, 0.199384, 
--1.002737, 3.807196, -26.139326, 	1.000000, 0.859409, 	-0.566467, -0.814177, 0.127399, 
--1.002737, 5.061195, -21.104027, 	1.000000, 0.669113, 	-0.566458, -0.779905, 0.266220, 
--1.002737, 4.261988, -23.779169, 	1.000000, 0.775297, 	-0.564634, -0.800896, 0.199384, 
-0.000000, 4.032219, -23.733923, 	1.500000, 0.775297, 	0.000000, -0.970479, 0.241185, 
-0.000000, 4.032219, -23.733923, 	1.500000, 0.775297, 	0.000000, -0.970479, 0.241185, 
-1.002737, 4.261988, -23.779171, 	2.000000, 0.775297, 	0.564634, -0.800896, 0.199384, 
-1.002737, 5.061195, -21.104025, 	2.000000, 0.669113, 	0.566458, -0.779905, 0.266220, 
-1.002737, 5.061195, -21.104025, 	2.000000, 0.669113, 	0.566458, -0.779905, 0.266220, 
-1.002737, 6.120935, -18.335461, 	2.000000, 0.547971, 	0.566613, -0.758528, 0.321845, 
-0.000000, 5.893641, -18.274008, 	1.500000, 0.547971, 	-0.000000, -0.920850, 0.389917, 
-0.000000, 5.893641, -18.274008, 	1.500000, 0.547971, 	-0.000000, -0.920850, 0.389917, 
--1.002737, 6.120935, -18.335461, 	1.000000, 0.547971, 	-0.566613, -0.758528, 0.321845, 
--1.002737, 5.061195, -21.104027, 	1.000000, 0.669113, 	-0.566458, -0.779905, 0.266220, 
--1.002737, 7.357327, -15.695049, 	1.000000, 0.418984, 	-0.568348, -0.740553, 0.358555, 
--1.002737, 6.120935, -18.335461, 	1.000000, 0.547971, 	-0.566613, -0.758528, 0.321845, 
-0.000000, 5.893641, -18.274008, 	1.500000, 0.547971, 	-0.000000, -0.920850, 0.389917, 
-0.000000, 5.893641, -18.274008, 	1.500000, 0.547971, 	-0.000000, -0.920850, 0.389917, 
-1.002737, 6.120935, -18.335461, 	2.000000, 0.547971, 	0.566613, -0.758528, 0.321845, 
-1.002737, 7.357327, -15.695049, 	2.000000, 0.418984, 	0.568348, -0.740553, 0.358555, 
-1.002737, 7.357327, -15.695049, 	2.000000, 0.418984, 	0.568348, -0.740553, 0.358555, 
-1.002737, 8.627859, -13.158705, 	2.000000, 0.282904, 	0.571429, -0.737705, 0.359528, 
-0.000000, 8.398937, -13.100854, 	1.500000, 0.282904, 	0.000000, -0.898731, 0.438502, 
-0.000000, 8.398937, -13.100854, 	1.500000, 0.282904, 	0.000000, -0.898731, 0.438502, 
--1.002737, 8.627859, -13.158705, 	1.000000, 0.282904, 	-0.571429, -0.737705, 0.359528, 
--1.002737, 7.357327, -15.695049, 	1.000000, 0.418984, 	-0.568348, -0.740553, 0.358555, 
--1.002737, 9.790028, -10.702334, 	1.000000, 0.140482, 	-0.576949, -0.747604, 0.328966, 
--1.002737, 8.627859, -13.158705, 	1.000000, 0.282904, 	-0.571429, -0.737705, 0.359528, 
-0.000000, 8.398937, -13.100854, 	1.500000, 0.282904, 	0.000000, -0.898731, 0.438502, 
-0.000000, 8.398937, -13.100854, 	1.500000, 0.282904, 	0.000000, -0.898731, 0.438502, 
-1.002737, 8.627859, -13.158705, 	2.000000, 0.282904, 	0.571429, -0.737705, 0.359528, 
-1.002737, 9.790028, -10.702334, 	2.000000, 0.140482, 	0.576977, -0.747533, 0.329077, 
-1.002737, 9.790028, -10.702334, 	2.000000, 0.140482, 	0.576977, -0.747533, 0.329077, 
-1.002127, 10.657795, -8.543959, 	2.000000, 0.010562, 	0.588607, -0.767452, 0.254084, 
--0.000610, 10.425087, -8.501664, 	1.500000, 0.010562, 	0.000044, -0.949091, 0.315003, 
--0.000610, 10.425087, -8.501664, 	1.500000, 0.010562, 	0.000044, -0.949091, 0.315003, 
--1.003346, 10.657795, -8.543959, 	1.020833, -0.009381, 	-0.588551, -0.767718, 0.253411, 
--1.002737, 9.790028, -10.702334, 	1.000000, 0.140482, 	-0.576949, -0.747604, 0.328966, 
--1.005175, 11.045135, -6.901599, 	1.083333, -0.167786, 	-0.591577, -0.797310, 0.119726, 
--1.003346, 10.657795, -8.543959, 	1.020833, -0.009381, 	-0.588551, -0.767718, 0.253411, 
--0.000610, 10.425087, -8.501664, 	1.500000, 0.010562, 	0.000044, -0.949091, 0.315003, 
--0.000610, 10.425087, -8.501664, 	1.500000, 0.010562, 	0.000044, -0.949091, 0.315003, 
-1.002127, 10.657795, -8.543959, 	2.000000, 0.010562, 	0.588607, -0.767452, 0.254084, 
-1.000299, 11.045135, -6.901599, 	2.000000, -0.088013, 	0.591516, -0.797171, 0.120947, 
-1.000299, 11.045135, -6.901599, 	2.000000, -0.088013, 	0.591516, -0.797171, 0.120947, 
-0.999079, 11.114811, -5.517140, 	2.000000, -0.170915, 	0.582792, -0.812607, -0.004817, 
--0.003657, 10.880220, -5.483850, 	1.500000, -0.170915, 	-0.000127, -0.999975, -0.007088, 
--0.003657, 10.880220, -5.483850, 	1.500000, -0.170915, 	-0.000127, -0.999975, -0.007088, 
--1.006394, 11.114811, -5.517140, 	1.000000, -0.170915, 	-0.583093, -0.812392, -0.004755, 
--1.005175, 11.045135, -6.901599, 	1.083333, -0.167786, 	-0.591577, -0.797310, 0.119726, 
--1.002737, 10.154959, -0.010050, 	1.000000, -0.503387, 	-0.554465, -0.809442, -0.193318, 
--1.003346, 10.729588, -2.409474, 	1.000000, -0.336720, 	-0.568927, -0.804482, -0.170679, 
--0.000610, 10.494156, -2.383091, 	1.500000, -0.336720, 	0.000040, -0.977947, -0.208854, 
--0.000610, 10.494156, -2.383091, 	1.500000, -0.336720, 	0.000040, -0.977947, -0.208854, 
-1.002127, 10.729588, -2.409474, 	2.000000, -0.336720, 	0.568931, -0.804350, -0.171283, 
-1.002737, 10.154957, -0.010050, 	2.000000, -0.503387, 	0.554487, -0.809403, -0.193422, 
-1.002737, 10.154957, -0.010050, 	2.000000, -0.503387, 	0.554487, -0.809403, -0.193422, 
-1.002737, 9.503082, 2.725576, 	2.000000, -0.671927, 	0.543427, -0.820485, -0.177458, 
-0.000000, 9.272461, 2.752070, 	1.500000, -0.671927, 	-0.000000, -0.977791, -0.209581, 
-0.000000, 9.272461, 2.752070, 	1.500000, -0.671927, 	-0.000000, -0.977791, -0.209581, 
--1.002737, 9.503082, 2.725576, 	1.000000, -0.671927, 	-0.543427, -0.820485, -0.177458, 
--1.002737, 10.154959, -0.010050, 	1.000000, -0.503387, 	-0.554465, -0.809442, -0.193318, 
--1.002737, 8.971350, 5.457178, 	1.000000, -0.844213, 	-0.532911, -0.837943, -0.117722, 
--1.002737, 9.503082, 2.725576, 	1.000000, -0.671927, 	-0.543427, -0.820485, -0.177458, 
-0.000000, 9.272461, 2.752070, 	1.500000, -0.671927, 	-0.000000, -0.977791, -0.209581, 
-0.000000, 9.272461, 2.752070, 	1.500000, -0.671927, 	-0.000000, -0.977791, -0.209581, 
-1.002737, 9.503082, 2.725576, 	2.000000, -0.671927, 	0.543427, -0.820485, -0.177458, 
-1.002737, 8.971350, 5.457179, 	2.000000, -0.844213, 	0.532911, -0.837943, -0.117722, 
-1.002737, 8.971350, 5.457179, 	2.000000, -0.844213, 	0.532911, -0.837943, -0.117722, 
-1.002737, 8.743584, 8.108689, 	2.000000, -1.016250, 	0.522039, -0.852900, 0.006099, 
-0.000000, 8.530107, 8.155542, 	1.500000, -1.016250, 	0.000000, -0.999937, 0.011225, 
-0.000000, 8.530107, 8.155542, 	1.500000, -1.016250, 	0.000000, -0.999937, 0.011225, 
--1.002737, 8.743584, 8.108688, 	1.000000, -1.016250, 	-0.522039, -0.852900, 0.006099, 
--1.002737, 8.971350, 5.457178, 	1.000000, -0.844213, 	-0.532911, -0.837943, -0.117722, 
--1.002737, 9.003599, 10.604042, 	1.000000, -1.184038, 	-0.512969, -0.841946, 0.167304, 
--1.002737, 8.743584, 8.108688, 	1.000000, -1.016250, 	-0.522039, -0.852900, 0.006099, 
-0.000000, 8.530107, 8.155542, 	1.500000, -1.016250, 	0.000000, -0.999937, 0.011225, 
-0.000000, 8.530107, 8.155542, 	1.500000, -1.016250, 	0.000000, -0.999937, 0.011225, 
-1.002737, 8.743584, 8.108689, 	2.000000, -1.016250, 	0.522039, -0.852900, 0.006099, 
-1.002737, 9.003599, 10.604041, 	2.000000, -1.184038, 	0.512969, -0.841946, 0.167304, 
-1.002737, 9.003599, 10.604041, 	2.000000, -1.184038, 	0.512969, -0.841946, 0.167304, 
-1.002737, 9.694744, 12.910284, 	2.000000, -1.349954, 	0.500990, -0.803388, 0.321833, 
-0.000000, 9.513226, 12.999825, 	1.500000, -1.349954, 	0.000000, -0.927387, 0.374104, 
-0.000000, 9.513226, 12.999825, 	1.500000, -1.349954, 	0.000000, -0.927387, 0.374104, 
--1.002737, 9.694744, 12.910284, 	1.000000, -1.349954, 	-0.500990, -0.803388, 0.321833, 
--1.002737, 9.003599, 10.604042, 	1.000000, -1.184038, 	-0.512969, -0.841946, 0.167304, 
--1.002737, 10.760361, 14.994465, 	1.000000, -1.516370, 	-0.490912, -0.740187, 0.459488, 
--1.002737, 9.694744, 12.910284, 	1.000000, -1.349954, 	-0.500990, -0.803388, 0.321833, 
-0.000000, 9.513226, 12.999825, 	1.500000, -1.349954, 	0.000000, -0.927387, 0.374104, 
-0.000000, 9.513226, 12.999825, 	1.500000, -1.349954, 	0.000000, -0.927387, 0.374104, 
-1.002737, 9.694744, 12.910284, 	2.000000, -1.349954, 	0.500990, -0.803388, 0.321833, 
-1.002737, 10.760361, 14.994465, 	2.000000, -1.516370, 	0.490912, -0.740187, 0.459488, 
-1.002737, 10.760361, 14.994465, 	2.000000, -1.516370, 	0.490912, -0.740187, 0.459488, 
-1.002737, 12.090717, 16.772659, 	2.000000, -1.679268, 	0.484165, -0.653669, 0.581636, 
-0.000000, 11.955647, 16.911739, 	1.500000, -1.679268, 	0.000000, -0.746148, 0.665780, 
-0.000000, 11.955647, 16.911739, 	1.500000, -1.679268, 	0.000000, -0.746148, 0.665780, 
--1.002737, 12.090717, 16.772659, 	1.000000, -1.679268, 	-0.484165, -0.653669, 0.581636, 
--1.002737, 10.760361, 14.994465, 	1.000000, -1.516370, 	-0.490912, -0.740187, 0.459488, 
--1.002737, 13.576077, 18.160946, 	1.000000, -1.834628, 	-0.481336, -0.535363, 0.694048, 
--1.002737, 12.090717, 16.772659, 	1.000000, -1.679268, 	-0.484165, -0.653669, 0.581636, 
-0.000000, 11.955647, 16.911739, 	1.500000, -1.679268, 	0.000000, -0.746148, 0.665780, 
-0.000000, 11.955647, 16.911739, 	1.500000, -1.679268, 	0.000000, -0.746148, 0.665780, 
-1.002737, 12.090717, 16.772659, 	2.000000, -1.679268, 	0.484165, -0.653669, 0.581636, 
-1.002737, 13.576080, 18.160946, 	2.000000, -1.834628, 	0.481336, -0.535363, 0.694048, 
-1.002737, 13.576080, 18.160946, 	2.000000, -1.834628, 	0.481336, -0.535363, 0.694048, 
-1.002737, 15.212280, 19.181923, 	2.000000, -1.988039, 	0.480828, -0.389724, 0.785442, 
-0.000000, 15.132900, 19.357809, 	1.500000, -1.988039, 	0.000001, -0.443892, 0.896080, 
-0.000000, 15.132900, 19.357809, 	1.500000, -1.988039, 	0.000001, -0.443892, 0.896080, 
--1.002737, 15.212280, 19.181923, 	1.000000, -1.988039, 	-0.480827, -0.389724, 0.785443, 
--1.002737, 13.576077, 18.160946, 	1.000000, -1.834628, 	-0.481336, -0.535363, 0.694048, 
--1.002737, 16.995155, 19.858189, 	1.000000, -2.145087, 	-0.479530, -0.225145, 0.848151, 
--1.002737, 15.212280, 19.181923, 	1.000000, -1.988039, 	-0.480827, -0.389724, 0.785443, 
-0.000000, 15.132900, 19.357809, 	1.500000, -1.988039, 	0.000001, -0.443892, 0.896080, 
-0.000000, 15.132900, 19.357809, 	1.500000, -1.988039, 	0.000001, -0.443892, 0.896080, 
-1.002737, 15.212280, 19.181923, 	2.000000, -1.988039, 	0.480828, -0.389724, 0.785442, 
-1.002737, 16.995155, 19.858189, 	2.000000, -2.145087, 	0.479530, -0.225145, 0.848151, 
-1.002737, 16.995155, 19.858189, 	2.000000, -2.145087, 	0.479530, -0.225145, 0.848151, 
-1.002737, 18.890533, 20.158619, 	2.000000, -2.305904, 	0.477686, -0.044014, 0.877427, 
-0.000000, 18.878441, 20.350098, 	1.500000, -2.305904, 	0.000000, -0.050074, 0.998746, 
-0.000000, 18.878441, 20.350098, 	1.500000, -2.305904, 	0.000000, -0.050074, 0.998746, 
--1.002737, 18.890533, 20.158619, 	1.000000, -2.305904, 	-0.477686, -0.044014, 0.877427, 
--1.002737, 16.995155, 19.858189, 	1.000000, -2.145087, 	-0.479530, -0.225145, 0.848151, 
--1.002737, 20.864250, 20.052088, 	1.000000, -2.470621, 	-0.474232, 0.150976, 0.867358, 
--1.002737, 18.890533, 20.158619, 	1.000000, -2.305904, 	-0.477686, -0.044014, 0.877427, 
-0.000000, 18.878441, 20.350098, 	1.500000, -2.305904, 	0.000000, -0.050074, 0.998746, 
-0.000000, 18.878441, 20.350098, 	1.500000, -2.305904, 	0.000000, -0.050074, 0.998746, 
-1.002737, 18.890533, 20.158619, 	2.000000, -2.305904, 	0.477686, -0.044014, 0.877427, 
-1.002737, 20.864250, 20.052088, 	2.000000, -2.470621, 	0.474231, 0.150976, 0.867359, 
-1.002737, 20.864250, 20.052088, 	2.000000, -2.470621, 	0.474231, 0.150976, 0.867359, 
-1.002737, 22.911228, 19.457972, 	2.000000, -2.646001, 	0.471248, 0.342725, 0.812690, 
-0.000000, 22.975082, 19.636301, 	1.500000, -2.646001, 	0.000000, 0.388135, 0.921603, 
-0.000000, 22.975082, 19.636301, 	1.500000, -2.646001, 	0.000000, 0.388135, 0.921603, 
--1.002737, 22.911228, 19.457972, 	1.000000, -2.646001, 	-0.471248, 0.342725, 0.812690, 
--1.002737, 20.864250, 20.052088, 	1.000000, -2.470621, 	-0.474232, 0.150976, 0.867358, 
--1.002737, 25.026405, 18.295650, 	1.000000, -2.838810, 	-0.470077, 0.507995, 0.721781, 
--1.002737, 22.911228, 19.457972, 	1.000000, -2.646001, 	-0.471248, 0.342725, 0.812690, 
-0.000000, 22.975082, 19.636301, 	1.500000, -2.646001, 	0.000000, 0.388135, 0.921603, 
-0.000000, 22.975082, 19.636301, 	1.500000, -2.646001, 	0.000000, 0.388135, 0.921603, 
-1.002737, 22.911228, 19.457972, 	2.000000, -2.646001, 	0.471248, 0.342725, 0.812690, 
-1.002737, 25.026405, 18.295650, 	2.000000, -2.838810, 	0.470077, 0.507995, 0.721781, 
-1.002737, 25.026405, 18.295650, 	2.000000, -2.838810, 	0.470077, 0.507995, 0.721781, 
-1.002737, 26.982021, 16.592329, 	2.000000, -3.038383, 	0.470672, 0.656258, 0.589740, 
-0.000000, 27.125668, 16.715830, 	1.500000, -3.038383, 	0.000001, 0.743876, 0.668318, 
-0.000000, 27.125668, 16.715830, 	1.500000, -3.038383, 	0.000001, 0.743876, 0.668318, 
--1.002737, 26.982025, 16.592329, 	1.000000, -3.038383, 	-0.470672, 0.656259, 0.589739, 
--1.002737, 25.026405, 18.295650, 	1.000000, -2.838810, 	-0.470077, 0.507995, 0.721781, 
--1.002737, 28.550339, 14.375221, 	1.000000, -3.234054, 	-0.475606, 0.784875, 0.397203, 
--1.002737, 26.982025, 16.592329, 	1.000000, -3.038383, 	-0.470672, 0.656259, 0.589739, 
-0.000000, 27.125668, 16.715830, 	1.500000, -3.038383, 	0.000001, 0.743876, 0.668318, 
-0.000000, 27.125668, 16.715830, 	1.500000, -3.038383, 	0.000001, 0.743876, 0.668318, 
-1.002737, 26.982021, 16.592329, 	2.000000, -3.038383, 	0.470672, 0.656258, 0.589740, 
-1.002737, 28.550339, 14.375221, 	2.000000, -3.234054, 	0.475606, 0.784875, 0.397204, 
-1.002737, 28.550339, 14.375221, 	2.000000, -3.234054, 	0.475606, 0.784875, 0.397204, 
-1.002737, 29.425041, 11.768046, 	2.000000, -3.421010, 	0.486093, 0.865826, 0.118573, 
-0.000000, 29.623409, 11.797009, 	1.500000, -3.421010, 	0.000000, 0.990552, 0.137137, 
-0.000000, 29.623409, 11.797009, 	1.500000, -3.421010, 	0.000000, 0.990552, 0.137137, 
--1.002737, 29.425041, 11.768046, 	1.000000, -3.421010, 	-0.486094, 0.865825, 0.118573, 
--1.002737, 28.550339, 14.375221, 	1.000000, -3.234054, 	-0.475606, 0.784875, 0.397203, 
--1.002737, 29.299828, 8.894522, 	1.000000, -3.594440, 	-0.508085, 0.850361, -0.136877, 
--1.002737, 29.425041, 11.768046, 	1.000000, -3.421010, 	-0.486094, 0.865825, 0.118573, 
-0.000000, 29.623409, 11.797009, 	1.500000, -3.421010, 	0.000000, 0.990552, 0.137137, 
-0.000000, 29.623409, 11.797009, 	1.500000, -3.421010, 	0.000000, 0.990552, 0.137137, 
-1.002737, 29.425041, 11.768046, 	2.000000, -3.421010, 	0.486093, 0.865826, 0.118573, 
-1.002737, 29.299828, 8.894522, 	2.000000, -3.594440, 	0.508084, 0.850362, -0.136877, 
-1.002737, 29.299828, 8.894522, 	2.000000, -3.594440, 	0.508084, 0.850362, -0.136877, 
-1.002737, 28.522129, 6.172330, 	2.000000, -3.741287, 	0.527923, 0.793569, -0.302564, 
-0.000000, 28.730427, 6.103821, 	1.500000, -3.741288, 	0.000000, 0.935308, -0.353834, 
-0.000000, 28.730427, 6.103821, 	1.500000, -3.741288, 	0.000000, 0.935308, -0.353834, 
--1.002737, 28.522129, 6.172330, 	1.000000, -3.741287, 	-0.527924, 0.793569, -0.302563, 
--1.002737, 29.299828, 8.894522, 	1.000000, -3.594440, 	-0.508085, 0.850361, -0.136877, 
--1.002737, 27.439381, 4.019153, 	1.000000, -3.848496, 	-0.545786, 0.725589, -0.419091, 
--1.002737, 28.522129, 6.172330, 	1.000000, -3.741287, 	-0.527924, 0.793569, -0.302563, 
-0.000000, 28.730427, 6.103821, 	1.500000, -3.741288, 	0.000000, 0.935308, -0.353834, 
-0.000000, 28.730427, 6.103821, 	1.500000, -3.741288, 	0.000000, 0.935308, -0.353834, 
-1.002737, 28.522129, 6.172330, 	2.000000, -3.741287, 	0.527923, 0.793569, -0.302564, 
-1.002737, 27.439377, 4.019153, 	2.000000, -3.848496, 	0.545786, 0.725589, -0.419091, 
-1.002737, 27.439377, 4.019153, 	2.000000, -3.848496, 	0.545786, 0.725589, -0.419091, 
-1.002737, 26.363422, 2.436586, 	2.000000, -3.922053, 	0.561369, 0.675750, -0.477732, 
-0.000000, 26.558514, 2.310673, 	1.500000, -3.922053, 	0.000001, 0.817607, -0.575776, 
-0.000000, 26.558514, 2.310673, 	1.500000, -3.922053, 	0.000001, 0.817607, -0.575776, 
--1.002737, 26.363422, 2.436586, 	1.020833, -3.882167, 	-0.561369, 0.675750, -0.477732, 
--1.002737, 27.439381, 4.019153, 	1.000000, -3.848496, 	-0.545786, 0.725589, -0.419091, 
-0.000000, 25.158775, 0.885566, 	1.500000, -4.000000, 	0.000000, 0.098978, -0.995090, 
--0.742768, 25.130249, 1.141007, 	1.000000, -4.000000, 	-0.424007, 0.088516, -0.901323, 
--1.002737, 25.606094, 1.426226, 	1.083333, -3.808398, 	-0.572183, 0.564519, -0.594916, 
--1.002737, 25.606094, 1.426226, 	1.083333, -3.808398, 	-0.572183, 0.564519, -0.594916, 
--1.002737, 26.363422, 2.436586, 	1.020833, -3.882167, 	-0.561369, 0.675750, -0.477732, 
-0.000000, 26.558514, 2.310673, 	1.500000, -3.922053, 	0.000001, 0.817607, -0.575776, 
-0.000000, 26.558514, 2.310673, 	1.500000, -3.922053, 	0.000001, 0.817607, -0.575776, 
-1.002737, 26.363422, 2.436586, 	2.000000, -3.922053, 	0.561369, 0.675750, -0.477732, 
-1.002737, 25.606094, 1.426226, 	2.000000, -3.967943, 	0.572183, 0.564519, -0.594916, 
-1.002737, 25.606094, 1.426226, 	2.000000, -3.967943, 	0.572183, 0.564519, -0.594916, 
-0.742768, 25.130249, 1.141007, 	2.000000, -4.000000, 	0.424007, 0.088516, -0.901323, 
-0.000000, 25.158775, 0.885566, 	1.500000, -4.000000, 	0.000000, 0.098978, -0.995090, 
-1.002737, 4.921762, -29.530731, 	3.000000, 0.966243, 	0.582240, 0.811733, -0.045667, 
-1.002737, 4.997122, -28.191074, 	3.000000, 0.922656, 	0.582175, 0.810004, -0.070467, 
-1.336982, 4.293425, -28.133030, 	2.500000, 0.922656, 	0.999926, -0.012083, 0.001603, 
-1.336982, 4.293425, -28.133030, 	2.500000, 0.922656, 	0.999926, -0.012083, 0.001603, 
-1.002737, 3.589725, -28.074989, 	2.000000, 0.922656, 	0.569426, -0.818637, 0.074745, 
-1.002737, 3.502487, -29.476650, 	2.000000, 0.966243, 	0.570521, -0.819696, 0.051023, 
-1.002737, 3.807196, -26.139326, 	2.000000, 0.859409, 	0.566467, -0.814178, 0.127399, 
-1.002737, 3.589725, -28.074989, 	2.000000, 0.922656, 	0.569426, -0.818637, 0.074745, 
-1.336982, 4.293425, -28.133030, 	2.500000, 0.922656, 	0.999926, -0.012083, 0.001603, 
-1.336982, 4.293425, -28.133030, 	2.500000, 0.922656, 	0.999926, -0.012083, 0.001603, 
-1.002737, 4.997122, -28.191074, 	3.000000, 0.922656, 	0.582175, 0.810004, -0.070467, 
-1.002737, 5.199909, -26.333269, 	3.000000, 0.859409, 	0.582690, 0.803052, -0.124820, 
-1.002737, 5.199909, -26.333269, 	3.000000, 0.859409, 	0.582690, 0.803052, -0.124820, 
-1.002737, 5.640600, -24.050657, 	3.000000, 0.775297, 	0.583127, 0.787897, -0.197941, 
-1.336982, 4.951294, -23.914915, 	2.500000, 0.775297, 	0.999837, -0.017439, 0.004781, 
-1.336982, 4.951294, -23.914915, 	2.500000, 0.775297, 	0.999837, -0.017439, 0.004781, 
-1.002737, 4.261988, -23.779171, 	2.000000, 0.775297, 	0.564634, -0.800896, 0.199384, 
-1.002737, 3.807196, -26.139326, 	2.000000, 0.859409, 	0.566467, -0.814178, 0.127399, 
-1.002737, 5.061195, -21.104025, 	2.000000, 0.669113, 	0.566458, -0.779905, 0.266220, 
-1.002737, 4.261988, -23.779171, 	2.000000, 0.775297, 	0.564634, -0.800896, 0.199384, 
-1.336982, 4.951294, -23.914915, 	2.500000, 0.775297, 	0.999837, -0.017439, 0.004781, 
-1.336982, 4.951294, -23.914915, 	2.500000, 0.775297, 	0.999837, -0.017439, 0.004781, 
-1.002737, 5.640600, -24.050657, 	3.000000, 0.775297, 	0.583127, 0.787897, -0.197941, 
-1.002737, 6.429670, -21.436577, 	3.000000, 0.669113, 	0.579786, 0.770207, -0.265761, 
-1.002737, 6.429670, -21.436577, 	3.000000, 0.669113, 	0.579786, 0.770207, -0.265761, 
-1.002737, 7.484703, -18.704170, 	3.000000, 0.547971, 	0.576888, 0.751119, -0.320970, 
-1.336982, 6.802818, -18.519814, 	2.500000, 0.547971, 	0.999946, -0.009100, 0.005070, 
-1.336982, 6.802818, -18.519814, 	2.500000, 0.547971, 	0.999946, -0.009100, 0.005070, 
-1.002737, 6.120935, -18.335461, 	2.000000, 0.547971, 	0.566613, -0.758528, 0.321845, 
-1.002737, 5.061195, -21.104025, 	2.000000, 0.669113, 	0.566458, -0.779905, 0.266220, 
-1.002737, 7.357327, -15.695049, 	2.000000, 0.418984, 	0.568348, -0.740553, 0.358555, 
-1.002737, 6.120935, -18.335461, 	2.000000, 0.547971, 	0.566613, -0.758528, 0.321845, 
-1.336982, 6.802818, -18.519814, 	2.500000, 0.547971, 	0.999946, -0.009100, 0.005070, 
-1.336982, 6.802818, -18.519814, 	2.500000, 0.547971, 	0.999946, -0.009100, 0.005070, 
-1.002737, 7.484703, -18.704170, 	3.000000, 0.547971, 	0.576888, 0.751119, -0.320970, 
-1.002737, 8.723274, -16.066572, 	3.000000, 0.418984, 	0.570576, 0.739144, -0.357922, 
-1.002737, 8.723274, -16.066572, 	3.000000, 0.418984, 	0.570576, 0.739144, -0.357922, 
-1.002737, 10.001389, -13.505806, 	3.000000, 0.282904, 	0.565597, 0.742254, -0.359389, 
-1.336982, 9.314625, -13.332256, 	2.500000, 0.282904, 	0.999983, 0.005126, -0.002905, 
-1.336982, 9.314625, -13.332256, 	2.500000, 0.282904, 	0.999983, 0.005126, -0.002905, 
-1.002737, 8.627859, -13.158705, 	2.000000, 0.282904, 	0.571429, -0.737705, 0.359528, 
-1.002737, 7.357327, -15.695049, 	2.000000, 0.418984, 	0.568348, -0.740553, 0.358555, 
-1.002737, 9.790028, -10.702334, 	2.000000, 0.140482, 	0.576977, -0.747533, 0.329077, 
-1.002737, 8.627859, -13.158705, 	2.000000, 0.282904, 	0.571429, -0.737705, 0.359528, 
-1.336982, 9.314625, -13.332256, 	2.500000, 0.282904, 	0.999983, 0.005126, -0.002905, 
-1.336982, 9.314625, -13.332256, 	2.500000, 0.282904, 	0.999983, 0.005126, -0.002905, 
-1.002737, 10.001389, -13.505806, 	3.000000, 0.282904, 	0.565597, 0.742254, -0.359389, 
-1.002737, 11.175043, -11.003893, 	3.000000, 0.140482, 	0.562569, 0.757951, -0.330192, 
-1.002737, 11.175043, -11.003893, 	3.000000, 0.140482, 	0.562569, 0.757951, -0.330192, 
-1.002127, 12.054029, -8.797724, 	2.958333, -0.009381, 	0.560195, 0.787255, -0.257702, 
-1.336373, 11.355911, -8.670841, 	2.500000, 0.010562, 	0.999602, 0.026239, -0.010414, 
-1.336373, 11.355911, -8.670841, 	2.500000, 0.010562, 	0.999602, 0.026239, -0.010414, 
-1.002127, 10.657795, -8.543959, 	2.000000, 0.010562, 	0.588607, -0.767452, 0.254084, 
-1.002737, 9.790028, -10.702334, 	2.000000, 0.140482, 	0.576977, -0.747533, 0.329077, 
-1.333325, 11.818588, -5.617008, 	2.500000, -0.170915, 	0.999852, 0.017082, 0.001868, 
-0.999079, 11.114811, -5.517140, 	2.000000, -0.170915, 	0.582792, -0.812607, -0.004817, 
-1.000299, 11.045135, -6.901599, 	2.000000, -0.088013, 	0.591516, -0.797171, 0.120947, 
-1.000299, 11.045135, -6.901599, 	2.000000, -0.088013, 	0.591516, -0.797171, 0.120947, 
-1.002127, 10.657795, -8.543959, 	2.000000, 0.010562, 	0.588607, -0.767452, 0.254084, 
-1.336373, 11.355911, -8.670841, 	2.500000, 0.010562, 	0.999602, 0.026239, -0.010414, 
-1.336373, 11.355911, -8.670841, 	2.500000, 0.010562, 	0.999602, 0.026239, -0.010414, 
-1.002127, 12.054029, -8.797724, 	2.958333, -0.009381, 	0.560195, 0.787255, -0.257702, 
-1.000299, 12.448139, -7.124194, 	2.833333, -0.167786, 	0.564659, 0.816023, -0.123558, 
-1.000299, 12.448139, -7.124194, 	2.833333, -0.167786, 	0.564659, 0.816023, -0.123558, 
-0.999079, 12.522362, -5.716876, 	3.000000, -0.170915, 	0.565733, 0.824587, 0.001687, 
-1.333325, 11.818588, -5.617008, 	2.500000, -0.170915, 	0.999852, 0.017082, 0.001868, 
-1.002737, 10.154957, -0.010050, 	2.000000, -0.503387, 	0.554487, -0.809403, -0.193422, 
-1.002127, 10.729588, -2.409474, 	2.000000, -0.336720, 	0.568931, -0.804350, -0.171283, 
-1.336373, 11.435898, -2.488622, 	2.500000, -0.336720, 	0.999684, 0.024018, 0.007427, 
-1.336373, 11.435898, -2.488622, 	2.500000, -0.336720, 	0.999684, 0.024018, 0.007427, 
-1.002127, 12.142200, -2.567771, 	3.000000, -0.336720, 	0.545588, 0.819894, 0.173516, 
-1.002737, 11.560024, -0.158328, 	3.000000, -0.503387, 	0.548192, 0.812432, 0.198592, 
-1.002737, 11.560024, -0.158328, 	3.000000, -0.503387, 	0.548192, 0.812432, 0.198592, 
-1.002737, 10.886791, 2.566613, 	3.000000, -0.671927, 	0.549613, 0.814083, 0.187601, 
-1.336982, 10.194935, 2.646095, 	2.500000, -0.671927, 	0.999975, -0.006839, -0.001674, 
-1.336982, 10.194935, 2.646095, 	2.500000, -0.671927, 	0.999975, -0.006839, -0.001674, 
-1.002737, 9.503082, 2.725576, 	2.000000, -0.671927, 	0.543427, -0.820485, -0.177458, 
-1.002737, 10.154957, -0.010050, 	2.000000, -0.503387, 	0.554487, -0.809403, -0.193422, 
-1.002737, 8.971350, 5.457179, 	2.000000, -0.844213, 	0.532911, -0.837943, -0.117722, 
-1.002737, 9.503082, 2.725576, 	2.000000, -0.671927, 	0.543427, -0.820485, -0.177458, 
-1.336982, 10.194935, 2.646095, 	2.500000, -0.671927, 	0.999975, -0.006839, -0.001674, 
-1.336982, 10.194935, 2.646095, 	2.500000, -0.671927, 	0.999975, -0.006839, -0.001674, 
-1.002737, 10.886791, 2.566613, 	3.000000, -0.671927, 	0.549613, 0.814083, 0.187601, 
-1.002737, 10.314148, 5.254678, 	3.000000, -0.844213, 	0.550065, 0.824042, 0.135587, 
-1.002737, 10.314148, 5.254678, 	3.000000, -0.844213, 	0.550065, 0.824042, 0.135587, 
-1.002737, 10.024445, 7.827566, 	3.000000, -1.016250, 	0.552727, 0.833125, 0.019881, 
-1.336982, 9.384014, 7.968127, 	2.500000, -1.016250, 	0.999385, -0.034959, -0.002597, 
-1.336982, 9.384014, 7.968127, 	2.500000, -1.016250, 	0.999385, -0.034959, -0.002597, 
-1.002737, 8.743584, 8.108689, 	2.000000, -1.016250, 	0.522039, -0.852900, 0.006099, 
-1.002737, 8.971350, 5.457179, 	2.000000, -0.844213, 	0.532911, -0.837943, -0.117722, 
-1.002737, 9.003599, 10.604041, 	2.000000, -1.184038, 	0.512969, -0.841946, 0.167304, 
-1.002737, 8.743584, 8.108689, 	2.000000, -1.016250, 	0.522039, -0.852900, 0.006099, 
-1.336982, 9.384014, 7.968127, 	2.500000, -1.016250, 	0.999385, -0.034959, -0.002597, 
-1.336982, 9.384014, 7.968127, 	2.500000, -1.016250, 	0.999385, -0.034959, -0.002597, 
-1.002737, 10.024445, 7.827566, 	3.000000, -1.016250, 	0.552727, 0.833125, 0.019881, 
-1.002737, 10.200031, 10.206976, 	3.000000, -1.184038, 	0.545898, 0.826469, -0.137636, 
-1.002737, 10.200031, 10.206976, 	3.000000, -1.184038, 	0.545898, 0.826469, -0.137636, 
-1.002737, 10.783842, 12.373039, 	3.000000, -1.349954, 	0.535040, 0.792292, -0.293267, 
-1.336982, 10.239292, 12.641662, 	2.500000, -1.349954, 	0.999218, -0.036495, 0.015192, 
-1.336982, 10.239292, 12.641662, 	2.500000, -1.349954, 	0.999218, -0.036495, 0.015192, 
-1.002737, 9.694744, 12.910284, 	2.000000, -1.349954, 	0.500990, -0.803388, 0.321833, 
-1.002737, 9.003599, 10.604041, 	2.000000, -1.184038, 	0.512969, -0.841946, 0.167304, 
-1.002737, 10.760361, 14.994465, 	2.000000, -1.516370, 	0.490912, -0.740187, 0.459488, 
-1.002737, 9.694744, 12.910284, 	2.000000, -1.349954, 	0.500990, -0.803388, 0.321833, 
-1.336982, 10.239292, 12.641662, 	2.500000, -1.349954, 	0.999218, -0.036495, 0.015192, 
-1.336982, 10.239292, 12.641662, 	2.500000, -1.349954, 	0.999218, -0.036495, 0.015192, 
-1.002737, 10.783842, 12.373039, 	3.000000, -1.349954, 	0.535040, 0.792292, -0.293267, 
-1.002737, 11.718807, 14.305887, 	3.000000, -1.516370, 	0.524951, 0.731928, -0.434405, 
-1.002737, 11.718807, 14.305887, 	3.000000, -1.516370, 	0.524951, 0.731928, -0.434405, 
-1.002737, 12.901150, 15.938179, 	3.000000, -1.679268, 	0.520177, 0.645820, -0.558867, 
-1.336982, 12.495934, 16.355419, 	2.500000, -1.679268, 	0.999037, -0.033131, 0.028753, 
-1.336982, 12.495934, 16.355419, 	2.500000, -1.679268, 	0.999037, -0.033131, 0.028753, 
-1.002737, 12.090717, 16.772659, 	2.000000, -1.679268, 	0.484165, -0.653669, 0.581636, 
-1.002737, 10.760361, 14.994465, 	2.000000, -1.516370, 	0.490912, -0.740187, 0.459488, 
-1.002737, 13.576080, 18.160946, 	2.000000, -1.834628, 	0.481336, -0.535363, 0.694048, 
-1.002737, 12.090717, 16.772659, 	2.000000, -1.679268, 	0.484165, -0.653669, 0.581636, 
-1.336982, 12.495934, 16.355419, 	2.500000, -1.679268, 	0.999037, -0.033131, 0.028753, 
-1.336982, 12.495934, 16.355419, 	2.500000, -1.679268, 	0.999037, -0.033131, 0.028753, 
-1.002737, 12.901150, 15.938179, 	3.000000, -1.679268, 	0.520177, 0.645820, -0.558867, 
-1.002737, 14.227100, 17.202572, 	3.000000, -1.834628, 	0.519663, 0.527798, -0.671848, 
-1.002737, 14.227100, 17.202572, 	3.000000, -1.834628, 	0.519663, 0.527798, -0.671848, 
-1.002737, 15.688553, 18.126600, 	3.000000, -1.988039, 	0.519424, 0.384311, -0.763219, 
-1.336982, 15.450417, 18.654261, 	2.500000, -1.988039, 	0.998886, -0.021467, 0.042031, 
-1.336982, 15.450417, 18.654261, 	2.500000, -1.988039, 	0.998886, -0.021467, 0.042031, 
-1.002737, 15.212280, 19.181923, 	2.000000, -1.988039, 	0.480828, -0.389724, 0.785442, 
-1.002737, 13.576080, 18.160946, 	2.000000, -1.834628, 	0.481336, -0.535363, 0.694048, 
-1.002737, 16.995155, 19.858189, 	2.000000, -2.145087, 	0.479530, -0.225145, 0.848151, 
-1.002737, 15.212280, 19.181923, 	2.000000, -1.988039, 	0.480828, -0.389724, 0.785442, 
-1.336982, 15.450417, 18.654261, 	2.500000, -1.988039, 	0.998886, -0.021467, 0.042031, 
-1.336982, 15.450417, 18.654261, 	2.500000, -1.988039, 	0.998886, -0.021467, 0.042031, 
-1.002737, 15.688553, 18.126600, 	3.000000, -1.988039, 	0.519424, 0.384311, -0.763219, 
-1.002737, 17.277420, 18.737804, 	3.000000, -2.145087, 	0.519855, 0.222506, -0.824768, 
-1.002737, 17.277420, 18.737804, 	3.000000, -2.145087, 	0.519855, 0.222506, -0.824768, 
-1.002737, 18.963112, 19.009758, 	3.000000, -2.305904, 	0.519106, 0.044200, -0.853567, 
-1.336982, 18.926823, 19.584188, 	2.500000, -2.305904, 	0.998704, -0.001978, 0.050856, 
-1.336982, 18.926823, 19.584188, 	2.500000, -2.305904, 	0.998704, -0.001978, 0.050856, 
-1.002737, 18.890533, 20.158619, 	2.000000, -2.305904, 	0.477686, -0.044014, 0.877427, 
-1.002737, 16.995155, 19.858189, 	2.000000, -2.145087, 	0.479530, -0.225145, 0.848151, 
-1.002737, 20.864250, 20.052088, 	2.000000, -2.470621, 	0.474231, 0.150976, 0.867359, 
-1.002737, 18.890533, 20.158619, 	2.000000, -2.305904, 	0.477686, -0.044014, 0.877427, 
-1.336982, 18.926823, 19.584188, 	2.500000, -2.305904, 	0.998704, -0.001978, 0.050856, 
-1.336982, 18.926823, 19.584188, 	2.500000, -2.305904, 	0.998704, -0.001978, 0.050856, 
-1.002737, 18.963112, 19.009758, 	3.000000, -2.305904, 	0.519106, 0.044200, -0.853567, 
-1.002737, 20.715042, 18.916035, 	3.000000, -2.470621, 	0.518180, -0.147145, -0.842519, 
-1.002737, 20.715042, 18.916035, 	3.000000, -2.470621, 	0.518180, -0.147145, -0.842519, 
-1.002737, 22.528091, 18.387989, 	3.000000, -2.646001, 	0.514483, -0.334572, -0.789537, 
-1.336982, 22.719658, 18.922981, 	2.500000, -2.646001, 	0.998523, 0.022591, 0.049420, 
-1.336982, 22.719658, 18.922981, 	2.500000, -2.646001, 	0.998523, 0.022591, 0.049420, 
-1.002737, 22.911228, 19.457972, 	2.000000, -2.646001, 	0.471248, 0.342725, 0.812690, 
-1.002737, 20.864250, 20.052088, 	2.000000, -2.470621, 	0.474231, 0.150976, 0.867359, 
-1.002737, 25.026405, 18.295650, 	2.000000, -2.838810, 	0.470077, 0.507995, 0.721781, 
-1.002737, 22.911228, 19.457972, 	2.000000, -2.646001, 	0.471248, 0.342725, 0.812690, 
-1.336982, 22.719658, 18.922981, 	2.500000, -2.646001, 	0.998523, 0.022591, 0.049420, 
-1.336982, 22.719658, 18.922981, 	2.500000, -2.646001, 	0.998523, 0.022591, 0.049420, 
-1.002737, 22.528091, 18.387989, 	3.000000, -2.646001, 	0.514483, -0.334572, -0.789537, 
-1.002737, 24.397125, 17.356983, 	3.000000, -2.838810, 	0.512162, -0.495528, -0.701529, 
-1.002737, 24.397125, 17.356983, 	3.000000, -2.838810, 	0.512162, -0.495528, -0.701529, 
-1.002737, 26.120163, 15.851318, 	3.000000, -3.038383, 	0.515999, -0.637877, -0.571716, 
-1.336982, 26.551086, 16.221825, 	2.500000, -3.038383, 	0.998387, 0.041476, 0.038776, 
-1.336982, 26.551086, 16.221825, 	2.500000, -3.038383, 	0.998387, 0.041476, 0.038776, 
-1.002737, 26.982021, 16.592329, 	2.000000, -3.038383, 	0.470672, 0.656258, 0.589740, 
-1.002737, 25.026405, 18.295650, 	2.000000, -2.838810, 	0.470077, 0.507995, 0.721781, 
-1.002737, 28.550339, 14.375221, 	2.000000, -3.234054, 	0.475606, 0.784875, 0.397204, 
-1.002737, 26.982021, 16.592329, 	2.000000, -3.038383, 	0.470672, 0.656258, 0.589740, 
-1.336982, 26.551086, 16.221825, 	2.500000, -3.038383, 	0.998387, 0.041476, 0.038776, 
-1.336982, 26.551086, 16.221825, 	2.500000, -3.038383, 	0.998387, 0.041476, 0.038776, 
-1.002737, 26.120163, 15.851318, 	3.000000, -3.038383, 	0.515999, -0.637877, -0.571716, 
-1.002737, 27.495193, 13.899298, 	3.000000, -3.234054, 	0.529173, -0.759785, -0.377761, 
-1.002737, 27.495193, 13.899298, 	3.000000, -3.234054, 	0.529173, -0.759785, -0.377761, 
-1.002737, 28.234837, 11.594270, 	3.000000, -3.421010, 	0.549862, -0.829858, -0.094800, 
-1.336982, 28.829941, 11.681159, 	2.500000, -3.421010, 	0.997287, 0.072725, 0.011376, 
-1.336982, 28.829941, 11.681159, 	2.500000, -3.421010, 	0.997287, 0.072725, 0.011376, 
-1.002737, 29.425041, 11.768046, 	2.000000, -3.421010, 	0.486093, 0.865826, 0.118573, 
-1.002737, 28.550339, 14.375221, 	2.000000, -3.234054, 	0.475606, 0.784875, 0.397204, 
-1.002737, 29.299828, 8.894522, 	2.000000, -3.594440, 	0.508084, 0.850362, -0.136877, 
-1.002737, 29.425041, 11.768046, 	2.000000, -3.421010, 	0.486093, 0.865826, 0.118573, 
-1.336982, 28.829941, 11.681159, 	2.500000, -3.421010, 	0.997287, 0.072725, 0.011376, 
-1.336982, 28.829941, 11.681159, 	2.500000, -3.421010, 	0.997287, 0.072725, 0.011376, 
-1.002737, 28.234837, 11.594270, 	3.000000, -3.421010, 	0.549862, -0.829858, -0.094800, 
-1.002737, 28.051701, 9.029581, 	3.000000, -3.594440, 	0.552395, -0.818570, 0.157487, 
-1.002737, 28.051701, 9.029581, 	3.000000, -3.594440, 	0.552395, -0.818570, 0.157487, 
-1.002737, 27.272324, 6.583387, 	3.000000, -3.741287, 	0.563171, -0.762895, 0.317537, 
-1.336982, 27.897228, 6.377859, 	2.500000, -3.741288, 	0.999306, 0.035287, -0.011950, 
-1.336982, 27.897228, 6.377859, 	2.500000, -3.741288, 	0.999306, 0.035287, -0.011950, 
-1.002737, 28.522129, 6.172330, 	2.000000, -3.741287, 	0.527923, 0.793569, -0.302564, 
-1.002737, 29.299828, 8.894522, 	2.000000, -3.594440, 	0.508084, 0.850362, -0.136877, 
-1.002737, 27.439377, 4.019153, 	2.000000, -3.848496, 	0.545786, 0.725589, -0.419091, 
-1.002737, 28.522129, 6.172330, 	2.000000, -3.741287, 	0.527923, 0.793569, -0.302564, 
-1.336982, 27.897228, 6.377859, 	2.500000, -3.741288, 	0.999306, 0.035287, -0.011950, 
-1.336982, 27.897228, 6.377859, 	2.500000, -3.741288, 	0.999306, 0.035287, -0.011950, 
-1.002737, 27.272324, 6.583387, 	3.000000, -3.741287, 	0.563171, -0.762895, 0.317537, 
-1.002737, 26.223228, 4.633848, 	3.000000, -3.848496, 	0.571231, -0.699649, 0.429169, 
-1.002737, 26.223228, 4.633848, 	3.000000, -3.848496, 	0.571231, -0.699649, 0.429169, 
-1.002737, 25.192875, 3.192066, 	3.000000, -3.922053, 	0.573805, -0.657830, 0.487860, 
-1.336982, 25.778152, 2.814326, 	2.500000, -3.922053, 	0.999924, 0.011227, -0.005182, 
-1.336982, 25.778152, 2.814326, 	2.500000, -3.922053, 	0.999924, 0.011227, -0.005182, 
-1.002737, 26.363422, 2.436586, 	2.000000, -3.922053, 	0.561369, 0.675750, -0.477732, 
-1.002737, 27.439377, 4.019153, 	2.000000, -3.848496, 	0.545786, 0.725589, -0.419091, 
-1.002737, 24.600067, 1.327282, 	2.500000, -4.000000, 	0.595697, -0.491752, -0.635079, 
-0.742768, 25.130249, 1.141007, 	2.000000, -4.000000, 	0.424007, 0.088516, -0.901323, 
-1.002737, 25.606094, 1.426226, 	2.000000, -3.967943, 	0.572183, 0.564519, -0.594916, 
-1.002737, 25.606094, 1.426226, 	2.000000, -3.967943, 	0.572183, 0.564519, -0.594916, 
-1.002737, 26.363422, 2.436586, 	2.000000, -3.922053, 	0.561369, 0.675750, -0.477732, 
-1.336982, 25.778152, 2.814326, 	2.500000, -3.922053, 	0.999924, 0.011227, -0.005182, 
-1.336982, 25.778152, 2.814326, 	2.500000, -3.922053, 	0.999924, 0.011227, -0.005182, 
-1.002737, 25.192875, 3.192066, 	3.000000, -3.922053, 	0.573805, -0.657830, 0.487860, 
-1.002737, 24.469711, 2.269146, 	3.000000, -3.967943, 	0.583534, -0.710408, 0.393458, 
-1.002737, 24.469711, 2.269146, 	3.000000, -3.967943, 	0.583534, -0.710408, 0.393458, 
-0.742768, 24.296909, 1.783397, 	3.000000, -4.000000, 	0.428917, -0.894621, -0.125234, 
-1.002737, 24.600067, 1.327282, 	2.500000, -4.000000, 	0.595697, -0.491752, -0.635079, 
--1.002737, 4.921762, -29.530731, 	4.000000, 0.966243, 	-0.582241, 0.811733, -0.045666, 
--1.002737, 4.997122, -28.191074, 	4.000000, 0.932486, 	-0.582174, 0.810005, -0.070467, 
-0.000000, 5.231688, -28.210423, 	3.500000, 0.922656, 	0.000000, 0.996270, -0.086288, 
-0.000000, 5.231688, -28.210423, 	3.500000, 0.922656, 	0.000000, 0.996270, -0.086288, 
-1.002737, 4.997122, -28.191074, 	3.000000, 0.922656, 	0.582175, 0.810004, -0.070467, 
-1.002737, 4.921762, -29.530731, 	3.000000, 0.966243, 	0.582240, 0.811733, -0.045667, 
-1.002737, 5.199909, -26.333269, 	3.000000, 0.859409, 	0.582690, 0.803052, -0.124820, 
-1.002737, 4.997122, -28.191074, 	3.000000, 0.922656, 	0.582175, 0.810004, -0.070467, 
-0.000000, 5.231688, -28.210423, 	3.500000, 0.922656, 	0.000000, 0.996270, -0.086288, 
-0.000000, 5.231688, -28.210423, 	3.500000, 0.922656, 	0.000000, 0.996270, -0.086288, 
--1.002737, 4.997122, -28.191074, 	4.000000, 0.932486, 	-0.582174, 0.810005, -0.070467, 
--1.002737, 5.199909, -26.333269, 	4.000000, 0.859409, 	-0.582690, 0.803052, -0.124820, 
--1.002737, 5.199909, -26.333269, 	4.000000, 0.859409, 	-0.582690, 0.803052, -0.124820, 
--1.002737, 5.640600, -24.050657, 	4.000000, 0.786333, 	-0.583127, 0.787897, -0.197941, 
-0.000000, 5.870369, -24.095905, 	3.500000, 0.775297, 	0.000000, 0.969755, -0.244081, 
-0.000000, 5.870369, -24.095905, 	3.500000, 0.775297, 	0.000000, 0.969755, -0.244081, 
-1.002737, 5.640600, -24.050657, 	3.000000, 0.775297, 	0.583127, 0.787897, -0.197941, 
-1.002737, 5.199909, -26.333269, 	3.000000, 0.859409, 	0.582690, 0.803052, -0.124820, 
-1.002737, 6.429670, -21.436577, 	3.000000, 0.669113, 	0.579786, 0.770207, -0.265761, 
-1.002737, 5.640600, -24.050657, 	3.000000, 0.775297, 	0.583127, 0.787897, -0.197941, 
-0.000000, 5.870369, -24.095905, 	3.500000, 0.775297, 	0.000000, 0.969755, -0.244081, 
-0.000000, 5.870369, -24.095905, 	3.500000, 0.775297, 	0.000000, 0.969755, -0.244081, 
--1.002737, 5.640600, -24.050657, 	4.000000, 0.786333, 	-0.583127, 0.787897, -0.197941, 
--1.002737, 6.429670, -21.436577, 	4.000000, 0.669113, 	-0.579786, 0.770207, -0.265761, 
--1.002737, 6.429670, -21.436577, 	4.000000, 0.669113, 	-0.579786, 0.770207, -0.265761, 
--1.002737, 7.484703, -18.704168, 	4.000000, 0.551894, 	-0.576888, 0.751118, -0.320970, 
-0.000000, 7.711994, -18.765621, 	3.500000, 0.547971, 	-0.000000, 0.919277, -0.393611, 
-0.000000, 7.711994, -18.765621, 	3.500000, 0.547971, 	-0.000000, 0.919277, -0.393611, 
-1.002737, 7.484703, -18.704170, 	3.000000, 0.547971, 	0.576888, 0.751119, -0.320970, 
-1.002737, 6.429670, -21.436577, 	3.000000, 0.669113, 	0.579786, 0.770207, -0.265761, 
-1.002737, 8.723274, -16.066572, 	3.000000, 0.418984, 	0.570576, 0.739144, -0.357922, 
-1.002737, 7.484703, -18.704170, 	3.000000, 0.547971, 	0.576888, 0.751119, -0.320970, 
-0.000000, 7.711994, -18.765621, 	3.500000, 0.547971, 	-0.000000, 0.919277, -0.393611, 
-0.000000, 7.711994, -18.765621, 	3.500000, 0.547971, 	-0.000000, 0.919277, -0.393611, 
--1.002737, 7.484703, -18.704168, 	4.000000, 0.551894, 	-0.576888, 0.751118, -0.320970, 
--1.002737, 8.723274, -16.066572, 	4.000000, 0.418984, 	-0.570577, 0.739144, -0.357922, 
--1.002737, 8.723274, -16.066572, 	4.000000, 0.418984, 	-0.570577, 0.739144, -0.357922, 
--1.002737, 10.001389, -13.505806, 	4.000000, 0.286075, 	-0.565597, 0.742253, -0.359389, 
-0.000000, 10.230309, -13.563657, 	3.500000, 0.282904, 	-0.000000, 0.900257, -0.435359, 
-0.000000, 10.230309, -13.563657, 	3.500000, 0.282904, 	-0.000000, 0.900257, -0.435359, 
-1.002737, 10.001389, -13.505806, 	3.000000, 0.282904, 	0.565597, 0.742254, -0.359389, 
-1.002737, 8.723274, -16.066572, 	3.000000, 0.418984, 	0.570576, 0.739144, -0.357922, 
-1.002737, 11.175043, -11.003893, 	3.000000, 0.140482, 	0.562569, 0.757951, -0.330192, 
-1.002737, 10.001389, -13.505806, 	3.000000, 0.282904, 	0.565597, 0.742254, -0.359389, 
-0.000000, 10.230309, -13.563657, 	3.500000, 0.282904, 	-0.000000, 0.900257, -0.435359, 
-0.000000, 10.230309, -13.563657, 	3.500000, 0.282904, 	-0.000000, 0.900257, -0.435359, 
--1.002737, 10.001389, -13.505806, 	4.000000, 0.286075, 	-0.565597, 0.742253, -0.359389, 
--1.002737, 11.175043, -11.003893, 	4.000000, 0.140482, 	-0.562513, 0.757929, -0.330337, 
--1.002737, 11.175043, -11.003893, 	4.000000, 0.140482, 	-0.562513, 0.757929, -0.330337, 
--1.003346, 12.054029, -8.797724, 	4.000000, -0.005111, 	-0.560047, 0.787144, -0.258362, 
--0.000610, 12.286734, -8.840019, 	3.333333, -0.069211, 	0.000044, 0.950614, -0.310377, 
--0.000610, 12.286734, -8.840019, 	3.333333, -0.069211, 	0.000044, 0.950614, -0.310377, 
-1.002127, 12.054029, -8.797724, 	2.958333, -0.009381, 	0.560195, 0.787255, -0.257702, 
-1.002737, 11.175043, -11.003893, 	3.000000, 0.140482, 	0.562569, 0.757951, -0.330192, 
-1.000299, 12.448139, -7.124194, 	2.833333, -0.167786, 	0.564659, 0.816023, -0.123558, 
-1.002127, 12.054029, -8.797724, 	2.958333, -0.009381, 	0.560195, 0.787255, -0.257702, 
--0.000610, 12.286734, -8.840019, 	3.333333, -0.069211, 	0.000044, 0.950614, -0.310377, 
--0.000610, 12.286734, -8.840019, 	3.333333, -0.069211, 	0.000044, 0.950614, -0.310377, 
--1.003346, 12.054029, -8.797724, 	4.000000, -0.005111, 	-0.560047, 0.787144, -0.258362, 
--1.005175, 12.448139, -7.124194, 	2.666667, -0.726194, 	-0.564732, 0.815815, -0.124590, 
--1.005175, 12.448139, -7.124194, 	2.666667, -0.726194, 	-0.564732, 0.815815, -0.124590, 
--1.006394, 12.522362, -5.716876, 	1.333333, -1.447277, 	-0.566040, 0.824377, 0.001632, 
--0.003657, 12.756954, -5.750165, 	2.166667, -0.809096, 	-0.000126, 1.000000, 0.000870, 
--0.003657, 12.756954, -5.750165, 	2.166667, -0.809096, 	-0.000126, 1.000000, 0.000870, 
-0.999079, 12.522362, -5.716876, 	3.000000, -0.170915, 	0.565733, 0.824587, 0.001687, 
-1.000299, 12.448139, -7.124194, 	2.833333, -0.167786, 	0.564659, 0.816023, -0.123558, 
-1.002737, 11.560024, -0.158328, 	3.000000, -0.503387, 	0.548192, 0.812432, 0.198592, 
-1.002127, 12.142200, -2.567771, 	3.000000, -0.336720, 	0.545588, 0.819894, 0.173516, 
--0.000610, 12.377636, -2.594154, 	3.500000, -0.336720, 	0.000041, 0.978486, 0.206311, 
--0.000610, 12.377636, -2.594154, 	3.500000, -0.336720, 	0.000041, 0.978486, 0.206311, 
--1.003346, 12.142200, -2.567771, 	4.000000, -0.336720, 	-0.545383, 0.819886, 0.174196, 
--1.002737, 11.560024, -0.158328, 	4.000000, -0.503387, 	-0.548128, 0.812439, 0.198744, 
--1.002737, 11.560024, -0.158328, 	4.000000, -0.503387, 	-0.548128, 0.812439, 0.198744, 
--1.002737, 10.886791, 2.566613, 	4.000000, -0.670054, 	-0.549613, 0.814083, 0.187601, 
-0.000000, 11.117409, 2.540119, 	3.500000, -0.671927, 	0.000000, 0.974103, 0.226104, 
-0.000000, 11.117409, 2.540119, 	3.500000, -0.671927, 	0.000000, 0.974103, 0.226104, 
-1.002737, 10.886791, 2.566613, 	3.000000, -0.671927, 	0.549613, 0.814083, 0.187601, 
-1.002737, 11.560024, -0.158328, 	3.000000, -0.503387, 	0.548192, 0.812432, 0.198592, 
-1.002737, 10.314148, 5.254678, 	3.000000, -0.844213, 	0.550065, 0.824042, 0.135587, 
-1.002737, 10.886791, 2.566613, 	3.000000, -0.671927, 	0.549613, 0.814083, 0.187601, 
-0.000000, 11.117409, 2.540119, 	3.500000, -0.671927, 	0.000000, 0.974103, 0.226104, 
-0.000000, 11.117409, 2.540119, 	3.500000, -0.671927, 	0.000000, 0.974103, 0.226104, 
--1.002737, 10.886791, 2.566613, 	4.000000, -0.670054, 	-0.549613, 0.814083, 0.187601, 
--1.002737, 10.314148, 5.254678, 	4.000000, -0.844213, 	-0.550065, 0.824042, 0.135588, 
--1.002737, 10.314148, 5.254678, 	4.000000, -0.844213, 	-0.550065, 0.824042, 0.135588, 
--1.002737, 10.024443, 7.827566, 	4.000000, -1.018373, 	-0.552727, 0.833125, 0.019881, 
-0.000000, 10.237921, 7.780712, 	3.500000, -1.016250, 	-0.000000, 0.999593, 0.028523, 
-0.000000, 10.237921, 7.780712, 	3.500000, -1.016250, 	-0.000000, 0.999593, 0.028523, 
-1.002737, 10.024445, 7.827566, 	3.000000, -1.016250, 	0.552727, 0.833125, 0.019881, 
-1.002737, 10.314148, 5.254678, 	3.000000, -0.844213, 	0.550065, 0.824042, 0.135587, 
-1.002737, 10.200031, 10.206976, 	3.000000, -1.184038, 	0.545898, 0.826469, -0.137636, 
-1.002737, 10.024445, 7.827566, 	3.000000, -1.016250, 	0.552727, 0.833125, 0.019881, 
-0.000000, 10.237921, 7.780712, 	3.500000, -1.016250, 	-0.000000, 0.999593, 0.028523, 
-0.000000, 10.237921, 7.780712, 	3.500000, -1.016250, 	-0.000000, 0.999593, 0.028523, 
--1.002737, 10.024443, 7.827566, 	4.000000, -1.018373, 	-0.552727, 0.833125, 0.019881, 
--1.002737, 10.200031, 10.206976, 	4.000000, -1.184038, 	-0.545898, 0.826469, -0.137636, 
--1.002737, 10.200031, 10.206976, 	4.000000, -1.184038, 	-0.545898, 0.826469, -0.137636, 
--1.002737, 10.783842, 12.373039, 	4.000000, -1.349704, 	-0.535040, 0.792292, -0.293266, 
-0.000000, 10.965359, 12.283498, 	3.500000, -1.349954, 	-0.000000, 0.938935, -0.344095, 
-0.000000, 10.965359, 12.283498, 	3.500000, -1.349954, 	-0.000000, 0.938935, -0.344095, 
-1.002737, 10.783842, 12.373039, 	3.000000, -1.349954, 	0.535040, 0.792292, -0.293267, 
-1.002737, 10.200031, 10.206976, 	3.000000, -1.184038, 	0.545898, 0.826469, -0.137636, 
-1.002737, 11.718807, 14.305887, 	3.000000, -1.516370, 	0.524951, 0.731928, -0.434405, 
-1.002737, 10.783842, 12.373039, 	3.000000, -1.349954, 	0.535040, 0.792292, -0.293267, 
-0.000000, 10.965359, 12.283498, 	3.500000, -1.349954, 	-0.000000, 0.938935, -0.344095, 
-0.000000, 10.965359, 12.283498, 	3.500000, -1.349954, 	-0.000000, 0.938935, -0.344095, 
--1.002737, 10.783842, 12.373039, 	4.000000, -1.349704, 	-0.535040, 0.792292, -0.293266, 
--1.002737, 11.718807, 14.305887, 	4.000000, -1.516370, 	-0.524951, 0.731928, -0.434405, 
--1.002737, 11.718807, 14.305887, 	4.000000, -1.516370, 	-0.524951, 0.731928, -0.434405, 
--1.002737, 12.901150, 15.938179, 	4.000000, -1.683037, 	-0.520176, 0.645820, -0.558867, 
-0.000000, 13.036221, 15.799099, 	3.500000, -1.679268, 	0.000000, 0.757369, -0.652987, 
-0.000000, 13.036221, 15.799099, 	3.500000, -1.679268, 	0.000000, 0.757369, -0.652987, 
-1.002737, 12.901150, 15.938179, 	3.000000, -1.679268, 	0.520177, 0.645820, -0.558867, 
-1.002737, 11.718807, 14.305887, 	3.000000, -1.516370, 	0.524951, 0.731928, -0.434405, 
-1.002737, 14.227100, 17.202572, 	3.000000, -1.834628, 	0.519663, 0.527798, -0.671848, 
-1.002737, 12.901150, 15.938179, 	3.000000, -1.679268, 	0.520177, 0.645820, -0.558867, 
-0.000000, 13.036221, 15.799099, 	3.500000, -1.679268, 	0.000000, 0.757369, -0.652987, 
-0.000000, 13.036221, 15.799099, 	3.500000, -1.679268, 	0.000000, 0.757369, -0.652987, 
--1.002737, 12.901150, 15.938179, 	4.000000, -1.683037, 	-0.520176, 0.645820, -0.558867, 
--1.002737, 14.227100, 17.202572, 	4.000000, -1.834628, 	-0.519663, 0.527798, -0.671848, 
--1.002737, 14.227100, 17.202572, 	4.000000, -1.834628, 	-0.519663, 0.527798, -0.671848, 
--1.002737, 15.688553, 18.126600, 	4.000000, -1.986219, 	-0.519424, 0.384311, -0.763219, 
-0.000000, 15.767933, 17.950714, 	3.500000, -1.988039, 	0.000000, 0.450479, -0.892787, 
-0.000000, 15.767933, 17.950714, 	3.500000, -1.988039, 	0.000000, 0.450479, -0.892787, 
-1.002737, 15.688553, 18.126600, 	3.000000, -1.988039, 	0.519424, 0.384311, -0.763219, 
-1.002737, 14.227100, 17.202572, 	3.000000, -1.834628, 	0.519663, 0.527798, -0.671848, 
-1.002737, 17.277420, 18.737804, 	3.000000, -2.145087, 	0.519855, 0.222506, -0.824768, 
-1.002737, 15.688553, 18.126600, 	3.000000, -1.988039, 	0.519424, 0.384311, -0.763219, 
-0.000000, 15.767933, 17.950714, 	3.500000, -1.988039, 	0.000000, 0.450479, -0.892787, 
-0.000000, 15.767933, 17.950714, 	3.500000, -1.988039, 	0.000000, 0.450479, -0.892787, 
--1.002737, 15.688553, 18.126600, 	4.000000, -1.986219, 	-0.519424, 0.384311, -0.763219, 
--1.002737, 17.277420, 18.737804, 	4.000000, -2.145087, 	-0.519855, 0.222506, -0.824768, 
--1.002737, 17.277420, 18.737804, 	4.000000, -2.145087, 	-0.519855, 0.222506, -0.824768, 
--1.002737, 18.963112, 19.009758, 	4.000000, -2.303954, 	-0.519106, 0.044200, -0.853567, 
-0.000000, 18.975204, 18.818281, 	3.500000, -2.305904, 	-0.000000, 0.051821, -0.998656, 
-0.000000, 18.975204, 18.818281, 	3.500000, -2.305904, 	-0.000000, 0.051821, -0.998656, 
-1.002737, 18.963112, 19.009758, 	3.000000, -2.305904, 	0.519106, 0.044200, -0.853567, 
-1.002737, 17.277420, 18.737804, 	3.000000, -2.145087, 	0.519855, 0.222506, -0.824768, 
-1.002737, 20.715042, 18.916035, 	3.000000, -2.470621, 	0.518180, -0.147145, -0.842519, 
-1.002737, 18.963112, 19.009758, 	3.000000, -2.305904, 	0.519106, 0.044200, -0.853567, 
-0.000000, 18.975204, 18.818281, 	3.500000, -2.305904, 	-0.000000, 0.051821, -0.998656, 
-0.000000, 18.975204, 18.818281, 	3.500000, -2.305904, 	-0.000000, 0.051821, -0.998656, 
--1.002737, 18.963112, 19.009758, 	4.000000, -2.303954, 	-0.519106, 0.044200, -0.853567, 
--1.002737, 20.715042, 18.916035, 	4.000000, -2.470621, 	-0.518180, -0.147145, -0.842519, 
--1.002737, 20.715042, 18.916035, 	4.000000, -2.470621, 	-0.518180, -0.147145, -0.842519, 
--1.002737, 22.528088, 18.387989, 	4.000000, -2.637287, 	-0.514483, -0.334572, -0.789537, 
-0.000000, 22.464233, 18.209660, 	3.500000, -2.646001, 	-0.000000, -0.390600, -0.920561, 
-0.000000, 22.464233, 18.209660, 	3.500000, -2.646001, 	-0.000000, -0.390600, -0.920561, 
-1.002737, 22.528091, 18.387989, 	3.000000, -2.646001, 	0.514483, -0.334572, -0.789537, 
-1.002737, 20.715042, 18.916035, 	3.000000, -2.470621, 	0.518180, -0.147145, -0.842519, 
-1.002737, 24.397125, 17.356983, 	3.000000, -2.838810, 	0.512162, -0.495528, -0.701529, 
-1.002737, 22.528091, 18.387989, 	3.000000, -2.646001, 	0.514483, -0.334572, -0.789537, 
-0.000000, 22.464233, 18.209660, 	3.500000, -2.646001, 	-0.000000, -0.390600, -0.920561, 
-0.000000, 22.464233, 18.209660, 	3.500000, -2.646001, 	-0.000000, -0.390600, -0.920561, 
--1.002737, 22.528088, 18.387989, 	4.000000, -2.637287, 	-0.514483, -0.334572, -0.789537, 
--1.002737, 24.397125, 17.356983, 	4.000000, -2.838810, 	-0.512162, -0.495528, -0.701529, 
--1.002737, 24.397125, 17.356983, 	4.000000, -2.838810, 	-0.512162, -0.495528, -0.701529, 
--1.002737, 26.120163, 15.851318, 	4.000000, -3.040334, 	-0.515999, -0.637877, -0.571716, 
-0.000000, 25.976517, 15.727814, 	3.500000, -3.038383, 	-0.000000, -0.744667, -0.667436, 
-0.000000, 25.976517, 15.727814, 	3.500000, -3.038383, 	-0.000000, -0.744667, -0.667436, 
-1.002737, 26.120163, 15.851318, 	3.000000, -3.038383, 	0.515999, -0.637877, -0.571716, 
-1.002737, 24.397125, 17.356983, 	3.000000, -2.838810, 	0.512162, -0.495528, -0.701529, 
-1.002737, 27.495193, 13.899298, 	3.000000, -3.234054, 	0.529173, -0.759785, -0.377761, 
-1.002737, 26.120163, 15.851318, 	3.000000, -3.038383, 	0.515999, -0.637877, -0.571716, 
-0.000000, 25.976517, 15.727814, 	3.500000, -3.038383, 	-0.000000, -0.744667, -0.667436, 
-0.000000, 25.976517, 15.727814, 	3.500000, -3.038383, 	-0.000000, -0.744667, -0.667436, 
--1.002737, 26.120163, 15.851318, 	4.000000, -3.040334, 	-0.515999, -0.637877, -0.571716, 
--1.002737, 27.495193, 13.899298, 	4.000000, -3.234054, 	-0.529173, -0.759785, -0.377761, 
--1.002737, 27.495193, 13.899298, 	4.000000, -3.234054, 	-0.529173, -0.759785, -0.377761, 
--1.002737, 28.234837, 11.594271, 	4.000000, -3.427773, 	-0.549861, -0.829859, -0.094800, 
-0.000000, 28.036469, 11.565307, 	3.500000, -3.421010, 	-0.000000, -0.993846, -0.110776, 
-0.000000, 28.036469, 11.565307, 	3.500000, -3.421010, 	-0.000000, -0.993846, -0.110776, 
-1.002737, 28.234837, 11.594270, 	3.000000, -3.421010, 	0.549862, -0.829858, -0.094800, 
-1.002737, 27.495193, 13.899298, 	3.000000, -3.234054, 	0.529173, -0.759785, -0.377761, 
-1.002737, 28.051701, 9.029581, 	3.000000, -3.594440, 	0.552395, -0.818570, 0.157487, 
-1.002737, 28.234837, 11.594270, 	3.000000, -3.421010, 	0.549862, -0.829858, -0.094800, 
-0.000000, 28.036469, 11.565307, 	3.500000, -3.421010, 	-0.000000, -0.993846, -0.110776, 
-0.000000, 28.036469, 11.565307, 	3.500000, -3.421010, 	-0.000000, -0.993846, -0.110776, 
--1.002737, 28.234837, 11.594271, 	4.000000, -3.427773, 	-0.549861, -0.829859, -0.094800, 
--1.002737, 28.051701, 9.029581, 	4.000000, -3.594440, 	-0.552394, -0.818572, 0.157487, 
--1.002737, 28.051701, 9.029581, 	4.000000, -3.594440, 	-0.552394, -0.818572, 0.157487, 
--1.002737, 27.272324, 6.583387, 	4.000000, -3.761107, 	-0.563170, -0.762896, 0.317537, 
-0.000000, 27.064018, 6.651896, 	3.500000, -3.741288, 	0.000000, -0.921832, 0.387591, 
-0.000000, 27.064018, 6.651896, 	3.500000, -3.741288, 	0.000000, -0.921832, 0.387591, 
-1.002737, 27.272324, 6.583387, 	3.000000, -3.741287, 	0.563171, -0.762895, 0.317537, 
-1.002737, 28.051701, 9.029581, 	3.000000, -3.594440, 	0.552395, -0.818570, 0.157487, 
-1.002737, 26.223228, 4.633848, 	3.000000, -3.848496, 	0.571231, -0.699649, 0.429169, 
-1.002737, 27.272324, 6.583387, 	3.000000, -3.741287, 	0.563171, -0.762895, 0.317537, 
-0.000000, 27.064018, 6.651896, 	3.500000, -3.741288, 	0.000000, -0.921832, 0.387591, 
-0.000000, 27.064018, 6.651896, 	3.500000, -3.741288, 	0.000000, -0.921832, 0.387591, 
--1.002737, 27.272324, 6.583387, 	4.000000, -3.761107, 	-0.563170, -0.762896, 0.317537, 
--1.002737, 26.223228, 4.633848, 	4.000000, -3.848496, 	-0.571231, -0.699650, 0.429169, 
--1.002737, 26.223228, 4.633848, 	4.000000, -3.848496, 	-0.571231, -0.699650, 0.429169, 
--1.002737, 25.192875, 3.192066, 	4.000000, -3.935886, 	-0.573805, -0.657830, 0.487860, 
-0.000000, 24.997784, 3.317980, 	3.500000, -3.922053, 	-0.000000, -0.801896, 0.597463, 
-0.000000, 24.997784, 3.317980, 	3.500000, -3.922053, 	-0.000000, -0.801896, 0.597463, 
-1.002737, 25.192875, 3.192066, 	3.000000, -3.922053, 	0.573805, -0.657830, 0.487860, 
-1.002737, 26.223228, 4.633848, 	3.000000, -3.848496, 	0.571231, -0.699649, 0.429169, 
-0.000000, 24.041351, 1.768998, 	3.500000, -4.000000, 	0.000000, -0.991299, -0.131630, 
-0.742768, 24.296909, 1.783397, 	3.000000, -4.000000, 	0.428917, -0.894621, -0.125234, 
-1.002737, 24.469711, 2.269146, 	3.000000, -3.967943, 	0.583534, -0.710408, 0.393458, 
-1.002737, 24.469711, 2.269146, 	3.000000, -3.967943, 	0.583534, -0.710408, 0.393458, 
-1.002737, 25.192875, 3.192066, 	3.000000, -3.922053, 	0.573805, -0.657830, 0.487860, 
-0.000000, 24.997784, 3.317980, 	3.500000, -3.922053, 	-0.000000, -0.801896, 0.597463, 
-0.000000, 24.997784, 3.317980, 	3.500000, -3.922053, 	-0.000000, -0.801896, 0.597463, 
--1.002737, 25.192875, 3.192066, 	4.000000, -3.935886, 	-0.573805, -0.657830, 0.487860, 
--1.002737, 24.469711, 2.269146, 	4.000000, -3.967943, 	-0.583534, -0.710408, 0.393458, 
--1.002737, 24.469711, 2.269146, 	4.000000, -3.967943, 	-0.583534, -0.710408, 0.393458, 
--0.742768, 24.296909, 1.783397, 	4.000000, -4.000000, 	-0.428917, -0.894621, -0.125234, 
-0.000000, 24.041351, 1.768998, 	3.500000, -4.000000, 	0.000000, -0.991299, -0.131630, 
--1.002737, -1.292564, -32.294178, 	1.000000, 0.972854, 	-0.576236, -0.817066, 0.018853, 
--1.002737, -1.259859, -30.876823, 	1.000000, 0.937170, 	-0.573164, -0.818796, 0.032517, 
--1.336982, -0.552929, -30.921089, 	0.500000, 0.937170, 	-0.999978, -0.006540, 0.000687, 
--1.336982, -0.552929, -30.921089, 	0.500000, 0.937170, 	-0.999978, -0.006540, 0.000687, 
--1.002737, 0.153999, -30.965355, 	0.000000, 0.945709, 	-0.580105, 0.814042, -0.028521, 
--1.002737, 0.129889, -32.334755, 	0.000000, 0.972854, 	-0.578352, 0.815661, -0.014359, 
--1.002737, 0.245815, -29.027195, 	0.000000, 0.884407, 	-0.580554, 0.811733, -0.063605, 
--1.002737, 0.153999, -30.965355, 	0.000000, 0.945709, 	-0.580105, 0.814042, -0.028521, 
--1.336982, -0.552929, -30.921089, 	0.500000, 0.937170, 	-0.999978, -0.006540, 0.000687, 
--1.336982, -0.552929, -30.921089, 	0.500000, 0.937170, 	-0.999978, -0.006540, 0.000687, 
--1.002737, -1.259859, -30.876823, 	1.000000, 0.937170, 	-0.573164, -0.818796, 0.032517, 
--1.002737, -1.156864, -28.875961, 	1.000000, 0.884407, 	-0.570246, -0.818776, 0.066533, 
--1.002737, -1.156864, -28.875961, 	1.000000, 0.884407, 	-0.570246, -0.818776, 0.066533, 
--1.002737, -0.895025, -26.385366, 	1.000000, 0.812277, 	-0.568649, -0.814249, 0.116778, 
--1.336982, -0.199492, -26.493555, 	0.500000, 0.812277, 	-0.999928, -0.011914, 0.001651, 
--1.336982, -0.199492, -26.493555, 	0.500000, 0.812277, 	-0.999928, -0.011914, 0.001651, 
--1.002737, 0.496042, -26.601746, 	0.000000, 0.823105, 	-0.581048, 0.805721, -0.114877, 
--1.002737, 0.245815, -29.027195, 	0.000000, 0.884407, 	-0.580554, 0.811733, -0.063605, 
--1.002737, 0.995396, -23.770485, 	0.000000, 0.718491, 	-0.583417, 0.789634, -0.190008, 
--1.002737, 0.496042, -26.601746, 	0.000000, 0.823105, 	-0.581048, 0.805721, -0.114877, 
--1.336982, -0.199492, -26.493555, 	0.500000, 0.812277, 	-0.999928, -0.011914, 0.001651, 
--1.336982, -0.199492, -26.493555, 	0.500000, 0.812277, 	-0.999928, -0.011914, 0.001651, 
--1.002737, -0.895025, -26.385366, 	1.000000, 0.812277, 	-0.568649, -0.814249, 0.116778, 
--1.002737, -0.385786, -23.498796, 	1.000000, 0.718491, 	-0.565019, -0.802220, 0.192863, 
--1.002737, -0.385786, -23.498796, 	1.000000, 0.718491, 	-0.565019, -0.802220, 0.192863, 
--1.000716, 0.522999, -20.483551, 	1.046875, 0.600702, 	-0.555184, -0.771596, 0.310500, 
--1.334961, 1.211163, -20.628946, 	0.687500, 0.612715, 	-0.999676, -0.020934, 0.014474, 
--1.334961, 1.211163, -20.628946, 	0.687500, 0.612715, 	-0.999676, -0.020934, 0.014474, 
--1.000716, 1.899328, -20.774343, 	0.000000, 0.613877, 	-0.578823, 0.757196, -0.302684, 
--1.002737, 0.995396, -23.770485, 	0.000000, 0.718491, 	-0.583417, 0.789634, -0.190008, 
--0.994652, 3.363289, -17.854239, 	1.500000, 0.568689, 	-0.554925, 0.739714, -0.380633, 
--1.000716, 1.899328, -20.774343, 	0.000000, 0.613877, 	-0.578823, 0.757196, -0.302684, 
--1.334961, 1.211163, -20.628946, 	0.687500, 0.612715, 	-0.999676, -0.020934, 0.014474, 
--1.334961, 1.211163, -20.628946, 	0.687500, 0.612715, 	-0.999676, -0.020934, 0.014474, 
--1.000716, 0.522999, -20.483551, 	1.046875, 0.600702, 	-0.555184, -0.771596, 0.310500, 
--0.994652, 1.983473, -17.606916, 	1.187500, 0.456561, 	-0.553223, -0.737418, 0.387504, 
--0.994652, 1.983473, -17.606916, 	1.187500, 0.456561, 	-0.553223, -0.737418, 0.387504, 
--0.990610, 3.544037, -14.721523, 	1.000000, 0.267209, 	-0.562098, -0.749029, 0.350717, 
--1.324855, 4.237772, -14.807808, 	2.000000, 0.395355, 	-0.999804, 0.015791, -0.011962, 
--1.324855, 4.237772, -14.807808, 	2.000000, 0.395355, 	-0.999804, 0.015791, -0.011962, 
--0.990610, 4.931509, -14.894089, 	3.000000, 0.523501, 	-0.544986, 0.762408, -0.348891, 
--0.994652, 3.363289, -17.854239, 	1.500000, 0.568689, 	-0.554925, 0.739714, -0.380633, 
--1.002737, 6.556976, -6.071414, 	0.000000, -0.308178, 	-0.553122, 0.818963, 0.152824, 
--1.000716, 6.770885, -8.754030, 	0.000000, -0.079458, 	-0.549751, 0.833161, -0.060139, 
--1.334961, 6.071638, -8.749280, 	0.500000, -0.079458, 	-0.999000, 0.044233, -0.006500, 
--1.334961, 6.071638, -8.749280, 	0.500000, -0.079458, 	-0.999000, 0.044233, -0.006500, 
--1.000716, 5.372389, -8.744530, 	1.000000, -0.079458, 	-0.594849, -0.801661, 0.059106, 
--1.002737, 5.163677, -6.177338, 	1.000000, -0.308178, 	-0.587361, -0.794674, -0.153298, 
--1.002737, 5.163677, -6.177338, 	1.000000, -0.308178, 	-0.587361, -0.794674, -0.153298, 
--1.002737, 4.402004, -3.694788, 	1.000000, -0.537451, 	-0.571136, -0.774985, -0.270559, 
--1.336982, 5.093796, -3.594290, 	0.500000, -0.537451, 	-0.999877, 0.014256, 0.006545, 
--1.336982, 5.093796, -3.594290, 	0.500000, -0.537451, 	-0.999877, 0.014256, 0.006545, 
--1.002737, 5.785589, -3.493792, 	0.000000, -0.536897, 	-0.556039, 0.785897, 0.270530, 
--1.002737, 6.556976, -6.071414, 	0.000000, -0.308178, 	-0.553122, 0.818963, 0.152824, 
--1.002737, 4.735826, -0.785002, 	0.000000, -0.767833, 	-0.563593, 0.774459, 0.287360, 
--1.002737, 5.785589, -3.493792, 	0.000000, -0.536897, 	-0.556039, 0.785897, 0.270530, 
--1.336982, 5.093796, -3.594290, 	0.500000, -0.537451, 	-0.999877, 0.014256, 0.006545, 
--1.336982, 5.093796, -3.594290, 	0.500000, -0.537451, 	-0.999877, 0.014256, 0.006545, 
--1.002737, 4.402004, -3.694788, 	1.000000, -0.537451, 	-0.571136, -0.774985, -0.270559, 
--1.002737, 3.362402, -1.013249, 	1.000000, -0.767833, 	-0.559574, -0.778227, -0.285025, 
--1.002737, 3.362402, -1.013249, 	1.000000, -0.767833, 	-0.559574, -0.778227, -0.285025, 
--1.002737, 2.394936, 1.783656, 	1.046875, -0.973474, 	-0.550621, -0.806194, -0.216490, 
--1.336982, 3.076645, 1.877820, 	0.687500, -0.955495, 	-0.999725, -0.022213, -0.007478, 
--1.336982, 3.076645, 1.877820, 	0.687500, -0.955495, 	-0.999725, -0.022213, -0.007478, 
--1.002737, 3.758350, 1.971984, 	0.000000, -0.998770, 	-0.573360, 0.788967, 0.220880, 
--1.002737, 4.735826, -0.785002, 	0.000000, -0.767833, 	-0.563593, 0.774459, 0.287360, 
--1.002737, 3.203825, 4.694192, 	1.500000, -0.960717, 	-0.573166, 0.812586, 0.105755, 
--1.002737, 3.758350, 1.971984, 	0.000000, -0.998770, 	-0.573360, 0.788967, 0.220880, 
--1.336982, 3.076645, 1.877820, 	0.687500, -0.955495, 	-0.999725, -0.022213, -0.007478, 
--1.336982, 3.076645, 1.877820, 	0.687500, -0.955495, 	-0.999725, -0.022213, -0.007478, 
--1.002737, 2.394936, 1.783656, 	1.046875, -0.973474, 	-0.550621, -0.806194, -0.216490, 
--1.002737, 1.849670, 4.612304, 	1.187500, -1.128520, 	-0.548005, -0.830422, -0.100446, 
--1.002737, 1.849670, 4.612304, 	1.187500, -1.128520, 	-0.548005, -0.830422, -0.100446, 
--1.002737, 1.707661, 7.456823, 	1.000000, -1.306215, 	-0.546192, -0.837529, 0.014826, 
--1.336982, 2.380295, 7.427917, 	2.000000, -1.114440, 	-0.999670, -0.025705, 0.000199, 
--1.336982, 2.380295, 7.427917, 	2.000000, -1.114440, 	-0.999670, -0.025705, 0.000199, 
--1.002737, 3.052929, 7.399012, 	3.000000, -0.922665, 	-0.571504, 0.820505, -0.012461, 
--1.002737, 3.203825, 4.694192, 	1.500000, -0.960717, 	-0.573166, 0.812586, 0.105755, 
--1.022346, 4.637777, 15.286472, 	1.333333, -1.667888, 	-0.574184, 0.765044, -0.291584, 
--1.007639, 3.836994, 12.751901, 	0.000000, -1.613659, 	-0.571038, 0.793815, -0.209219, 
--1.341885, 3.176014, 12.915927, 	0.500000, -1.613659, 	-0.999798, -0.020077, 0.001135, 
--1.341885, 3.176014, 12.915927, 	0.500000, -1.613659, 	-0.999798, -0.020077, 0.001135, 
--1.007639, 2.515034, 13.079953, 	1.000000, -1.613659, 	-0.551445, -0.808533, 0.205386, 
--1.022346, 3.341311, 15.726742, 	1.166667, -1.691614, 	-0.553953, -0.781075, 0.288198, 
--1.022346, 3.341311, 15.726742, 	1.166667, -1.691614, 	-0.553953, -0.781075, 0.288198, 
--1.032151, 4.412262, 18.174877, 	1.000000, -1.776346, 	-0.555665, -0.740194, 0.378615, 
--1.366396, 5.044981, 17.903212, 	1.833333, -1.749232, 	-0.999757, -0.019426, 0.010462, 
--1.366396, 5.044981, 17.903212, 	1.833333, -1.749232, 	-0.999757, -0.019426, 0.010462, 
--1.032151, 5.677700, 17.631544, 	2.666667, -1.722117, 	-0.577835, 0.723604, -0.377496, 
--1.022346, 4.637777, 15.286472, 	1.333333, -1.667888, 	-0.574184, 0.765044, -0.291584, 
--1.002737, 8.987209, 23.827108, 	0.500000, -2.000000, 	-0.690086, 0.408969, 0.597098, 
--0.742768, 9.282909, 23.329664, 	0.000000, -2.000000, 	-0.487251, 0.872639, 0.032983, 
--1.002737, 9.038933, 22.663582, 	0.000000, -1.969517, 	-0.582357, 0.720010, -0.377421, 
--1.002737, 9.038933, 22.663582, 	0.000000, -1.969517, 	-0.582357, 0.720010, -0.377421, 
--1.007639, 8.160118, 21.422651, 	0.000000, -1.939034, 	-0.574068, 0.669723, -0.471080, 
--1.341885, 7.556932, 21.789433, 	0.500000, -1.939034, 	-0.999989, 0.000304, 0.004665, 
--1.341885, 7.556932, 21.789433, 	0.500000, -1.939034, 	-0.999989, 0.000304, 0.004665, 
--1.007639, 6.953747, 22.156216, 	1.000000, -1.939034, 	-0.571627, -0.672843, 0.469600, 
--1.002737, 7.854620, 23.452549, 	1.000000, -1.969517, 	-0.579230, -0.604597, 0.546768, 
--1.002737, 7.854620, 23.452549, 	1.000000, -1.969517, 	-0.579230, -0.604597, 0.546768, 
--0.742768, 8.411285, 23.925793, 	1.000000, -2.000000, 	-0.485429, -0.281111, 0.827850, 
--1.002737, 8.987209, 23.827108, 	0.500000, -2.000000, 	-0.690086, 0.408969, 0.597098, 
-1.002737, -1.292564, -32.294174, 	2.000000, 0.972854, 	0.576237, -0.817066, 0.018853, 
-1.002737, -1.259859, -30.876823, 	2.000000, 0.937170, 	0.573164, -0.818795, 0.032517, 
-0.000000, -1.495502, -30.862072, 	1.500000, 0.937170, 	0.000000, -0.999196, 0.040090, 
-0.000000, -1.495502, -30.862072, 	1.500000, 0.937170, 	0.000000, -0.999196, 0.040090, 
--1.002737, -1.259859, -30.876823, 	1.000000, 0.937170, 	-0.573164, -0.818796, 0.032517, 
--1.002737, -1.292564, -32.294178, 	1.000000, 0.972854, 	-0.576236, -0.817066, 0.018853, 
--1.002737, -1.156864, -28.875961, 	1.000000, 0.884407, 	-0.570246, -0.818776, 0.066533, 
--1.002737, -1.259859, -30.876823, 	1.000000, 0.937170, 	-0.573164, -0.818796, 0.032517, 
-0.000000, -1.495502, -30.862072, 	1.500000, 0.937170, 	0.000000, -0.999196, 0.040090, 
-0.000000, -1.495502, -30.862072, 	1.500000, 0.937170, 	0.000000, -0.999196, 0.040090, 
-1.002737, -1.259859, -30.876823, 	2.000000, 0.937170, 	0.573164, -0.818795, 0.032517, 
-1.002737, -1.156864, -28.875965, 	2.000000, 0.884407, 	0.570246, -0.818775, 0.066533, 
-1.002737, -1.156864, -28.875965, 	2.000000, 0.884407, 	0.570246, -0.818775, 0.066533, 
-1.002737, -0.895025, -26.385365, 	2.000000, 0.812277, 	0.568649, -0.814249, 0.116778, 
-0.000000, -1.126870, -26.349302, 	1.500000, 0.812277, 	0.000000, -0.989855, 0.142082, 
-0.000000, -1.126870, -26.349302, 	1.500000, 0.812277, 	0.000000, -0.989855, 0.142082, 
--1.002737, -0.895025, -26.385366, 	1.000000, 0.812277, 	-0.568649, -0.814249, 0.116778, 
--1.002737, -1.156864, -28.875961, 	1.000000, 0.884407, 	-0.570246, -0.818776, 0.066533, 
--1.002737, -0.385786, -23.498796, 	1.000000, 0.718491, 	-0.565019, -0.802220, 0.192863, 
--1.002737, -0.895025, -26.385366, 	1.000000, 0.812277, 	-0.568649, -0.814249, 0.116778, 
-0.000000, -1.126870, -26.349302, 	1.500000, 0.812277, 	0.000000, -0.989855, 0.142082, 
-0.000000, -1.126870, -26.349302, 	1.500000, 0.812277, 	0.000000, -0.989855, 0.142082, 
-1.002737, -0.895025, -26.385365, 	2.000000, 0.812277, 	0.568649, -0.814249, 0.116778, 
-1.002737, -0.385786, -23.498796, 	2.000000, 0.718491, 	0.564910, -0.802377, 0.192532, 
-1.002737, -0.385786, -23.498796, 	2.000000, 0.718491, 	0.564910, -0.802377, 0.192532, 
-1.004758, 0.522999, -20.483551, 	2.000000, 0.596697, 	0.555081, -0.772140, 0.309331, 
-0.002021, 0.293610, -20.435085, 	1.500000, 0.596697, 	-0.000089, -0.928581, 0.371129, 
-0.002021, 0.293610, -20.435085, 	1.500000, 0.596697, 	-0.000089, -0.928581, 0.371129, 
--1.000716, 0.522999, -20.483551, 	1.046875, 0.600702, 	-0.555184, -0.771596, 0.310500, 
--1.002737, -0.385786, -23.498796, 	1.000000, 0.718491, 	-0.565019, -0.802220, 0.192863, 
--0.994652, 1.983473, -17.606916, 	1.187500, 0.456561, 	-0.553223, -0.737418, 0.387504, 
--1.000716, 0.522999, -20.483551, 	1.046875, 0.600702, 	-0.555184, -0.771596, 0.310500, 
-0.002021, 0.293610, -20.435085, 	1.500000, 0.596697, 	-0.000089, -0.928581, 0.371129, 
-0.002021, 0.293610, -20.435085, 	1.500000, 0.596697, 	-0.000089, -0.928581, 0.371129, 
-1.004758, 0.522999, -20.483551, 	2.000000, 0.596697, 	0.555081, -0.772140, 0.309331, 
-1.010821, 1.983473, -17.606916, 	2.000000, 0.440543, 	0.553586, -0.738015, 0.385845, 
-1.010821, 1.983473, -17.606916, 	2.000000, 0.440543, 	0.553586, -0.738015, 0.385845, 
-1.014864, 3.544037, -14.721523, 	2.000000, 0.267209, 	0.562535, -0.748836, 0.350428, 
-0.012127, 3.312792, -14.692760, 	1.500000, 0.267209, 	0.000169, -0.904592, 0.426279, 
-0.012127, 3.312792, -14.692760, 	1.500000, 0.267209, 	0.000169, -0.904592, 0.426279, 
--0.990610, 3.544037, -14.721523, 	1.000000, 0.267209, 	-0.562098, -0.749029, 0.350717, 
--0.994652, 1.983473, -17.606916, 	1.187500, 0.456561, 	-0.553223, -0.737418, 0.387504, 
--1.002737, 5.163677, -6.177338, 	1.000000, -0.308178, 	-0.587361, -0.794674, -0.153298, 
--1.000716, 5.372389, -8.744530, 	1.000000, -0.079458, 	-0.594849, -0.801661, 0.059106, 
-0.002021, 5.139305, -8.742946, 	1.500000, -0.079458, 	-0.000101, -0.997122, 0.075814, 
-0.002021, 5.139305, -8.742946, 	1.500000, -0.079458, 	-0.000101, -0.997122, 0.075814, 
-1.004758, 5.372389, -8.744530, 	2.000000, -0.079458, 	0.594556, -0.801738, 0.060986, 
-1.002737, 5.163681, -6.177338, 	2.000000, -0.308178, 	0.587260, -0.794834, -0.152858, 
-1.002737, 5.163681, -6.177338, 	2.000000, -0.308178, 	0.587260, -0.794834, -0.152858, 
-1.002737, 4.402004, -3.694788, 	2.000000, -0.537451, 	0.571136, -0.774985, -0.270560, 
-0.000000, 4.171406, -3.728287, 	1.500000, -0.537451, 	0.000000, -0.943782, -0.330570, 
-0.000000, 4.171406, -3.728287, 	1.500000, -0.537451, 	0.000000, -0.943782, -0.330570, 
--1.002737, 4.402004, -3.694788, 	1.000000, -0.537451, 	-0.571136, -0.774985, -0.270559, 
--1.002737, 5.163677, -6.177338, 	1.000000, -0.308178, 	-0.587361, -0.794674, -0.153298, 
--1.002737, 3.362402, -1.013249, 	1.000000, -0.767833, 	-0.559574, -0.778227, -0.285025, 
--1.002737, 4.402004, -3.694788, 	1.000000, -0.537451, 	-0.571136, -0.774985, -0.270559, 
-0.000000, 4.171406, -3.728287, 	1.500000, -0.537451, 	0.000000, -0.943782, -0.330570, 
-0.000000, 4.171406, -3.728287, 	1.500000, -0.537451, 	0.000000, -0.943782, -0.330570, 
-1.002737, 4.402004, -3.694788, 	2.000000, -0.537451, 	0.571136, -0.774985, -0.270560, 
-1.002737, 3.362402, -1.013249, 	2.000000, -0.767833, 	0.559574, -0.778227, -0.285025, 
-1.002737, 3.362402, -1.013249, 	2.000000, -0.767833, 	0.559574, -0.778227, -0.285025, 
-1.002737, 2.394936, 1.783656, 	2.000000, -0.979466, 	0.550621, -0.806194, -0.216490, 
-0.000000, 2.167702, 1.752268, 	1.500000, -0.979466, 	-0.000000, -0.966229, -0.257685, 
-0.000000, 2.167702, 1.752268, 	1.500000, -0.979466, 	-0.000000, -0.966229, -0.257685, 
--1.002737, 2.394936, 1.783656, 	1.046875, -0.973474, 	-0.550621, -0.806194, -0.216490, 
--1.002737, 3.362402, -1.013249, 	1.000000, -0.767833, 	-0.559574, -0.778227, -0.285025, 
--1.002737, 1.849670, 4.612304, 	1.187500, -1.128520, 	-0.548005, -0.830422, -0.100446, 
--1.002737, 2.394936, 1.783656, 	1.046875, -0.973474, 	-0.550621, -0.806194, -0.216490, 
-0.000000, 2.167702, 1.752268, 	1.500000, -0.979466, 	-0.000000, -0.966229, -0.257685, 
-0.000000, 2.167702, 1.752268, 	1.500000, -0.979466, 	-0.000000, -0.966229, -0.257685, 
-1.002737, 2.394936, 1.783656, 	2.000000, -0.979466, 	0.550621, -0.806194, -0.216490, 
-1.002737, 1.849670, 4.612304, 	2.000000, -1.152493, 	0.548005, -0.830422, -0.100446, 
-1.002737, 1.849670, 4.612304, 	2.000000, -1.152493, 	0.548005, -0.830422, -0.100446, 
-1.002737, 1.707661, 7.456823, 	2.000000, -1.306215, 	0.546192, -0.837529, 0.014826, 
-0.000000, 1.483450, 7.466458, 	1.500000, -1.306215, 	0.000000, -0.999837, 0.018050, 
-0.000000, 1.483450, 7.466458, 	1.500000, -1.306215, 	0.000000, -0.999837, 0.018050, 
--1.002737, 1.707661, 7.456823, 	1.000000, -1.306215, 	-0.546192, -0.837529, 0.014826, 
--1.002737, 1.849670, 4.612304, 	1.187500, -1.128520, 	-0.548005, -0.830422, -0.100446, 
--1.022346, 3.341311, 15.726742, 	1.166667, -1.691614, 	-0.553953, -0.781075, 0.288198, 
--1.007639, 2.515034, 13.079953, 	1.000000, -1.613659, 	-0.551445, -0.808533, 0.205386, 
--0.004902, 2.294706, 13.134627, 	1.500000, -1.613659, 	0.000247, -0.968748, 0.248048, 
--0.004902, 2.294706, 13.134627, 	1.500000, -1.613659, 	0.000247, -0.968748, 0.248048, 
-0.997835, 2.515034, 13.079953, 	2.000000, -1.613659, 	0.552074, -0.807195, 0.208929, 
-0.983128, 3.341311, 15.726744, 	2.000000, -1.695003, 	0.553551, -0.779630, 0.292845, 
-0.983128, 3.341311, 15.726744, 	2.000000, -1.695003, 	0.553551, -0.779630, 0.292845, 
-0.973323, 4.412262, 18.174875, 	2.000000, -1.776346, 	0.554281, -0.740975, 0.379115, 
--0.029414, 4.201355, 18.265430, 	1.500000, -1.776346, 	-0.000535, -0.890739, 0.454514, 
--0.029414, 4.201355, 18.265430, 	1.500000, -1.776346, 	-0.000535, -0.890739, 0.454514, 
--1.032151, 4.412262, 18.174877, 	1.000000, -1.776346, 	-0.555665, -0.740194, 0.378615, 
--1.022346, 3.341311, 15.726742, 	1.166667, -1.691614, 	-0.553953, -0.781075, 0.288198, 
-0.000000, 8.401409, 24.234768, 	1.500000, -2.000000, 	-0.000001, -0.291501, 0.956571, 
--0.742768, 8.411285, 23.925793, 	1.000000, -2.000000, 	-0.485429, -0.281111, 0.827850, 
--1.002737, 7.854620, 23.452549, 	1.000000, -1.969517, 	-0.579230, -0.604597, 0.546768, 
--1.002737, 7.854620, 23.452549, 	1.000000, -1.969517, 	-0.579230, -0.604597, 0.546768, 
--1.007639, 6.953747, 22.156216, 	1.000000, -1.939034, 	-0.571627, -0.672843, 0.469600, 
--0.004902, 6.752687, 22.278475, 	1.500000, -1.939034, 	0.000369, -0.822635, 0.568570, 
--0.004902, 6.752687, 22.278475, 	1.500000, -1.939034, 	0.000369, -0.822635, 0.568570, 
-0.997835, 6.953747, 22.156214, 	2.000000, -1.939034, 	0.572743, -0.675634, 0.464203, 
-1.002737, 7.854620, 23.452549, 	2.000000, -1.969517, 	0.580173, -0.605657, 0.544591, 
-1.002737, 7.854620, 23.452549, 	2.000000, -1.969517, 	0.580173, -0.605657, 0.544591, 
-0.742768, 8.411285, 23.925795, 	2.000000, -2.000000, 	0.485428, -0.281111, 0.827851, 
-0.000000, 8.401409, 24.234768, 	1.500000, -2.000000, 	-0.000001, -0.291501, 0.956571, 
-1.002737, 0.129889, -32.334755, 	2.937500, 0.946466, 	0.578352, 0.815661, -0.014359, 
-1.002737, 0.153999, -30.965355, 	2.906250, 0.897588, 	0.580105, 0.814042, -0.028521, 
-1.336982, -0.552929, -30.921089, 	2.500000, 0.937170, 	0.999978, -0.006539, 0.000687, 
-1.336982, -0.552929, -30.921089, 	2.500000, 0.937170, 	0.999978, -0.006539, 0.000687, 
-1.002737, -1.259859, -30.876823, 	2.000000, 0.937170, 	0.573164, -0.818795, 0.032517, 
-1.002737, -1.292564, -32.294174, 	2.000000, 0.972854, 	0.576237, -0.817066, 0.018853, 
-1.002737, -1.156864, -28.875965, 	2.000000, 0.884407, 	0.570246, -0.818775, 0.066533, 
-1.002737, -1.259859, -30.876823, 	2.000000, 0.937170, 	0.573164, -0.818795, 0.032517, 
-1.336982, -0.552929, -30.921089, 	2.500000, 0.937170, 	0.999978, -0.006539, 0.000687, 
-1.336982, -0.552929, -30.921089, 	2.500000, 0.937170, 	0.999978, -0.006539, 0.000687, 
-1.002737, 0.153999, -30.965355, 	2.906250, 0.897588, 	0.580105, 0.814042, -0.028521, 
-1.002737, 0.245815, -29.027195, 	2.937500, 0.858019, 	0.580554, 0.811733, -0.063605, 
-1.002737, 0.245815, -29.027195, 	2.937500, 0.858019, 	0.580554, 0.811733, -0.063605, 
-1.002737, 0.496042, -26.601746, 	2.968750, 0.804268, 	0.581048, 0.805721, -0.114877, 
-1.336982, -0.199492, -26.493555, 	2.500000, 0.812277, 	0.999928, -0.011914, 0.001651, 
-1.336982, -0.199492, -26.493555, 	2.500000, 0.812277, 	0.999928, -0.011914, 0.001651, 
-1.002737, -0.895025, -26.385365, 	2.000000, 0.812277, 	0.568649, -0.814249, 0.116778, 
-1.002737, -1.156864, -28.875965, 	2.000000, 0.884407, 	0.570246, -0.818775, 0.066533, 
-1.002737, -0.385786, -23.498796, 	2.000000, 0.718491, 	0.564910, -0.802377, 0.192532, 
-1.002737, -0.895025, -26.385365, 	2.000000, 0.812277, 	0.568649, -0.814249, 0.116778, 
-1.336982, -0.199492, -26.493555, 	2.500000, 0.812277, 	0.999928, -0.011914, 0.001651, 
-1.336982, -0.199492, -26.493555, 	2.500000, 0.812277, 	0.999928, -0.011914, 0.001651, 
-1.002737, 0.496042, -26.601746, 	2.968750, 0.804268, 	0.581048, 0.805721, -0.114877, 
-1.002737, 0.995396, -23.770485, 	2.937500, 0.712843, 	0.583294, 0.789623, -0.190427, 
-1.002737, 0.995396, -23.770485, 	2.937500, 0.712843, 	0.583294, 0.789623, -0.190427, 
-1.004758, 1.899328, -20.774343, 	2.890625, 0.592229, 	0.578470, 0.756840, -0.304248, 
-1.339004, 1.211163, -20.628948, 	2.500000, 0.596697, 	0.999699, -0.021427, 0.011933, 
-1.339004, 1.211163, -20.628948, 	2.500000, 0.596697, 	0.999699, -0.021427, 0.011933, 
-1.004758, 0.522999, -20.483551, 	2.000000, 0.596697, 	0.555081, -0.772140, 0.309331, 
-1.002737, -0.385786, -23.498796, 	2.000000, 0.718491, 	0.564910, -0.802377, 0.192532, 
-1.010821, 1.983473, -17.606916, 	2.000000, 0.440543, 	0.553586, -0.738015, 0.385845, 
-1.004758, 0.522999, -20.483551, 	2.000000, 0.596697, 	0.555081, -0.772140, 0.309331, 
-1.339004, 1.211163, -20.628948, 	2.500000, 0.596697, 	0.999699, -0.021427, 0.011933, 
-1.339004, 1.211163, -20.628948, 	2.500000, 0.596697, 	0.999699, -0.021427, 0.011933, 
-1.004758, 1.899328, -20.774343, 	2.890625, 0.592229, 	0.578470, 0.756840, -0.304248, 
-1.010821, 3.363289, -17.854240, 	2.875000, 0.450913, 	0.554791, 0.739026, -0.382161, 
-1.010821, 3.363289, -17.854240, 	2.875000, 0.450913, 	0.554791, 0.739026, -0.382161, 
-1.014864, 4.931509, -14.894089, 	3.000000, 0.267209, 	0.545447, 0.762198, -0.348629, 
-1.349109, 4.237772, -14.807808, 	2.500000, 0.267209, 	0.999805, 0.015731, -0.011963, 
-1.349109, 4.237772, -14.807808, 	2.500000, 0.267209, 	0.999805, 0.015731, -0.011963, 
-1.014864, 3.544037, -14.721523, 	2.000000, 0.267209, 	0.562535, -0.748836, 0.350428, 
-1.010821, 1.983473, -17.606916, 	2.000000, 0.440543, 	0.553586, -0.738015, 0.385845, 
-1.002737, 5.163681, -6.177338, 	2.000000, -0.308178, 	0.587260, -0.794834, -0.152858, 
-1.004758, 5.372389, -8.744530, 	2.000000, -0.079458, 	0.594556, -0.801738, 0.060986, 
-1.339004, 6.071638, -8.749280, 	2.500000, -0.079458, 	0.999013, 0.044275, -0.003633, 
-1.339004, 6.071638, -8.749280, 	2.500000, -0.079458, 	0.999013, 0.044275, -0.003633, 
-1.004758, 6.770885, -8.754030, 	3.000000, -0.079458, 	0.549543, 0.833398, -0.058740, 
-1.002737, 6.556976, -6.071414, 	2.937500, -0.360878, 	0.552962, 0.818993, 0.153246, 
-1.002737, 6.556976, -6.071414, 	2.937500, -0.360878, 	0.552962, 0.818993, 0.153246, 
-1.002737, 5.785589, -3.493792, 	2.968750, -0.549437, 	0.556039, 0.785897, 0.270530, 
-1.336982, 5.093796, -3.594290, 	2.500000, -0.537451, 	0.999877, 0.014256, 0.006545, 
-1.336982, 5.093796, -3.594290, 	2.500000, -0.537451, 	0.999877, 0.014256, 0.006545, 
-1.002737, 4.402004, -3.694788, 	2.000000, -0.537451, 	0.571136, -0.774985, -0.270560, 
-1.002737, 5.163681, -6.177338, 	2.000000, -0.308178, 	0.587260, -0.794834, -0.152858, 
-1.002737, 3.362402, -1.013249, 	2.000000, -0.767833, 	0.559574, -0.778227, -0.285025, 
-1.002737, 4.402004, -3.694788, 	2.000000, -0.537451, 	0.571136, -0.774985, -0.270560, 
-1.336982, 5.093796, -3.594290, 	2.500000, -0.537451, 	0.999877, 0.014256, 0.006545, 
-1.336982, 5.093796, -3.594290, 	2.500000, -0.537451, 	0.999877, 0.014256, 0.006545, 
-1.002737, 5.785589, -3.493792, 	2.968750, -0.549437, 	0.556039, 0.785897, 0.270530, 
-1.002737, 4.735826, -0.785002, 	2.937500, -0.763077, 	0.563593, 0.774459, 0.287360, 
-1.002737, 4.735826, -0.785002, 	2.937500, -0.763077, 	0.563593, 0.774459, 0.287360, 
-1.002737, 3.758350, 1.971984, 	2.890625, -0.966339, 	0.573361, 0.788967, 0.220880, 
-1.336982, 3.076645, 1.877820, 	2.500000, -0.979466, 	0.999725, -0.022213, -0.007478, 
-1.336982, 3.076645, 1.877820, 	2.500000, -0.979466, 	0.999725, -0.022213, -0.007478, 
-1.002737, 2.394936, 1.783656, 	2.000000, -0.979466, 	0.550621, -0.806194, -0.216490, 
-1.002737, 3.362402, -1.013249, 	2.000000, -0.767833, 	0.559574, -0.778227, -0.285025, 
-1.336982, 2.380295, 7.427917, 	2.500000, -1.306215, 	0.999670, -0.025705, 0.000199, 
-1.002737, 1.707661, 7.456823, 	2.000000, -1.306215, 	0.546192, -0.837529, 0.014826, 
-1.002737, 1.849670, 4.612304, 	2.000000, -1.152493, 	0.548005, -0.830422, -0.100446, 
-1.002737, 1.849670, 4.612304, 	2.000000, -1.152493, 	0.548005, -0.830422, -0.100446, 
-1.002737, 2.394936, 1.783656, 	2.000000, -0.979466, 	0.550621, -0.806194, -0.216490, 
-1.336982, 3.076645, 1.877820, 	2.500000, -0.979466, 	0.999725, -0.022213, -0.007478, 
-1.336982, 3.076645, 1.877820, 	2.500000, -0.979466, 	0.999725, -0.022213, -0.007478, 
-1.002737, 3.758350, 1.971984, 	2.890625, -0.966339, 	0.573361, 0.788967, 0.220880, 
-1.002737, 3.203825, 4.694192, 	2.875000, -1.123764, 	0.573167, 0.812586, 0.105755, 
-1.002737, 3.203825, 4.694192, 	2.875000, -1.123764, 	0.573167, 0.812586, 0.105755, 
-1.002737, 3.052929, 7.399012, 	3.000000, -1.306215, 	0.571504, 0.820504, -0.012461, 
-1.336982, 2.380295, 7.427917, 	2.500000, -1.306215, 	0.999670, -0.025705, 0.000199, 
-0.983128, 3.341311, 15.726744, 	2.000000, -1.695003, 	0.553551, -0.779630, 0.292845, 
-0.997835, 2.515034, 13.079953, 	2.000000, -1.613659, 	0.552074, -0.807195, 0.208929, 
-1.332080, 3.176014, 12.915927, 	2.500000, -1.613659, 	0.999801, -0.018232, 0.008046, 
-1.332080, 3.176014, 12.915927, 	2.500000, -1.613659, 	0.999801, -0.018232, 0.008046, 
-0.997834, 3.836994, 12.751901, 	3.000000, -1.613659, 	0.571655, 0.794480, -0.204969, 
-0.983128, 4.637777, 15.286472, 	2.833333, -1.698392, 	0.573967, 0.767126, -0.286495, 
-0.983128, 4.637777, 15.286472, 	2.833333, -1.698392, 	0.573967, 0.767126, -0.286495, 
-0.973323, 5.677700, 17.631544, 	3.000000, -1.776346, 	0.576561, 0.724323, -0.378066, 
-1.307569, 5.044981, 17.903212, 	2.500000, -1.776346, 	0.999751, -0.019683, 0.010530, 
-1.307569, 5.044981, 17.903212, 	2.500000, -1.776346, 	0.999751, -0.019683, 0.010530, 
-0.973323, 4.412262, 18.174875, 	2.000000, -1.776346, 	0.554281, -0.740975, 0.379115, 
-0.983128, 3.341311, 15.726744, 	2.000000, -1.695003, 	0.553551, -0.779630, 0.292845, 
-1.002737, 8.987209, 23.827108, 	2.500000, -2.000000, 	0.690085, 0.408969, 0.597099, 
-0.742768, 8.411285, 23.925795, 	2.000000, -2.000000, 	0.485428, -0.281111, 0.827851, 
-1.002737, 7.854620, 23.452549, 	2.000000, -1.969517, 	0.580173, -0.605657, 0.544591, 
-1.002737, 7.854620, 23.452549, 	2.000000, -1.969517, 	0.580173, -0.605657, 0.544591, 
-0.997835, 6.953747, 22.156214, 	2.000000, -1.939034, 	0.572743, -0.675634, 0.464203, 
-1.332080, 7.556932, 21.789433, 	2.500000, -1.939034, 	0.999977, -0.005048, -0.004524, 
-1.332080, 7.556932, 21.789433, 	2.500000, -1.939034, 	0.999977, -0.005048, -0.004524, 
-0.997834, 8.160118, 21.422651, 	3.000000, -1.939034, 	0.574744, 0.665807, -0.475784, 
-1.002737, 9.038933, 22.663582, 	3.000000, -1.969517, 	0.583232, 0.718345, -0.379238, 
-1.002737, 9.038933, 22.663582, 	3.000000, -1.969517, 	0.583232, 0.718345, -0.379238, 
-0.742768, 9.282909, 23.329664, 	3.000000, -2.000000, 	0.487250, 0.872639, 0.032983, 
-1.002737, 8.987209, 23.827108, 	2.500000, -2.000000, 	0.690085, 0.408969, 0.597099, 
--1.002737, 0.129889, -32.334755, 	3.500000, 0.761751, 	-0.578352, 0.815661, -0.014359, 
--1.002737, 0.153999, -30.965355, 	3.000000, 0.523501, 	-0.580105, 0.814042, -0.028521, 
-0.000000, 0.389645, -30.980114, 	3.125000, 0.778842, 	-0.000000, 0.999403, -0.034561, 
-0.000000, 0.389645, -30.980114, 	3.125000, 0.778842, 	-0.000000, 0.999403, -0.034561, 
-1.002737, 0.153999, -30.965355, 	2.906250, 0.897588, 	0.580105, 0.814042, -0.028521, 
-1.002737, 0.129889, -32.334755, 	2.937500, 0.946466, 	0.578352, 0.815661, -0.014359, 
-1.002737, 0.245815, -29.027195, 	2.937500, 0.858019, 	0.580554, 0.811733, -0.063605, 
-1.002737, 0.153999, -30.965355, 	2.906250, 0.897588, 	0.580105, 0.814042, -0.028521, 
-0.000000, 0.389645, -30.980114, 	3.125000, 0.778842, 	-0.000000, 0.999403, -0.034561, 
-0.000000, 0.389645, -30.980114, 	3.125000, 0.778842, 	-0.000000, 0.999403, -0.034561, 
--1.002737, 0.153999, -30.965355, 	3.000000, 0.523501, 	-0.580105, 0.814042, -0.028521, 
--1.002737, 0.245815, -29.027195, 	3.500000, 0.673303, 	-0.580554, 0.811733, -0.063605, 
--1.002737, 0.245815, -29.027195, 	3.500000, 0.673303, 	-0.580554, 0.811733, -0.063605, 
--1.002737, 0.496042, -26.601746, 	4.000000, 0.823105, 	-0.581048, 0.805721, -0.114877, 
-0.000000, 0.727886, -26.637808, 	3.375000, 0.780241, 	0.000000, 0.990007, -0.141020, 
-0.000000, 0.727886, -26.637808, 	3.375000, 0.780241, 	0.000000, 0.990007, -0.141020, 
-1.002737, 0.496042, -26.601746, 	2.968750, 0.804268, 	0.581048, 0.805721, -0.114877, 
-1.002737, 0.245815, -29.027195, 	2.937500, 0.858019, 	0.580554, 0.811733, -0.063605, 
-1.002737, 0.995396, -23.770485, 	2.937500, 0.712843, 	0.583294, 0.789623, -0.190427, 
-1.002737, 0.496042, -26.601746, 	2.968750, 0.804268, 	0.581048, 0.805721, -0.114877, 
-0.000000, 0.727886, -26.637808, 	3.375000, 0.780241, 	0.000000, 0.990007, -0.141020, 
-0.000000, 0.727886, -26.637808, 	3.375000, 0.780241, 	0.000000, 0.990007, -0.141020, 
--1.002737, 0.496042, -26.601746, 	4.000000, 0.823105, 	-0.581048, 0.805721, -0.114877, 
--1.002737, 0.995396, -23.770485, 	3.500000, 0.673303, 	-0.583417, 0.789634, -0.190008, 
--1.002737, 0.995396, -23.770485, 	3.500000, 0.673303, 	-0.583417, 0.789634, -0.190008, 
--1.000716, 1.899328, -20.774343, 	3.000000, 0.523501, 	-0.578823, 0.757196, -0.302684, 
-0.002021, 2.128716, -20.822807, 	3.062500, 0.578824, 	-0.000086, 0.927679, -0.373379, 
-0.002021, 2.128716, -20.822807, 	3.062500, 0.578824, 	-0.000086, 0.927679, -0.373379, 
-1.004758, 1.899328, -20.774343, 	2.890625, 0.592229, 	0.578470, 0.756840, -0.304248, 
-1.002737, 0.995396, -23.770485, 	2.937500, 0.712843, 	0.583294, 0.789623, -0.190427, 
-0.012127, 5.162754, -14.922852, 	3.000000, 0.395355, 	0.000167, 0.910359, -0.413819, 
-1.014864, 4.931509, -14.894089, 	3.000000, 0.267209, 	0.545447, 0.762198, -0.348629, 
-1.010821, 3.363289, -17.854240, 	2.875000, 0.450913, 	0.554791, 0.739026, -0.382161, 
-1.010821, 3.363289, -17.854240, 	2.875000, 0.450913, 	0.554791, 0.739026, -0.382161, 
-1.004758, 1.899328, -20.774343, 	2.890625, 0.592229, 	0.578470, 0.756840, -0.304248, 
-0.002021, 2.128716, -20.822807, 	3.062500, 0.578824, 	-0.000086, 0.927679, -0.373379, 
-0.002021, 2.128716, -20.822807, 	3.062500, 0.578824, 	-0.000086, 0.927679, -0.373379, 
--1.000716, 1.899328, -20.774343, 	3.000000, 0.523501, 	-0.578823, 0.757196, -0.302684, 
--0.994652, 3.363289, -17.854239, 	3.000000, 0.523501, 	-0.554925, 0.739714, -0.380633, 
--0.994652, 3.363289, -17.854239, 	3.000000, 0.523501, 	-0.554925, 0.739714, -0.380633, 
--0.990610, 4.931509, -14.894089, 	3.000000, 0.523501, 	-0.544986, 0.762408, -0.348891, 
-0.012127, 5.162754, -14.922852, 	3.000000, 0.395355, 	0.000167, 0.910359, -0.413819, 
-1.002737, 6.556976, -6.071414, 	2.937500, -0.360878, 	0.552962, 0.818993, 0.153246, 
-1.004758, 6.770885, -8.754030, 	3.000000, -0.079458, 	0.549543, 0.833398, -0.058740, 
-0.002021, 7.003967, -8.755614, 	3.000000, -0.501061, 	-0.000102, 0.997541, -0.070087, 
-0.002021, 7.003967, -8.755614, 	3.000000, -0.501061, 	-0.000102, 0.997541, -0.070087, 
--1.000716, 6.770885, -8.754030, 	3.000000, -0.922665, 	-0.549751, 0.833161, -0.060139, 
--1.002737, 6.556976, -6.071414, 	3.500000, -0.729781, 	-0.553122, 0.818963, 0.152824, 
--1.002737, 6.556976, -6.071414, 	3.500000, -0.729781, 	-0.553122, 0.818963, 0.152824, 
--1.002737, 5.785589, -3.493792, 	4.000000, -0.536897, 	-0.556039, 0.785897, 0.270530, 
-0.000000, 6.016188, -3.460293, 	3.375000, -0.585395, 	-0.000000, 0.945916, 0.324411, 
-0.000000, 6.016188, -3.460293, 	3.375000, -0.585395, 	-0.000000, 0.945916, 0.324411, 
-1.002737, 5.785589, -3.493792, 	2.968750, -0.549437, 	0.556039, 0.785897, 0.270530, 
-1.002737, 6.556976, -6.071414, 	2.937500, -0.360878, 	0.552962, 0.818993, 0.153246, 
-1.002737, 4.735826, -0.785002, 	2.937500, -0.763077, 	0.563593, 0.774459, 0.287360, 
-1.002737, 5.785589, -3.493792, 	2.968750, -0.549437, 	0.556039, 0.785897, 0.270530, 
-0.000000, 6.016188, -3.460293, 	3.375000, -0.585395, 	-0.000000, 0.945916, 0.324411, 
-0.000000, 6.016188, -3.460293, 	3.375000, -0.585395, 	-0.000000, 0.945916, 0.324411, 
--1.002737, 5.785589, -3.493792, 	4.000000, -0.536897, 	-0.556039, 0.785897, 0.270530, 
--1.002737, 4.735826, -0.785002, 	3.500000, -0.729781, 	-0.563593, 0.774459, 0.287360, 
--1.002737, 4.735826, -0.785002, 	3.500000, -0.729781, 	-0.563593, 0.774459, 0.287360, 
--1.002737, 3.758350, 1.971984, 	3.000000, -0.922665, 	-0.573360, 0.788967, 0.220880, 
-0.000000, 3.985586, 2.003372, 	3.062500, -0.926955, 	0.000000, 0.962477, 0.271365, 
-0.000000, 3.985586, 2.003372, 	3.062500, -0.926955, 	0.000000, 0.962477, 0.271365, 
-1.002737, 3.758350, 1.971984, 	2.890625, -0.966339, 	0.573361, 0.788967, 0.220880, 
-1.002737, 4.735826, -0.785002, 	2.937500, -0.763077, 	0.563593, 0.774459, 0.287360, 
-1.002737, 3.203825, 4.694192, 	2.875000, -1.123764, 	0.573167, 0.812586, 0.105755, 
-1.002737, 3.758350, 1.971984, 	2.890625, -0.966339, 	0.573361, 0.788967, 0.220880, 
-0.000000, 3.985586, 2.003372, 	3.062500, -0.926955, 	0.000000, 0.962477, 0.271365, 
-0.000000, 3.985586, 2.003372, 	3.062500, -0.926955, 	0.000000, 0.962477, 0.271365, 
--1.002737, 3.758350, 1.971984, 	3.000000, -0.922665, 	-0.573360, 0.788967, 0.220880, 
--1.002737, 3.203825, 4.694192, 	3.000000, -0.922665, 	-0.573166, 0.812586, 0.105755, 
--1.002737, 3.203825, 4.694192, 	3.000000, -0.922665, 	-0.573166, 0.812586, 0.105755, 
--1.002737, 3.052929, 7.399012, 	3.000000, -0.922665, 	-0.571504, 0.820505, -0.012461, 
-0.000000, 3.277142, 7.389376, 	3.000000, -1.114440, 	0.000000, 0.999891, -0.014768, 
-0.000000, 3.277142, 7.389376, 	3.000000, -1.114440, 	0.000000, 0.999891, -0.014768, 
-1.002737, 3.052929, 7.399012, 	3.000000, -1.306215, 	0.571504, 0.820504, -0.012461, 
-1.002737, 3.203825, 4.694192, 	2.875000, -1.123764, 	0.573167, 0.812586, 0.105755, 
--0.029414, 5.888605, 17.540989, 	2.833333, -1.749232, 	-0.000556, 0.885983, -0.463718, 
-0.973323, 5.677700, 17.631544, 	3.000000, -1.776346, 	0.576561, 0.724323, -0.378066, 
-0.983128, 4.637777, 15.286472, 	2.833333, -1.698392, 	0.573967, 0.767126, -0.286495, 
-0.983128, 4.637777, 15.286472, 	2.833333, -1.698392, 	0.573967, 0.767126, -0.286495, 
-0.997834, 3.836994, 12.751901, 	3.000000, -1.613659, 	0.571655, 0.794480, -0.204969, 
--0.004902, 4.057320, 12.697225, 	2.833333, -1.667888, 	0.000259, 0.967531, -0.252752, 
--0.004902, 4.057320, 12.697225, 	2.833333, -1.667888, 	0.000259, 0.967531, -0.252752, 
--1.007639, 3.836994, 12.751901, 	2.666667, -1.722117, 	-0.571038, 0.793815, -0.209219, 
--1.022346, 4.637777, 15.286472, 	2.666667, -1.722117, 	-0.574184, 0.765044, -0.291584, 
--1.022346, 4.637777, 15.286472, 	2.666667, -1.722117, 	-0.574184, 0.765044, -0.291584, 
--1.032151, 5.677700, 17.631544, 	2.666667, -1.722117, 	-0.577835, 0.723604, -0.377496, 
--0.029414, 5.888605, 17.540989, 	2.833333, -1.749232, 	-0.000556, 0.885983, -0.463718, 
-0.000000, 9.573013, 23.419453, 	3.500000, -2.000000, 	-0.000000, 0.997856, 0.065453, 
-0.742768, 9.282909, 23.329664, 	3.000000, -2.000000, 	0.487250, 0.872639, 0.032983, 
-1.002737, 9.038933, 22.663582, 	3.000000, -1.969517, 	0.583232, 0.718345, -0.379238, 
-1.002737, 9.038933, 22.663582, 	3.000000, -1.969517, 	0.583232, 0.718345, -0.379238, 
-0.997834, 8.160118, 21.422651, 	3.000000, -1.939034, 	0.574744, 0.665807, -0.475784, 
--0.004902, 8.361179, 21.300390, 	3.500000, -1.939034, 	0.000389, 0.815229, -0.579139, 
--0.004902, 8.361179, 21.300390, 	3.500000, -1.939034, 	0.000389, 0.815229, -0.579139, 
--1.007639, 8.160118, 21.422651, 	4.000000, -1.939034, 	-0.574068, 0.669723, -0.471080, 
--1.002737, 9.038933, 22.663582, 	4.000000, -1.969517, 	-0.582357, 0.720010, -0.377421, 
--1.002737, 9.038933, 22.663582, 	4.000000, -1.969517, 	-0.582357, 0.720010, -0.377421, 
--0.742768, 9.282909, 23.329664, 	4.000000, -2.000000, 	-0.487251, 0.872639, 0.032983, 
-0.000000, 9.573013, 23.419453, 	3.500000, -2.000000, 	-0.000000, 0.997856, 0.065453, 
--1.002737, -2.734034, 6.657467, 	1.500000, 0.761751, 	-0.582703, 0.762742, 0.280503, 
--1.002737, -1.996943, 4.816424, 	0.000000, 1.000000, 	-0.580237, 0.756078, 0.302774, 
--1.336982, -2.618040, 4.463405, 	0.500000, 1.000000, 	-0.999977, -0.006223, -0.002555, 
--1.336982, -2.618040, 4.463405, 	0.500000, 1.000000, 	-0.999977, -0.006223, -0.002555, 
--1.002737, -3.239137, 4.110385, 	1.000000, 1.000000, 	-0.573276, -0.760494, -0.304965, 
--1.002737, -3.988198, 5.977939, 	1.187500, 0.890530, 	-0.568961, -0.771457, -0.284847, 
--1.002737, -3.988198, 5.977939, 	1.187500, 0.890530, 	-0.568961, -0.771457, -0.284847, 
--1.002737, -4.824668, 8.406097, 	1.000000, 0.817855, 	-0.564875, -0.790113, -0.237986, 
--1.336982, -4.187579, 8.722692, 	2.000000, 0.670678, 	-0.999851, -0.016874, -0.003651, 
--1.336982, -4.187579, 8.722692, 	2.000000, 0.670678, 	-0.999851, -0.016874, -0.003651, 
--1.002737, -3.550490, 9.039287, 	3.000000, 0.523501, 	-0.582189, 0.779143, 0.232362, 
--1.002737, -2.734034, 6.657467, 	1.500000, 0.761751, 	-0.582703, 0.762742, 0.280503, 
--1.002737, -4.339600, 12.037193, 	0.000000, 0.651188, 	-0.578711, 0.795540, 0.179472, 
--1.002737, -3.550490, 9.039287, 	0.000000, 0.817855, 	-0.582189, 0.779143, 0.232362, 
--1.336982, -4.187579, 8.722692, 	0.500000, 0.817855, 	-0.999851, -0.016874, -0.003651, 
--1.336982, -4.187579, 8.722692, 	0.500000, 0.817855, 	-0.999851, -0.016874, -0.003651, 
--1.002737, -4.824668, 8.406097, 	1.000000, 0.817855, 	-0.564875, -0.790113, -0.237986, 
--1.002737, -5.641894, 11.472322, 	1.000000, 0.651188, 	-0.564280, -0.804601, -0.184946, 
--1.002737, -5.641894, 11.472322, 	1.000000, 0.651188, 	-0.564280, -0.804601, -0.184946, 
--1.002737, -6.318611, 14.911804, 	1.000000, 0.470545, 	-0.563019, -0.816504, -0.127790, 
--1.336982, -5.652997, 15.157051, 	0.500000, 0.470545, 	-0.999903, -0.013895, -0.000479, 
--1.336982, -5.652997, 15.157051, 	0.500000, 0.470545, 	-0.999903, -0.013895, -0.000479, 
--1.002737, -4.987385, 15.402298, 	0.000000, 0.484521, 	-0.576620, 0.807781, 0.122473, 
--1.002737, -4.339600, 12.037193, 	0.000000, 0.651188, 	-0.578711, 0.795540, 0.179472, 
--1.002737, -5.379865, 18.885717, 	0.000000, 0.261948, 	-0.572718, 0.816712, 0.070540, 
--1.002737, -4.987385, 15.402298, 	0.000000, 0.484521, 	-0.576620, 0.807781, 0.122473, 
--1.336982, -5.652997, 15.157051, 	0.500000, 0.470545, 	-0.999903, -0.013895, -0.000479, 
--1.336982, -5.652997, 15.157051, 	0.500000, 0.470545, 	-0.999903, -0.013895, -0.000479, 
--1.002737, -6.318611, 14.911804, 	1.000000, 0.470545, 	-0.563019, -0.816504, -0.127790, 
--1.002737, -6.733546, 18.459730, 	1.000000, 0.261948, 	-0.564150, -0.822280, -0.074773, 
--1.002737, -6.733546, 18.459730, 	1.000000, 0.261948, 	-0.564150, -0.822280, -0.074773, 
--1.002737, -6.957025, 21.947737, 	1.000000, 0.047044, 	-0.566391, -0.823173, -0.039848, 
--1.336982, -6.271589, 22.133167, 	0.500000, 0.047044, 	-0.999991, -0.004281, 0.000323, 
--1.336982, -6.271589, 22.133167, 	0.500000, 0.047044, 	-0.999991, -0.004281, 0.000323, 
--1.002737, -5.586154, 22.318600, 	0.000000, 0.039374, 	-0.570604, 0.820419, 0.036373, 
--1.002737, -5.379865, 18.885717, 	0.000000, 0.261948, 	-0.572718, 0.816712, 0.070540, 
--1.002737, -5.675372, 25.532089, 	0.000000, -0.152521, 	-0.572885, 0.819555, 0.011471, 
--1.002737, -5.586154, 22.318600, 	0.000000, 0.039374, 	-0.570604, 0.820419, 0.036373, 
--1.336982, -6.271589, 22.133167, 	0.500000, 0.047044, 	-0.999991, -0.004281, 0.000323, 
--1.336982, -6.271589, 22.133167, 	0.500000, 0.047044, 	-0.999991, -0.004281, 0.000323, 
--1.002737, -6.957025, 21.947737, 	1.000000, 0.047044, 	-0.566391, -0.823173, -0.039848, 
--1.002737, -7.059372, 25.207462, 	1.000000, -0.152521, 	-0.565822, -0.824400, -0.014526, 
--1.002737, -7.059372, 25.207462, 	1.000000, -0.152521, 	-0.565822, -0.824400, -0.014526, 
--1.002737, -7.074721, 28.664906, 	1.000000, -0.338108, 	-0.564757, -0.825254, 0.002341, 
--1.336982, -6.377152, 28.805500, 	0.500000, -0.338108, 	-0.999930, -0.011845, 0.000045, 
--1.336982, -6.377152, 28.805500, 	0.500000, -0.338108, 	-0.999930, -0.011845, 0.000045, 
--1.002737, -5.679584, 28.946095, 	0.000000, -0.344415, 	-0.577055, 0.816690, -0.004975, 
--1.002737, -5.675372, 25.532089, 	0.000000, -0.152521, 	-0.572885, 0.819555, 0.011471, 
--1.002737, -5.630855, 32.893612, 	0.000000, -0.511082, 	-0.132943, 0.189166, -0.972904, 
--1.002737, -5.679584, 28.946095, 	0.000000, -0.344415, 	-0.577055, 0.816690, -0.004975, 
--1.336982, -6.377152, 28.805500, 	0.500000, -0.338108, 	-0.999930, -0.011845, 0.000045, 
--1.336982, -6.377152, 28.805500, 	0.500000, -0.338108, 	-0.999930, -0.011845, 0.000045, 
--1.002737, -7.074721, 28.664906, 	1.000000, -0.338108, 	-0.564757, -0.825254, 0.002341, 
--1.002737, -7.037199, 32.893612, 	1.000000, -0.511082, 	-0.140149, -0.202450, -0.969212, 
--1.002737, -7.037199, 32.893612, 	1.000000, -0.511082, 	-0.140149, -0.202450, -0.969212, 
--4.193409, -10.256766, 32.893612, 	1.027778, -0.557378, 	-0.685012, -0.716396, 0.132421, 
--5.620958, -6.307936, 32.893612, 	0.625000, -0.573582, 	-0.991757, -0.001005, 0.128133, 
--5.620958, -6.307936, 32.893612, 	0.625000, -0.573582, 	-0.991757, -0.001005, 0.128133, 
--4.193409, -2.445326, 32.893612, 	0.000000, -0.594415, 	-0.686924, 0.716419, 0.121978, 
--1.002737, -5.630855, 32.893612, 	0.000000, -0.511082, 	-0.132943, 0.189166, -0.972904, 
--1.002737, -3.988198, 5.977939, 	1.187500, 0.890530, 	-0.568961, -0.771457, -0.284847, 
--1.002737, -3.239137, 4.110385, 	1.000000, 1.000000, 	-0.573276, -0.760494, -0.304965, 
-0.000000, -3.446170, 3.992712, 	1.500000, 1.000000, 	0.000000, -0.928140, -0.372231, 
-0.000000, -3.446170, 3.992712, 	1.500000, 1.000000, 	0.000000, -0.928140, -0.372231, 
-1.002737, -3.239137, 4.110385, 	2.000000, 1.000000, 	0.573276, -0.760494, -0.304965, 
-1.002737, -3.988198, 5.977940, 	2.000000, 0.908927, 	0.568961, -0.771457, -0.284847, 
-1.002737, -3.988198, 5.977940, 	2.000000, 0.908927, 	0.568961, -0.771457, -0.284847, 
-1.002737, -4.824668, 8.406097, 	2.000000, 0.798956, 	0.564875, -0.790113, -0.237986, 
-0.000000, -5.037031, 8.300566, 	1.500000, 0.798956, 	0.000000, -0.957267, -0.289205, 
-0.000000, -5.037031, 8.300566, 	1.500000, 0.798956, 	0.000000, -0.957267, -0.289205, 
--1.002737, -4.824668, 8.406097, 	1.000000, 0.817855, 	-0.564875, -0.790113, -0.237986, 
--1.002737, -3.988198, 5.977939, 	1.187500, 0.890530, 	-0.568961, -0.771457, -0.284847, 
--1.002737, -5.641894, 11.472322, 	1.000000, 0.651188, 	-0.564280, -0.804601, -0.184946, 
--1.002737, -4.824668, 8.406097, 	1.000000, 0.817855, 	-0.564875, -0.790113, -0.237986, 
-0.000000, -5.037031, 8.300566, 	1.500000, 0.798956, 	0.000000, -0.957267, -0.289205, 
-0.000000, -5.037031, 8.300566, 	1.500000, 0.798956, 	0.000000, -0.957267, -0.289205, 
-1.002737, -4.824668, 8.406097, 	2.000000, 0.798956, 	0.564875, -0.790113, -0.237986, 
-1.002737, -5.641894, 11.472323, 	2.000000, 0.651188, 	0.564280, -0.804601, -0.184946, 
-1.002737, -5.641894, 11.472323, 	2.000000, 0.651188, 	0.564280, -0.804601, -0.184946, 
-1.002737, -6.318611, 14.911802, 	2.000000, 0.470545, 	0.563019, -0.816504, -0.127790, 
-0.000000, -6.540482, 14.830055, 	1.500000, 0.470545, 	-0.000000, -0.987788, -0.155806, 
-0.000000, -6.540482, 14.830055, 	1.500000, 0.470545, 	-0.000000, -0.987788, -0.155806, 
--1.002737, -6.318611, 14.911804, 	1.000000, 0.470545, 	-0.563019, -0.816504, -0.127790, 
--1.002737, -5.641894, 11.472322, 	1.000000, 0.651188, 	-0.564280, -0.804601, -0.184946, 
--1.002737, -6.733546, 18.459730, 	1.000000, 0.261948, 	-0.564150, -0.822280, -0.074773, 
--1.002737, -6.318611, 14.911804, 	1.000000, 0.470545, 	-0.563019, -0.816504, -0.127790, 
-0.000000, -6.540482, 14.830055, 	1.500000, 0.470545, 	-0.000000, -0.987788, -0.155806, 
-0.000000, -6.540482, 14.830055, 	1.500000, 0.470545, 	-0.000000, -0.987788, -0.155806, 
-1.002737, -6.318611, 14.911802, 	2.000000, 0.470545, 	0.563019, -0.816504, -0.127790, 
-1.002737, -6.733546, 18.459730, 	2.000000, 0.261948, 	0.564150, -0.822280, -0.074773, 
-1.002737, -6.733546, 18.459730, 	2.000000, 0.261948, 	0.564150, -0.822280, -0.074773, 
-1.002737, -6.957025, 21.947737, 	2.000000, 0.047044, 	0.566391, -0.823173, -0.039848, 
-0.000000, -7.185503, 21.885925, 	1.500000, 0.047044, 	0.000000, -0.998796, -0.049054, 
-0.000000, -7.185503, 21.885925, 	1.500000, 0.047044, 	0.000000, -0.998796, -0.049054, 
--1.002737, -6.957025, 21.947737, 	1.000000, 0.047044, 	-0.566391, -0.823173, -0.039848, 
--1.002737, -6.733546, 18.459730, 	1.000000, 0.261948, 	-0.564150, -0.822280, -0.074773, 
--1.002737, -7.059372, 25.207462, 	1.000000, -0.152521, 	-0.565822, -0.824400, -0.014526, 
--1.002737, -6.957025, 21.947737, 	1.000000, 0.047044, 	-0.566391, -0.823173, -0.039848, 
-0.000000, -7.185503, 21.885925, 	1.500000, 0.047044, 	0.000000, -0.998796, -0.049054, 
-0.000000, -7.185503, 21.885925, 	1.500000, 0.047044, 	0.000000, -0.998796, -0.049054, 
-1.002737, -6.957025, 21.947737, 	2.000000, 0.047044, 	0.566391, -0.823173, -0.039848, 
-1.002737, -7.059372, 25.207462, 	2.000000, -0.152521, 	0.565821, -0.824400, -0.014526, 
-1.002737, -7.059372, 25.207462, 	2.000000, -0.152521, 	0.565821, -0.824400, -0.014526, 
-1.002737, -7.074721, 28.664906, 	2.000000, -0.338108, 	0.564757, -0.825254, 0.002341, 
-0.000000, -7.307243, 28.618042, 	1.500000, -0.338108, 	0.000000, -0.999997, 0.002440, 
-0.000000, -7.307243, 28.618042, 	1.500000, -0.338108, 	0.000000, -0.999997, 0.002440, 
--1.002737, -7.074721, 28.664906, 	1.000000, -0.338108, 	-0.564757, -0.825254, 0.002341, 
--1.002737, -7.059372, 25.207462, 	1.000000, -0.152521, 	-0.565822, -0.824400, -0.014526, 
--1.002737, -7.037199, 32.893612, 	1.000000, -0.511082, 	-0.140149, -0.202450, -0.969212, 
--1.002737, -7.074721, 28.664906, 	1.000000, -0.338108, 	-0.564757, -0.825254, 0.002341, 
-0.000000, -7.307243, 28.618042, 	1.500000, -0.338108, 	0.000000, -0.999997, 0.002440, 
-0.000000, -7.307243, 28.618042, 	1.500000, -0.338108, 	0.000000, -0.999997, 0.002440, 
-1.002737, -7.074721, 28.664906, 	2.000000, -0.338108, 	0.564757, -0.825254, 0.002341, 
-1.002737, -7.037199, 32.893612, 	2.000000, -0.511082, 	0.140149, -0.202450, -0.969212, 
-1.002737, -7.037199, 32.893612, 	2.000000, -0.511082, 	0.140149, -0.202450, -0.969212, 
-4.193409, -10.256766, 32.893612, 	1.972222, -0.557378, 	0.680284, -0.725440, 0.104643, 
-0.000000, -11.548096, 32.893612, 	1.500000, -0.573582, 	-0.004203, -0.998166, 0.060395, 
-0.000000, -11.548096, 32.893612, 	1.500000, -0.573582, 	-0.004203, -0.998166, 0.060395, 
--4.193409, -10.256766, 32.893612, 	1.027778, -0.557378, 	-0.685012, -0.716396, 0.132421, 
--1.002737, -7.037199, 32.893612, 	1.000000, -0.511082, 	-0.140149, -0.202450, -0.969212, 
-1.002737, -3.988198, 5.977940, 	2.000000, 0.908927, 	0.568961, -0.771457, -0.284847, 
-1.002737, -3.239137, 4.110385, 	2.000000, 1.000000, 	0.573276, -0.760494, -0.304965, 
-1.336982, -2.618040, 4.463405, 	2.500000, 1.000000, 	0.999977, -0.006223, -0.002555, 
-1.336982, -2.618040, 4.463405, 	2.500000, 1.000000, 	0.999977, -0.006223, -0.002555, 
-1.002737, -1.996943, 4.816424, 	3.000000, 1.000000, 	0.580237, 0.756078, 0.302774, 
-1.002737, -2.734034, 6.657467, 	3.000000, 0.908927, 	0.582703, 0.762742, 0.280503, 
-1.002737, -2.734034, 6.657467, 	3.000000, 0.908927, 	0.582703, 0.762742, 0.280503, 
-1.002737, -3.550490, 9.039287, 	3.000000, 0.798956, 	0.582189, 0.779143, 0.232362, 
-1.336982, -4.187579, 8.722693, 	2.500000, 0.798956, 	0.999851, -0.016874, -0.003651, 
-1.336982, -4.187579, 8.722693, 	2.500000, 0.798956, 	0.999851, -0.016874, -0.003651, 
-1.002737, -4.824668, 8.406097, 	2.000000, 0.798956, 	0.564875, -0.790113, -0.237986, 
-1.002737, -3.988198, 5.977940, 	2.000000, 0.908927, 	0.568961, -0.771457, -0.284847, 
-1.002737, -5.641894, 11.472323, 	2.000000, 0.651188, 	0.564280, -0.804601, -0.184946, 
-1.002737, -4.824668, 8.406097, 	2.000000, 0.798956, 	0.564875, -0.790113, -0.237986, 
-1.336982, -4.187579, 8.722693, 	2.500000, 0.798956, 	0.999851, -0.016874, -0.003651, 
-1.336982, -4.187579, 8.722693, 	2.500000, 0.798956, 	0.999851, -0.016874, -0.003651, 
-1.002737, -3.550490, 9.039287, 	3.000000, 0.798956, 	0.582189, 0.779143, 0.232362, 
-1.002737, -4.339600, 12.037193, 	3.000000, 0.651188, 	0.578711, 0.795540, 0.179472, 
-1.002737, -4.339600, 12.037193, 	3.000000, 0.651188, 	0.578711, 0.795540, 0.179472, 
-1.002737, -4.987385, 15.402298, 	3.000000, 0.470545, 	0.576620, 0.807781, 0.122473, 
-1.336982, -5.652997, 15.157051, 	2.500000, 0.470545, 	0.999903, -0.013895, -0.000479, 
-1.336982, -5.652997, 15.157051, 	2.500000, 0.470545, 	0.999903, -0.013895, -0.000479, 
-1.002737, -6.318611, 14.911802, 	2.000000, 0.470545, 	0.563019, -0.816504, -0.127790, 
-1.002737, -5.641894, 11.472323, 	2.000000, 0.651188, 	0.564280, -0.804601, -0.184946, 
-1.002737, -6.733546, 18.459730, 	2.000000, 0.261948, 	0.564150, -0.822280, -0.074773, 
-1.002737, -6.318611, 14.911802, 	2.000000, 0.470545, 	0.563019, -0.816504, -0.127790, 
-1.336982, -5.652997, 15.157051, 	2.500000, 0.470545, 	0.999903, -0.013895, -0.000479, 
-1.336982, -5.652997, 15.157051, 	2.500000, 0.470545, 	0.999903, -0.013895, -0.000479, 
-1.002737, -4.987385, 15.402298, 	3.000000, 0.470545, 	0.576620, 0.807781, 0.122473, 
-1.002737, -5.379865, 18.885717, 	3.000000, 0.261948, 	0.572718, 0.816712, 0.070540, 
-1.002737, -5.379865, 18.885717, 	3.000000, 0.261948, 	0.572718, 0.816712, 0.070540, 
-1.002737, -5.586154, 22.318600, 	3.000000, 0.047044, 	0.570604, 0.820419, 0.036373, 
-1.336982, -6.271589, 22.133167, 	2.500000, 0.047044, 	0.999991, -0.004281, 0.000323, 
-1.336982, -6.271589, 22.133167, 	2.500000, 0.047044, 	0.999991, -0.004281, 0.000323, 
-1.002737, -6.957025, 21.947737, 	2.000000, 0.047044, 	0.566391, -0.823173, -0.039848, 
-1.002737, -6.733546, 18.459730, 	2.000000, 0.261948, 	0.564150, -0.822280, -0.074773, 
-1.002737, -7.059372, 25.207462, 	2.000000, -0.152521, 	0.565821, -0.824400, -0.014526, 
-1.002737, -6.957025, 21.947737, 	2.000000, 0.047044, 	0.566391, -0.823173, -0.039848, 
-1.336982, -6.271589, 22.133167, 	2.500000, 0.047044, 	0.999991, -0.004281, 0.000323, 
-1.336982, -6.271589, 22.133167, 	2.500000, 0.047044, 	0.999991, -0.004281, 0.000323, 
-1.002737, -5.586154, 22.318600, 	3.000000, 0.047044, 	0.570604, 0.820419, 0.036373, 
-1.002737, -5.675372, 25.532089, 	3.000000, -0.152521, 	0.572885, 0.819555, 0.011471, 
-1.002737, -5.675372, 25.532089, 	3.000000, -0.152521, 	0.572885, 0.819555, 0.011471, 
-1.002737, -5.679584, 28.946095, 	3.000000, -0.338108, 	0.577055, 0.816690, -0.004975, 
-1.336982, -6.377152, 28.805500, 	2.500000, -0.338108, 	0.999930, -0.011845, 0.000045, 
-1.336982, -6.377152, 28.805500, 	2.500000, -0.338108, 	0.999930, -0.011845, 0.000045, 
-1.002737, -7.074721, 28.664906, 	2.000000, -0.338108, 	0.564757, -0.825254, 0.002341, 
-1.002737, -7.059372, 25.207462, 	2.000000, -0.152521, 	0.565821, -0.824400, -0.014526, 
-1.002737, -7.037199, 32.893612, 	2.000000, -0.511082, 	0.140149, -0.202450, -0.969212, 
-1.002737, -7.074721, 28.664906, 	2.000000, -0.338108, 	0.564757, -0.825254, 0.002341, 
-1.336982, -6.377152, 28.805500, 	2.500000, -0.338108, 	0.999930, -0.011845, 0.000045, 
-1.336982, -6.377152, 28.805500, 	2.500000, -0.338108, 	0.999930, -0.011845, 0.000045, 
-1.002737, -5.679584, 28.946095, 	3.000000, -0.338108, 	0.577055, 0.816690, -0.004975, 
-1.002737, -5.630855, 32.893612, 	3.000000, -0.511082, 	0.132943, 0.189166, -0.972904, 
-1.002737, -5.630855, 32.893612, 	3.000000, -0.511082, 	0.132943, 0.189166, -0.972904, 
-4.193409, -2.445326, 32.893612, 	3.000000, -0.594415, 	0.682263, 0.725032, 0.094055, 
-5.620958, -6.307936, 32.893612, 	2.375000, -0.573582, 	0.996241, -0.000983, 0.086619, 
-5.620958, -6.307936, 32.893612, 	2.375000, -0.573582, 	0.996241, -0.000983, 0.086619, 
-4.193409, -10.256766, 32.893612, 	1.972222, -0.557378, 	0.680284, -0.725440, 0.104643, 
-1.002737, -7.037199, 32.893612, 	2.000000, -0.511082, 	0.140149, -0.202450, -0.969212, 
--1.002737, -1.445931, 3.440848, 	2.500000, -1.666667, 	-0.596303, 0.745197, 0.298504, 
--1.002737, -1.996943, 4.816424, 	3.000000, -1.666667, 	-0.580237, 0.756078, 0.302774, 
-0.000000, -1.789911, 4.934098, 	3.000000, -1.833333, 	-0.000000, 0.928348, 0.371713, 
-0.000000, -1.789911, 4.934098, 	3.000000, -1.833333, 	-0.000000, 0.928348, 0.371713, 
-1.002737, -1.996943, 4.816424, 	3.000000, -2.000000, 	0.580237, 0.756078, 0.302774, 
-1.002737, -1.445931, 3.440848, 	2.500000, -2.000000, 	0.596303, 0.745197, 0.298504, 
-1.002737, -2.734034, 6.657467, 	3.000000, 0.908927, 	0.582703, 0.762742, 0.280503, 
-1.002737, -1.996943, 4.816424, 	3.000000, 1.000000, 	0.580237, 0.756078, 0.302774, 
-0.000000, -1.789911, 4.934098, 	3.500000, 1.000000, 	-0.000000, 0.928348, 0.371713, 
-0.000000, -1.789911, 4.934098, 	3.500000, 1.000000, 	-0.000000, 0.928348, 0.371713, 
--1.002737, -1.996943, 4.816424, 	4.000000, 1.000000, 	-0.580237, 0.756078, 0.302774, 
--1.002737, -2.734034, 6.657467, 	4.000000, 0.908927, 	-0.582703, 0.762742, 0.280503, 
--1.002737, -2.734034, 6.657467, 	4.000000, 0.908927, 	-0.582703, 0.762742, 0.280503, 
--1.002737, -3.550490, 9.039287, 	4.000000, 0.817855, 	-0.582189, 0.779143, 0.232362, 
-0.000000, -3.338127, 9.144818, 	3.500000, 0.798956, 	0.000000, 0.958542, 0.284953, 
-0.000000, -3.338127, 9.144818, 	3.500000, 0.798956, 	0.000000, 0.958542, 0.284953, 
-1.002737, -3.550490, 9.039287, 	3.000000, 0.798956, 	0.582189, 0.779143, 0.232362, 
-1.002737, -2.734034, 6.657467, 	3.000000, 0.908927, 	0.582703, 0.762742, 0.280503, 
-1.002737, -4.339600, 12.037193, 	3.000000, 0.651188, 	0.578711, 0.795540, 0.179472, 
-1.002737, -3.550490, 9.039287, 	3.000000, 0.798956, 	0.582189, 0.779143, 0.232362, 
-0.000000, -3.338127, 9.144818, 	3.500000, 0.798956, 	0.000000, 0.958542, 0.284953, 
-0.000000, -3.338127, 9.144818, 	3.500000, 0.798956, 	0.000000, 0.958542, 0.284953, 
--1.002737, -3.550490, 9.039287, 	4.000000, 0.817855, 	-0.582189, 0.779143, 0.232362, 
--1.002737, -4.339600, 12.037193, 	4.000000, 0.651188, 	-0.578711, 0.795540, 0.179472, 
--1.002737, -4.339600, 12.037193, 	4.000000, 0.651188, 	-0.578711, 0.795540, 0.179472, 
--1.002737, -4.987385, 15.402298, 	4.000000, 0.484521, 	-0.576620, 0.807781, 0.122473, 
-0.000000, -4.765513, 15.484047, 	3.500000, 0.470545, 	0.000000, 0.988884, 0.148690, 
-0.000000, -4.765513, 15.484047, 	3.500000, 0.470545, 	0.000000, 0.988884, 0.148690, 
-1.002737, -4.987385, 15.402298, 	3.000000, 0.470545, 	0.576620, 0.807781, 0.122473, 
-1.002737, -4.339600, 12.037193, 	3.000000, 0.651188, 	0.578711, 0.795540, 0.179472, 
-1.002737, -5.379865, 18.885717, 	3.000000, 0.261948, 	0.572718, 0.816712, 0.070540, 
-1.002737, -4.987385, 15.402298, 	3.000000, 0.470545, 	0.576620, 0.807781, 0.122473, 
-0.000000, -4.765513, 15.484047, 	3.500000, 0.470545, 	0.000000, 0.988884, 0.148690, 
-0.000000, -4.765513, 15.484047, 	3.500000, 0.470545, 	0.000000, 0.988884, 0.148690, 
--1.002737, -4.987385, 15.402298, 	4.000000, 0.484521, 	-0.576620, 0.807781, 0.122473, 
--1.002737, -5.379865, 18.885717, 	4.000000, 0.261948, 	-0.572718, 0.816712, 0.070540, 
--1.002737, -5.379865, 18.885717, 	4.000000, 0.261948, 	-0.572718, 0.816712, 0.070540, 
--1.002737, -5.586154, 22.318600, 	4.000000, 0.039374, 	-0.570604, 0.820419, 0.036373, 
-0.000000, -5.357677, 22.380409, 	3.500000, 0.047044, 	-0.000000, 0.999050, 0.043579, 
-0.000000, -5.357677, 22.380409, 	3.500000, 0.047044, 	-0.000000, 0.999050, 0.043579, 
-1.002737, -5.586154, 22.318600, 	3.000000, 0.047044, 	0.570604, 0.820419, 0.036373, 
-1.002737, -5.379865, 18.885717, 	3.000000, 0.261948, 	0.572718, 0.816712, 0.070540, 
-1.002737, -5.675372, 25.532089, 	3.000000, -0.152521, 	0.572885, 0.819555, 0.011471, 
-1.002737, -5.586154, 22.318600, 	3.000000, 0.047044, 	0.570604, 0.820419, 0.036373, 
-0.000000, -5.357677, 22.380409, 	3.500000, 0.047044, 	-0.000000, 0.999050, 0.043579, 
-0.000000, -5.357677, 22.380409, 	3.500000, 0.047044, 	-0.000000, 0.999050, 0.043579, 
--1.002737, -5.586154, 22.318600, 	4.000000, 0.039374, 	-0.570604, 0.820419, 0.036373, 
--1.002737, -5.675372, 25.532089, 	4.000000, -0.152521, 	-0.572885, 0.819555, 0.011471, 
--1.002737, -5.675372, 25.532089, 	4.000000, -0.152521, 	-0.572885, 0.819555, 0.011471, 
--1.002737, -5.679584, 28.946095, 	4.000000, -0.344415, 	-0.577055, 0.816690, -0.004975, 
-0.000000, -5.447061, 28.992958, 	3.500000, -0.338108, 	0.000000, 0.999979, -0.006525, 
-0.000000, -5.447061, 28.992958, 	3.500000, -0.338108, 	0.000000, 0.999979, -0.006525, 
-1.002737, -5.679584, 28.946095, 	3.000000, -0.338108, 	0.577055, 0.816690, -0.004975, 
-1.002737, -5.675372, 25.532089, 	3.000000, -0.152521, 	0.572885, 0.819555, 0.011471, 
-1.002737, -5.630855, 32.893612, 	3.000000, -0.511082, 	0.132943, 0.189166, -0.972904, 
-1.002737, -5.679584, 28.946095, 	3.000000, -0.338108, 	0.577055, 0.816690, -0.004975, 
-0.000000, -5.447061, 28.992958, 	3.500000, -0.338108, 	0.000000, 0.999979, -0.006525, 
-0.000000, -5.447061, 28.992958, 	3.500000, -0.338108, 	0.000000, 0.999979, -0.006525, 
--1.002737, -5.679584, 28.946095, 	4.000000, -0.344415, 	-0.577055, 0.816690, -0.004975, 
--1.002737, -5.630855, 32.893612, 	4.000000, -0.511082, 	-0.132943, 0.189166, -0.972904, 
--1.002737, -5.630855, 32.893612, 	4.000000, -0.511082, 	-0.132943, 0.189166, -0.972904, 
--4.193409, -2.445326, 32.893612, 	4.000000, -0.594415, 	-0.686924, 0.716419, 0.121978, 
-0.000000, -1.067776, 32.893612, 	3.500000, -0.594415, 	-0.004492, 0.998437, 0.055707, 
-0.000000, -1.067776, 32.893612, 	3.500000, -0.594415, 	-0.004492, 0.998437, 0.055707, 
-4.193409, -2.445326, 32.893612, 	3.000000, -0.594415, 	0.682263, 0.725032, 0.094055, 
-1.002737, -5.630855, 32.893612, 	3.000000, -0.511082, 	0.132943, 0.189166, -0.972904, 
--1.002737, -2.684134, 2.725971, 	3.500000, -1.666667, 	-0.555812, -0.771611, -0.309336, 
--1.002737, -3.239137, 4.110385, 	4.000000, -1.666667, 	-0.573276, -0.760494, -0.304965, 
--1.336982, -2.618040, 4.463405, 	4.000000, -1.833333, 	-0.999977, -0.006223, -0.002555, 
--1.336982, -2.618040, 4.463405, 	4.000000, -1.833333, 	-0.999977, -0.006223, -0.002555, 
--1.002737, -1.996943, 4.816424, 	4.000000, -2.000000, 	-0.580237, 0.756078, 0.302774, 
--1.002737, -1.445931, 3.440848, 	3.500000, -2.000000, 	-0.596303, 0.745197, 0.298504, 
-1.002737, -2.684134, 2.725971, 	4.500000, -1.666667, 	0.555812, -0.771611, -0.309336, 
-1.002737, -3.239137, 4.110385, 	5.000000, -1.666667, 	0.573276, -0.760494, -0.304965, 
-0.000000, -3.446170, 3.992712, 	5.000000, -1.833333, 	0.000000, -0.928140, -0.372231, 
-0.000000, -3.446170, 3.992712, 	5.000000, -1.833333, 	0.000000, -0.928140, -0.372231, 
--1.002737, -3.239137, 4.110385, 	5.000000, -2.000000, 	-0.573276, -0.760494, -0.304965, 
--1.002737, -2.684134, 2.725971, 	4.500000, -2.000000, 	-0.555812, -0.771611, -0.309336, 
--1.336982, -22.914524, -4.929887, 	7.000000, -1.833333, 	-0.999805, -0.016666, 0.010584, 
--1.002737, -22.289114, -5.237599, 	7.000000, -1.666667, 	-0.580101, 0.726129, -0.369081, 
--1.002737, -22.791559, -6.324653, 	6.500000, -1.666667, 	-0.585182, 0.679392, -0.442706, 
--1.002737, -22.791559, -6.324653, 	6.500000, -1.666667, 	-0.585182, 0.679392, -0.442706, 
--0.742768, -23.169422, -6.772669, 	6.000000, -1.666667, 	-0.444774, 0.383424, -0.809421, 
--1.002737, -23.736286, -6.771559, 	6.000000, -1.833333, 	-0.633041, -0.276747, -0.722959, 
--1.002737, -23.736286, -6.771559, 	6.000000, -1.833333, 	-0.633041, -0.276747, -0.722959, 
--0.742768, -24.152987, -6.401496, 	6.000000, -2.000000, 	-0.455754, -0.834431, -0.309862, 
--1.002737, -24.101816, -5.795360, 	6.500000, -2.000000, 	-0.571338, -0.788867, 0.226409, 
--1.002737, -24.101816, -5.795360, 	6.500000, -2.000000, 	-0.571338, -0.788867, 0.226409, 
--1.002737, -23.539934, -4.622173, 	7.000000, -2.000000, 	-0.559738, -0.733607, 0.385376, 
--1.336982, -22.914524, -4.929887, 	7.000000, -1.833333, 	-0.999805, -0.016666, 0.010584, 
--1.336982, -20.877926, -1.798224, 	0.500000, 4.901888, 	-0.999242, -0.027513, 0.027552, 
--1.002737, -20.362839, -2.232996, 	1.000000, 4.901887, 	-0.577401, 0.607255, -0.545756, 
--1.002737, -21.510138, -3.803390, 	1.000000, 4.957545, 	-0.579339, 0.686160, -0.439944, 
--1.002737, -21.510138, -3.803390, 	1.000000, 4.957545, 	-0.579339, 0.686160, -0.439944, 
--1.002737, -22.289114, -5.237599, 	1.000000, 5.000000, 	-0.580101, 0.726129, -0.369081, 
--1.336982, -22.914524, -4.929887, 	0.500000, 5.000000, 	-0.999805, -0.016666, 0.010584, 
--1.336982, -22.914524, -4.929887, 	0.500000, 5.000000, 	-0.999805, -0.016666, 0.010584, 
--1.002737, -23.539934, -4.622173, 	0.000000, 5.000000, 	-0.559738, -0.733607, 0.385376, 
--1.002737, -22.670450, -3.070609, 	0.000000, 4.957545, 	-0.549531, -0.697669, 0.459646, 
--1.002737, -22.670450, -3.070609, 	0.000000, 4.957545, 	-0.549531, -0.697669, 0.459646, 
--1.002737, -21.393009, -1.363454, 	0.000000, 4.915090, 	-0.538985, -0.621423, 0.568620, 
--1.336982, -20.877926, -1.798224, 	0.500000, 4.901888, 	-0.999242, -0.027513, 0.027552, 
--1.336982, -17.125900, 1.021948, 	0.500000, 4.706708, 	-0.998755, -0.017888, 0.046575, 
--1.002737, -16.806824, 0.450041, 	1.000000, 4.706708, 	-0.570721, 0.333495, -0.750372, 
--1.002737, -18.755436, -0.737389, 	1.000000, 4.819824, 	-0.571841, 0.493951, -0.654989, 
--1.002737, -18.755436, -0.737389, 	1.000000, 4.819824, 	-0.571841, 0.493951, -0.654989, 
--1.002737, -20.362839, -2.232996, 	1.000000, 4.901887, 	-0.577401, 0.607255, -0.545756, 
--1.336982, -20.877926, -1.798224, 	0.500000, 4.901888, 	-0.999242, -0.027513, 0.027552, 
--1.336982, -20.877926, -1.798224, 	0.500000, 4.901888, 	-0.999242, -0.027513, 0.027552, 
--1.002737, -21.393009, -1.363454, 	0.000000, 4.915090, 	-0.538985, -0.621423, 0.568620, 
--1.002737, -19.607264, 0.276508, 	0.000000, 4.819824, 	-0.531663, -0.507888, 0.677779, 
--1.002737, -19.607264, 0.276508, 	0.000000, 4.819824, 	-0.531663, -0.507888, 0.677779, 
--1.002737, -17.444981, 1.593854, 	0.000000, 4.724558, 	-0.523473, -0.350048, 0.776815, 
--1.336982, -17.125900, 1.021948, 	0.500000, 4.706708, 	-0.998755, -0.017888, 0.046575, 
--1.336982, -12.461710, 1.998980, 	0.500000, 4.382352, 	-0.999581, -0.002143, 0.028884, 
--1.002737, -12.384212, 1.352605, 	1.000000, 4.382352, 	-0.556840, 0.051516, -0.829021, 
--1.002737, -14.635897, 1.095908, 	1.000000, 4.557891, 	-0.560822, 0.165222, -0.811283, 
--1.002737, -14.635897, 1.095908, 	1.000000, 4.557891, 	-0.560822, 0.165222, -0.811283, 
--1.002737, -16.806824, 0.450041, 	1.000000, 4.706708, 	-0.570721, 0.333495, -0.750372, 
--1.336982, -17.125900, 1.021948, 	0.500000, 4.706708, 	-0.998755, -0.017888, 0.046575, 
--1.336982, -17.125900, 1.021948, 	0.500000, 4.706708, 	-0.998755, -0.017888, 0.046575, 
--1.002737, -17.444981, 1.593854, 	0.000000, 4.724558, 	-0.523473, -0.350048, 0.776815, 
--1.002737, -15.037928, 2.333167, 	0.000000, 4.557892, 	-0.524224, -0.178780, 0.832603, 
--1.002737, -15.037928, 2.333167, 	0.000000, 4.557892, 	-0.524224, -0.178780, 0.832603, 
--1.002737, -12.539209, 2.645355, 	0.000000, 4.391225, 	-0.529316, -0.059790, 0.846315, 
--1.336982, -12.461710, 1.998980, 	0.500000, 4.382352, 	-0.999581, -0.002143, 0.028884, 
--1.336982, -8.028582, 1.726443, 	0.500000, 3.977933, 	-0.998903, 0.011916, 0.045285, 
--1.002737, -8.188779, 1.086162, 	1.000000, 3.977933, 	-0.571796, -0.203921, -0.794648, 
--1.002737, -10.193326, 1.372527, 	1.000000, 4.189068, 	-0.563923, -0.052320, -0.824168, 
--1.002737, -10.193326, 1.372527, 	1.000000, 4.189068, 	-0.563923, -0.052320, -0.824168, 
--1.002737, -12.384212, 1.352605, 	1.000000, 4.382352, 	-0.556840, 0.051516, -0.829021, 
--1.336982, -12.461710, 1.998980, 	0.500000, 4.382352, 	-0.999581, -0.002143, 0.028884, 
--1.336982, -12.461710, 1.998980, 	0.500000, 4.382352, 	-0.999581, -0.002143, 0.028884, 
--1.002737, -12.539209, 2.645355, 	0.000000, 4.391225, 	-0.529316, -0.059790, 0.846315, 
--1.002737, -10.101929, 2.681329, 	0.000000, 4.189068, 	-0.529646, 0.050516, 0.846713, 
--1.002737, -10.101929, 2.681329, 	0.000000, 4.189068, 	-0.529646, 0.050516, 0.846713, 
--1.002737, -7.868385, 2.366725, 	0.000000, 3.986911, 	-0.526810, 0.210598, 0.823480, 
--1.336982, -8.028582, 1.726443, 	0.500000, 3.977933, 	-0.998903, 0.011916, 0.045285, 
--1.336982, -4.681401, -0.053863, 	0.500000, 3.518014, 	-0.999076, 0.030579, 0.030219, 
--1.002737, -5.023273, -0.595701, 	1.000000, 3.518014, 	-0.554291, -0.537252, -0.635706, 
--1.002737, -6.496116, 0.423996, 	1.000000, 3.748844, 	-0.567467, -0.386666, -0.726960, 
--1.002737, -6.496116, 0.423996, 	1.000000, 3.748844, 	-0.567467, -0.386666, -0.726960, 
--1.002737, -8.188779, 1.086162, 	1.000000, 3.977933, 	-0.571796, -0.203921, -0.794648, 
--1.336982, -8.028582, 1.726443, 	0.500000, 3.977933, 	-0.998903, 0.011916, 0.045285, 
--1.336982, -8.028582, 1.726443, 	0.500000, 3.977933, 	-0.998903, 0.011916, 0.045285, 
--1.002737, -7.868385, 2.366725, 	0.000000, 3.986911, 	-0.526810, 0.210598, 0.823480, 
--1.002737, -5.980879, 1.627182, 	0.000000, 3.748844, 	-0.522694, 0.400366, 0.752661, 
--1.002737, -5.980879, 1.627182, 	0.000000, 3.748844, 	-0.522694, 0.400366, 0.752661, 
--1.002737, -4.339529, 0.487975, 	0.000000, 3.510776, 	-0.515414, 0.553092, 0.654552, 
--1.336982, -4.681401, -0.053863, 	0.500000, 3.518014, 	-0.999076, 0.030579, 0.030219, 
--1.336982, -2.032626, -3.152671, 	0.500000, 3.096704, 	-0.999446, 0.028671, 0.016899, 
--1.002737, -2.514818, -3.530164, 	1.000000, 3.096704, 	-0.535283, -0.710141, -0.457353, 
--1.002737, -3.678185, -1.954659, 	1.000000, 3.301661, 	-0.541786, -0.639146, -0.545858, 
--1.002737, -3.678185, -1.954659, 	1.000000, 3.301661, 	-0.541786, -0.639146, -0.545858, 
--1.002737, -5.023273, -0.595701, 	1.000000, 3.518014, 	-0.554291, -0.537252, -0.635706, 
--1.336982, -4.681401, -0.053863, 	0.500000, 3.518014, 	-0.999076, 0.030579, 0.030219, 
--1.336982, -4.681401, -0.053863, 	0.500000, 3.518014, 	-0.999076, 0.030579, 0.030219, 
--1.002737, -4.339529, 0.487975, 	0.000000, 3.510776, 	-0.515414, 0.553092, 0.654552, 
--1.002737, -2.844458, -1.025621, 	0.000000, 3.301661, 	-0.509526, 0.653879, 0.559309, 
--1.002737, -2.844458, -1.025621, 	0.000000, 3.301661, 	-0.509526, 0.653879, 0.559309, 
--1.002737, -1.550434, -2.775177, 	0.000000, 3.092546, 	-0.505987, 0.723592, 0.469458, 
--1.336982, -2.032626, -3.152671, 	0.500000, 3.096704, 	-0.999446, 0.028671, 0.016899, 
--1.336982, -0.371475, -6.820555, 	0.500000, 2.714038, 	-0.999078, 0.041649, 0.010372, 
--1.002737, -0.955311, -7.018215, 	1.000000, 2.714038, 	-0.543592, -0.816934, -0.192683, 
--1.002737, -1.587135, -5.199499, 	1.000000, 2.900065, 	-0.538039, -0.769598, -0.343850, 
--1.002737, -1.587135, -5.199499, 	1.000000, 2.900065, 	-0.538039, -0.769598, -0.343850, 
--1.002737, -2.514818, -3.530164, 	1.000000, 3.096704, 	-0.535283, -0.710141, -0.457353, 
--1.336982, -2.032626, -3.152671, 	0.500000, 3.096704, 	-0.999446, 0.028671, 0.016899, 
--1.336982, -2.032626, -3.152671, 	0.500000, 3.096704, 	-0.999446, 0.028671, 0.016899, 
--1.002737, -1.550434, -2.775177, 	0.000000, 3.092546, 	-0.505987, 0.723592, 0.469458, 
--1.002737, -0.512230, -4.622262, 	0.000000, 2.900065, 	-0.503207, 0.785550, 0.360132, 
--1.002737, -0.512230, -4.622262, 	0.000000, 2.900065, 	-0.503207, 0.785550, 0.360132, 
--1.002737, 0.212360, -6.622896, 	0.000000, 2.707584, 	-0.505652, 0.835716, 0.214230, 
--1.336982, -0.371475, -6.820555, 	0.500000, 2.714038, 	-0.999078, 0.041649, 0.010372, 
--1.336982, -0.183937, -11.115767, 	0.500000, 2.371212, 	-0.999002, 0.043336, -0.010816, 
--1.002737, -0.835270, -11.133001, 	1.000000, 2.371212, 	-0.556778, -0.814518, 0.162970, 
--1.002737, -0.679522, -9.041862, 	1.000000, 2.540917, 	-0.550509, -0.834486, -0.023924, 
--1.002737, -0.679522, -9.041862, 	1.000000, 2.540917, 	-0.550509, -0.834486, -0.023924, 
--1.002737, -0.955311, -7.018215, 	1.000000, 2.714038, 	-0.543592, -0.816934, -0.192683, 
--1.336982, -0.371475, -6.820555, 	0.500000, 2.714038, 	-0.999078, 0.041649, 0.010372, 
--1.336982, -0.371475, -6.820555, 	0.500000, 2.714038, 	-0.999078, 0.041649, 0.010372, 
--1.002737, 0.212360, -6.622896, 	0.000000, 2.707584, 	-0.505652, 0.835716, 0.214230, 
--1.002737, 0.565540, -8.833092, 	0.000000, 2.540917, 	-0.512670, 0.857167, 0.049331, 
--1.002737, 0.565540, -8.833092, 	0.000000, 2.540917, 	-0.512670, 0.857167, 0.049331, 
--1.002737, 0.467394, -11.098533, 	0.000000, 2.374251, 	-0.517497, 0.844529, -0.137721, 
--1.336982, -0.183937, -11.115767, 	0.500000, 2.371212, 	-0.999002, 0.043336, -0.010816, 
--1.336982, -1.762512, -15.300098, 	0.500000, 2.020624, 	-0.999977, 0.006790, -0.000522, 
--1.002737, -2.439466, -15.191065, 	1.000000, 2.020624, 	-0.552162, -0.756555, 0.350343, 
--1.002737, -1.498060, -13.154191, 	1.000000, 2.195430, 	-0.550846, -0.775955, 0.307348, 
--1.002737, -1.498060, -13.154191, 	1.000000, 2.195430, 	-0.550846, -0.775955, 0.307348, 
--1.002737, -0.835270, -11.133001, 	1.000000, 2.371212, 	-0.556778, -0.814518, 0.162970, 
--1.336982, -0.183937, -11.115767, 	0.500000, 2.371212, 	-0.999002, 0.043336, -0.010816, 
--1.336982, -0.183937, -11.115767, 	0.500000, 2.371212, 	-0.999002, 0.043336, -0.010816, 
--1.002737, 0.467394, -11.098533, 	0.000000, 2.374251, 	-0.517497, 0.844529, -0.137721, 
--1.002737, -0.161999, -13.264900, 	0.000000, 2.195430, 	-0.528455, 0.798898, -0.287224, 
--1.002737, -0.161999, -13.264900, 	0.000000, 2.195430, 	-0.528455, 0.798898, -0.287224, 
--1.002737, -1.085560, -15.409132, 	0.000000, 2.016609, 	-0.545979, 0.767296, -0.336399, 
--1.336982, -1.762512, -15.300098, 	0.500000, 2.020624, 	-0.999977, 0.006790, -0.000522, 
--1.336982, -3.677238, -19.700720, 	0.500000, 1.696742, 	-0.999943, -0.009227, 0.005371, 
--1.002737, -4.363696, -19.552979, 	1.000000, 1.696742, 	-0.563275, -0.773529, 0.290474, 
--1.002737, -3.431055, -17.329250, 	1.000000, 1.853850, 	-0.559291, -0.758482, 0.334513, 
--1.002737, -3.431055, -17.329250, 	1.000000, 1.853850, 	-0.559291, -0.758482, 0.334513, 
--1.002737, -2.439466, -15.191065, 	1.000000, 2.020624, 	-0.552162, -0.756555, 0.350343, 
--1.336982, -1.762512, -15.300098, 	0.500000, 2.020624, 	-0.999977, 0.006790, -0.000522, 
--1.336982, -1.762512, -15.300098, 	0.500000, 2.020624, 	-0.999977, 0.006790, -0.000522, 
--1.002737, -1.085560, -15.409132, 	0.000000, 2.016609, 	-0.545979, 0.767296, -0.336399, 
--1.002737, -2.066217, -17.608171, 	0.000000, 1.853850, 	-0.561407, 0.760416, -0.326481, 
--1.002737, -2.066217, -17.608171, 	0.000000, 1.853850, 	-0.561407, 0.760416, -0.326481, 
--1.002737, -2.990782, -19.848455, 	0.000000, 1.691091, 	-0.573541, 0.767562, -0.286181, 
--1.336982, -3.677238, -19.700720, 	0.500000, 1.696742, 	-0.999943, -0.009227, 0.005371, 
--1.336982, -4.998410, -24.141369, 	0.500000, 1.417808, 	-0.999879, -0.015054, 0.003873, 
--1.002737, -5.694758, -24.033106, 	1.000000, 1.417808, 	-0.566494, -0.804616, 0.177981, 
--1.002737, -5.128252, -21.846479, 	1.000000, 1.550938, 	-0.566340, -0.790066, 0.234638, 
--1.002737, -5.128252, -21.846479, 	1.000000, 1.550938, 	-0.566340, -0.790066, 0.234638, 
--1.002737, -4.363696, -19.552979, 	1.000000, 1.696742, 	-0.563275, -0.773529, 0.290474, 
--1.336982, -3.677238, -19.700720, 	0.500000, 1.696742, 	-0.999943, -0.009227, 0.005371, 
--1.336982, -3.677238, -19.700720, 	0.500000, 1.696742, 	-0.999943, -0.009227, 0.005371, 
--1.002737, -2.990782, -19.848455, 	0.000000, 1.691091, 	-0.573541, 0.767562, -0.286181, 
--1.002737, -3.746061, -22.116426, 	0.000000, 1.550938, 	-0.578794, 0.781497, -0.232937, 
--1.002737, -3.746061, -22.116426, 	0.000000, 1.550938, 	-0.578794, 0.781497, -0.232937, 
--1.002737, -4.302059, -24.249632, 	0.000000, 1.410785, 	-0.582444, 0.793471, -0.176531, 
--1.336982, -4.998410, -24.141369, 	0.500000, 1.417808, 	-0.999879, -0.015054, 0.003873, 
--1.336982, -5.505962, -27.491592, 	0.500000, 1.186658, 	-0.999932, -0.011525, 0.001722, 
--1.002737, -6.213656, -27.449341, 	1.000000, 1.186658, 	-0.570758, -0.816393, 0.087968, 
--1.002737, -6.033253, -25.936214, 	1.000000, 1.298722, 	-0.568446, -0.813396, 0.123515, 
--1.002737, -6.033253, -25.936214, 	1.000000, 1.298722, 	-0.568446, -0.813396, 0.123515, 
--1.002737, -5.694758, -24.033106, 	1.000000, 1.417808, 	-0.566494, -0.804616, 0.177981, 
--1.336982, -4.998410, -24.141369, 	0.500000, 1.417808, 	-0.999879, -0.015054, 0.003873, 
--1.336982, -4.998410, -24.141369, 	0.500000, 1.417808, 	-0.999879, -0.015054, 0.003873, 
--1.002737, -4.302059, -24.249632, 	0.000000, 1.410785, 	-0.582444, 0.793471, -0.176531, 
--1.002737, -4.628780, -26.085621, 	0.000000, 1.298722, 	-0.582983, 0.803361, -0.121414, 
--1.002737, -4.628780, -26.085621, 	0.000000, 1.298722, 	-0.582983, 0.803361, -0.121414, 
--1.002737, -4.798269, -27.533844, 	0.000000, 1.186658, 	-0.583018, 0.808019, -0.084825, 
--1.336982, -5.505962, -27.491592, 	0.500000, 1.186658, 	-0.999932, -0.011525, 0.001722, 
--1.002737, -6.305892, -28.466030, 	0.500000, 1.053028, 	-0.565626, -0.821288, 0.074517, 
--1.002737, -6.213656, -27.449341, 	1.000000, 1.053028, 	-0.570758, -0.816393, 0.087968, 
--1.336982, -5.505962, -27.491592, 	1.000000, 1.119843, 	-0.999932, -0.011525, 0.001722, 
--1.336982, -5.505962, -27.491592, 	1.000000, 1.119843, 	-0.999932, -0.011525, 0.001722, 
--1.002737, -4.798269, -27.533844, 	1.000000, 1.186658, 	-0.583018, 0.808019, -0.084825, 
--1.002737, -4.882575, -28.503754, 	0.500000, 1.186658, 	-0.589040, 0.805068, -0.069986, 
-0.000000, -22.080643, -5.340171, 	1.000000, 1.026514, 	0.000000, 0.892013, -0.452009, 
-1.002737, -22.289114, -5.237599, 	1.000000, 1.053028, 	0.580101, 0.726128, -0.369081, 
-1.002737, -22.791559, -6.324653, 	0.500000, 1.053028, 	0.585182, 0.679392, -0.442706, 
-1.002737, -22.791559, -6.324653, 	0.500000, 1.053028, 	0.585182, 0.679392, -0.442706, 
-0.742768, -23.169422, -6.772669, 	0.000000, 1.053028, 	0.444774, 0.383425, -0.809421, 
-0.000000, -23.066525, -7.012697, 	0.000000, 1.026514, 	-0.000000, 0.424976, -0.905205, 
-0.000000, -23.066525, -7.012697, 	0.000000, 1.026514, 	-0.000000, 0.424976, -0.905205, 
--0.742768, -23.169422, -6.772669, 	0.000000, 1.000000, 	-0.444774, 0.383424, -0.809421, 
--1.002737, -22.791559, -6.324653, 	0.500000, 1.000000, 	-0.585182, 0.679392, -0.442706, 
--1.002737, -22.791559, -6.324653, 	0.500000, 1.000000, 	-0.585182, 0.679392, -0.442706, 
--1.002737, -22.289114, -5.237599, 	1.000000, 1.000000, 	-0.580101, 0.726129, -0.369081, 
-0.000000, -22.080643, -5.340171, 	1.000000, 1.026514, 	0.000000, 0.892013, -0.452009, 
-0.000000, -20.191145, -2.377919, 	1.500000, 4.901888, 	0.000000, 0.744223, -0.667931, 
-1.002737, -20.362839, -2.232996, 	2.000000, 4.901887, 	0.577401, 0.607255, -0.545756, 
-1.002737, -21.510138, -3.803390, 	2.000000, 4.957545, 	0.579339, 0.686160, -0.439944, 
-1.002737, -21.510138, -3.803390, 	2.000000, 4.957545, 	0.579339, 0.686160, -0.439944, 
-1.002737, -22.289114, -5.237599, 	2.000000, 5.000000, 	0.580101, 0.726128, -0.369081, 
-0.000000, -22.080643, -5.340171, 	1.500000, 5.000000, 	0.000000, 0.892013, -0.452009, 
-0.000000, -22.080643, -5.340171, 	1.500000, 5.000000, 	0.000000, 0.892013, -0.452009, 
--1.002737, -22.289114, -5.237599, 	1.000000, 5.000000, 	-0.580101, 0.726129, -0.369081, 
--1.002737, -21.510138, -3.803390, 	1.000000, 4.957545, 	-0.579339, 0.686160, -0.439944, 
--1.002737, -21.510138, -3.803390, 	1.000000, 4.957545, 	-0.579339, 0.686160, -0.439944, 
--1.002737, -20.362839, -2.232996, 	1.000000, 4.901887, 	-0.577401, 0.607255, -0.545756, 
-0.000000, -20.191145, -2.377919, 	1.500000, 4.901888, 	0.000000, 0.744223, -0.667931, 
-0.000000, -16.700464, 0.259406, 	1.500000, 4.706708, 	-0.000000, 0.404784, -0.914412, 
-1.002737, -16.806824, 0.450041, 	2.000000, 4.706708, 	0.570721, 0.333495, -0.750372, 
-1.002737, -18.755436, -0.737389, 	2.000000, 4.819824, 	0.571841, 0.493951, -0.654989, 
-1.002737, -18.755436, -0.737389, 	2.000000, 4.819824, 	0.571841, 0.493951, -0.654989, 
-1.002737, -20.362839, -2.232996, 	2.000000, 4.901887, 	0.577401, 0.607255, -0.545756, 
-0.000000, -20.191145, -2.377919, 	1.500000, 4.901888, 	0.000000, 0.744223, -0.667931, 
-0.000000, -20.191145, -2.377919, 	1.500000, 4.901888, 	0.000000, 0.744223, -0.667931, 
--1.002737, -20.362839, -2.232996, 	1.000000, 4.901887, 	-0.577401, 0.607255, -0.545756, 
--1.002737, -18.755436, -0.737389, 	1.000000, 4.819824, 	-0.571841, 0.493951, -0.654989, 
--1.002737, -18.755436, -0.737389, 	1.000000, 4.819824, 	-0.571841, 0.493951, -0.654989, 
--1.002737, -16.806824, 0.450041, 	1.000000, 4.706708, 	-0.570721, 0.333495, -0.750372, 
-0.000000, -16.700464, 0.259406, 	1.500000, 4.706708, 	-0.000000, 0.404784, -0.914412, 
-0.000000, -12.358379, 1.137146, 	1.500000, 4.382352, 	0.000000, 0.060964, -0.998140, 
-1.002737, -12.384212, 1.352605, 	2.000000, 4.382352, 	0.556840, 0.051516, -0.829021, 
-1.002737, -14.635897, 1.095908, 	2.000000, 4.557891, 	0.560822, 0.165222, -0.811283, 
-1.002737, -14.635897, 1.095908, 	2.000000, 4.557891, 	0.560822, 0.165222, -0.811283, 
-1.002737, -16.806824, 0.450041, 	2.000000, 4.706708, 	0.570721, 0.333495, -0.750372, 
-0.000000, -16.700464, 0.259406, 	1.500000, 4.706708, 	-0.000000, 0.404784, -0.914412, 
-0.000000, -16.700464, 0.259406, 	1.500000, 4.706708, 	-0.000000, 0.404784, -0.914412, 
--1.002737, -16.806824, 0.450041, 	1.000000, 4.706708, 	-0.570721, 0.333495, -0.750372, 
--1.002737, -14.635897, 1.095908, 	1.000000, 4.557891, 	-0.560822, 0.165222, -0.811283, 
--1.002737, -14.635897, 1.095908, 	1.000000, 4.557891, 	-0.560822, 0.165222, -0.811283, 
--1.002737, -12.384212, 1.352605, 	1.000000, 4.382352, 	-0.556840, 0.051516, -0.829021, 
-0.000000, -12.358379, 1.137146, 	1.500000, 4.382352, 	0.000000, 0.060964, -0.998140, 
-0.000000, -8.242178, 0.872734, 	1.500000, 3.977933, 	0.000000, -0.248755, -0.968567, 
-1.002737, -8.188779, 1.086162, 	2.000000, 3.977933, 	0.571796, -0.203921, -0.794648, 
-1.002737, -10.193325, 1.372527, 	2.000000, 4.189068, 	0.563923, -0.052320, -0.824168, 
-1.002737, -10.193325, 1.372527, 	2.000000, 4.189068, 	0.563923, -0.052320, -0.824168, 
-1.002737, -12.384212, 1.352605, 	2.000000, 4.382352, 	0.556840, 0.051516, -0.829021, 
-0.000000, -12.358379, 1.137146, 	1.500000, 4.382352, 	0.000000, 0.060964, -0.998140, 
-0.000000, -12.358379, 1.137146, 	1.500000, 4.382352, 	0.000000, 0.060964, -0.998140, 
--1.002737, -12.384212, 1.352605, 	1.000000, 4.382352, 	-0.556840, 0.051516, -0.829021, 
--1.002737, -10.193326, 1.372527, 	1.000000, 4.189068, 	-0.563923, -0.052320, -0.824168, 
--1.002737, -10.193326, 1.372527, 	1.000000, 4.189068, 	-0.563923, -0.052320, -0.824168, 
--1.002737, -8.188779, 1.086162, 	1.000000, 3.977933, 	-0.571796, -0.203921, -0.794648, 
-0.000000, -8.242178, 0.872734, 	1.500000, 3.977933, 	0.000000, -0.248755, -0.968567, 
-0.000000, -5.137229, -0.776313, 	1.500000, 3.518014, 	-0.000000, -0.646205, -0.763164, 
-1.002737, -5.023273, -0.595701, 	2.000000, 3.518014, 	0.554291, -0.537252, -0.635706, 
-1.002737, -6.496116, 0.423996, 	2.000000, 3.748844, 	0.567467, -0.386666, -0.726960, 
-1.002737, -6.496116, 0.423996, 	2.000000, 3.748844, 	0.567467, -0.386666, -0.726960, 
-1.002737, -8.188779, 1.086162, 	2.000000, 3.977933, 	0.571796, -0.203921, -0.794648, 
-0.000000, -8.242178, 0.872734, 	1.500000, 3.977933, 	0.000000, -0.248755, -0.968567, 
-0.000000, -8.242178, 0.872734, 	1.500000, 3.977933, 	0.000000, -0.248755, -0.968567, 
--1.002737, -8.188779, 1.086162, 	1.000000, 3.977933, 	-0.571796, -0.203921, -0.794648, 
--1.002737, -6.496116, 0.423996, 	1.000000, 3.748844, 	-0.567467, -0.386666, -0.726960, 
--1.002737, -6.496116, 0.423996, 	1.000000, 3.748844, 	-0.567467, -0.386666, -0.726960, 
--1.002737, -5.023273, -0.595701, 	1.000000, 3.518014, 	-0.554291, -0.537252, -0.635706, 
-0.000000, -5.137229, -0.776313, 	1.500000, 3.518014, 	-0.000000, -0.646205, -0.763164, 
-0.000000, -2.675549, -3.655995, 	1.500000, 3.096704, 	-0.000000, -0.841132, -0.540830, 
-1.002737, -2.514818, -3.530164, 	2.000000, 3.096704, 	0.535283, -0.710141, -0.457354, 
-1.002737, -3.678185, -1.954659, 	2.000000, 3.301661, 	0.541785, -0.639146, -0.545858, 
-1.002737, -3.678185, -1.954659, 	2.000000, 3.301661, 	0.541785, -0.639146, -0.545858, 
-1.002737, -5.023273, -0.595701, 	2.000000, 3.518014, 	0.554291, -0.537252, -0.635706, 
-0.000000, -5.137229, -0.776313, 	1.500000, 3.518014, 	-0.000000, -0.646205, -0.763164, 
-0.000000, -5.137229, -0.776313, 	1.500000, 3.518014, 	-0.000000, -0.646205, -0.763164, 
--1.002737, -5.023273, -0.595701, 	1.000000, 3.518014, 	-0.554291, -0.537252, -0.635706, 
--1.002737, -3.678185, -1.954659, 	1.000000, 3.301661, 	-0.541786, -0.639146, -0.545858, 
--1.002737, -3.678185, -1.954659, 	1.000000, 3.301661, 	-0.541786, -0.639146, -0.545858, 
--1.002737, -2.514818, -3.530164, 	1.000000, 3.096704, 	-0.535283, -0.710141, -0.457353, 
-0.000000, -2.675549, -3.655995, 	1.500000, 3.096704, 	-0.000000, -0.841132, -0.540830, 
-0.000000, -1.149923, -7.084101, 	1.500000, 2.714038, 	0.000000, -0.973883, -0.227050, 
-1.002737, -0.955311, -7.018215, 	2.000000, 2.714038, 	0.543591, -0.816934, -0.192683, 
-1.002737, -1.587135, -5.199499, 	2.000000, 2.900065, 	0.538039, -0.769598, -0.343850, 
-1.002737, -1.587135, -5.199499, 	2.000000, 2.900065, 	0.538039, -0.769598, -0.343850, 
-1.002737, -2.514818, -3.530164, 	2.000000, 3.096704, 	0.535283, -0.710141, -0.457354, 
-0.000000, -2.675549, -3.655995, 	1.500000, 3.096704, 	-0.000000, -0.841132, -0.540830, 
-0.000000, -2.675549, -3.655995, 	1.500000, 3.096704, 	-0.000000, -0.841132, -0.540830, 
--1.002737, -2.514818, -3.530164, 	1.000000, 3.096704, 	-0.535283, -0.710141, -0.457353, 
--1.002737, -1.587135, -5.199499, 	1.000000, 2.900065, 	-0.538039, -0.769598, -0.343850, 
--1.002737, -1.587135, -5.199499, 	1.000000, 2.900065, 	-0.538039, -0.769598, -0.343850, 
--1.002737, -0.955311, -7.018215, 	1.000000, 2.714038, 	-0.543592, -0.816934, -0.192683, 
-0.000000, -1.149923, -7.084101, 	1.500000, 2.714038, 	0.000000, -0.973883, -0.227050, 
-0.000000, -1.052381, -11.138744, 	1.500000, 2.371212, 	0.000000, -0.979438, 0.201745, 
-1.002737, -0.835270, -11.133000, 	2.000000, 2.371212, 	0.556778, -0.814518, 0.162970, 
-1.002737, -0.679521, -9.041862, 	2.000000, 2.540917, 	0.550509, -0.834486, -0.023924, 
-1.002737, -0.679521, -9.041862, 	2.000000, 2.540917, 	0.550509, -0.834486, -0.023924, 
-1.002737, -0.955311, -7.018215, 	2.000000, 2.714038, 	0.543591, -0.816934, -0.192683, 
-0.000000, -1.149923, -7.084101, 	1.500000, 2.714038, 	0.000000, -0.973883, -0.227050, 
-0.000000, -1.149923, -7.084101, 	1.500000, 2.714038, 	0.000000, -0.973883, -0.227050, 
--1.002737, -0.955311, -7.018215, 	1.000000, 2.714038, 	-0.543592, -0.816934, -0.192683, 
--1.002737, -0.679522, -9.041862, 	1.000000, 2.540917, 	-0.550509, -0.834486, -0.023924, 
--1.002737, -0.679522, -9.041862, 	1.000000, 2.540917, 	-0.550509, -0.834486, -0.023924, 
--1.002737, -0.835270, -11.133001, 	1.000000, 2.371212, 	-0.556778, -0.814518, 0.162970, 
-0.000000, -1.052381, -11.138744, 	1.500000, 2.371212, 	0.000000, -0.979438, 0.201745, 
-0.000000, -2.665116, -15.154720, 	1.500000, 2.020624, 	-0.000000, -0.906717, 0.421740, 
-1.002737, -2.439466, -15.191065, 	2.000000, 2.020624, 	0.552162, -0.756556, 0.350343, 
-1.002737, -1.498060, -13.154191, 	2.000000, 2.195430, 	0.550846, -0.775955, 0.307348, 
-1.002737, -1.498060, -13.154191, 	2.000000, 2.195430, 	0.550846, -0.775955, 0.307348, 
-1.002737, -0.835270, -11.133000, 	2.000000, 2.371212, 	0.556778, -0.814518, 0.162970, 
-0.000000, -1.052381, -11.138744, 	1.500000, 2.371212, 	0.000000, -0.979438, 0.201745, 
-0.000000, -1.052381, -11.138744, 	1.500000, 2.371212, 	0.000000, -0.979438, 0.201745, 
--1.002737, -0.835270, -11.133001, 	1.000000, 2.371212, 	-0.556778, -0.814518, 0.162970, 
--1.002737, -1.498060, -13.154191, 	1.000000, 2.195430, 	-0.550846, -0.775955, 0.307348, 
--1.002737, -1.498060, -13.154191, 	1.000000, 2.195430, 	-0.550846, -0.775955, 0.307348, 
--1.002737, -2.439466, -15.191065, 	1.000000, 2.020624, 	-0.552162, -0.756555, 0.350343, 
-0.000000, -2.665116, -15.154720, 	1.500000, 2.020624, 	-0.000000, -0.906717, 0.421740, 
-0.000000, -4.592515, -19.503733, 	1.500000, 1.696742, 	-0.000000, -0.936315, 0.351162, 
-1.002737, -4.363696, -19.552979, 	2.000000, 1.696742, 	0.563275, -0.773529, 0.290474, 
-1.002737, -3.431055, -17.329250, 	2.000000, 1.853850, 	0.559291, -0.758482, 0.334513, 
-1.002737, -3.431055, -17.329250, 	2.000000, 1.853850, 	0.559291, -0.758482, 0.334513, 
-1.002737, -2.439466, -15.191065, 	2.000000, 2.020624, 	0.552162, -0.756556, 0.350343, 
-0.000000, -2.665116, -15.154720, 	1.500000, 2.020624, 	-0.000000, -0.906717, 0.421740, 
-0.000000, -2.665116, -15.154720, 	1.500000, 2.020624, 	-0.000000, -0.906717, 0.421740, 
--1.002737, -2.439466, -15.191065, 	1.000000, 2.020624, 	-0.552162, -0.756555, 0.350343, 
--1.002737, -3.431055, -17.329250, 	1.000000, 1.853850, 	-0.559291, -0.758482, 0.334513, 
--1.002737, -3.431055, -17.329250, 	1.000000, 1.853850, 	-0.559291, -0.758482, 0.334513, 
--1.002737, -4.363696, -19.552979, 	1.000000, 1.696742, 	-0.563275, -0.773529, 0.290474, 
-0.000000, -4.592515, -19.503733, 	1.500000, 1.696742, 	-0.000000, -0.936315, 0.351162, 
-0.000000, -5.926875, -23.997019, 	1.500000, 1.417808, 	-0.000000, -0.976472, 0.215645, 
-1.002737, -5.694758, -24.033106, 	2.000000, 1.417808, 	0.566494, -0.804616, 0.177981, 
-1.002737, -5.128252, -21.846479, 	2.000000, 1.550938, 	0.566340, -0.790066, 0.234638, 
-1.002737, -5.128252, -21.846479, 	2.000000, 1.550938, 	0.566340, -0.790066, 0.234638, 
-1.002737, -4.363696, -19.552979, 	2.000000, 1.696742, 	0.563275, -0.773529, 0.290474, 
-0.000000, -4.592515, -19.503733, 	1.500000, 1.696742, 	-0.000000, -0.936315, 0.351162, 
-0.000000, -4.592515, -19.503733, 	1.500000, 1.696742, 	-0.000000, -0.936315, 0.351162, 
--1.002737, -4.363696, -19.552979, 	1.000000, 1.696742, 	-0.563275, -0.773529, 0.290474, 
--1.002737, -5.128252, -21.846479, 	1.000000, 1.550938, 	-0.566340, -0.790066, 0.234638, 
--1.002737, -5.128252, -21.846479, 	1.000000, 1.550938, 	-0.566340, -0.790066, 0.234638, 
--1.002737, -5.694758, -24.033106, 	1.000000, 1.417808, 	-0.566494, -0.804616, 0.177981, 
-0.000000, -5.926875, -23.997019, 	1.500000, 1.417808, 	-0.000000, -0.976472, 0.215645, 
-0.000000, -6.449554, -27.435261, 	1.500000, 1.186658, 	-0.000000, -0.994229, 0.107280, 
-1.002737, -6.213656, -27.449341, 	2.000000, 1.186658, 	0.570758, -0.816393, 0.087968, 
-1.002737, -6.033253, -25.936216, 	2.000000, 1.298722, 	0.568446, -0.813396, 0.123515, 
-1.002737, -6.033253, -25.936216, 	2.000000, 1.298722, 	0.568446, -0.813396, 0.123515, 
-1.002737, -5.694758, -24.033106, 	2.000000, 1.417808, 	0.566494, -0.804616, 0.177981, 
-0.000000, -5.926875, -23.997019, 	1.500000, 1.417808, 	-0.000000, -0.976472, 0.215645, 
-0.000000, -5.926875, -23.997019, 	1.500000, 1.417808, 	-0.000000, -0.976472, 0.215645, 
--1.002737, -5.694758, -24.033106, 	1.000000, 1.417808, 	-0.566494, -0.804616, 0.177981, 
--1.002737, -6.033253, -25.936214, 	1.000000, 1.298722, 	-0.568446, -0.813396, 0.123515, 
--1.002737, -6.033253, -25.936214, 	1.000000, 1.298722, 	-0.568446, -0.813396, 0.123515, 
--1.002737, -6.213656, -27.449341, 	1.000000, 1.186658, 	-0.570758, -0.816393, 0.087968, 
-0.000000, -6.449554, -27.435261, 	1.500000, 1.186658, 	-0.000000, -0.994229, 0.107280, 
-1.002737, -6.305892, -28.466030, 	1.500000, 1.053028, 	0.565626, -0.821288, 0.074517, 
-1.002737, -6.213656, -27.449341, 	2.000000, 1.053028, 	0.570758, -0.816393, 0.087968, 
-0.000000, -6.449554, -27.435261, 	2.000000, 1.119843, 	-0.000000, -0.994229, 0.107280, 
-0.000000, -6.449554, -27.435261, 	2.000000, 1.119843, 	-0.000000, -0.994229, 0.107280, 
--1.002737, -6.213656, -27.449341, 	2.000000, 1.186658, 	-0.570758, -0.816393, 0.087968, 
--1.002737, -6.305892, -28.466030, 	1.500000, 1.186658, 	-0.565626, -0.821288, 0.074517, 
-1.336982, -22.914524, -4.929887, 	2.000000, 1.026514, 	0.999805, -0.016666, 0.010584, 
-1.002737, -23.539934, -4.622173, 	2.000000, 1.053028, 	0.559738, -0.733607, 0.385376, 
-1.002737, -24.101816, -5.795360, 	1.500000, 1.053028, 	0.571338, -0.788867, 0.226409, 
-1.002737, -24.101816, -5.795360, 	1.500000, 1.053028, 	0.571338, -0.788867, 0.226409, 
-0.742768, -24.152987, -6.401496, 	1.000000, 1.053028, 	0.455754, -0.834430, -0.309862, 
-1.002737, -23.736286, -6.771559, 	1.000000, 1.026514, 	0.633041, -0.276748, -0.722959, 
-1.002737, -23.736286, -6.771559, 	1.000000, 1.026514, 	0.633041, -0.276748, -0.722959, 
-0.742768, -23.169422, -6.772669, 	1.000000, 1.000000, 	0.444774, 0.383425, -0.809421, 
-1.002737, -22.791559, -6.324653, 	1.500000, 1.000000, 	0.585182, 0.679392, -0.442706, 
-1.002737, -22.791559, -6.324653, 	1.500000, 1.000000, 	0.585182, 0.679392, -0.442706, 
-1.002737, -22.289114, -5.237599, 	2.000000, 1.000000, 	0.580101, 0.726128, -0.369081, 
-1.336982, -22.914524, -4.929887, 	2.000000, 1.026514, 	0.999805, -0.016666, 0.010584, 
-1.336982, -20.877926, -1.798224, 	2.500000, 4.901888, 	0.999242, -0.027513, 0.027552, 
-1.002737, -21.393009, -1.363454, 	3.000000, 4.901887, 	0.538985, -0.621423, 0.568620, 
-1.002737, -22.670450, -3.070609, 	3.000000, 4.957545, 	0.549531, -0.697669, 0.459646, 
-1.002737, -22.670450, -3.070609, 	3.000000, 4.957545, 	0.549531, -0.697669, 0.459646, 
-1.002737, -23.539934, -4.622173, 	3.000000, 5.000000, 	0.559738, -0.733607, 0.385376, 
-1.336982, -22.914524, -4.929887, 	2.500000, 5.000000, 	0.999805, -0.016666, 0.010584, 
-1.336982, -22.914524, -4.929887, 	2.500000, 5.000000, 	0.999805, -0.016666, 0.010584, 
-1.002737, -22.289114, -5.237599, 	2.000000, 5.000000, 	0.580101, 0.726128, -0.369081, 
-1.002737, -21.510138, -3.803390, 	2.000000, 4.957545, 	0.579339, 0.686160, -0.439944, 
-1.002737, -21.510138, -3.803390, 	2.000000, 4.957545, 	0.579339, 0.686160, -0.439944, 
-1.002737, -20.362839, -2.232996, 	2.000000, 4.901887, 	0.577401, 0.607255, -0.545756, 
-1.336982, -20.877926, -1.798224, 	2.500000, 4.901888, 	0.999242, -0.027513, 0.027552, 
-1.336982, -17.125900, 1.021948, 	2.500000, 4.706708, 	0.998755, -0.017888, 0.046575, 
-1.002737, -17.444981, 1.593854, 	3.000000, 4.706708, 	0.523473, -0.350048, 0.776815, 
-1.002737, -19.607264, 0.276508, 	3.000000, 4.819824, 	0.531663, -0.507888, 0.677779, 
-1.002737, -19.607264, 0.276508, 	3.000000, 4.819824, 	0.531663, -0.507888, 0.677779, 
-1.002737, -21.393009, -1.363454, 	3.000000, 4.901887, 	0.538985, -0.621423, 0.568620, 
-1.336982, -20.877926, -1.798224, 	2.500000, 4.901888, 	0.999242, -0.027513, 0.027552, 
-1.336982, -20.877926, -1.798224, 	2.500000, 4.901888, 	0.999242, -0.027513, 0.027552, 
-1.002737, -20.362839, -2.232996, 	2.000000, 4.901887, 	0.577401, 0.607255, -0.545756, 
-1.002737, -18.755436, -0.737389, 	2.000000, 4.819824, 	0.571841, 0.493951, -0.654989, 
-1.002737, -18.755436, -0.737389, 	2.000000, 4.819824, 	0.571841, 0.493951, -0.654989, 
-1.002737, -16.806824, 0.450041, 	2.000000, 4.706708, 	0.570721, 0.333495, -0.750372, 
-1.336982, -17.125900, 1.021948, 	2.500000, 4.706708, 	0.998755, -0.017888, 0.046575, 
-1.336982, -12.461710, 1.998980, 	2.500000, 4.382352, 	0.999581, -0.002143, 0.028884, 
-1.002737, -12.539209, 2.645355, 	3.000000, 4.382352, 	0.529316, -0.059790, 0.846315, 
-1.002737, -15.037928, 2.333167, 	3.000000, 4.557891, 	0.524224, -0.178780, 0.832603, 
-1.002737, -15.037928, 2.333167, 	3.000000, 4.557891, 	0.524224, -0.178780, 0.832603, 
-1.002737, -17.444981, 1.593854, 	3.000000, 4.706708, 	0.523473, -0.350048, 0.776815, 
-1.336982, -17.125900, 1.021948, 	2.500000, 4.706708, 	0.998755, -0.017888, 0.046575, 
-1.336982, -17.125900, 1.021948, 	2.500000, 4.706708, 	0.998755, -0.017888, 0.046575, 
-1.002737, -16.806824, 0.450041, 	2.000000, 4.706708, 	0.570721, 0.333495, -0.750372, 
-1.002737, -14.635897, 1.095908, 	2.000000, 4.557891, 	0.560822, 0.165222, -0.811283, 
-1.002737, -14.635897, 1.095908, 	2.000000, 4.557891, 	0.560822, 0.165222, -0.811283, 
-1.002737, -12.384212, 1.352605, 	2.000000, 4.382352, 	0.556840, 0.051516, -0.829021, 
-1.336982, -12.461710, 1.998980, 	2.500000, 4.382352, 	0.999581, -0.002143, 0.028884, 
-1.336982, -8.028582, 1.726443, 	2.500000, 3.977933, 	0.998903, 0.011916, 0.045285, 
-1.002737, -7.868385, 2.366725, 	3.000000, 3.977933, 	0.526810, 0.210598, 0.823480, 
-1.002737, -10.101929, 2.681329, 	3.000000, 4.189068, 	0.529646, 0.050516, 0.846713, 
-1.002737, -10.101929, 2.681329, 	3.000000, 4.189068, 	0.529646, 0.050516, 0.846713, 
-1.002737, -12.539209, 2.645355, 	3.000000, 4.382352, 	0.529316, -0.059790, 0.846315, 
-1.336982, -12.461710, 1.998980, 	2.500000, 4.382352, 	0.999581, -0.002143, 0.028884, 
-1.336982, -12.461710, 1.998980, 	2.500000, 4.382352, 	0.999581, -0.002143, 0.028884, 
-1.002737, -12.384212, 1.352605, 	2.000000, 4.382352, 	0.556840, 0.051516, -0.829021, 
-1.002737, -10.193325, 1.372527, 	2.000000, 4.189068, 	0.563923, -0.052320, -0.824168, 
-1.002737, -10.193325, 1.372527, 	2.000000, 4.189068, 	0.563923, -0.052320, -0.824168, 
-1.002737, -8.188779, 1.086162, 	2.000000, 3.977933, 	0.571796, -0.203921, -0.794648, 
-1.336982, -8.028582, 1.726443, 	2.500000, 3.977933, 	0.998903, 0.011916, 0.045285, 
-1.336982, -4.681401, -0.053863, 	2.500000, 3.518014, 	0.999076, 0.030579, 0.030219, 
-1.002737, -4.339529, 0.487975, 	3.000000, 3.518014, 	0.515414, 0.553092, 0.654552, 
-1.002737, -5.980879, 1.627182, 	3.000000, 3.748844, 	0.522693, 0.400366, 0.752661, 
-1.002737, -5.980879, 1.627182, 	3.000000, 3.748844, 	0.522693, 0.400366, 0.752661, 
-1.002737, -7.868385, 2.366725, 	3.000000, 3.977933, 	0.526810, 0.210598, 0.823480, 
-1.336982, -8.028582, 1.726443, 	2.500000, 3.977933, 	0.998903, 0.011916, 0.045285, 
-1.336982, -8.028582, 1.726443, 	2.500000, 3.977933, 	0.998903, 0.011916, 0.045285, 
-1.002737, -8.188779, 1.086162, 	2.000000, 3.977933, 	0.571796, -0.203921, -0.794648, 
-1.002737, -6.496116, 0.423996, 	2.000000, 3.748844, 	0.567467, -0.386666, -0.726960, 
-1.002737, -6.496116, 0.423996, 	2.000000, 3.748844, 	0.567467, -0.386666, -0.726960, 
-1.002737, -5.023273, -0.595701, 	2.000000, 3.518014, 	0.554291, -0.537252, -0.635706, 
-1.336982, -4.681401, -0.053863, 	2.500000, 3.518014, 	0.999076, 0.030579, 0.030219, 
-1.336982, -2.032627, -3.152670, 	2.500000, 3.096704, 	0.999446, 0.028671, 0.016899, 
-1.002737, -1.550435, -2.775177, 	3.000000, 3.096704, 	0.505988, 0.723592, 0.469458, 
-1.002737, -2.844458, -1.025621, 	3.000000, 3.301661, 	0.509526, 0.653879, 0.559309, 
-1.002737, -2.844458, -1.025621, 	3.000000, 3.301661, 	0.509526, 0.653879, 0.559309, 
-1.002737, -4.339529, 0.487975, 	3.000000, 3.518014, 	0.515414, 0.553092, 0.654552, 
-1.336982, -4.681401, -0.053863, 	2.500000, 3.518014, 	0.999076, 0.030579, 0.030219, 
-1.336982, -4.681401, -0.053863, 	2.500000, 3.518014, 	0.999076, 0.030579, 0.030219, 
-1.002737, -5.023273, -0.595701, 	2.000000, 3.518014, 	0.554291, -0.537252, -0.635706, 
-1.002737, -3.678185, -1.954659, 	2.000000, 3.301661, 	0.541785, -0.639146, -0.545858, 
-1.002737, -3.678185, -1.954659, 	2.000000, 3.301661, 	0.541785, -0.639146, -0.545858, 
-1.002737, -2.514818, -3.530164, 	2.000000, 3.096704, 	0.535283, -0.710141, -0.457354, 
-1.336982, -2.032627, -3.152670, 	2.500000, 3.096704, 	0.999446, 0.028671, 0.016899, 
-1.336982, -0.371475, -6.820555, 	2.500000, 2.714038, 	0.999079, 0.041649, 0.010372, 
-1.002737, 0.212362, -6.622896, 	3.000000, 2.714038, 	0.505651, 0.835716, 0.214230, 
-1.002737, -0.512230, -4.622262, 	3.000000, 2.900065, 	0.503207, 0.785549, 0.360132, 
-1.002737, -0.512230, -4.622262, 	3.000000, 2.900065, 	0.503207, 0.785549, 0.360132, 
-1.002737, -1.550435, -2.775177, 	3.000000, 3.096704, 	0.505988, 0.723592, 0.469458, 
-1.336982, -2.032627, -3.152670, 	2.500000, 3.096704, 	0.999446, 0.028671, 0.016899, 
-1.336982, -2.032627, -3.152670, 	2.500000, 3.096704, 	0.999446, 0.028671, 0.016899, 
-1.002737, -2.514818, -3.530164, 	2.000000, 3.096704, 	0.535283, -0.710141, -0.457354, 
-1.002737, -1.587135, -5.199499, 	2.000000, 2.900065, 	0.538039, -0.769598, -0.343850, 
-1.002737, -1.587135, -5.199499, 	2.000000, 2.900065, 	0.538039, -0.769598, -0.343850, 
-1.002737, -0.955311, -7.018215, 	2.000000, 2.714038, 	0.543591, -0.816934, -0.192683, 
-1.336982, -0.371475, -6.820555, 	2.500000, 2.714038, 	0.999079, 0.041649, 0.010372, 
-1.336982, -0.183937, -11.115767, 	2.500000, 2.371212, 	0.999002, 0.043336, -0.010816, 
-1.002737, 0.467394, -11.098533, 	3.000000, 2.371212, 	0.517497, 0.844529, -0.137721, 
-1.002737, 0.565540, -8.833092, 	3.000000, 2.540917, 	0.512670, 0.857168, 0.049331, 
-1.002737, 0.565540, -8.833092, 	3.000000, 2.540917, 	0.512670, 0.857168, 0.049331, 
-1.002737, 0.212362, -6.622896, 	3.000000, 2.714038, 	0.505651, 0.835716, 0.214230, 
-1.336982, -0.371475, -6.820555, 	2.500000, 2.714038, 	0.999079, 0.041649, 0.010372, 
-1.336982, -0.371475, -6.820555, 	2.500000, 2.714038, 	0.999079, 0.041649, 0.010372, 
-1.002737, -0.955311, -7.018215, 	2.000000, 2.714038, 	0.543591, -0.816934, -0.192683, 
-1.002737, -0.679521, -9.041862, 	2.000000, 2.540917, 	0.550509, -0.834486, -0.023924, 
-1.002737, -0.679521, -9.041862, 	2.000000, 2.540917, 	0.550509, -0.834486, -0.023924, 
-1.002737, -0.835270, -11.133000, 	2.000000, 2.371212, 	0.556778, -0.814518, 0.162970, 
-1.336982, -0.183937, -11.115767, 	2.500000, 2.371212, 	0.999002, 0.043336, -0.010816, 
-1.336982, -1.762512, -15.300098, 	2.500000, 2.020624, 	0.999977, 0.006790, -0.000522, 
-1.002737, -1.085560, -15.409132, 	3.000000, 2.020624, 	0.545979, 0.767296, -0.336399, 
-1.002737, -0.161999, -13.264900, 	3.000000, 2.195430, 	0.528455, 0.798898, -0.287224, 
-1.002737, -0.161999, -13.264900, 	3.000000, 2.195430, 	0.528455, 0.798898, -0.287224, 
-1.002737, 0.467394, -11.098533, 	3.000000, 2.371212, 	0.517497, 0.844529, -0.137721, 
-1.336982, -0.183937, -11.115767, 	2.500000, 2.371212, 	0.999002, 0.043336, -0.010816, 
-1.336982, -0.183937, -11.115767, 	2.500000, 2.371212, 	0.999002, 0.043336, -0.010816, 
-1.002737, -0.835270, -11.133000, 	2.000000, 2.371212, 	0.556778, -0.814518, 0.162970, 
-1.002737, -1.498060, -13.154191, 	2.000000, 2.195430, 	0.550846, -0.775955, 0.307348, 
-1.002737, -1.498060, -13.154191, 	2.000000, 2.195430, 	0.550846, -0.775955, 0.307348, 
-1.002737, -2.439466, -15.191065, 	2.000000, 2.020624, 	0.552162, -0.756556, 0.350343, 
-1.336982, -1.762512, -15.300098, 	2.500000, 2.020624, 	0.999977, 0.006790, -0.000522, 
-1.336982, -3.677238, -19.700720, 	2.500000, 1.696742, 	0.999943, -0.009227, 0.005371, 
-1.002737, -2.990782, -19.848455, 	3.000000, 1.696742, 	0.573541, 0.767561, -0.286181, 
-1.002737, -2.066217, -17.608171, 	3.000000, 1.853850, 	0.561407, 0.760416, -0.326481, 
-1.002737, -2.066217, -17.608171, 	3.000000, 1.853850, 	0.561407, 0.760416, -0.326481, 
-1.002737, -1.085560, -15.409132, 	3.000000, 2.020624, 	0.545979, 0.767296, -0.336399, 
-1.336982, -1.762512, -15.300098, 	2.500000, 2.020624, 	0.999977, 0.006790, -0.000522, 
-1.336982, -1.762512, -15.300098, 	2.500000, 2.020624, 	0.999977, 0.006790, -0.000522, 
-1.002737, -2.439466, -15.191065, 	2.000000, 2.020624, 	0.552162, -0.756556, 0.350343, 
-1.002737, -3.431055, -17.329250, 	2.000000, 1.853850, 	0.559291, -0.758482, 0.334513, 
-1.002737, -3.431055, -17.329250, 	2.000000, 1.853850, 	0.559291, -0.758482, 0.334513, 
-1.002737, -4.363696, -19.552979, 	2.000000, 1.696742, 	0.563275, -0.773529, 0.290474, 
-1.336982, -3.677238, -19.700720, 	2.500000, 1.696742, 	0.999943, -0.009227, 0.005371, 
-1.336982, -4.998410, -24.141369, 	2.500000, 1.417808, 	0.999879, -0.015055, 0.003873, 
-1.002737, -4.302059, -24.249632, 	3.000000, 1.417808, 	0.582444, 0.793471, -0.176531, 
-1.002737, -3.746061, -22.116426, 	3.000000, 1.550938, 	0.578794, 0.781497, -0.232937, 
-1.002737, -3.746061, -22.116426, 	3.000000, 1.550938, 	0.578794, 0.781497, -0.232937, 
-1.002737, -2.990782, -19.848455, 	3.000000, 1.696742, 	0.573541, 0.767561, -0.286181, 
-1.336982, -3.677238, -19.700720, 	2.500000, 1.696742, 	0.999943, -0.009227, 0.005371, 
-1.336982, -3.677238, -19.700720, 	2.500000, 1.696742, 	0.999943, -0.009227, 0.005371, 
-1.002737, -4.363696, -19.552979, 	2.000000, 1.696742, 	0.563275, -0.773529, 0.290474, 
-1.002737, -5.128252, -21.846479, 	2.000000, 1.550938, 	0.566340, -0.790066, 0.234638, 
-1.002737, -5.128252, -21.846479, 	2.000000, 1.550938, 	0.566340, -0.790066, 0.234638, 
-1.002737, -5.694758, -24.033106, 	2.000000, 1.417808, 	0.566494, -0.804616, 0.177981, 
-1.336982, -4.998410, -24.141369, 	2.500000, 1.417808, 	0.999879, -0.015055, 0.003873, 
-1.336982, -5.505962, -27.491592, 	2.500000, 1.186658, 	0.999932, -0.011526, 0.001722, 
-1.002737, -4.798269, -27.533844, 	3.000000, 1.186658, 	0.583019, 0.808019, -0.084825, 
-1.002737, -4.628780, -26.085621, 	3.000000, 1.298722, 	0.582983, 0.803361, -0.121414, 
-1.002737, -4.628780, -26.085621, 	3.000000, 1.298722, 	0.582983, 0.803361, -0.121414, 
-1.002737, -4.302059, -24.249632, 	3.000000, 1.417808, 	0.582444, 0.793471, -0.176531, 
-1.336982, -4.998410, -24.141369, 	2.500000, 1.417808, 	0.999879, -0.015055, 0.003873, 
-1.336982, -4.998410, -24.141369, 	2.500000, 1.417808, 	0.999879, -0.015055, 0.003873, 
-1.002737, -5.694758, -24.033106, 	2.000000, 1.417808, 	0.566494, -0.804616, 0.177981, 
-1.002737, -6.033253, -25.936216, 	2.000000, 1.298722, 	0.568446, -0.813396, 0.123515, 
-1.002737, -6.033253, -25.936216, 	2.000000, 1.298722, 	0.568446, -0.813396, 0.123515, 
-1.002737, -6.213656, -27.449341, 	2.000000, 1.186658, 	0.570758, -0.816393, 0.087968, 
-1.336982, -5.505962, -27.491592, 	2.500000, 1.186658, 	0.999932, -0.011526, 0.001722, 
-1.002737, -4.882575, -28.503754, 	2.500000, 1.053028, 	0.589040, 0.805067, -0.069986, 
-1.002737, -4.798269, -27.533844, 	3.000000, 1.053028, 	0.583019, 0.808019, -0.084825, 
-1.336982, -5.505962, -27.491592, 	3.000000, 1.119843, 	0.999932, -0.011526, 0.001722, 
-1.336982, -5.505962, -27.491592, 	3.000000, 1.119843, 	0.999932, -0.011526, 0.001722, 
-1.002737, -6.213656, -27.449341, 	3.000000, 1.186658, 	0.570758, -0.816393, 0.087968, 
-1.002737, -6.305892, -28.466030, 	2.500000, 1.186658, 	0.565626, -0.821288, 0.074517, 
-0.000000, -23.748404, -4.519603, 	3.000000, 1.026514, 	-0.000000, -0.884854, 0.465869, 
--1.002737, -23.539934, -4.622173, 	3.000000, 1.053028, 	-0.559738, -0.733607, 0.385376, 
--1.002737, -24.101816, -5.795360, 	2.500000, 1.053028, 	-0.571338, -0.788867, 0.226409, 
--1.002737, -24.101816, -5.795360, 	2.500000, 1.053028, 	-0.571338, -0.788867, 0.226409, 
--0.742768, -24.152987, -6.401496, 	2.000000, 1.053028, 	-0.455754, -0.834431, -0.309862, 
-0.000000, -24.406044, -6.530420, 	2.000000, 1.026514, 	0.000000, -0.933376, -0.358900, 
-0.000000, -24.406044, -6.530420, 	2.000000, 1.026514, 	0.000000, -0.933376, -0.358900, 
-0.742768, -24.152987, -6.401496, 	2.000000, 1.000000, 	0.455754, -0.834430, -0.309862, 
-1.002737, -24.101816, -5.795360, 	2.500000, 1.000000, 	0.571338, -0.788867, 0.226409, 
-1.002737, -24.101816, -5.795360, 	2.500000, 1.000000, 	0.571338, -0.788867, 0.226409, 
-1.002737, -23.539934, -4.622173, 	3.000000, 1.000000, 	0.559738, -0.733607, 0.385376, 
-0.000000, -23.748404, -4.519603, 	3.000000, 1.026514, 	-0.000000, -0.884854, 0.465869, 
-0.000000, -21.564705, -1.218530, 	3.500000, 4.901888, 	0.000000, -0.737549, 0.675293, 
--1.002737, -21.393009, -1.363454, 	4.000000, 4.915090, 	-0.538985, -0.621423, 0.568620, 
--1.002737, -22.670450, -3.070609, 	4.000000, 4.957545, 	-0.549531, -0.697669, 0.459646, 
--1.002737, -22.670450, -3.070609, 	4.000000, 4.957545, 	-0.549531, -0.697669, 0.459646, 
--1.002737, -23.539934, -4.622173, 	4.000000, 5.000000, 	-0.559738, -0.733607, 0.385376, 
-0.000000, -23.748404, -4.519603, 	3.500000, 5.000000, 	-0.000000, -0.884854, 0.465869, 
-0.000000, -23.748404, -4.519603, 	3.500000, 5.000000, 	-0.000000, -0.884854, 0.465869, 
-1.002737, -23.539934, -4.622173, 	3.000000, 5.000000, 	0.559738, -0.733607, 0.385376, 
-1.002737, -22.670450, -3.070609, 	3.000000, 4.957545, 	0.549531, -0.697669, 0.459646, 
-1.002737, -22.670450, -3.070609, 	3.000000, 4.957545, 	0.549531, -0.697669, 0.459646, 
-1.002737, -21.393009, -1.363454, 	3.000000, 4.901887, 	0.538985, -0.621423, 0.568620, 
-0.000000, -21.564705, -1.218530, 	3.500000, 4.901888, 	0.000000, -0.737549, 0.675293, 
-0.000000, -17.551340, 1.784490, 	3.500000, 4.706708, 	-0.000000, -0.412059, 0.911157, 
--1.002737, -17.444981, 1.593854, 	4.000000, 4.724558, 	-0.523473, -0.350048, 0.776815, 
--1.002737, -19.607264, 0.276508, 	4.000000, 4.819824, 	-0.531663, -0.507888, 0.677779, 
--1.002737, -19.607264, 0.276508, 	4.000000, 4.819824, 	-0.531663, -0.507888, 0.677779, 
--1.002737, -21.393009, -1.363454, 	4.000000, 4.915090, 	-0.538985, -0.621423, 0.568620, 
-0.000000, -21.564705, -1.218530, 	3.500000, 4.901888, 	0.000000, -0.737549, 0.675293, 
-0.000000, -21.564705, -1.218530, 	3.500000, 4.901888, 	0.000000, -0.737549, 0.675293, 
-1.002737, -21.393009, -1.363454, 	3.000000, 4.901887, 	0.538985, -0.621423, 0.568620, 
-1.002737, -19.607264, 0.276508, 	3.000000, 4.819824, 	0.531663, -0.507888, 0.677779, 
-1.002737, -19.607264, 0.276508, 	3.000000, 4.819824, 	0.531663, -0.507888, 0.677779, 
-1.002737, -17.444981, 1.593854, 	3.000000, 4.706708, 	0.523473, -0.350048, 0.776815, 
-0.000000, -17.551340, 1.784490, 	3.500000, 4.706708, 	-0.000000, -0.412059, 0.911157, 
-0.000000, -12.565042, 2.860814, 	3.500000, 4.382352, 	-0.000000, -0.071332, 0.997453, 
--1.002737, -12.539209, 2.645355, 	4.000000, 4.391225, 	-0.529316, -0.059790, 0.846315, 
--1.002737, -15.037928, 2.333167, 	4.000000, 4.557892, 	-0.524224, -0.178780, 0.832603, 
--1.002737, -15.037928, 2.333167, 	4.000000, 4.557892, 	-0.524224, -0.178780, 0.832603, 
--1.002737, -17.444981, 1.593854, 	4.000000, 4.724558, 	-0.523473, -0.350048, 0.776815, 
-0.000000, -17.551340, 1.784490, 	3.500000, 4.706708, 	-0.000000, -0.412059, 0.911157, 
-0.000000, -17.551340, 1.784490, 	3.500000, 4.706708, 	-0.000000, -0.412059, 0.911157, 
-1.002737, -17.444981, 1.593854, 	3.000000, 4.706708, 	0.523473, -0.350048, 0.776815, 
-1.002737, -15.037928, 2.333167, 	3.000000, 4.557891, 	0.524224, -0.178780, 0.832603, 
-1.002737, -15.037928, 2.333167, 	3.000000, 4.557891, 	0.524224, -0.178780, 0.832603, 
-1.002737, -12.539209, 2.645355, 	3.000000, 4.382352, 	0.529316, -0.059790, 0.846315, 
-0.000000, -12.565042, 2.860814, 	3.500000, 4.382352, 	-0.000000, -0.071332, 0.997453, 
-0.000000, -7.814985, 2.580152, 	3.500000, 3.977933, 	-0.000000, 0.247588, 0.968866, 
--1.002737, -7.868385, 2.366725, 	4.000000, 3.986911, 	-0.526810, 0.210598, 0.823480, 
--1.002737, -10.101929, 2.681329, 	4.000000, 4.189068, 	-0.529646, 0.050516, 0.846713, 
--1.002737, -10.101929, 2.681329, 	4.000000, 4.189068, 	-0.529646, 0.050516, 0.846713, 
--1.002737, -12.539209, 2.645355, 	4.000000, 4.391225, 	-0.529316, -0.059790, 0.846315, 
-0.000000, -12.565042, 2.860814, 	3.500000, 4.382352, 	-0.000000, -0.071332, 0.997453, 
-0.000000, -12.565042, 2.860814, 	3.500000, 4.382352, 	-0.000000, -0.071332, 0.997453, 
-1.002737, -12.539209, 2.645355, 	3.000000, 4.382352, 	0.529316, -0.059790, 0.846315, 
-1.002737, -10.101929, 2.681329, 	3.000000, 4.189068, 	0.529646, 0.050516, 0.846713, 
-1.002737, -10.101929, 2.681329, 	3.000000, 4.189068, 	0.529646, 0.050516, 0.846713, 
-1.002737, -7.868385, 2.366725, 	3.000000, 3.977933, 	0.526810, 0.210598, 0.823480, 
-0.000000, -7.814985, 2.580152, 	3.500000, 3.977933, 	-0.000000, 0.247588, 0.968866, 
-0.000000, -4.225573, 0.668588, 	3.500000, 3.518014, 	-0.000000, 0.644556, 0.764557, 
--1.002737, -4.339529, 0.487975, 	4.000000, 3.510776, 	-0.515414, 0.553092, 0.654552, 
--1.002737, -5.980879, 1.627182, 	4.000000, 3.748844, 	-0.522694, 0.400366, 0.752661, 
--1.002737, -5.980879, 1.627182, 	4.000000, 3.748844, 	-0.522694, 0.400366, 0.752661, 
--1.002737, -7.868385, 2.366725, 	4.000000, 3.986911, 	-0.526810, 0.210598, 0.823480, 
-0.000000, -7.814985, 2.580152, 	3.500000, 3.977933, 	-0.000000, 0.247588, 0.968866, 
-0.000000, -7.814985, 2.580152, 	3.500000, 3.977933, 	-0.000000, 0.247588, 0.968866, 
-1.002737, -7.868385, 2.366725, 	3.000000, 3.977933, 	0.526810, 0.210598, 0.823480, 
-1.002737, -5.980879, 1.627182, 	3.000000, 3.748844, 	0.522693, 0.400366, 0.752661, 
-1.002737, -5.980879, 1.627182, 	3.000000, 3.748844, 	0.522693, 0.400366, 0.752661, 
-1.002737, -4.339529, 0.487975, 	3.000000, 3.518014, 	0.515414, 0.553092, 0.654552, 
-0.000000, -4.225573, 0.668588, 	3.500000, 3.518014, 	-0.000000, 0.644556, 0.764557, 
-0.000000, -1.389704, -2.649346, 	3.500000, 3.096704, 	0.000000, 0.838537, 0.544844, 
--1.002737, -1.550434, -2.775177, 	4.000000, 3.092546, 	-0.505987, 0.723592, 0.469458, 
--1.002737, -2.844458, -1.025621, 	4.000000, 3.301661, 	-0.509526, 0.653879, 0.559309, 
--1.002737, -2.844458, -1.025621, 	4.000000, 3.301661, 	-0.509526, 0.653879, 0.559309, 
--1.002737, -4.339529, 0.487975, 	4.000000, 3.510776, 	-0.515414, 0.553092, 0.654552, 
-0.000000, -4.225573, 0.668588, 	3.500000, 3.518014, 	-0.000000, 0.644556, 0.764557, 
-0.000000, -4.225573, 0.668588, 	3.500000, 3.518014, 	-0.000000, 0.644556, 0.764557, 
-1.002737, -4.339529, 0.487975, 	3.000000, 3.518014, 	0.515414, 0.553092, 0.654552, 
-1.002737, -2.844458, -1.025621, 	3.000000, 3.301661, 	0.509526, 0.653879, 0.559309, 
-1.002737, -2.844458, -1.025621, 	3.000000, 3.301661, 	0.509526, 0.653879, 0.559309, 
-1.002737, -1.550435, -2.775177, 	3.000000, 3.096704, 	0.505988, 0.723592, 0.469458, 
-0.000000, -1.389704, -2.649346, 	3.500000, 3.096704, 	0.000000, 0.838537, 0.544844, 
-0.000000, 0.406973, -6.557009, 	3.500000, 2.714038, 	-0.000000, 0.968208, 0.250145, 
--1.002737, 0.212360, -6.622896, 	4.000000, 2.707584, 	-0.505652, 0.835716, 0.214230, 
--1.002737, -0.512230, -4.622262, 	4.000000, 2.900065, 	-0.503207, 0.785550, 0.360132, 
--1.002737, -0.512230, -4.622262, 	4.000000, 2.900065, 	-0.503207, 0.785550, 0.360132, 
--1.002737, -1.550434, -2.775177, 	4.000000, 3.092546, 	-0.505987, 0.723592, 0.469458, 
-0.000000, -1.389704, -2.649346, 	3.500000, 3.096704, 	0.000000, 0.838537, 0.544844, 
-0.000000, -1.389704, -2.649346, 	3.500000, 3.096704, 	0.000000, 0.838537, 0.544844, 
-1.002737, -1.550435, -2.775177, 	3.000000, 3.096704, 	0.505988, 0.723592, 0.469458, 
-1.002737, -0.512230, -4.622262, 	3.000000, 2.900065, 	0.503207, 0.785549, 0.360132, 
-1.002737, -0.512230, -4.622262, 	3.000000, 2.900065, 	0.503207, 0.785549, 0.360132, 
-1.002737, 0.212362, -6.622896, 	3.000000, 2.714038, 	0.505651, 0.835716, 0.214230, 
-0.000000, 0.406973, -6.557009, 	3.500000, 2.714038, 	-0.000000, 0.968208, 0.250145, 
-0.000000, 0.684505, -11.092790, 	3.500000, 2.371212, 	0.000000, 0.987685, -0.156457, 
--1.002737, 0.467394, -11.098533, 	4.000000, 2.374251, 	-0.517497, 0.844529, -0.137721, 
--1.002737, 0.565540, -8.833092, 	4.000000, 2.540917, 	-0.512670, 0.857167, 0.049331, 
--1.002737, 0.565540, -8.833092, 	4.000000, 2.540917, 	-0.512670, 0.857167, 0.049331, 
--1.002737, 0.212360, -6.622896, 	4.000000, 2.707584, 	-0.505652, 0.835716, 0.214230, 
-0.000000, 0.406973, -6.557009, 	3.500000, 2.714038, 	-0.000000, 0.968208, 0.250145, 
-0.000000, 0.406973, -6.557009, 	3.500000, 2.714038, 	-0.000000, 0.968208, 0.250145, 
-1.002737, 0.212362, -6.622896, 	3.000000, 2.714038, 	0.505651, 0.835716, 0.214230, 
-1.002737, 0.565540, -8.833092, 	3.000000, 2.540917, 	0.512670, 0.857168, 0.049331, 
-1.002737, 0.565540, -8.833092, 	3.000000, 2.540917, 	0.512670, 0.857168, 0.049331, 
-1.002737, 0.467394, -11.098533, 	3.000000, 2.371212, 	0.517497, 0.844529, -0.137721, 
-0.000000, 0.684505, -11.092790, 	3.500000, 2.371212, 	0.000000, 0.987685, -0.156457, 
-0.000000, -0.859908, -15.445475, 	3.500000, 2.020624, 	0.000000, 0.916600, -0.399806, 
--1.002737, -1.085560, -15.409132, 	4.000000, 2.016609, 	-0.545979, 0.767296, -0.336399, 
--1.002737, -0.161999, -13.264900, 	4.000000, 2.195430, 	-0.528455, 0.798898, -0.287224, 
--1.002737, -0.161999, -13.264900, 	4.000000, 2.195430, 	-0.528455, 0.798898, -0.287224, 
--1.002737, 0.467394, -11.098533, 	4.000000, 2.374251, 	-0.517497, 0.844529, -0.137721, 
-0.000000, 0.684505, -11.092790, 	3.500000, 2.371212, 	0.000000, 0.987685, -0.156457, 
-0.000000, 0.684505, -11.092790, 	3.500000, 2.371212, 	0.000000, 0.987685, -0.156457, 
-1.002737, 0.467394, -11.098533, 	3.000000, 2.371212, 	0.517497, 0.844529, -0.137721, 
-1.002737, -0.161999, -13.264900, 	3.000000, 2.195430, 	0.528455, 0.798898, -0.287224, 
-1.002737, -0.161999, -13.264900, 	3.000000, 2.195430, 	0.528455, 0.798898, -0.287224, 
-1.002737, -1.085560, -15.409132, 	3.000000, 2.020624, 	0.545979, 0.767296, -0.336399, 
-0.000000, -0.859908, -15.445475, 	3.500000, 2.020624, 	0.000000, 0.916600, -0.399806, 
-0.000000, -2.761963, -19.897703, 	3.500000, 1.696742, 	0.000000, 0.936891, -0.349623, 
--1.002737, -2.990782, -19.848455, 	4.000000, 1.691091, 	-0.573541, 0.767562, -0.286181, 
--1.002737, -2.066217, -17.608171, 	4.000000, 1.853850, 	-0.561407, 0.760416, -0.326481, 
--1.002737, -2.066217, -17.608171, 	4.000000, 1.853850, 	-0.561407, 0.760416, -0.326481, 
--1.002737, -1.085560, -15.409132, 	4.000000, 2.016609, 	-0.545979, 0.767296, -0.336399, 
-0.000000, -0.859908, -15.445475, 	3.500000, 2.020624, 	0.000000, 0.916600, -0.399806, 
-0.000000, -0.859908, -15.445475, 	3.500000, 2.020624, 	0.000000, 0.916600, -0.399806, 
-1.002737, -1.085560, -15.409132, 	3.000000, 2.020624, 	0.545979, 0.767296, -0.336399, 
-1.002737, -2.066217, -17.608171, 	3.000000, 1.853850, 	0.561407, 0.760416, -0.326481, 
-1.002737, -2.066217, -17.608171, 	3.000000, 1.853850, 	0.561407, 0.760416, -0.326481, 
-1.002737, -2.990782, -19.848455, 	3.000000, 1.696742, 	0.573541, 0.767561, -0.286181, 
-0.000000, -2.761963, -19.897703, 	3.500000, 1.696742, 	0.000000, 0.936891, -0.349623, 
-0.000000, -4.069942, -24.285717, 	3.500000, 1.417808, 	0.000000, 0.976057, -0.217516, 
--1.002737, -4.302059, -24.249632, 	4.000000, 1.410785, 	-0.582444, 0.793471, -0.176531, 
--1.002737, -3.746061, -22.116426, 	4.000000, 1.550938, 	-0.578794, 0.781497, -0.232937, 
--1.002737, -3.746061, -22.116426, 	4.000000, 1.550938, 	-0.578794, 0.781497, -0.232937, 
--1.002737, -2.990782, -19.848455, 	4.000000, 1.691091, 	-0.573541, 0.767562, -0.286181, 
-0.000000, -2.761963, -19.897703, 	3.500000, 1.696742, 	0.000000, 0.936891, -0.349623, 
-0.000000, -2.761963, -19.897703, 	3.500000, 1.696742, 	0.000000, 0.936891, -0.349623, 
-1.002737, -2.990782, -19.848455, 	3.000000, 1.696742, 	0.573541, 0.767561, -0.286181, 
-1.002737, -3.746061, -22.116426, 	3.000000, 1.550938, 	0.578794, 0.781497, -0.232937, 
-1.002737, -3.746061, -22.116426, 	3.000000, 1.550938, 	0.578794, 0.781497, -0.232937, 
-1.002737, -4.302059, -24.249632, 	3.000000, 1.417808, 	0.582444, 0.793471, -0.176531, 
-0.000000, -4.069942, -24.285717, 	3.500000, 1.417808, 	0.000000, 0.976057, -0.217516, 
-0.000000, -4.562372, -27.547928, 	3.500000, 1.186658, 	0.000000, 0.994554, -0.104226, 
--1.002737, -4.798269, -27.533844, 	4.000000, 1.186658, 	-0.583018, 0.808019, -0.084825, 
--1.002737, -4.628780, -26.085621, 	4.000000, 1.298722, 	-0.582983, 0.803361, -0.121414, 
--1.002737, -4.628780, -26.085621, 	4.000000, 1.298722, 	-0.582983, 0.803361, -0.121414, 
--1.002737, -4.302059, -24.249632, 	4.000000, 1.410785, 	-0.582444, 0.793471, -0.176531, 
-0.000000, -4.069942, -24.285717, 	3.500000, 1.417808, 	0.000000, 0.976057, -0.217516, 
-0.000000, -4.069942, -24.285717, 	3.500000, 1.417808, 	0.000000, 0.976057, -0.217516, 
-1.002737, -4.302059, -24.249632, 	3.000000, 1.417808, 	0.582444, 0.793471, -0.176531, 
-1.002737, -4.628780, -26.085621, 	3.000000, 1.298722, 	0.582983, 0.803361, -0.121414, 
-1.002737, -4.628780, -26.085621, 	3.000000, 1.298722, 	0.582983, 0.803361, -0.121414, 
-1.002737, -4.798269, -27.533844, 	3.000000, 1.186658, 	0.583019, 0.808019, -0.084825, 
-0.000000, -4.562372, -27.547928, 	3.500000, 1.186658, 	0.000000, 0.994554, -0.104226, 
--1.002737, -4.882575, -28.503754, 	3.500000, 1.053028, 	-0.589040, 0.805068, -0.069986, 
--1.002737, -4.798269, -27.533844, 	4.000000, 1.053028, 	-0.583018, 0.808019, -0.084825, 
-0.000000, -4.562372, -27.547928, 	4.000000, 1.119843, 	0.000000, 0.994554, -0.104226, 
-0.000000, -4.562372, -27.547928, 	4.000000, 1.119843, 	0.000000, 0.994554, -0.104226, 
-1.002737, -4.798269, -27.533844, 	4.000000, 1.186658, 	0.583019, 0.808019, -0.084825, 
-1.002737, -4.882575, -28.503754, 	3.500000, 1.186658, 	0.589040, 0.805067, -0.069986, 
-1.010821, 4.753092, -11.679992, 	3.500000, 1.000000, 	0.576512, -0.780907, 0.240454, 
-1.014864, 3.544037, -14.721523, 	3.000000, 1.000000, 	0.562535, -0.748836, 0.350428, 
-1.349109, 4.237772, -14.807808, 	3.000000, 1.026514, 	0.999805, 0.015731, -0.011963, 
-1.349109, 4.237772, -14.807808, 	3.000000, 1.026514, 	0.999805, 0.015731, -0.011963, 
-1.014864, 4.931509, -14.894089, 	3.000000, 1.053028, 	0.545447, 0.762198, -0.348629, 
-1.010821, 6.148220, -11.777804, 	3.500000, 1.053028, 	0.548873, 0.801150, -0.238531, 
-1.010821, 6.148220, -11.777804, 	3.500000, 1.053028, 	0.548873, 0.801150, -0.238531, 
-1.004758, 6.770885, -8.754030, 	4.000000, 1.053028, 	0.549543, 0.833398, -0.058740, 
-1.339004, 6.071638, -8.749280, 	4.000000, 1.026514, 	0.999013, 0.044275, -0.003633, 
-1.339004, 6.071638, -8.749280, 	4.000000, 1.026514, 	0.999013, 0.044275, -0.003633, 
-1.004758, 5.372389, -8.744530, 	4.000000, 1.000000, 	0.594556, -0.801738, 0.060986, 
-1.010821, 4.753092, -11.679992, 	3.500000, 1.000000, 	0.576512, -0.780907, 0.240454, 
--0.994652, 4.753092, -11.679992, 	2.000000, 0.093876, 	-0.576606, -0.781401, 0.238616, 
--0.990610, 3.544037, -14.721523, 	2.000000, 0.267209, 	-0.562098, -0.749029, 0.350717, 
-0.012127, 3.312792, -14.692760, 	2.500000, 0.267209, 	0.000169, -0.904592, 0.426279, 
-0.012127, 3.312792, -14.692760, 	2.500000, 0.267209, 	0.000169, -0.904592, 0.426279, 
-1.014864, 3.544037, -14.721523, 	3.000000, 0.267209, 	0.562535, -0.748836, 0.350428, 
-1.010821, 4.753092, -11.679992, 	3.000000, 0.093875, 	0.576512, -0.780907, 0.240454, 
-1.010821, 4.753092, -11.679992, 	3.000000, 0.093875, 	0.576512, -0.780907, 0.240454, 
-1.004758, 5.372389, -8.744530, 	3.000000, -0.079458, 	0.594556, -0.801738, 0.060986, 
-0.002021, 5.139305, -8.742946, 	2.500000, -0.079458, 	-0.000101, -0.997122, 0.075814, 
-0.002021, 5.139305, -8.742946, 	2.500000, -0.079458, 	-0.000101, -0.997122, 0.075814, 
--1.000716, 5.372389, -8.744530, 	2.000000, -0.079458, 	-0.594849, -0.801661, 0.059106, 
--0.994652, 4.753092, -11.679992, 	2.000000, 0.093876, 	-0.576606, -0.781401, 0.238616, 
--0.994652, 6.148220, -11.777804, 	1.187500, 0.109894, 	-0.548576, 0.800857, -0.240193, 
--0.990610, 4.931509, -14.894089, 	1.000000, 0.267209, 	-0.544986, 0.762408, -0.348891, 
--1.324855, 4.237772, -14.807808, 	1.500000, 0.267209, 	-0.999804, 0.015791, -0.011962, 
--1.324855, 4.237772, -14.807808, 	1.500000, 0.267209, 	-0.999804, 0.015791, -0.011962, 
--0.990610, 3.544037, -14.721523, 	2.000000, 0.267209, 	-0.562098, -0.749029, 0.350717, 
--0.994652, 4.753092, -11.679992, 	2.000000, 0.093876, 	-0.576606, -0.781401, 0.238616, 
--0.994652, 4.753092, -11.679992, 	2.000000, 0.093876, 	-0.576606, -0.781401, 0.238616, 
--1.000716, 5.372389, -8.744530, 	2.000000, -0.079458, 	-0.594849, -0.801661, 0.059106, 
--1.334961, 6.071638, -8.749280, 	1.500000, -0.079458, 	-0.999000, 0.044233, -0.006500, 
--1.334961, 6.071638, -8.749280, 	1.500000, -0.079458, 	-0.999000, 0.044233, -0.006500, 
--1.000716, 6.770885, -8.754030, 	1.000000, -0.079458, 	-0.549751, 0.833161, -0.060139, 
--0.994652, 6.148220, -11.777804, 	1.187500, 0.109894, 	-0.548576, 0.800857, -0.240193, 
-1.010821, 6.148220, -11.777804, 	1.500000, 0.222021, 	0.548873, 0.801150, -0.238531, 
-1.014864, 4.931509, -14.894089, 	3.000000, 0.523501, 	0.545447, 0.762198, -0.348629, 
-0.012127, 5.162754, -14.922852, 	2.000000, 0.395355, 	0.000167, 0.910359, -0.413819, 
-0.012127, 5.162754, -14.922852, 	2.000000, 0.395355, 	0.000167, 0.910359, -0.413819, 
--0.990610, 4.931509, -14.894089, 	1.000000, 0.267209, 	-0.544986, 0.762408, -0.348891, 
--0.994652, 6.148220, -11.777804, 	1.187500, 0.109894, 	-0.548576, 0.800857, -0.240193, 
--0.994652, 6.148220, -11.777804, 	1.187500, 0.109894, 	-0.548576, 0.800857, -0.240193, 
--1.000716, 6.770885, -8.754030, 	1.000000, -0.079458, 	-0.549751, 0.833161, -0.060139, 
-0.002021, 7.003967, -8.755614, 	0.500000, -0.079458, 	-0.000102, 0.997541, -0.070087, 
-0.002021, 7.003967, -8.755614, 	0.500000, -0.079458, 	-0.000102, 0.997541, -0.070087, 
-1.004758, 6.770885, -8.754030, 	0.000000, -0.079458, 	0.549543, 0.833398, -0.058740, 
-1.010821, 6.148220, -11.777804, 	1.500000, 0.222021, 	0.548873, 0.801150, -0.238531, 
--1.002737, 1.949966, 10.301342, 	3.000000, 0.093875, 	-0.548106, -0.827983, 0.118418, 
--1.002737, 1.707661, 7.456823, 	3.000000, 0.267209, 	-0.546192, -0.837529, 0.014826, 
-0.000000, 1.483450, 7.466458, 	3.000000, 0.395355, 	0.000000, -0.999837, 0.018050, 
-0.000000, 1.483450, 7.466458, 	3.000000, 0.395355, 	0.000000, -0.999837, 0.018050, 
-1.002737, 1.707661, 7.456823, 	3.000000, 0.523501, 	0.546192, -0.837529, 0.014826, 
-1.002737, 1.949966, 10.301342, 	3.000000, -0.199582, 	0.548430, -0.827643, 0.119301, 
-1.002737, 1.949966, 10.301342, 	3.000000, -0.199582, 	0.548430, -0.827643, 0.119301, 
-0.997835, 2.515034, 13.079953, 	3.000000, -0.922665, 	0.552074, -0.807195, 0.208929, 
--0.004902, 2.294706, 13.134627, 	3.000000, -0.501061, 	0.000247, -0.968748, 0.248048, 
--0.004902, 2.294706, 13.134627, 	3.000000, -0.501061, 	0.000247, -0.968748, 0.248048, 
--1.007639, 2.515034, 13.079953, 	3.000000, -0.079458, 	-0.551445, -0.808533, 0.205386, 
--1.002737, 1.949966, 10.301342, 	3.000000, 0.093875, 	-0.548106, -0.827983, 0.118418, 
--1.002737, 3.286348, 10.103830, 	1.187500, -1.435965, 	-0.570397, 0.812622, -0.119555, 
--1.002737, 3.052929, 7.399012, 	1.000000, -1.306215, 	-0.571504, 0.820505, -0.012461, 
--1.336982, 2.380295, 7.427917, 	1.500000, -1.306215, 	-0.999670, -0.025705, 0.000199, 
--1.336982, 2.380295, 7.427917, 	1.500000, -1.306215, 	-0.999670, -0.025705, 0.000199, 
--1.002737, 1.707661, 7.456823, 	2.000000, -1.306215, 	-0.546192, -0.837529, 0.014826, 
--1.002737, 1.949966, 10.301342, 	2.000000, -1.459937, 	-0.548106, -0.827983, 0.118418, 
--1.002737, 1.949966, 10.301342, 	2.000000, -1.459937, 	-0.548106, -0.827983, 0.118418, 
--1.007639, 2.515034, 13.079953, 	2.000000, -1.613659, 	-0.551445, -0.808533, 0.205386, 
--1.341885, 3.176014, 12.915927, 	1.500000, -1.613659, 	-0.999798, -0.020077, 0.001135, 
--1.341885, 3.176014, 12.915927, 	1.500000, -1.613659, 	-0.999798, -0.020077, 0.001135, 
--1.007639, 3.836994, 12.751901, 	1.000000, -1.613659, 	-0.571038, 0.793815, -0.209219, 
--1.002737, 3.286348, 10.103830, 	1.187500, -1.435965, 	-0.570397, 0.812622, -0.119555, 
-1.002737, 3.286348, 10.103830, 	1.500000, -1.268162, 	0.570686, 0.812576, -0.118478, 
-1.002737, 3.052929, 7.399012, 	3.000000, -0.922665, 	0.571504, 0.820504, -0.012461, 
-0.000000, 3.277142, 7.389376, 	2.000000, -1.114440, 	0.000000, 0.999891, -0.014768, 
-0.000000, 3.277142, 7.389376, 	2.000000, -1.114440, 	0.000000, 0.999891, -0.014768, 
--1.002737, 3.052929, 7.399012, 	1.000000, -1.306215, 	-0.571504, 0.820505, -0.012461, 
--1.002737, 3.286348, 10.103830, 	1.187500, -1.435965, 	-0.570397, 0.812622, -0.119555, 
--1.002737, 3.286348, 10.103830, 	1.187500, -1.435965, 	-0.570397, 0.812622, -0.119555, 
--1.007639, 3.836994, 12.751901, 	1.000000, -1.613659, 	-0.571038, 0.793815, -0.209219, 
--0.004902, 4.057320, 12.697225, 	0.500000, -1.613659, 	0.000259, 0.967531, -0.252752, 
--0.004902, 4.057320, 12.697225, 	0.500000, -1.613659, 	0.000259, 0.967531, -0.252752, 
-0.997834, 3.836994, 12.751901, 	0.000000, -1.613659, 	0.571655, 0.794480, -0.204969, 
-1.002737, 3.286348, 10.103830, 	1.500000, -1.268162, 	0.570686, 0.812576, -0.118478, 
-1.002737, 1.949966, 10.301342, 	3.000000, -1.459937, 	0.548430, -0.827643, 0.119301, 
-1.002737, 1.707661, 7.456823, 	3.000000, -1.306215, 	0.546192, -0.837529, 0.014826, 
-1.336982, 2.380295, 7.427917, 	3.000000, -1.114440, 	0.999670, -0.025705, 0.000199, 
-1.336982, 2.380295, 7.427917, 	3.000000, -1.114440, 	0.999670, -0.025705, 0.000199, 
-1.002737, 3.052929, 7.399012, 	3.000000, -0.922665, 	0.571504, 0.820504, -0.012461, 
-1.002737, 3.286348, 10.103830, 	2.833333, -1.322391, 	0.570686, 0.812576, -0.118478, 
-1.002737, 3.286348, 10.103830, 	2.833333, -1.322391, 	0.570686, 0.812576, -0.118478, 
-0.997834, 3.836994, 12.751901, 	2.666667, -1.722117, 	0.571655, 0.794480, -0.204969, 
-1.332080, 3.176014, 12.915927, 	2.833333, -1.667888, 	0.999801, -0.018232, 0.008046, 
-1.332080, 3.176014, 12.915927, 	2.833333, -1.667888, 	0.999801, -0.018232, 0.008046, 
-0.997835, 2.515034, 13.079953, 	3.000000, -1.613659, 	0.552074, -0.807195, 0.208929, 
-1.002737, 1.949966, 10.301342, 	3.000000, -1.459937, 	0.548430, -0.827643, 0.119301, 
-0.983128, 5.711351, 20.357510, 	2.000000, -1.459937, 	0.562328, -0.698593, 0.442442, 
-0.973323, 4.412262, 18.174875, 	2.000000, -1.306215, 	0.554281, -0.740975, 0.379115, 
-1.307569, 5.044981, 17.903212, 	2.500000, -1.306215, 	0.999751, -0.019683, 0.010530, 
-1.307569, 5.044981, 17.903212, 	2.500000, -1.306215, 	0.999751, -0.019683, 0.010530, 
-0.973323, 5.677700, 17.631544, 	3.000000, -1.306215, 	0.576561, 0.724323, -0.378066, 
-0.983128, 6.945759, 19.711123, 	3.000000, -1.459937, 	0.574803, 0.682785, -0.451006, 
-0.983128, 6.945759, 19.711123, 	3.000000, -1.459937, 	0.574803, 0.682785, -0.451006, 
-0.997834, 8.160118, 21.422651, 	3.000000, -1.613659, 	0.574744, 0.665807, -0.475784, 
-1.332080, 7.556932, 21.789433, 	2.500000, -1.613659, 	0.999977, -0.005048, -0.004524, 
-1.332080, 7.556932, 21.789433, 	2.500000, -1.613659, 	0.999977, -0.005048, -0.004524, 
-0.997835, 6.953747, 22.156214, 	2.000000, -1.613659, 	0.572743, -0.675634, 0.464203, 
-0.983128, 5.711351, 20.357510, 	2.000000, -1.459937, 	0.562328, -0.698593, 0.442442, 
--1.022346, 5.711351, 20.357510, 	2.000000, -1.857690, 	-0.562464, -0.695442, 0.447208, 
--1.032151, 4.412262, 18.174877, 	2.000000, -1.776346, 	-0.555665, -0.740194, 0.378615, 
--0.029414, 4.201355, 18.265430, 	2.500000, -1.776346, 	-0.000535, -0.890739, 0.454514, 
--0.029414, 4.201355, 18.265430, 	2.500000, -1.776346, 	-0.000535, -0.890739, 0.454514, 
-0.973323, 4.412262, 18.174875, 	3.000000, -1.776346, 	0.554281, -0.740975, 0.379115, 
-0.983128, 5.711351, 20.357510, 	3.000000, -1.857690, 	0.562328, -0.698593, 0.442442, 
-0.983128, 5.711351, 20.357510, 	3.000000, -1.857690, 	0.562328, -0.698593, 0.442442, 
-0.997835, 6.953747, 22.156214, 	3.000000, -1.939034, 	0.572743, -0.675634, 0.464203, 
--0.004902, 6.752687, 22.278475, 	2.500000, -1.939034, 	0.000369, -0.822635, 0.568570, 
--0.004902, 6.752687, 22.278475, 	2.500000, -1.939034, 	0.000369, -0.822635, 0.568570, 
--1.007639, 6.953747, 22.156216, 	2.000000, -1.939034, 	-0.571627, -0.672843, 0.469600, 
--1.022346, 5.711351, 20.357510, 	2.000000, -1.857690, 	-0.562464, -0.695442, 0.447208, 
--1.022346, 6.945759, 19.711123, 	1.000000, -1.857690, 	-0.575450, 0.685898, -0.445422, 
--1.032151, 5.677700, 17.631544, 	1.000000, -1.776346, 	-0.577835, 0.723604, -0.377496, 
--1.366396, 5.044981, 17.903212, 	1.500000, -1.776346, 	-0.999757, -0.019426, 0.010462, 
--1.366396, 5.044981, 17.903212, 	1.500000, -1.776346, 	-0.999757, -0.019426, 0.010462, 
--1.032151, 4.412262, 18.174877, 	2.000000, -1.776346, 	-0.555665, -0.740194, 0.378615, 
--1.022346, 5.711351, 20.357510, 	2.000000, -1.857690, 	-0.562464, -0.695442, 0.447208, 
--1.022346, 5.711351, 20.357510, 	2.000000, -1.857690, 	-0.562464, -0.695442, 0.447208, 
--1.007639, 6.953747, 22.156216, 	2.000000, -1.939034, 	-0.571627, -0.672843, 0.469600, 
--1.341885, 7.556932, 21.789433, 	1.500000, -1.939034, 	-0.999989, 0.000304, 0.004665, 
--1.341885, 7.556932, 21.789433, 	1.500000, -1.939034, 	-0.999989, 0.000304, 0.004665, 
--1.007639, 8.160118, 21.422651, 	1.000000, -1.939034, 	-0.574068, 0.669723, -0.471080, 
--1.022346, 6.945759, 19.711123, 	1.000000, -1.857690, 	-0.575450, 0.685898, -0.445422, 
--1.002737, 8.987209, 23.827108, 	1.833333, -1.749232, 	-0.690086, 0.408969, 0.597098, 
--0.742768, 8.411285, 23.925793, 	1.000000, -1.776346, 	-0.485429, -0.281111, 0.827850, 
-0.000000, 8.401409, 24.234768, 	1.000000, -1.857690, 	-0.000001, -0.291501, 0.956571, 
-0.000000, 8.401409, 24.234768, 	1.000000, -1.857690, 	-0.000001, -0.291501, 0.956571, 
-0.742768, 8.411285, 23.925795, 	1.000000, -1.939034, 	0.485428, -0.281111, 0.827851, 
-1.002737, 8.987209, 23.827108, 	0.500000, -1.939034, 	0.690085, 0.408969, 0.597099, 
-1.002737, 8.987209, 23.827108, 	0.500000, -1.939034, 	0.690085, 0.408969, 0.597099, 
-0.742768, 9.282909, 23.329664, 	0.000000, -1.939034, 	0.487250, 0.872639, 0.032983, 
-0.000000, 9.573013, 23.419453, 	1.333333, -1.830575, 	-0.000000, 0.997856, 0.065453, 
-0.000000, 9.573013, 23.419453, 	1.333333, -1.830575, 	-0.000000, 0.997856, 0.065453, 
--0.742768, 9.282909, 23.329664, 	2.666667, -1.722117, 	-0.487251, 0.872639, 0.032983, 
--1.002737, 8.987209, 23.827108, 	1.833333, -1.749232, 	-0.690086, 0.408969, 0.597098, 
-0.983128, 6.945759, 19.711123, 	1.500000, -2.000000, 	0.574803, 0.682785, -0.451006, 
-0.973323, 5.677700, 17.631544, 	2.000000, -2.000000, 	0.576561, 0.724323, -0.378066, 
--0.029414, 5.888605, 17.540989, 	2.500000, -2.000000, 	-0.000556, 0.885983, -0.463718, 
--0.029414, 5.888605, 17.540989, 	2.500000, -2.000000, 	-0.000556, 0.885983, -0.463718, 
--1.032151, 5.677700, 17.631544, 	3.000000, -2.000000, 	-0.577835, 0.723604, -0.377496, 
--1.022346, 6.945759, 19.711123, 	3.500000, -2.000000, 	-0.575450, 0.685898, -0.445422, 
--1.022346, 6.945759, 19.711123, 	3.500000, -2.000000, 	-0.575450, 0.685898, -0.445422, 
--1.007639, 8.160118, 21.422651, 	4.000000, -2.000000, 	-0.574068, 0.669723, -0.471080, 
--0.004902, 8.361179, 21.300390, 	2.500000, -2.000000, 	0.000389, 0.815229, -0.579139, 
--0.004902, 8.361179, 21.300390, 	2.500000, -2.000000, 	0.000389, 0.815229, -0.579139, 
-0.997834, 8.160118, 21.422651, 	1.000000, -2.000000, 	0.574744, 0.665807, -0.475784, 
-0.983128, 6.945759, 19.711123, 	1.500000, -2.000000, 	0.574803, 0.682785, -0.451006, 
--1.005175, 11.029587, -4.132468, 	3.000000, -1.857690, 	-0.578521, -0.809497, -0.100142, 
--1.006394, 11.114811, -5.517140, 	3.000000, -1.776346, 	-0.583093, -0.812392, -0.004755, 
--0.003657, 10.880220, -5.483850, 	2.833333, -1.749232, 	-0.000127, -0.999975, -0.007088, 
--0.003657, 10.880220, -5.483850, 	2.833333, -1.749232, 	-0.000127, -0.999975, -0.007088, 
-0.999079, 11.114811, -5.517140, 	2.666667, -1.722117, 	0.582792, -0.812607, -0.004817, 
-1.000299, 11.029585, -4.132468, 	3.333333, -1.830575, 	0.578319, -0.809495, -0.101318, 
-1.000299, 11.029585, -4.132468, 	3.333333, -1.830575, 	0.578319, -0.809495, -0.101318, 
-1.002127, 10.729588, -2.409474, 	4.000000, -1.939034, 	0.568931, -0.804350, -0.171283, 
--0.000610, 10.494156, -2.383091, 	3.500000, -1.939034, 	0.000040, -0.977947, -0.208854, 
--0.000610, 10.494156, -2.383091, 	3.500000, -1.939034, 	0.000040, -0.977947, -0.208854, 
--1.003346, 10.729588, -2.409474, 	3.000000, -1.939034, 	-0.568927, -0.804482, -0.170679, 
--1.005175, 11.029587, -4.132468, 	3.000000, -1.857690, 	-0.578521, -0.809497, -0.100142, 
--1.005175, 12.441681, -4.309345, 	1.000000, -0.253818, 	-0.554831, 0.825951, 0.099839, 
--1.006394, 12.522362, -5.716876, 	1.000000, -0.170915, 	-0.566040, 0.824377, 0.001632, 
--1.340640, 11.818584, -5.617008, 	1.500000, -0.170915, 	-0.999853, 0.017074, 0.001872, 
--1.340640, 11.818584, -5.617008, 	1.500000, -0.170915, 	-0.999853, 0.017074, 0.001872, 
--1.006394, 11.114811, -5.517140, 	2.000000, -0.170915, 	-0.583093, -0.812392, -0.004755, 
--1.005175, 11.029587, -4.132468, 	2.000000, -0.253818, 	-0.578521, -0.809497, -0.100142, 
--1.005175, 11.029587, -4.132468, 	2.000000, -0.253818, 	-0.578521, -0.809497, -0.100142, 
--1.003346, 10.729588, -2.409474, 	2.000000, -0.336720, 	-0.568927, -0.804482, -0.170679, 
--1.337592, 11.435898, -2.488622, 	1.500000, -0.336720, 	-0.999671, 0.024155, 0.008634, 
--1.337592, 11.435898, -2.488622, 	1.500000, -0.336720, 	-0.999671, 0.024155, 0.008634, 
--1.003346, 12.142200, -2.567771, 	1.000000, -0.336720, 	-0.545383, 0.819886, 0.174196, 
--1.005175, 12.441681, -4.309345, 	1.000000, -0.253818, 	-0.554831, 0.825951, 0.099839, 
-0.000000, 25.158775, 0.885566, 	0.666667, -0.891999, 	0.000000, 0.098978, -0.995090, 
-0.742768, 25.130249, 1.141007, 	1.333333, -1.447277, 	0.424007, 0.088516, -0.901323, 
-1.002737, 24.600067, 1.327282, 	1.166667, -0.809096, 	0.595697, -0.491752, -0.635079, 
-1.002737, 24.600067, 1.327282, 	1.166667, -0.809096, 	0.595697, -0.491752, -0.635079, 
-0.742768, 24.296909, 1.783397, 	1.000000, -0.170915, 	0.428917, -0.894621, -0.125234, 
-0.000000, 24.041351, 1.768998, 	1.000000, -0.253818, 	0.000000, -0.991299, -0.131630, 
-0.000000, 24.041351, 1.768998, 	1.000000, -0.253818, 	0.000000, -0.991299, -0.131630, 
--0.742768, 24.296909, 1.783397, 	1.000000, -0.336720, 	-0.428917, -0.894621, -0.125234, 
--1.002737, 24.600067, 1.327282, 	0.500000, -0.336720, 	-0.595697, -0.491752, -0.635079, 
--1.002737, 24.600067, 1.327282, 	0.500000, -0.336720, 	-0.595697, -0.491752, -0.635079, 
--0.742768, 25.130249, 1.141007, 	0.000000, -0.336720, 	-0.424007, 0.088516, -0.901323, 
-0.000000, 25.158775, 0.885566, 	0.666667, -0.891999, 	0.000000, 0.098978, -0.995090, 
-1.000299, 12.441681, -4.309345, 	1.500000, -4.000000, 	0.554885, 0.826037, 0.098819, 
-0.999079, 12.522362, -5.716876, 	2.000000, -4.000000, 	0.565733, 0.824587, 0.001687, 
--0.003657, 12.756954, -5.750165, 	2.500000, -4.000000, 	-0.000126, 1.000000, 0.000870, 
--0.003657, 12.756954, -5.750165, 	2.500000, -4.000000, 	-0.000126, 1.000000, 0.000870, 
--1.006394, 12.522362, -5.716876, 	3.000000, -4.000000, 	-0.566040, 0.824377, 0.001632, 
--1.005175, 12.441681, -4.309345, 	3.500000, -4.000000, 	-0.554831, 0.825951, 0.099839, 
--1.005175, 12.441681, -4.309345, 	3.500000, -4.000000, 	-0.554831, 0.825951, 0.099839, 
--1.003346, 12.142200, -2.567771, 	4.000000, -4.000000, 	-0.545383, 0.819886, 0.174196, 
--0.000610, 12.377636, -2.594154, 	2.500000, -4.000000, 	0.000041, 0.978486, 0.206311, 
--0.000610, 12.377636, -2.594154, 	2.500000, -4.000000, 	0.000041, 0.978486, 0.206311, 
-1.002127, 12.142200, -2.567771, 	1.000000, -4.000000, 	0.545588, 0.819894, 0.173516, 
-1.000299, 12.441681, -4.309345, 	1.500000, -4.000000, 	0.554885, 0.826037, 0.098819, 
-1.000299, 11.029585, -4.132468, 	4.000000, -3.848496, 	0.578319, -0.809495, -0.101318, 
-0.999079, 11.114811, -5.517140, 	4.000000, -3.761107, 	0.582792, -0.812607, -0.004817, 
-1.333325, 11.818588, -5.617008, 	4.000000, -3.594440, 	0.999852, 0.017082, 0.001868, 
-1.333325, 11.818588, -5.617008, 	4.000000, -3.594440, 	0.999852, 0.017082, 0.001868, 
-0.999079, 12.522362, -5.716876, 	4.000000, -3.427773, 	0.565733, 0.824587, 0.001687, 
-1.000299, 12.441681, -4.309345, 	4.000000, -3.234054, 	0.554885, 0.826037, 0.098819, 
-1.000299, 12.441681, -4.309345, 	4.000000, -3.234054, 	0.554885, 0.826037, 0.098819, 
-1.002127, 12.142200, -2.567771, 	4.000000, -3.040334, 	0.545588, 0.819894, 0.173516, 
-1.336373, 11.435898, -2.488622, 	4.000000, -3.488110, 	0.999684, 0.024018, 0.007427, 
-1.336373, 11.435898, -2.488622, 	4.000000, -3.488110, 	0.999684, 0.024018, 0.007427, 
-1.002127, 10.729588, -2.409474, 	4.000000, -3.935886, 	0.568931, -0.804350, -0.171283, 
-1.000299, 11.029585, -4.132468, 	4.000000, -3.848496, 	0.578319, -0.809495, -0.101318, 
-1.002737, -23.736286, -6.771559, 	0.500000, 1.053028, 	0.633041, -0.276748, -0.722959, 
-0.742768, -24.152987, -6.401496, 	1.000000, 1.053028, 	0.455754, -0.834430, -0.309862, 
-0.000000, -24.406044, -6.530420, 	1.500000, 1.053028, 	0.000000, -0.933376, -0.358900, 
-0.000000, -24.406044, -6.530420, 	1.500000, 1.053028, 	0.000000, -0.933376, -0.358900, 
--0.742768, -24.152987, -6.401496, 	2.000000, 1.053028, 	-0.455754, -0.834431, -0.309862, 
--1.002737, -23.736286, -6.771559, 	4.000000, -0.306819, 	-0.633041, -0.276747, -0.722959, 
--1.002737, -23.736286, -6.771559, 	4.000000, -0.306819, 	-0.633041, -0.276747, -0.722959, 
--0.742768, -23.169422, -6.772669, 	6.000000, -1.666667, 	-0.444774, 0.383424, -0.809421, 
-0.000000, -23.066525, -7.012697, 	3.000000, -0.306819, 	-0.000000, 0.424976, -0.905205, 
-0.000000, -23.066525, -7.012697, 	3.000000, -0.306819, 	-0.000000, 0.424976, -0.905205, 
-0.742768, -23.169422, -6.772669, 	0.000000, 1.053028, 	0.444774, 0.383425, -0.809421, 
-1.002737, -23.736286, -6.771559, 	0.500000, 1.053028, 	0.633041, -0.276748, -0.722959, 
-1.336982, -2.618040, 4.463405, 	4.000000, -0.333333, 	0.999977, -0.006223, -0.002555, 
-1.002737, -3.239137, 4.110385, 	5.000000, -1.666667, 	0.573276, -0.760494, -0.304965, 
-1.002737, -2.684134, 2.725971, 	2.500000, -0.689796, 	0.555812, -0.771611, -0.309336, 
-1.002737, -1.445931, 3.440848, 	2.500000, -0.500000, 	0.596303, 0.745197, 0.298504, 
-1.002737, -1.996943, 4.816424, 	3.000000, 1.000000, 	0.580237, 0.756078, 0.302774, 
-1.336982, -2.618040, 4.463405, 	4.000000, -0.333333, 	0.999977, -0.006223, -0.002555, 
--1.336982, -0.581338, -32.314465, 	0.500000, 0.972854, 	0.000000, -0.028514, -0.999593, 
--0.000000, -0.581338, -32.314465, 	1.968750, 0.959660, 	0.000001, -0.028515, -0.999593, 
--1.002737, -1.292564, -32.294178, 	1.000000, 0.972854, 	0.000000, -0.028512, -0.999593, 
--1.336982, 4.212124, -29.503693, 	0.500000, 0.966243, 	0.000000, -0.038077, -0.999275, 
--0.000000, 4.212124, -29.503689, 	2.000000, 0.966243, 	-0.000000, -0.038077, -0.999275, 
--1.002737, 3.502487, -29.476650, 	1.000000, 0.966243, 	0.000000, -0.038077, -0.999275, 
--1.336982, -5.594234, -28.484890, 	0.500000, 1.119843, 	-0.000004, -0.026495, -0.999649, 
-0.000000, -5.594234, -28.484894, 	1.500000, 1.053028, 	-0.000000, -0.026493, -0.999649, 
--1.002737, -6.305892, -28.466030, 	0.500000, 1.053028, 	-0.000002, -0.026494, -0.999649, 
--1.336982, -2.065033, 3.083410, 	3.500000, -1.833333, 	0.000000, 0.500000, -0.866025, 
-0.000000, -2.065034, 3.083410, 	3.000000, -1.083333, 	0.000000, 0.500000, -0.866025, 
--1.002737, -2.684134, 2.725971, 	3.500000, -1.666667, 	0.000000, 0.500000, -0.866025, 
-1.002737, 0.129889, -32.334755, 	2.937500, 0.946466, 	0.000002, -0.028517, -0.999593, 
-1.336982, -0.581338, -32.314465, 	2.500000, 0.972854, 	0.000000, -0.028517, -0.999593, 
--0.000000, -0.581338, -32.314465, 	1.968750, 0.959660, 	0.000001, -0.028515, -0.999593, 
--0.000000, -0.581338, -32.314465, 	1.968750, 0.959660, 	0.000001, -0.028515, -0.999593, 
-1.336982, -0.581338, -32.314465, 	2.500000, 0.972854, 	0.000000, -0.028517, -0.999593, 
-1.002737, -1.292564, -32.294174, 	2.000000, 0.972854, 	0.000002, -0.028516, -0.999593, 
--0.000000, -0.581338, -32.314465, 	1.968750, 0.959660, 	0.000001, -0.028515, -0.999593, 
-1.002737, -1.292564, -32.294174, 	2.000000, 0.972854, 	0.000002, -0.028516, -0.999593, 
-0.000000, -1.529640, -32.287415, 	1.500000, 0.972854, 	0.000002, -0.028513, -0.999593, 
--0.000000, -0.581338, -32.314465, 	1.968750, 0.959660, 	0.000001, -0.028515, -0.999593, 
-0.000000, -1.529640, -32.287415, 	1.500000, 0.972854, 	0.000002, -0.028513, -0.999593, 
--1.002737, -1.292564, -32.294178, 	1.000000, 0.972854, 	0.000000, -0.028512, -0.999593, 
--1.002737, 0.129889, -32.334755, 	3.500000, 0.761751, 	-0.000002, -0.028517, -0.999593, 
--0.000000, -0.581338, -32.314465, 	1.968750, 0.959660, 	0.000001, -0.028515, -0.999593, 
--1.336982, -0.581338, -32.314465, 	0.500000, 0.972854, 	0.000000, -0.028514, -0.999593, 
-0.000000, 0.366964, -32.341518, 	3.250000, 0.867302, 	0.000000, -0.028517, -0.999593, 
--0.000000, -0.581338, -32.314465, 	1.968750, 0.959660, 	0.000001, -0.028515, -0.999593, 
--1.002737, 0.129889, -32.334755, 	3.500000, 0.761751, 	-0.000002, -0.028517, -0.999593, 
-1.002737, 0.129889, -32.334755, 	2.937500, 0.946466, 	0.000002, -0.028517, -0.999593, 
--0.000000, -0.581338, -32.314465, 	1.968750, 0.959660, 	0.000001, -0.028515, -0.999593, 
-0.000000, 0.366964, -32.341518, 	3.250000, 0.867302, 	0.000000, -0.028517, -0.999593, 
-1.002737, 4.921762, -29.530731, 	3.000000, 0.966243, 	-0.000000, -0.038080, -0.999275, 
-1.336982, 4.212124, -29.503689, 	2.500000, 0.966243, 	0.000000, -0.038077, -0.999275, 
--0.000000, 4.212124, -29.503689, 	2.000000, 0.966243, 	-0.000000, -0.038077, -0.999275, 
--0.000000, 4.212124, -29.503689, 	2.000000, 0.966243, 	-0.000000, -0.038077, -0.999275, 
-1.336982, 4.212124, -29.503689, 	2.500000, 0.966243, 	0.000000, -0.038077, -0.999275, 
-1.002737, 3.502487, -29.476650, 	2.000000, 0.966243, 	0.000000, -0.038075, -0.999275, 
--0.000000, 4.212124, -29.503689, 	2.000000, 0.966243, 	-0.000000, -0.038077, -0.999275, 
-1.002737, 3.502487, -29.476650, 	2.000000, 0.966243, 	0.000000, -0.038075, -0.999275, 
-0.000000, 3.265942, -29.467636, 	1.500000, 0.966243, 	0.000000, -0.038076, -0.999275, 
--0.000000, 4.212124, -29.503689, 	2.000000, 0.966243, 	-0.000000, -0.038077, -0.999275, 
-0.000000, 3.265942, -29.467636, 	1.500000, 0.966243, 	0.000000, -0.038076, -0.999275, 
--1.002737, 3.502487, -29.476650, 	1.000000, 0.966243, 	0.000000, -0.038077, -0.999275, 
--1.002737, 4.921762, -29.530731, 	4.000000, 0.966243, 	0.000000, -0.038077, -0.999275, 
--0.000000, 4.212124, -29.503689, 	2.000000, 0.966243, 	-0.000000, -0.038077, -0.999275, 
--1.336982, 4.212124, -29.503693, 	0.500000, 0.966243, 	0.000000, -0.038077, -0.999275, 
-0.000000, 5.158308, -29.539745, 	3.500000, 0.966243, 	-0.000000, -0.038080, -0.999275, 
--0.000000, 4.212124, -29.503689, 	2.000000, 0.966243, 	-0.000000, -0.038077, -0.999275, 
--1.002737, 4.921762, -29.530731, 	4.000000, 0.966243, 	0.000000, -0.038077, -0.999275, 
-1.002737, 4.921762, -29.530731, 	3.000000, 0.966243, 	-0.000000, -0.038080, -0.999275, 
--0.000000, 4.212124, -29.503689, 	2.000000, 0.966243, 	-0.000000, -0.038077, -0.999275, 
-0.000000, 5.158308, -29.539745, 	3.500000, 0.966243, 	-0.000000, -0.038080, -0.999275, 
-1.002737, -4.882575, -28.503754, 	2.500000, 1.053028, 	-0.000002, -0.026493, -0.999649, 
-1.336982, -5.594234, -28.484890, 	2.500000, 1.119843, 	0.000002, -0.026495, -0.999649, 
-0.000000, -5.594234, -28.484894, 	1.500000, 1.053028, 	-0.000000, -0.026493, -0.999649, 
-0.000000, -5.594234, -28.484894, 	1.500000, 1.053028, 	-0.000000, -0.026493, -0.999649, 
-1.336982, -5.594234, -28.484890, 	2.500000, 1.119843, 	0.000002, -0.026495, -0.999649, 
-1.002737, -6.305892, -28.466030, 	1.500000, 1.053028, 	0.000002, -0.026494, -0.999649, 
-0.000000, -5.594234, -28.484894, 	1.500000, 1.053028, 	-0.000000, -0.026493, -0.999649, 
-1.002737, -6.305892, -28.466030, 	1.500000, 1.053028, 	0.000002, -0.026494, -0.999649, 
-0.000000, -6.543112, -28.459743, 	1.500000, 1.119843, 	0.000000, -0.026496, -0.999649, 
-0.000000, -5.594234, -28.484894, 	1.500000, 1.053028, 	-0.000000, -0.026493, -0.999649, 
-0.000000, -6.543112, -28.459743, 	1.500000, 1.119843, 	0.000000, -0.026496, -0.999649, 
--1.002737, -6.305892, -28.466030, 	0.500000, 1.053028, 	-0.000002, -0.026494, -0.999649, 
--1.002737, -4.882575, -28.503754, 	3.500000, 1.053028, 	-0.000001, -0.026493, -0.999649, 
-0.000000, -5.594234, -28.484894, 	1.500000, 1.053028, 	-0.000000, -0.026493, -0.999649, 
--1.336982, -5.594234, -28.484890, 	0.500000, 1.119843, 	-0.000004, -0.026495, -0.999649, 
-0.000000, -4.645356, -28.510036, 	3.500000, 1.119843, 	0.000000, -0.026488, -0.999649, 
-0.000000, -5.594234, -28.484894, 	1.500000, 1.053028, 	-0.000000, -0.026493, -0.999649, 
--1.002737, -4.882575, -28.503754, 	3.500000, 1.053028, 	-0.000001, -0.026493, -0.999649, 
-1.002737, -4.882575, -28.503754, 	2.500000, 1.053028, 	-0.000002, -0.026493, -0.999649, 
-0.000000, -5.594234, -28.484894, 	1.500000, 1.053028, 	-0.000000, -0.026493, -0.999649, 
-0.000000, -4.645356, -28.510036, 	3.500000, 1.119843, 	0.000000, -0.026488, -0.999649, 
-1.002737, -1.445931, 3.440848, 	2.500000, -0.500000, 	-0.000000, 0.500000, -0.866025, 
-1.336982, -2.065033, 3.083410, 	2.500000, -0.594898, 	0.000000, 0.500000, -0.866025, 
-0.000000, -2.065034, 3.083410, 	3.000000, -1.083333, 	0.000000, 0.500000, -0.866025, 
-0.000000, -2.065034, 3.083410, 	3.000000, -1.083333, 	0.000000, 0.500000, -0.866025, 
-1.336982, -2.065033, 3.083410, 	2.500000, -0.594898, 	0.000000, 0.500000, -0.866025, 
-1.002737, -2.684134, 2.725971, 	4.500000, -1.666667, 	-0.000000, 0.500000, -0.866025, 
-0.000000, -2.065034, 3.083410, 	3.000000, -1.083333, 	0.000000, 0.500000, -0.866025, 
-1.002737, -2.684134, 2.725971, 	4.500000, -1.666667, 	-0.000000, 0.500000, -0.866025, 
-0.000000, -2.890502, 2.606825, 	4.500000, -1.833333, 	0.000000, 0.500000, -0.866026, 
-0.000000, -2.065034, 3.083410, 	3.000000, -1.083333, 	0.000000, 0.500000, -0.866025, 
-0.000000, -2.890502, 2.606825, 	4.500000, -1.833333, 	0.000000, 0.500000, -0.866026, 
--1.002737, -2.684134, 2.725971, 	3.500000, -1.666667, 	0.000000, 0.500000, -0.866025, 
--1.002737, -1.445931, 3.440848, 	2.500000, -1.666667, 	0.000000, 0.500000, -0.866025, 
-0.000000, -2.065034, 3.083410, 	3.000000, -1.083333, 	0.000000, 0.500000, -0.866025, 
--1.336982, -2.065033, 3.083410, 	3.500000, -1.833333, 	0.000000, 0.500000, -0.866025, 
-0.000000, -1.239565, 3.559994, 	2.500000, -1.833333, 	0.000000, 0.500000, -0.866025, 
-0.000000, -2.065034, 3.083410, 	3.000000, -1.083333, 	0.000000, 0.500000, -0.866025, 
--1.002737, -1.445931, 3.440848, 	2.500000, -1.666667, 	0.000000, 0.500000, -0.866025, 
-1.002737, -1.445931, 3.440848, 	2.500000, -0.500000, 	-0.000000, 0.500000, -0.866025, 
-0.000000, -2.065034, 3.083410, 	3.000000, -1.083333, 	0.000000, 0.500000, -0.866025, 
-0.000000, -1.239565, 3.559994, 	2.500000, -1.833333, 	0.000000, 0.500000, -0.866025, 
-4.193409, -2.445326, 32.893612, 	3.000000, -0.594415, 	0.682263, 0.725032, 0.094055, 
-0.250684, -6.277495, 43.932335, 	1.687500, -0.646499, 	0.009105, 0.001936, 0.999957, 
-5.620958, -6.307936, 32.893612, 	2.375000, -0.573582, 	0.996241, -0.000983, 0.086619, 
-0.250684, -6.277495, 43.932335, 	1.687500, -0.646499, 	0.009105, 0.001936, 0.999957, 
-4.193409, -10.256766, 32.893612, 	1.972222, -0.557378, 	0.680284, -0.725440, 0.104643, 
-5.620958, -6.307936, 32.893612, 	2.375000, -0.573582, 	0.996241, -0.000983, 0.086619, 
-0.250684, -6.277495, 43.932335, 	1.687500, -0.646499, 	0.009105, 0.001936, 0.999957, 
-0.000000, -11.548096, 32.893612, 	1.500000, -0.573582, 	-0.004203, -0.998166, 0.060395, 
-4.193409, -10.256766, 32.893612, 	1.972222, -0.557378, 	0.680284, -0.725440, 0.104643, 
-0.250684, -6.277495, 43.932335, 	1.687500, -0.646499, 	0.009105, 0.001936, 0.999957, 
--4.193409, -10.256766, 32.893612, 	1.027778, -0.557378, 	-0.685012, -0.716396, 0.132421, 
-0.000000, -11.548096, 32.893612, 	1.500000, -0.573582, 	-0.004203, -0.998166, 0.060395, 
--5.620958, -6.307936, 32.893612, 	0.625000, -0.573582, 	-0.991757, -0.001005, 0.128133, 
--4.193409, -10.256766, 32.893612, 	1.027778, -0.557378, 	-0.685012, -0.716396, 0.132421, 
-0.250684, -6.277495, 43.932335, 	1.687500, -0.646499, 	0.009105, 0.001936, 0.999957, 
-0.250684, -6.277495, 43.932335, 	1.687500, -0.646499, 	0.009105, 0.001936, 0.999957, 
--4.193409, -2.445326, 32.893612, 	0.000000, -0.594415, 	-0.686924, 0.716419, 0.121978, 
--5.620958, -6.307936, 32.893612, 	0.625000, -0.573582, 	-0.991757, -0.001005, 0.128133, 
-0.250684, -6.277495, 43.932335, 	1.687500, -0.646499, 	0.009105, 0.001936, 0.999957, 
-0.000000, -1.067776, 32.893612, 	3.500000, -0.594415, 	-0.004492, 0.998437, 0.055707, 
--4.193409, -2.445326, 32.893612, 	4.000000, -0.594415, 	-0.686924, 0.716419, 0.121978, 
-0.250684, -6.277495, 43.932335, 	1.687500, -0.646499, 	0.009105, 0.001936, 0.999957, 
-4.193409, -2.445326, 32.893612, 	3.000000, -0.594415, 	0.682263, 0.725032, 0.094055, 
-0.000000, -1.067776, 32.893612, 	3.500000, -0.594415, 	-0.004492, 0.998437, 0.055707, 
-};
diff --git a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderInterface.cpp b/tools/ArtistTools/source/CoreLib/Render/Interface/RenderInterface.cpp
deleted file mode 100644
index 61586d8..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderInterface.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "RenderInterface.h"
-#include "MeshShaderParam.h"
-#include "RenderPlugin.h"
-
-namespace RenderInterface
-{
-
-////////////////////////////////////////////////////////////////////////////////////////////
-bool InitDevice(int deviceID)
-{
-	if (!RenderPlugin::Instance()->InitDevice(deviceID))
-	{
-		MessageBox( 0, L"Could not create device.", L"Error", MB_ICONEXCLAMATION );
-		return false;
-	}
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool GetDeviceInfoString(wchar_t *str)
-{
-	return RenderPlugin::Instance()->GetDeviceInfoString(str);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool Initialize()
-{
-	return RenderPlugin::Instance()->Initialize();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void Shutdown()
-{
-	RenderPlugin::Instance()->Shutdown();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// gpu buffer management
-///////////////////////////////////////////////////////////////////////////////
-GPUBufferResource* CreateVertexBuffer( 
-	unsigned int ByteWidth, void* pSysMem)
-{
-	return RenderPlugin::Instance()->CreateVertexBuffer(ByteWidth, pSysMem);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CopyToDevice(
-	GPUBufferResource *pDevicePtr, 	void* pSysMem, 	unsigned int	ByteWidth)
-{
-	RenderPlugin::Instance()->CopyToDevice(pDevicePtr, pSysMem, ByteWidth);
-}
-
-///////////////////////////////////////////////////////////////////
-// texture resource mangement
-///////////////////////////////////////////////////////////////////
-GPUShaderResource* CreateTextureResource(const char* filepath)
-{
-	return RenderPlugin::Instance()->CreateTextureSRV(filepath);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void RenderShadowMap(GPUShaderResource* pShadowSRV, float znear, float zfar)
-{
-	// update constant buffer
-	ShadowVizParam shaderParam;
-	{
-		shaderParam.m_zFar = zfar;
-		shaderParam.m_zNear = znear;
-	}
-	CopyShaderParam(SHADER_TYPE_VISUALIZE_SHADOW, &shaderParam, sizeof(ShadowVizParam), 0);
-	
-	RenderPlugin::Instance()->BindPixelShaderResources(0, 1, &pShadowSRV);
-
-	// render states
-	RenderPlugin::Instance()->ApplySampler(0, SAMPLER_TYPE_POINTCLAMP);
-
-	RenderPlugin::Instance()->BindShaderResources(SHADER_TYPE_VISUALIZE_SHADOW, 1, &pShadowSRV);
-
-
-	RenderPlugin::Instance()->ApplyRasterizerState(RASTERIZER_STATE_FILL_CULL_NONE);
-	RenderPlugin::Instance()->ApplyDepthStencilState(DEPTH_STENCIL_DEPTH_NONE);
-	
-	// set IA vars
-	RenderPlugin::Instance()->ClearInputLayout();
-
-	RenderPlugin::Instance()->SetPrimitiveTopologyTriangleStrip();
-
-	// set shader and tex resource
-	ApplyShader(SHADER_TYPE_VISUALIZE_SHADOW);
-
-	// draw quad
-	RenderPlugin::Instance()->Draw(3, 0);
-
-	// cleanup shader and its resource
-	RenderPlugin::Instance()->ClearPixelShaderResources(0, 1);
-	RenderPlugin::Instance()->DisableShader(SHADER_TYPE_VISUALIZE_SHADOW);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// render with full color shader
-void RenderScreenQuad(
-	GPUShaderResource*	pTextureSRV
-	)
-{
-	RenderPlugin::Instance()->ApplyRasterizerState(RASTERIZER_STATE_FILL_CULL_NONE);
-	RenderPlugin::Instance()->ApplyDepthStencilState(DEPTH_STENCIL_DEPTH_NONE);
-
-	RenderPlugin::Instance()->ClearInputLayout();
-
-	RenderPlugin::Instance()->SetPrimitiveTopologyTriangleStrip();
-
-	if(pTextureSRV)
-	{
-		RenderPlugin::Instance()->BindShaderResources(SHADER_TYPE_SCREEN_QUAD, 1, &pTextureSRV);
-
-		ApplyShader(SHADER_TYPE_SCREEN_QUAD);
-		
-		RenderPlugin::Instance()->BindPixelShaderResources(0, 1, &pTextureSRV);
-		RenderPlugin::Instance()->ApplySampler(0, SAMPLER_TYPE_POINTCLAMP);
-
-		RenderPlugin::Instance()->Draw(3,0);
-
-		RenderPlugin::Instance()->ClearPixelShaderResources(0, 1);
-		RenderPlugin::Instance()->DisableShader(SHADER_TYPE_SCREEN_QUAD);
-	}
-	else
-	{
-		ApplyShader(SHADER_TYPE_SCREEN_QUAD_COLOR);
-
-		RenderPlugin::Instance()->Draw(3,0);
-
-		RenderPlugin::Instance()->DisableShader(SHADER_TYPE_SCREEN_QUAD_COLOR);
-	}
-}
-
-
-void SubmitGpuWork()
-{
-	RenderPlugin::Instance()->SubmitGpuWork();
-}
-
-void WaitForGpu()
-{
-	RenderPlugin::Instance()->WaitForGpu();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// draw calls
-///////////////////////////////////////////////////////////////////////////////
-void DrawLineList(GPUBufferResource* pDevicePtr, unsigned int nVerts, unsigned int stride)
-{
-	RenderPlugin::Instance()->SetVertexBuffer(pDevicePtr, stride);
-	RenderPlugin::Instance()->SetPrimitiveTopologyLineList();
-	RenderPlugin::Instance()->Draw(nVerts, 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// render states management
-///////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyDepthStencilState(DEPTH_STENCIL_STATE state)
-{
-	RenderPlugin::Instance()->ApplyDepthStencilState(state);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyRasterizerState(RASTERIZER_STATE state)
-{
-	RenderPlugin::Instance()->ApplyRasterizerState(state);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplySampler(int slot, SAMPLER_TYPE st)
-{
-	RenderPlugin::Instance()->ApplySampler(slot, st);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ApplyBlendState(BLEND_STATE st)
-{
-	RenderPlugin::Instance()->ApplyBlendState(st);
-}
-
-void ApplyForShadow(int ForShadow)
-{
-	RenderPlugin::Instance()->ApplyForShadow(ForShadow);
-}
-
-void SwitchToDX11()
-{
-	RenderPlugin::Instance()->SwitchToDX11();
-}
-
-void FlushDX11()
-{
-	RenderPlugin::Instance()->FlushDX11();
-}
-
-void FlushDX12()
-{
-	RenderPlugin::Instance()->FlushDX12();
-}
-
-void ApplyPrimitiveTopologyLine()
-{
-	RenderPlugin::Instance()->ApplyPrimitiveTopologyLine();
-}
-
-void ApplyPrimitiveTopologyTriangle()
-{
-	RenderPlugin::Instance()->ApplyPrimitiveTopologyTriangle();
-}
-
-///////////////////////////////////////////////////////////////////
-// shader magement
-///////////////////////////////////////////////////////////////////
-void ApplyShader(SHADER_TYPE st)
-{
-	RenderPlugin::Instance()->ApplyShader(st);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CopyShaderParam(SHADER_TYPE st, void* pSysMem, unsigned int bytes, unsigned int slot)
-{
-	RenderPlugin::Instance()->CopyShaderParam(st, pSysMem, bytes, slot);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// Viewport magement
-/////////////////////////////////////////////////////////////////////////////////////////
-void GetViewport(Viewport& vp)
-{
-	RenderPlugin::Instance()->GetViewport(vp);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SetViewport(const Viewport& vp)
-{
-	RenderPlugin::Instance()->SetViewport(vp);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// Render window interafce
-/////////////////////////////////////////////////////////////////////////////////////////
-bool CreateRenderWindow(HWND hWnd, int nSamples)
-{
-	return RenderPlugin::Instance()->CreateRenderWindow(hWnd, nSamples);
-}
-
-bool ResizeRenderWindow(int w, int h)
-{
-	return RenderPlugin::Instance()->ResizeRenderWindow(w,h);
-}
-
-void PresentRenderWindow()
-{
-	return RenderPlugin::Instance()->PresentRenderWindow();
-}
-
-void ClearRenderWindow(float r, float g, float b)
-{
-	return RenderPlugin::Instance()->ClearRenderWindow(r,g,b);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Texture resource management
-///////////////////////////////////////////////////////////////////////////////
-static GPUShaderResource* g_backgroundTextureSRV = 0;
-
-bool LoadBackgroundTexture(const char* filePath)
-{
-	ClearBackgroundTexture();
-
-	RenderPlugin::Instance()->PreRender();
-	g_backgroundTextureSRV = RenderPlugin::Instance()->CreateTextureSRV(filePath);
-	RenderPlugin::Instance()->PostRender();
-
-	return (g_backgroundTextureSRV != 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void RenderBackgroundTexture()
-{
-	RenderScreenQuad(g_backgroundTextureSRV);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void ClearBackgroundTexture()
-{
-	SAFE_RELEASE(g_backgroundTextureSRV);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// Text draw helper functions (using DXUT)
-/////////////////////////////////////////////////////////////////////////////////////////
-void TxtHelperBegin()
-{
-	RenderPlugin::Instance()->TxtHelperBegin();
-}
-
-void TxtHelperEnd()
-{
-	RenderPlugin::Instance()->TxtHelperEnd();
-}
-
-void TxtHelperSetInsertionPos(int x, int y)
-{
-	RenderPlugin::Instance()->TxtHelperSetInsertionPos(x,y);
-}
-
-void TxtHelperSetForegroundColor(float r, float g, float b, float a)
-{
-	RenderPlugin::Instance()->TxtHelperSetForegroundColor(r,g,b,a);
-}
-
-void TxtHelperDrawTextLine(wchar_t* str)
-{
-	RenderPlugin::Instance()->TxtHelperDrawTextLine(str);
-}
-
-} // end namespace
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderInterface.h b/tools/ArtistTools/source/CoreLib/Render/Interface/RenderInterface.h
deleted file mode 100644
index 9bc4036..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderInterface.h
+++ /dev/null
@@ -1,175 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "windows.h"
-
-#include "RenderResources.h"
-
-// API agnostic interface for rendering
-namespace RenderInterface
-{
-	///////////////////////////////////////////////////////////////////
-	enum RASTERIZER_STATE
-	{
-		RASTERIZER_STATE_FILL_CULL_NONE,
-		RASTERIZER_STATE_FILL_CULL_FRONT,
-		RASTERIZER_STATE_FILL_CULL_BACK,
-		RASTERIZER_STATE_WIRE,
-		RASTERIZER_STATE_END
-	};
-
-	///////////////////////////////////////////////////////////////////
-	enum DEPTH_STENCIL_STATE
-	{
-		DEPTH_STENCIL_DEPTH_TEST,
-		DEPTH_STENCIL_DEPTH_NONE,
-		DEPTH_STENCIL_STATE_END
-	};
-
-	///////////////////////////////////////////////////////////////////
-	enum SAMPLER_TYPE
-	{
-		SAMPLER_TYPE_LINEAR,
-		SAMPLER_TYPE_POINTCLAMP,
-		SAMPLER_TYPE_END,
-	};
-
-	///////////////////////////////////////////////////////////////////
-	enum BLEND_STATE
-	{
-		BLEND_STATE_ALPHA,
-		BLEND_STATE_NONE,
-		BLEND_STATE_END
-	};
-
-	///////////////////////////////////////////////////////////////////
-	enum SHADER_TYPE
-	{
-		SHADER_TYPE_MESH_RENDERING,
-		SHADER_TYPE_MESH_SHADOW,
-		SHADER_TYPE_SCREEN_QUAD,
-		SHADER_TYPE_SCREEN_QUAD_COLOR,
-		SHADER_TYPE_VISUALIZE_SHADOW,
-		SHADER_TYPE_SIMPLE_COLOR,
-#ifndef NV_ARTISTTOOLS
-		SHADER_TYPE_HAIR_SHADER_DEFAULT,
-		SHADER_TYPE_HAIR_SHADER_SHADOW,
-#endif // NV_ARTISTTOOLS
-	};
-
-	///////////////////////////////////////////////////////////////////
-	// global acess for render context and device to minimize D3D entry points
-	///////////////////////////////////////////////////////////////////
-	CORELIB_EXPORT bool InitDevice(int deviceID);
-	CORELIB_EXPORT bool Initialize();
-	CORELIB_EXPORT void Shutdown();
-
-	CORELIB_EXPORT void SubmitGpuWork();
-	CORELIB_EXPORT void WaitForGpu();
-
-	///////////////////////////////////////////////////////////////////
-	// render window management
-	///////////////////////////////////////////////////////////////////
-	CORELIB_EXPORT bool CreateRenderWindow(HWND hWnd, int nSamples);
-	CORELIB_EXPORT bool ResizeRenderWindow(int w, int h);
-	CORELIB_EXPORT void PresentRenderWindow();
-	CORELIB_EXPORT void ClearRenderWindow(float r, float g, float b);
-
-	///////////////////////////////////////////////////////////////////
-	// shader magement
-	///////////////////////////////////////////////////////////////////
-	CORELIB_EXPORT void ApplyShader(SHADER_TYPE st);
-	CORELIB_EXPORT void CopyShaderParam(SHADER_TYPE st, void* pSysMem, unsigned int bytes, unsigned int slot = 0);
-
-	///////////////////////////////////////////////////////////////////
-	// viewport management
-	///////////////////////////////////////////////////////////////////
-	struct Viewport
-	{
-		float			TopLeftX;
-		float			TopLeftY;
-		float			Width;
-		float			Height;
-		float			MinDepth;
-		float			MaxDepth;
-	};
-
-	CORELIB_EXPORT void GetViewport(Viewport& vp);
-	CORELIB_EXPORT void SetViewport(const Viewport& vp);
-
-	///////////////////////////////////////////////////////////////////
-	// gpu buffer management
-	///////////////////////////////////////////////////////////////////
-	CORELIB_EXPORT GPUBufferResource* CreateVertexBuffer( 	unsigned int ByteWidth, void* pSysMem = 0);
-	CORELIB_EXPORT void CopyToDevice(GPUBufferResource *pDevicePtr, void* pSysMem, unsigned int	ByteWidth);
-
-	///////////////////////////////////////////////////////////////////
-	// texture resource mangement
-	///////////////////////////////////////////////////////////////////
-	CORELIB_EXPORT GPUShaderResource* CreateTextureResource(const char* filePath);
-	CORELIB_EXPORT void RenderShadowMap(GPUShaderResource* pShadowSRV, float znear, float zfar);
-
-	///////////////////////////////////////////////////////////////////
-	// render state management
-	///////////////////////////////////////////////////////////////////
-	CORELIB_EXPORT void ApplyDepthStencilState(DEPTH_STENCIL_STATE state);
-	CORELIB_EXPORT void ApplyRasterizerState(RASTERIZER_STATE state);
-	CORELIB_EXPORT void ApplySampler(int slot, SAMPLER_TYPE st);
-	CORELIB_EXPORT void ApplyBlendState(BLEND_STATE st);
-
-	CORELIB_EXPORT void ApplyForShadow(int ForShadow);
-	CORELIB_EXPORT void SwitchToDX11();
-	CORELIB_EXPORT void FlushDX11();
-	CORELIB_EXPORT void FlushDX12();
-	CORELIB_EXPORT void ApplyPrimitiveTopologyLine();
-	CORELIB_EXPORT void ApplyPrimitiveTopologyTriangle();
-	///////////////////////////////////////////////////////////////////
-	// draw calls
-	///////////////////////////////////////////////////////////////////
-	void DrawLineList(GPUBufferResource* pVertexBuffer, unsigned int nVerts, unsigned int bytesize);
-
-	///////////////////////////////////////////////////////////////////
-	// background textures
-	///////////////////////////////////////////////////////////////////
-	bool LoadBackgroundTexture(const char* filePath);
-	void RenderBackgroundTexture();
-	void ClearBackgroundTexture();
-
-	///////////////////////////////////////////////////////////////////
-	CORELIB_EXPORT bool GetDeviceInfoString(wchar_t *str);
-
-	///////////////////////////////////////////////////////////////////
-	// text helpers
-	CORELIB_EXPORT void TxtHelperBegin();
-	CORELIB_EXPORT void TxtHelperEnd();
-	CORELIB_EXPORT void TxtHelperSetInsertionPos(int x, int y);
-	CORELIB_EXPORT void TxtHelperSetForegroundColor(float r, float g, float b, float a = 1.0f);
-	CORELIB_EXPORT void TxtHelperDrawTextLine(wchar_t* str);
-}
diff --git a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderPlugin.cpp b/tools/ArtistTools/source/CoreLib/Render/Interface/RenderPlugin.cpp
deleted file mode 100644
index 3df8c85..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderPlugin.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#include "RenderPlugin.h"
-
-#include <io.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-RenderPlugin* g_Plugin = nullptr;
-
-RenderPlugin::RenderPlugin()
-{
-	m_RenderApi = "";
-}
-
-typedef RenderPlugin*(*Func)(void);
-
-bool RenderPlugin::Load(std::vector<std::string>& render_plugins)
-{
-	if (render_plugins.size() == 0)
-	{
-		return false;
-	}
-
-	std::vector<std::string>::iterator it;
-	std::string pluginDll = "";	
-	HMODULE module = NULL;
-	Func CreateFunc = NULL;
-	bool loaded = false;
-	for (it = render_plugins.begin(); it != render_plugins.end(); it++)
-	{
-#ifdef NV_ARTISTTOOLS
-		pluginDll = "RenderPlugin";
-#else
-		pluginDll = "FurRender";
-#endif
-
-		pluginDll.append(*it);
-
-#ifdef _WIN64
-		pluginDll.append(".win64");
-#else						  
-		pluginDll.append(".win32");
-#endif
-
-#ifdef _DEBUG
-		pluginDll.append(".d");
-#else						  
-#endif
-
-		pluginDll.append(".dll");
-
-		module = LoadLibraryA(pluginDll.c_str());
-		if (NULL == module)
-			return false;
-
-		CreateFunc = (Func)GetProcAddress(module, "CreateRenderPlugin");
-		if (NULL == CreateFunc)
-			return false;
-
-		g_Plugin = CreateFunc();
-		if (NULL != g_Plugin)
-		{
-			loaded = true;
-			break;
-		}
-	}
-	return loaded;
-}
-
-RenderPlugin::~RenderPlugin()
-{
-}
-
-
-RenderPlugin* RenderPlugin::Instance()
-{
-	return g_Plugin;
-}
-
-void RenderPlugin::Destroy()
-{
-	if (nullptr == g_Plugin)
-		return;
-
-	delete g_Plugin;
-	g_Plugin = nullptr;
-}
diff --git a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderPlugin.h b/tools/ArtistTools/source/CoreLib/Render/Interface/RenderPlugin.h
deleted file mode 100644
index e755aea..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderPlugin.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma once
-
-#include "RenderInterface.h"
-using namespace RenderInterface;
-
-class NVHairReadOnlyBuffer;
-class GPUProfiler;
-class ShadowMap;
-
-class IDXGIAdapter;
-class IUnknown;
-class IDXGIFactory1;
-class IDXGISwapChain;
-
-struct D3DHandles
-{
-public:
-	IDXGIAdapter*       pAdapter;
-	IDXGIFactory1*      pFactory;
-	IUnknown*           pDevice;
-	IUnknown*           pDeviceContext;
-
-	IDXGISwapChain*		pDXGISwapChain;
-	IUnknown*			pD3D11BackBuffer;
-	IUnknown*		    pD3D11RenderTargetView;
-	IUnknown*			pD3D11DepthBuffer;
-	IUnknown*		    pD3D11DepthStencilView;
-};
-
-#ifdef CORERENDER_LIB
-# define CORERENDER_EXPORT Q_DECL_EXPORT
-#else
-# define CORERENDER_EXPORT Q_DECL_IMPORT
-#endif
-
-class CORELIB_EXPORT RenderPlugin
-{
-public:
-	static bool Load(std::vector<std::string>& render_plugins);
-	static RenderPlugin* Instance();
-	static void Destroy();
-
-	~RenderPlugin();
-
-	// self
-	virtual std::string GetRenderApi() { return m_RenderApi; }
-
-	// interface
-	virtual bool InitDevice(int deviceID) = 0;
-	virtual bool Initialize() = 0;
-	virtual void Shutdown() = 0;
-	virtual void CopyToDevice(GPUBufferResource *pDevicePtr, void* pSysMem, unsigned int	ByteWidth) = 0;
-	virtual void ApplyDepthStencilState(DEPTH_STENCIL_STATE state) = 0;
-	virtual void ApplyRasterizerState(RASTERIZER_STATE state) = 0;
-	virtual void ApplySampler(int slot, SAMPLER_TYPE st) = 0;
-	virtual void ApplyBlendState(BLEND_STATE st) = 0;
-	virtual void GetViewport(Viewport& vp) = 0;
-	virtual void SetViewport(const Viewport& vp) = 0;
-	virtual void BindVertexShaderResources(int startSlot, int numSRVs, GPUShaderResource** ppSRVs) = 0;
-	virtual void BindPixelShaderResources(int startSlot, int numSRVs, GPUShaderResource** ppSRVs) = 0;
-	virtual void ClearVertexShaderResources(int startSlot, int numSRVs) = 0;
-	virtual void ClearPixelShaderResources(int startSlot, int numSRVs) = 0;
-	virtual void ClearInputLayout() = 0;
-	virtual void SetVertexBuffer(GPUBufferResource* pBuffer, UINT stride, UINT offset = 0) = 0;
-	virtual void SetPrimitiveTopologyTriangleStrip() = 0;
-	virtual void SetPrimitiveTopologyTriangleList() = 0;
-	virtual void SetPrimitiveTopologyLineList() = 0;
-	virtual void Draw(unsigned int vertexCount, unsigned int startCount = 0) = 0;
-	virtual GPUBufferResource* CreateVertexBuffer(unsigned int ByteWidth, void* pSysMem = 0) = 0;
-	virtual GPUShaderResource* CreateShaderResource(unsigned int stride, unsigned int numElements, void* pSysMem, NVHairReadOnlyBuffer* pReadOnlyBuffer = NULL) = 0;
-	
-	// interface dx12
-	virtual void ApplyForShadow(int ForShadow) = 0;
-	virtual void SwitchToDX11() = 0;
-	virtual void FlushDX11() = 0;	
-	virtual void FlushDX12() = 0;
-	virtual void ApplyPrimitiveTopologyLine() = 0;
-	virtual void ApplyPrimitiveTopologyTriangle() = 0;
-	virtual void SubmitGpuWork() = 0;
-	virtual void WaitForGpu() = 0;
-
-	// util
-	virtual bool CreateRenderWindow(HWND hWnd, int nSamples) = 0;
-	virtual bool ResizeRenderWindow(int w, int h) = 0;
-	virtual void PresentRenderWindow() = 0;
-	virtual void ClearRenderWindow(float r, float g, float b) = 0;
-	virtual bool GetDeviceInfoString(wchar_t *str) = 0;
-	virtual GPUShaderResource* CreateTextureSRV(const char* texturename) = 0;
-	virtual void TxtHelperBegin() = 0;
-	virtual void TxtHelperEnd() = 0;
-	virtual void TxtHelperSetInsertionPos(int x, int y) = 0;
-	virtual void TxtHelperSetForegroundColor(float r, float g, float b, float a = 1.0f) = 0;
-	virtual void TxtHelperDrawTextLine(wchar_t* str) = 0;
-
-	// shader
-	virtual bool InitializeShaders() = 0;
-	virtual void DestroyShaders() = 0;
-	virtual void ApplyShader(SHADER_TYPE st) = 0;
-	virtual void DisableShader(SHADER_TYPE st) = 0;
-	virtual void BindShaderResources(SHADER_TYPE st, int numSRVs, GPUShaderResource** ppSRVs) = 0;
-	virtual void CopyShaderParam(SHADER_TYPE st, void* pSysMem, unsigned int bytes, unsigned int slot = 0) = 0;
-
-	// GPUProfiler
-	virtual GPUProfiler* CreateGPUProfiler() = 0;
-
-	// ShadowMap
-	virtual ShadowMap* CreateShadowMap(int resolution) = 0;
-
-	// D3D12RenderContext
-	virtual void PreRender() = 0;
-	virtual void PostRender() = 0;
-
-	// GPUMeshResources
-	virtual GPUMeshResources* GPUMeshResourcesCreate(MeshData* pMeshData, const SkinData& skinData) = 0;
-	virtual void GPUMeshResourcesRelease(GPUMeshResources* pResource) = 0;
-
-	// Get devices related
-	virtual D3DHandles& GetDeviceHandles(D3DHandles& deviceHandles) = 0;
-
-protected:
-	RenderPlugin();
-	std::string m_RenderApi;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderResources.cpp b/tools/ArtistTools/source/CoreLib/Render/Interface/RenderResources.cpp
deleted file mode 100644
index 19863fc..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderResources.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "RenderResources.h"
-
-// shared path
-#include "AnimUtil.h"
-#include "MeshData.h"
-
-#include "RenderPlugin.h"
-
-////////////////////////////////////////////////////////////////////////////////////////
-GPUMeshResources* GPUMeshResources::Create(MeshData* pMeshData, const SkinData& skinData)
-{
-	return RenderPlugin::Instance()->GPUMeshResourcesCreate(pMeshData, skinData);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-void GPUMeshResources::Release()
-{
-	RenderPlugin::Instance()->GPUMeshResourcesRelease(this);
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderResources.h b/tools/ArtistTools/source/CoreLib/Render/Interface/RenderResources.h
deleted file mode 100644
index c261730..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/Interface/RenderResources.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#pragma once
-
-#include "corelib_global.h"
-#include "CoreLib.h"
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(x) { if (x) x->Release(); x = 0; }
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////
-// API specific GPU resources (todo - add reference counting)
-//////////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////////////
-class GPUBufferResource
-{
-public:
-	virtual ~GPUBufferResource() {}
-	virtual void Release() = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////
-class GPUShaderResource
-{
-public:
-	virtual ~GPUShaderResource() {}
-	virtual void Release() = 0;
-};
-
-class MeshData;
-class SkinData;
-
-////////////////////////////////////////////////////////////////////////////////////////
-class GPUMeshResources
-{
-public:
-	GPUBufferResource*		m_pVertexBuffer;
-	GPUShaderResource*		m_pBoneIndicesSRV;
-	GPUShaderResource*		m_pBoneWeightsSRV;
-
-	static GPUMeshResources* Create(MeshData*, const SkinData& skinData);
-	void Release();
-};
-
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/LightShaderParam.h b/tools/ArtistTools/source/CoreLib/Render/LightShaderParam.h
deleted file mode 100644
index 9935f71..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/LightShaderParam.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "MathUtil.h"
-
-#define MAX_LIGHTS 4
-
-// shader parameter for light
-struct LightParam
-{
-	int				m_enable;
-	atcore_float3	m_dir;
-
-	int				m_useShadows;
-	atcore_float3	m_color;
-
-	atcore_float3	m_ambientColor;
-	int				m_isEnvLight;
-
-	int				m_lhs;
-	int				_reserved1;
-	int				_reserved2;
-	int				_reserved3;
-
-	float			m_depthBias;
-	float			m_depthGain;
-	int				m_useEnvMap;
-	float			m_intensity;
-
-	atcore_float4x4	m_viewMatrix;
-	atcore_float4x4	m_lightMatrix;
-
-public:
-	LightParam()
-	{
-		m_dir = gfsdk_makeFloat3(-1.0f, -1.0f, -1.0f);
-		m_enable	= 0;
-		m_useShadows = false;
-		m_isEnvLight = 0;
-		m_useEnvMap = 0;
-
-		m_depthBias = 1.0f;
-		m_depthGain = 1.0f;
-
-		m_color = gfsdk_makeFloat3(1.0f, 1.0f, 1.0f);
-		m_ambientColor = gfsdk_makeFloat3(0.0f, 0.0f, 0.0f);
-	}
-};
-
-
-// light shader block in c-buffer 
-struct LightShaderParam
-{
-	LightParam		m_lightParam[MAX_LIGHTS];
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/MeshShaderParam.h b/tools/ArtistTools/source/CoreLib/Render/MeshShaderParam.h
deleted file mode 100644
index 5dce51d..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/MeshShaderParam.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "MathUtil.h"
-#include "LightShaderParam.h"
-
-// same layout as the constant buffer used in body shader
-#define MAX_BONE_MATRICES 512
-
-// shared struct for mesh shader cbuffer and material access
-struct MeshShaderParam
-{
-	atcore_float4x4	m_ViewProjection;
-	atcore_float4x4	m_BodyTransformation;
-
-	LightShaderParam m_lightParam;
-
-	atcore_float3	m_eyePosition;
-	float			m_specularShininess;
-
-	int				m_useDiffuseTextures;
-	int				m_useSpecularTextures;
-	int				m_useNormalTextures;
-	int				m_useTextures;
-
-
-	atcore_float4	m_ambientColor;
-	atcore_float4	m_diffuseColor;
-	atcore_float4	m_specularColor;
-
-	int				m_wireFrame;
-	int				m_useLighting;
-	int				m_wireFrameOver;
-	float			m_unitScale;
-
-	int				m_useDQs;
-	int				m_diffuseChannel;
-	int				m_flatNormal;
-	int 			m_usePinPos;
-
-	atcore_float4x4		 m_boneMatrices[MAX_BONE_MATRICES];
-	atcore_dualquaternion m_boneDQs[MAX_BONE_MATRICES];
-
-	MeshShaderParam()
-	{
-		m_specularShininess			= 30.0f;
-
-		m_ambientColor				= gfsdk_makeFloat4(0.0f, 0.0f, 0.0f, 1.0f);
-		m_diffuseColor				= gfsdk_makeFloat4(1.0f, 1.0f, 1.0f, 1.0f);
-		m_specularColor				= gfsdk_makeFloat4(0.0f, 0.0f, 0.0f, 0.0f);
-
-		m_useDiffuseTextures		= true;
-		m_useSpecularTextures		= true;
-		m_useNormalTextures			= true;
-		m_useTextures				= true;
-
-		m_wireFrame					= false;
-		m_wireFrameOver				= false;
-		m_useLighting				= true;
-		m_unitScale					= 1.0f;
-
-		m_useDQs					= false;
-		m_flatNormal				= false;
-
-		m_usePinPos					= false;
-
-		memset(m_boneMatrices, 0, sizeof(atcore_float4x4) * MAX_BONE_MATRICES);
-		memset(m_boneDQs, 0, sizeof(atcore_dualquaternion) * MAX_BONE_MATRICES);
-	}
-};
-
-// struct for mesh shadow shader cbuffer 
-struct MeshShadowShaderParam
-{
-	atcore_float4x4	m_ViewProjection;
-	atcore_float4x4	m_ViewMatrix;
-	atcore_float4x4	m_BodyTransformation;
-
-	int				m_useDQs;
-	int 			m_usePinPos;
-	float			_reserved_[2];
-
-	atcore_float4x4		 m_boneMatrices[MAX_BONE_MATRICES];
-	atcore_dualquaternion m_boneDQs[MAX_BONE_MATRICES];
-
-	MeshShadowShaderParam()
-	{
-		m_useDQs = false;
-		m_usePinPos = false;
-
-		memset(m_boneMatrices, 0, sizeof(atcore_float4x4) * MAX_BONE_MATRICES);
-		memset(m_boneDQs, 0, sizeof(atcore_dualquaternion) * MAX_BONE_MATRICES);
-	}
-};
-
-struct SimpleShaderParam
-{
-	atcore_float4x4 world;
-	atcore_float4x4 view;
-	atcore_float4x4 projection;
-	atcore_float4	color;
-
-	int		useVertexColor;
-	int		dummy2;
-	int		dummy3;
-	int		dummy4;
-};
-
-struct ShadowVizParam
-{
-	float			m_zNear;
-	float			m_zFar;
-	float			_align1;
-	float			_align2;
-};
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Render/ShadowMap.cpp b/tools/ArtistTools/source/CoreLib/Render/ShadowMap.cpp
deleted file mode 100644
index 72b90be..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/ShadowMap.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "ShadowMap.h"
-
-#include "RenderPlugin.h"
-
-/////////////////////////////////////////////////////////////////////////
-ShadowMap* ShadowMap::Create(int resolution)
-{
-	return RenderPlugin::Instance()->CreateShadowMap(resolution);
-}
diff --git a/tools/ArtistTools/source/CoreLib/Render/ShadowMap.h b/tools/ArtistTools/source/CoreLib/Render/ShadowMap.h
deleted file mode 100644
index 9a62b06..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/ShadowMap.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "d3d11.h"
-
-class GPUShaderResource;
-
-struct ShadowMap
-{	
-public:
-	static ShadowMap* ShadowMap::Create(int resolution);
-	virtual ~ShadowMap() {}
-
-	virtual void Release() = 0;
-	virtual void BeginRendering(float clearDepth) = 0;
-	virtual void EndRendering() = 0;
-
-	virtual GPUShaderResource* GetShadowSRV() = 0;
-};
-
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/SimpleRenderable.cpp b/tools/ArtistTools/source/CoreLib/Render/SimpleRenderable.cpp
deleted file mode 100644
index 0dfb169..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/SimpleRenderable.cpp
+++ /dev/null
@@ -1,493 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#include "SimpleRenderable.h"
-
-#include "RenderInterface.h"
-
-#include <vector>
-
-#include "Nv.h"
-
-static std::vector<SimpleRenderable*> g_SimpleShapes;
-
-struct DefaultVertexType
-{
-	atcore_float3 pos;
-	atcore_float4 color;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-SimpleRenderable::SimpleRenderable()
-	: m_pVertexBuffer(NV_NULL)
-	, m_numIndices(0)
-	, m_numVertices(0)
-{
-
-}
-
-///////////////////////////////////////////////////////////////////////////////
-SimpleRenderable::~SimpleRenderable()
-{
-	Free();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleRenderable::Free()
-{
-	SAFE_RELEASE(m_pVertexBuffer);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleRenderable::Initialize()
-{
-	//////////////////////////////////////////////////////////////////////////////
-	// create icon shape
-	g_SimpleShapes.resize(NUM_SHAPE_TYPES);
-
-	g_SimpleShapes[GROUND_YUP] = new SimpleRenderable;
-	g_SimpleShapes[GROUND_YUP]->InitGroundGeometry(false);
-
-	g_SimpleShapes[GROUND_ZUP] = new SimpleRenderable;
-	g_SimpleShapes[GROUND_ZUP]->InitGroundGeometry(true);
-
-	g_SimpleShapes[AXIS_YUP] = new SimpleRenderable;
-	g_SimpleShapes[AXIS_YUP]->InitAxisGeometry(false);
-
-	g_SimpleShapes[AXIS_ZUP] = new SimpleRenderable;
-	g_SimpleShapes[AXIS_ZUP]->InitAxisGeometry(true);
-
-	g_SimpleShapes[WIND_YUP] = new SimpleRenderable;
-	g_SimpleShapes[WIND_YUP]->InitWindGeometry();
-
-	g_SimpleShapes[WIND_ZUP] = new SimpleRenderable;
-	g_SimpleShapes[WIND_ZUP]->InitWindGeometry();
-
-	g_SimpleShapes[LIGHT] = new SimpleRenderable;
-	g_SimpleShapes[LIGHT]->InitLightGeometry();
-
-	g_SimpleShapes[LIGHT_RAY] = new SimpleRenderable;
-	g_SimpleShapes[LIGHT_RAY]->InitLightRayGeometry();
-
-	return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void SimpleRenderable::Draw(SHAPE_TYPE t, bool depthTest)
-{
-	if (t >= g_SimpleShapes.size())
-		return;
-
-	g_SimpleShapes[t]->Draw(depthTest);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-void SimpleRenderable::Shutdown()
-{
-	for (int i = 0; i < g_SimpleShapes.size(); i++)
-	{
-		if (g_SimpleShapes[i])
-		{
-			g_SimpleShapes[i]->Free();
-			delete g_SimpleShapes[i];
-		}
-	}
-
-	g_SimpleShapes.clear();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleRenderable::InitGroundGeometry(bool zUP)
-{
-	const int nSeed = 10;
-	const int nRow = nSeed * 2 + 1;
-	const int nLines = nRow * 2;
-	const float fLen = 25.0f;
-	const float fSpace = fLen/nSeed;
-	float groundHeight = 0.0f;
-
-	const atcore_float4 color1 = gfsdk_makeFloat4(0.65, 0.65, 0.65, 1.0f);
-	const atcore_float4 color2 = gfsdk_makeFloat4(0.1f, 0.1f, 0.1f, 1.0f);
-
-	DWORD offset;
-
-	const int numVerts = nLines * 2;
-	DefaultVertexType* buf = new DefaultVertexType[numVerts];
-	DefaultVertexType* pData = buf;
-
-	//build ground lines/verts
-	for(int i = 0; i < nSeed; i++)
-	{
-		if ( zUP )
-		{
-			// lines parallel to y
-			pData->pos = gfsdk_makeFloat3(-fSpace * (i+1), -fLen, groundHeight);
-			pData->color = color1;
-			pData++;
-
-			pData->pos = gfsdk_makeFloat3(-fSpace * (i+1), fLen, groundHeight);
-			pData->color = color1;
-			pData++;
-
-			// lines parallel to y
-			pData->pos = gfsdk_makeFloat3(fSpace * (i+1), -fLen, groundHeight);
-			pData->color = color1;
-			pData++;
-
-			pData->pos = gfsdk_makeFloat3(fSpace * (i+1), fLen, groundHeight);
-			pData->color = color1;
-			pData++;
-
-			// line x
-			pData->pos = gfsdk_makeFloat3(-fLen, -fSpace * (i+1), groundHeight);
-			pData->color = color1;
-			pData++;
-
-			pData->pos = gfsdk_makeFloat3(fLen, -fSpace * (i+1), groundHeight);
-			pData->color = color1;
-			pData++;
-
-			// line x
-			pData->pos = gfsdk_makeFloat3(-fLen, fSpace * (i+1), groundHeight);
-			pData->color = color1;
-			pData++;
-
-			pData->pos = gfsdk_makeFloat3(fLen, fSpace * (i+1), groundHeight);
-			pData->color = color1;
-			pData++;
-		}
-		else
-		{
-			// lines parallel to z
-			pData->pos = gfsdk_makeFloat3(-fSpace * (i+1), groundHeight, -fLen);
-			pData->color = color1;
-			pData++;
-
-			pData->pos = gfsdk_makeFloat3(-fSpace * (i+1), groundHeight, fLen);
-			pData->color = color1;
-			pData++;
-
-			// lines parallel to z
-			pData->pos = gfsdk_makeFloat3(fSpace * (i+1), groundHeight, -fLen);
-			pData->color = color1;
-			pData++;
-
-			pData->pos = gfsdk_makeFloat3(fSpace * (i+1), groundHeight, fLen);
-			pData->color = color1;
-			pData++;
-
-			// line x
-			pData->pos = gfsdk_makeFloat3(-fLen, groundHeight, -fSpace * (i+1));
-			pData->color = color1;
-			pData++;
-
-			pData->pos = gfsdk_makeFloat3(fLen, groundHeight, -fSpace * (i+1));
-			pData->color = color1;
-			pData++;
-
-			// line x
-			pData->pos = gfsdk_makeFloat3(-fLen, groundHeight, fSpace * (i+1));
-			pData->color = color1;
-			pData++;
-
-			pData->pos = gfsdk_makeFloat3(fLen, groundHeight, fSpace * (i+1));
-			pData->color = color1;
-			pData++;
-		}
-	}
-
-	if ( zUP )
-	{
-		// line y
-		pData->pos = gfsdk_makeFloat3(-fLen, 0.0f, groundHeight);
-		pData->color = color2;
-		pData++;
-
-		pData->pos = gfsdk_makeFloat3(fLen, 0.0f, groundHeight);
-		pData->color = color2;
-		pData++;
-
-		// line x
-		pData->pos = gfsdk_makeFloat3(0.0f, -fLen, groundHeight);
-		pData->color = color2;
-		pData++;
-
-		pData->pos = gfsdk_makeFloat3(0.0f, fLen, groundHeight);
-		pData->color = color2;
-		pData++;
-	}
-	else
-	{
-		// line z
-		pData->pos = gfsdk_makeFloat3(-fLen, groundHeight, 0.0f);
-		pData->color = color2;
-		pData++;
-
-		pData->pos = gfsdk_makeFloat3(fLen, groundHeight, 0.0f);
-		pData->color = color2;
-		pData++;
-
-		// line x
-		pData->pos = gfsdk_makeFloat3(0.0f, groundHeight, -fLen);
-		pData->color = color2;
-		pData++;
-
-		pData->pos = gfsdk_makeFloat3(0.0f, groundHeight, fLen);
-		pData->color = color2;
-		pData++;
-	}
-
-	int bufBytes = sizeof(DefaultVertexType) * numVerts;
-
-	m_pVertexBuffer = RenderInterface::CreateVertexBuffer(bufBytes, buf);
-
-	m_numVertices = numVerts;
-
-	return (NV_NULL != m_pVertexBuffer);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleRenderable::InitAxisGeometry(bool zUP)
-{
-	const atcore_float4 colorRed = gfsdk_makeFloat4(1.0f, 0, 0, 1.0f);
-	const atcore_float4 colorGreen = gfsdk_makeFloat4(0, 1.0f, 0, 1.0f);
-	const atcore_float4 colorBlue = gfsdk_makeFloat4(0, 0, 1.0f, 1.0f);
-	const float dist = 1.0f;
-	const int numVerts = 3 * 2;
-	DefaultVertexType* buf = new DefaultVertexType[numVerts];
-	DefaultVertexType* pData = buf;
-
-	{
-		// x axis
-		pData->pos = gfsdk_makeFloat3(0, 0, 0);
-		pData->color = colorRed;
-		pData++;
-
-		pData->pos = gfsdk_makeFloat3(dist, 0, 0);
-		pData->color = colorRed;
-		pData++;
-
-		// y axis
-		pData->pos = gfsdk_makeFloat3(0, 0, 0);
-		pData->color = colorGreen;
-		pData++;
-
-		pData->pos = gfsdk_makeFloat3(0, dist, 0);
-		pData->color = colorGreen;
-		pData++;
-
-		// z axis
-		pData->pos = gfsdk_makeFloat3(0, 0, 0);
-		pData->color = colorBlue;
-		pData++;
-
-		pData->pos = gfsdk_makeFloat3(0, 0, dist);
-		pData->color = colorBlue;
-		pData++;
-	}
-
-	int bufBytes = sizeof(DefaultVertexType) * numVerts;
-
-	m_pVertexBuffer = RenderInterface::CreateVertexBuffer(bufBytes, buf);
-
-	m_numVertices = numVerts;
-
-	return (NV_NULL != m_pVertexBuffer);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleRenderable::InitLightGeometry()
-{
-	// The following geometry data are generated by external/ObjLoad tool
-#include "GeometryData/LightGeometryData.h"
-	const atcore_float4 colorYellow = gfsdk_makeFloat4(1.0f, 1.0f, 0, 1.0f);
-	const int numVerts = num_faces*3*2;
-	DefaultVertexType* buf = new DefaultVertexType[numVerts];
-	DefaultVertexType* pData = buf;
-
-	const float modelScale = 0.25f;
-	for (int fi = 0; fi < num_faces; ++fi)
-	{
-		float* v0 = &vertices[(fi*3+0)*8];
-		float* v1 = &vertices[(fi*3+1)*8];
-		float* v2 = &vertices[(fi*3+2)*8];
-
-		// flip Y
-		v0[2] *= -1;
-		v1[2] *= -1;
-		v2[2] *= -1;
-		
-		// line 0
-		pData->pos = modelScale * gfsdk_makeFloat3(v0[0], v0[1], v0[2]);
-		pData->color = colorYellow;
-		pData++;
-
-		pData->pos = modelScale * gfsdk_makeFloat3(v1[0], v1[1], v1[2]);
-		pData->color = colorYellow;
-		pData++;
-
-		// line 1
-		pData->pos = modelScale * gfsdk_makeFloat3(v1[0], v1[1], v1[2]);
-		pData->color = colorYellow;
-		pData++;
-
-		pData->pos = modelScale * gfsdk_makeFloat3(v2[0], v2[1], v2[2]);
-		pData->color = colorYellow;
-		pData++;
-
-		// line 2
-		pData->pos = modelScale * gfsdk_makeFloat3(v2[0], v2[1], v2[2]);
-		pData->color = colorYellow;
-		pData++;
-
-		pData->pos = modelScale * gfsdk_makeFloat3(v0[0], v0[1], v0[2]);
-		pData->color = colorYellow;
-		pData++;
-	}
-
-	int bufBytes = sizeof(DefaultVertexType) * numVerts;
-
-	m_pVertexBuffer = RenderInterface::CreateVertexBuffer(bufBytes, buf);
-
-	m_numVertices = numVerts;
-
-	return (NV_NULL != m_pVertexBuffer);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleRenderable::InitLightRayGeometry()
-{
-	const atcore_float4 colorRed = gfsdk_makeFloat4(1.0f, 0, 0, 1.0f);
-	const int numVerts = 2;
-	DefaultVertexType* buf = new DefaultVertexType[numVerts];
-	DefaultVertexType* pData = buf;
-
-	pData->pos = gfsdk_makeFloat3(0, 0, 0);
-	pData->color = colorRed;
-	pData++;
-
-	pData->pos = gfsdk_makeFloat3(0, 0, 0);
-	pData->color = colorRed;
-	pData++;
-
-	int bufBytes = sizeof(DefaultVertexType) * numVerts;
-
-	m_pVertexBuffer = RenderInterface::CreateVertexBuffer(bufBytes, buf);
-
-	m_numVertices = numVerts;
-
-	return (NV_NULL != m_pVertexBuffer);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleRenderable::InitWindGeometry()
-{
-	// The following geometry data are generated by external/ObjLoad tool
-#include "GeometryData/WindGeometryData.h"
-	const atcore_float4 colorBlue = gfsdk_makeFloat4(0, 0, 1.0f, 1.0f);
-	const int numVerts = num_faces*3*2;
-	DefaultVertexType* buf = new DefaultVertexType[numVerts];
-	DefaultVertexType* pData = buf;
-
-	const float modelScale = 0.5f;
-	for (int fi = 0; fi < num_faces; ++fi)
-	{
-		float* v0 = &vertices[(fi*3+0)*8];
-		float* v1 = &vertices[(fi*3+1)*8];
-		float* v2 = &vertices[(fi*3+2)*8];
-		
-		pData->pos = modelScale * gfsdk_makeFloat3(v0[0], v0[1], v0[2]);
-		pData->color = colorBlue;
-		pData++;
-
-		pData->pos = modelScale * gfsdk_makeFloat3(v1[0], v1[1], v1[2]);
-		pData->color = colorBlue;
-		pData++;
-
-		pData->pos = modelScale * gfsdk_makeFloat3(v1[0], v1[1], v1[2]);
-		pData->color = colorBlue;
-		pData++;
-
-		pData->pos = modelScale * gfsdk_makeFloat3(v2[0], v2[1], v2[2]);
-		pData->color = colorBlue;
-		pData++;
-
-		pData->pos = modelScale * gfsdk_makeFloat3(v2[0], v2[1], v2[2]);
-		pData->color = colorBlue;
-		pData++;
-
-		pData->pos = modelScale * gfsdk_makeFloat3(v0[0], v0[1], v0[2]);
-		pData->color = colorBlue;
-		pData++;
-	}
-
-	int bufBytes = sizeof(DefaultVertexType) * numVerts;
-
-	m_pVertexBuffer = RenderInterface::CreateVertexBuffer(bufBytes, buf);
-
-	m_numVertices = numVerts;
-
-	return (NV_NULL != m_pVertexBuffer);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleRenderable::Draw(bool depthTest)
-{
-	RenderInterface::ApplyPrimitiveTopologyLine();
-	
-	RenderInterface::ApplyShader(RenderInterface::SHADER_TYPE_SIMPLE_COLOR);
-	RenderInterface::DrawLineList(m_pVertexBuffer, m_numVertices, sizeof(DefaultVertexType));
-
-	RenderInterface::FlushDX12();
-	RenderInterface::ApplyPrimitiveTopologyTriangle();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleRenderable::DrawLine(const atcore_float3& from, const atcore_float3& to)
-{
-	SimpleRenderable* pShape = g_SimpleShapes[LIGHT_RAY];
-
-	DefaultVertexType buf[2];
-	DefaultVertexType* pData = buf;
-		
-	// start position
-	pData->pos = from;
-	pData->color = gfsdk_makeFloat4(1.0f, 1.0f, 0, 1.0f);
-	pData++;
-
-	// end position
-	pData->pos = to;
-	pData->color = gfsdk_makeFloat4(1.0f, 1.0f, 0, 1.0f);
-	pData++;
-
-	RenderInterface::CopyToDevice(pShape->m_pVertexBuffer, buf, 2 * sizeof(DefaultVertexType));
-	
-	pShape->Draw(true);
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Render/SimpleRenderable.h b/tools/ArtistTools/source/CoreLib/Render/SimpleRenderable.h
deleted file mode 100644
index c43c07d..0000000
--- a/tools/ArtistTools/source/CoreLib/Render/SimpleRenderable.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#pragma once
-
-#include "MathUtil.h"
-
-class GPUBufferResource;
-
-class SimpleRenderable
-{
-public:
-	enum SHAPE_TYPE
-	{
-		GROUND_YUP,
-		GROUND_ZUP,
-		AXIS_YUP,
-		AXIS_ZUP,
-		WIND_YUP,
-		WIND_ZUP,
-		LIGHT,
-		LIGHT_RAY,
-		NUM_SHAPE_TYPES
-	};
-
-	static bool Initialize();
-	static void Shutdown();
-	static void Draw(SHAPE_TYPE t, bool depthTest = true); 
-	static void DrawLine(const atcore_float3& from, const atcore_float3& to);
-
-protected:
-	GPUBufferResource*	m_pVertexBuffer;
-
-	unsigned int	m_numVertices;
-	unsigned int	m_numIndices;
-		
-	SimpleRenderable();
-	~SimpleRenderable();
-
-	bool InitGroundGeometry(bool zUp);
-	bool InitAxisGeometry(bool zUp);
-	bool InitLightGeometry();
-	bool InitLightRayGeometry();
-	bool InitWindGeometry();
-
-	void Draw(bool depthTest = true);
-
-	void Free();
-
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Resource/AppMainWindow.qrc b/tools/ArtistTools/source/CoreLib/Resource/AppMainWindow.qrc
deleted file mode 100644
index cffd039..0000000
--- a/tools/ArtistTools/source/CoreLib/Resource/AppMainWindow.qrc
+++ /dev/null
@@ -1,4 +0,0 @@
-<RCC>
-    <qresource prefix="AppMainWindow">
-    </qresource>
-</RCC>
diff --git a/tools/ArtistTools/source/CoreLib/Resource/D3DQt-CC.ico b/tools/ArtistTools/source/CoreLib/Resource/D3DQt-CC.ico
deleted file mode 100644
index 4477340..0000000
--- a/tools/ArtistTools/source/CoreLib/Resource/D3DQt-CC.ico
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/Resource/resource.rc b/tools/ArtistTools/source/CoreLib/Resource/resource.rc
deleted file mode 100644
index abc138a..0000000
--- a/tools/ArtistTools/source/CoreLib/Resource/resource.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-IDI_ICON1		ICON		DISCARDABLE	"D3DQt-CC.ico"
-
diff --git a/tools/ArtistTools/source/CoreLib/Scene/Camera.cpp b/tools/ArtistTools/source/CoreLib/Scene/Camera.cpp
deleted file mode 100644
index 326f846..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/Camera.cpp
+++ /dev/null
@@ -1,891 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#include "Camera.h"
-
-//#define USE_D3DX9MATH
-#ifdef USE_D3DX9MATH
-#include <d3dx9math.h> // TODO - remove d3dx reference (quaternion funcs)
-
-#pragma comment(lib, "d3dx9.lib")
-#define MAKEVECTOR3 D3DXVECTOR3
-#else
-#ifndef max
-#define max(a,b)            (((a) > (b)) ? (a) : (b))
-#endif
-
-#define FLOAT float
-#define D3DXVECTOR3 atcore_float3
-#define D3DXMATRIX atcore_float4x4
-#define D3DXQUATERNION atcore_float4
-
-#define MAKEVECTOR3 gfsdk_makeFloat3
-
-#define D3DXToRadian( degree ) ((degree) * 0.01745329251994329547)
-
-D3DXQUATERNION * D3DXQuaternionIdentity(
-	__inout  D3DXQUATERNION *pOut
-	)
-{
-	*pOut = gfsdk_makeFloat4(0, 0, 0, 1);
-	return pOut;
-}
-
-D3DXQUATERNION * D3DXQuaternionNormalize(
-	__inout  D3DXQUATERNION *pOut,
-	__in     const D3DXQUATERNION *pQ
-	)
-{
-	gfsdk_normalize(*pOut);
-	return pOut;
-}
-
-D3DXQUATERNION * D3DXQuaternionRotationAxis(
-	__inout  D3DXQUATERNION *pOut,
-	__in     const D3DXVECTOR3 *pV,
-	__in     FLOAT Angle
-	)
-{
-	FLOAT s = sin(Angle * 0.5);
-
-	FLOAT x = pV->x * s;
-	FLOAT y = pV->y * s;
-	FLOAT z = pV->z * s;
-	FLOAT w = cos(Angle * 0.5);
-
-	*pOut = gfsdk_makeFloat4(x, y, z, w);
-	return pOut;
-}
-
-D3DXQUATERNION * D3DXQuaternionMultiply(
-	__inout  D3DXQUATERNION *pOut,
-	__in     const D3DXQUATERNION *pQ1,
-	__in     const D3DXQUATERNION *pQ2
-	)
-{
-	gfsdk_normalize(*pQ1);
-	gfsdk_normalize(*pQ2);
-
-	FLOAT px = pQ2->x;
-	FLOAT py = pQ2->y;
-	FLOAT pz = pQ2->z;
-	FLOAT pw = pQ2->w;
-
-	FLOAT qx = pQ1->x;
-	FLOAT qy = pQ1->y;
-	FLOAT qz = pQ1->z;
-	FLOAT qw = pQ1->w;
-
-	FLOAT x = pw * qx + px * qw + py * qz - pz * qy;
-	FLOAT y = pw * qy + py * qw + pz * qx - px * qz;
-	FLOAT z = pw * qz + pz * qw + px * qy - py * qx;
-	FLOAT w = pw * qw - px * qx - py * qy - pz * qz;
-
-	*pOut = gfsdk_makeFloat4(x, y, z, w);
-	gfsdk_normalize(*pOut);
-	return pOut;
-}
-
-D3DXMATRIX * D3DXMatrixLookAtLH(
-	__inout  D3DXMATRIX *pOut,
-	__in     const D3DXVECTOR3 *pEye,
-	__in     const D3DXVECTOR3 *pAt,
-	__in     const D3DXVECTOR3 *pUp
-	)
-{
-	/*
-	zaxis = normal(At - Eye)
-	xaxis = normal(cross(Up, zaxis))
-	yaxis = cross(zaxis, xaxis)
-
-	xaxis.x           yaxis.x           zaxis.x          0
-	xaxis.y           yaxis.y           zaxis.y          0
-	xaxis.z           yaxis.z           zaxis.z          0
-	-dot(xaxis, eye)  -dot(yaxis, eye)  -dot(zaxis, eye)  1
-	*/
-
-	D3DXVECTOR3 zaxis = *pAt - *pEye;
-	gfsdk_normalize(zaxis);
-	D3DXVECTOR3 xaxis = gfsdk_cross(*pUp, zaxis);
-	gfsdk_normalize(xaxis);
-	D3DXVECTOR3 yaxis = gfsdk_cross(zaxis, xaxis);
-
-	gfsdk_makeIdentity(*pOut);
-	pOut->_11 = xaxis.x;
-	pOut->_21 = xaxis.y;
-	pOut->_31 = xaxis.z;
-	pOut->_12 = yaxis.x;
-	pOut->_22 = yaxis.y;
-	pOut->_32 = yaxis.z;
-	pOut->_13 = zaxis.x;
-	pOut->_23 = zaxis.y;
-	pOut->_33 = zaxis.z;
-	pOut->_41 = -gfsdk_dot(xaxis, *pEye);
-	pOut->_42 = -gfsdk_dot(yaxis, *pEye);
-	pOut->_43 = -gfsdk_dot(zaxis, *pEye);
-	return pOut;
-}
-
-D3DXMATRIX * D3DXMatrixLookAtRH(
-	__inout  D3DXMATRIX *pOut,
-	__in     const D3DXVECTOR3 *pEye,
-	__in     const D3DXVECTOR3 *pAt,
-	__in     const D3DXVECTOR3 *pUp
-	)
-{
-	/*
-	zaxis = normal(Eye - At)
-	xaxis = normal(cross(Up, zaxis))
-	yaxis = cross(zaxis, xaxis)
-
-	xaxis.x           yaxis.x           zaxis.x          0
-	xaxis.y           yaxis.y           zaxis.y          0
-	xaxis.z           yaxis.z           zaxis.z          0
-	-dot(xaxis, eye)  -dot(yaxis, eye)  -dot(zaxis, eye)  1
-	*/
-
-	D3DXVECTOR3 zaxis = *pEye - *pAt;
-	gfsdk_normalize(zaxis);
-	D3DXVECTOR3 xaxis = gfsdk_cross(*pUp, zaxis);
-	gfsdk_normalize(xaxis);
-	D3DXVECTOR3 yaxis = gfsdk_cross(zaxis, xaxis);
-
-	gfsdk_makeIdentity(*pOut);
-	pOut->_11 = xaxis.x;
-	pOut->_21 = xaxis.y;
-	pOut->_31 = xaxis.z;
-	pOut->_12 = yaxis.x;
-	pOut->_22 = yaxis.y;
-	pOut->_32 = yaxis.z;
-	pOut->_13 = zaxis.x;
-	pOut->_23 = zaxis.y;
-	pOut->_33 = zaxis.z;
-	pOut->_41 = -gfsdk_dot(xaxis, *pEye);
-	pOut->_42 = -gfsdk_dot(yaxis, *pEye);
-	pOut->_43 = gfsdk_dot(zaxis, *pEye);
-	return pOut;
-}
-
-D3DXMATRIX * D3DXMatrixPerspectiveFovLH(
-	__inout  D3DXMATRIX *pOut,
-	__in     FLOAT fovy,
-	__in     FLOAT Aspect,
-	__in     FLOAT zn,
-	__in     FLOAT zf
-	)
-{
-	/*
-	cot(fovY/2)		0						0					0
-	0				cot(fovY/2)/aspect		0					0
-	0				0						zf/(zf-zn)			1
-	0				0						-zn*zf/(zf-zn)		0
-	*/
-
-	memset(pOut, 0, sizeof(D3DXMATRIX));
-	FLOAT cosHalfFovy = 1 / tan(fovy * 0.5);
-	pOut->_11 = cosHalfFovy;
-	pOut->_22 = cosHalfFovy / Aspect;
-	pOut->_33 = zf / (zf - zn);
-	pOut->_34 = 1;
-	pOut->_43 = -zn*zf / (zf - zn);
-	return pOut;
-}
-
-D3DXMATRIX * D3DXMatrixPerspectiveFovRH(
-	__inout  D3DXMATRIX *pOut,
-	__in     FLOAT fovy,
-	__in     FLOAT Aspect,
-	__in     FLOAT zn,
-	__in     FLOAT zf
-	)
-{
-	/*
-	cot(fovY/2)/aspect		0				0					0
-	0						cot(fovY/2)		0					0
-	0						0				zf/(zn-zf)			-1
-	0						0				zn*zf/(zn-zf)		0
-	*/
-
-	memset(pOut, 0, sizeof(D3DXMATRIX));
-	FLOAT cosHalfFovy = 1 / tan(fovy * 0.5);
-	pOut->_11 = cosHalfFovy / Aspect;
-	pOut->_22 = cosHalfFovy;
-	pOut->_33 = zf / (zn - zf);
-	pOut->_34 = -1;
-	pOut->_43 = zn*zf / (zn - zf);
-	return pOut;
-}
-
-D3DXMATRIX * D3DXMatrixOrthoLH(
-	__inout  D3DXMATRIX *pOut,
-	__in     FLOAT w,
-	__in     FLOAT h,
-	__in     FLOAT zn,
-	__in     FLOAT zf
-	)
-{
-	/*
-	2/w  0    0           0
-	0    2/h  0           0
-	0    0    1/(zf-zn)   0
-	0    0    zn/(zn-zf)  1
-	*/
-
-	gfsdk_makeIdentity(*pOut);
-	pOut->_11 = 2 / w;
-	pOut->_22 = 2 / h;
-	pOut->_33 = 1 / (zf - zn);
-	pOut->_43 = zn / (zn - zf);
-	return pOut;
-}
-
-D3DXMATRIX * D3DXMatrixOrthoRH(
-	__inout  D3DXMATRIX *pOut,
-	__in     FLOAT w,
-	__in     FLOAT h,
-	__in     FLOAT zn,
-	__in     FLOAT zf
-	)
-{
-	/*
-	2/w  0    0           0
-	0    2/h  0           0
-	0    0    1/(zn-zf)   0
-	0    0    zn/(zn-zf)  1
-	*/
-
-	gfsdk_makeIdentity(*pOut);
-	pOut->_11 = 2 / w;
-	pOut->_22 = 2 / h;
-	pOut->_33 = 1 / (zn - zf);
-	pOut->_43 = zn / (zn - zf);
-	return pOut;
-}
-
-D3DXQUATERNION * D3DXQuaternionRotationMatrix(
-	__inout  D3DXQUATERNION *pOut,
-	__in     const D3DXMATRIX *pM
-	)
-{
-	FLOAT fourXSquaredMinus1 = pM->_11 - pM->_22 - pM->_33;
-	FLOAT fourYSquaredMinus1 = pM->_22 - pM->_11 - pM->_33;
-	FLOAT fourZSquaredMinus1 = pM->_33 - pM->_11 - pM->_22;
-	FLOAT fourWSquaredMinus1 = pM->_11 + pM->_22 + pM->_33;
-
-	int biggestIndex = 0;
-	FLOAT fourBiggestSquaredMinus1 = fourWSquaredMinus1;
-	if (fourXSquaredMinus1 > fourBiggestSquaredMinus1)
-	{
-		fourBiggestSquaredMinus1 = fourXSquaredMinus1;
-		biggestIndex = 1;
-	}
-	if (fourYSquaredMinus1 > fourBiggestSquaredMinus1)
-	{
-		fourBiggestSquaredMinus1 = fourYSquaredMinus1;
-		biggestIndex = 2;
-	}
-	if (fourZSquaredMinus1 > fourBiggestSquaredMinus1)
-	{
-		fourBiggestSquaredMinus1 = fourZSquaredMinus1;
-		biggestIndex = 3;
-	}
-
-	FLOAT biggestVal = sqrt(fourBiggestSquaredMinus1 + 1) * 0.5;
-	FLOAT mult = 0.25 / biggestVal;
-
-	D3DXQuaternionIdentity(pOut);
-	switch (biggestIndex)
-	{
-	case 0:
-		pOut->w = biggestVal;
-		pOut->x = (pM->_23 - pM->_32) * mult;
-		pOut->y = (pM->_31 - pM->_13) * mult;
-		pOut->z = (pM->_12 - pM->_21) * mult;
-		break;
-	case 1:
-		pOut->w = (pM->_23 - pM->_32) * mult;
-		pOut->x = biggestVal;
-		pOut->y = (pM->_12 + pM->_21) * mult;
-		pOut->z = (pM->_31 + pM->_13) * mult;
-		break;
-	case 2:
-		pOut->w = (pM->_31 - pM->_13) * mult;
-		pOut->x = (pM->_12 + pM->_21) * mult;
-		pOut->y = biggestVal;
-		pOut->z = (pM->_23 + pM->_32) * mult;
-		break;
-	case 3:
-		pOut->w = (pM->_12 - pM->_21) * mult;
-		pOut->x = (pM->_31 + pM->_13) * mult;
-		pOut->y = (pM->_23 + pM->_32) * mult;
-		pOut->z = biggestVal;
-		break;
-	default:
-		break;
-	}
-	return pOut;
-}
-
-D3DXMATRIX * D3DXMatrixRotationQuaternion(
-	__inout  D3DXMATRIX *pOut,
-	__in     const D3DXQUATERNION *pQ
-	)
-{
-	gfsdk_makeIdentity(*pOut);
-	FLOAT qxx = (pQ->x * pQ->x);
-	FLOAT qyy = (pQ->y * pQ->y);
-	FLOAT qzz = (pQ->z * pQ->z);
-	FLOAT qxz = (pQ->x * pQ->z);
-	FLOAT qxy = (pQ->x * pQ->y);
-	FLOAT qyz = (pQ->y * pQ->z);
-	FLOAT qwx = (pQ->w * pQ->x);
-	FLOAT qwy = (pQ->w * pQ->y);
-	FLOAT qwz = (pQ->w * pQ->z);
-	pOut->_11 = 1 - 2 * (qyy + qzz);
-	pOut->_12 = 2 * (qxy + qwz);
-	pOut->_13 = 2 * (qxz - qwy);
-	pOut->_21 = 2 * (qxy - qwz);
-	pOut->_22 = 1 - 2 * (qxx + qzz);
-	pOut->_23 = 2 * (qyz + qwx);
-	pOut->_31 = 2 * (qxz + qwy);
-	pOut->_32 = 2 * (qyz - qwx);
-	pOut->_33 = 1 - 2 * (qxx + qyy);
-	return pOut;
-}
-#endif // USE_D3DX9MATH
-
-Camera::Camera(bool zup, bool lhs)
-	:
-	_zup(zup),
-	_lhs(lhs),
-	_isPerspective(true)
-{
-	
-    D3DXQuaternionIdentity((D3DXQUATERNION*)&_orientation);
-
-	gfsdk_makeIdentity(_viewMatrix);
-	gfsdk_makeIdentity(_projectionMatrix);
-
-	_fov = (75.0f / 360.0f) * 3.141592653589793;
-}
-
-Camera::~Camera()
-{
-}
-
-void 
-Camera::Init(bool zup, bool lhs)
-{
-	_lhs = lhs;
-	_zup = zup;
-}
-
-atcore_float3 Camera::GetUp() const
-{
-	atcore_float3 up;
-
-	if (IsYUp())
-		up = gfsdk_makeFloat3(0.0f, 1.0f, 0.0f);
-	else
-		up = gfsdk_makeFloat3(0.0f, 0.0f, 1.0f);
-
-	return up;
-}
-
-void Camera::SetDefaults()
-{
-	atcore_float3 eye;
-	atcore_float3 at = gfsdk_makeFloat3(0.0f, 0.0f, 0.0f);
-
-	if (IsYUp())
-	{
-		if (_lhs)
-			eye = gfsdk_makeFloat3(0.0f, 60.0f, -120.0f);
-		else
-			eye = gfsdk_makeFloat3(0.0f, 60.0f, 120.0f);
-	}
-	else // zup
-	{
-		if (_lhs)
-			eye = gfsdk_makeFloat3(0.0f, 120.0f, 60.0f);
-		else
-			eye = gfsdk_makeFloat3(0.0f, -120.0f, 60.0f);
-	}
-
-	atcore_float3 up = GetUp();
-
-	LookAt(eye, at, up);
-}
-
-// Build a look at matrix, and calculate the major axis and rotation component.
-void Camera::LookAt(const atcore_float3& eye, const atcore_float3& at, const atcore_float3& up)
-{
-	if (_lhs)
-		D3DXMatrixLookAtLH((D3DXMATRIX*)&_viewMatrix, (D3DXVECTOR3*)&eye, (D3DXVECTOR3*)&at, (D3DXVECTOR3*)&up);
-	else
-		D3DXMatrixLookAtRH((D3DXMATRIX*)&_viewMatrix, (D3DXVECTOR3*)&eye, (D3DXVECTOR3*)&at, (D3DXVECTOR3*)&up);
-
-    _eye = eye;
-    _at = at;
-
-    atcore_float3 dir = at - eye;
-	_lookDistance = gfsdk_length(dir);
- 
-    D3DXQuaternionRotationMatrix((D3DXQUATERNION*)&_orientation, (D3DXMATRIX*)&_viewMatrix);
-	BuildViewMatrix();
-}
-
-void Camera::SetEye(const atcore_float3& eye)
-{
-	_eye = eye;
-	_lookDistance = gfsdk_distance(_eye, _at);
-}
-
-void Camera::SetAt(const atcore_float3& at)
-{
-	_at = at;
-	_lookDistance = gfsdk_distance(_eye, _at);
-}
-
-void Camera::SetViewMatrix(const atcore_float3& xAxis, const atcore_float3& yAxis, const atcore_float3& zAxis)
-{
-	_viewMatrix._11 = xAxis.x; _viewMatrix._21 = xAxis.y; _viewMatrix._31 = xAxis.z;
-	_viewMatrix._12 = yAxis.x; _viewMatrix._22 = yAxis.y; _viewMatrix._32 = yAxis.z;
-	_viewMatrix._13 = zAxis.x; _viewMatrix._23 = zAxis.y; _viewMatrix._33 = zAxis.z;
-
-	D3DXQuaternionRotationMatrix((D3DXQUATERNION*)&_orientation, (D3DXMATRIX*)&_viewMatrix);
-	D3DXQuaternionNormalize((D3DXQUATERNION*)&_orientation, (D3DXQUATERNION*)&_orientation);
-
-	atcore_float3 _viewDirection = _lhs ? -1.0f * zAxis : zAxis;
-
-	_eye = _at + _viewDirection * _lookDistance;
-
-	_viewMatrix._41 = - gfsdk_dot(xAxis,_eye);
-	_viewMatrix._42 = - gfsdk_dot(yAxis,_eye);
-	_viewMatrix._43 = - gfsdk_dot(zAxis,_eye);
-}
-
-// Build a perspective matrix
-void Camera::Perspective()
-{
-	_isPerspective = true;
-
-	if (_lhs)
-		D3DXMatrixPerspectiveFovLH( (D3DXMATRIX*)&_projectionMatrix, _fov, _aspectRatio, _znear, _zfar);
-	else
-		D3DXMatrixPerspectiveFovRH( (D3DXMATRIX*)&_projectionMatrix, _fov, _aspectRatio, _znear, _zfar);
-
-}
-
-void Camera::Ortho(float width, float height, float znear, float zfar)
-{
-	if (_lhs)
-		D3DXMatrixOrthoLH( (D3DXMATRIX*)&_projectionMatrix, width, height, znear, zfar);
-	else
-		D3DXMatrixOrthoRH( (D3DXMATRIX*)&_projectionMatrix, width, height, znear, zfar);
-
-	_znear = znear;
-	_zfar = zfar;
-	_width = width;
-	_height = height;
-	_isPerspective = false;
-}
-
-// Dolly towards the viewpoint
-void Camera::Dolly(float zoom)
-{
-	if (_isPerspective)
-	{
-		atcore_float3 offset = _eye - _at;
-
-		_lookDistance = gfsdk_length(offset); 
-
-		gfsdk_normalize(offset);
-
-		float zoomFactor = zoom * _lookDistance;
-
-		_lookDistance += zoomFactor;
-
-		_eye = _lookDistance * offset + _at;
-	    
-		BuildViewMatrix();
-	}
-	else
-	{
-		_width += zoom * 4.0f;
-		_height += zoom * 4.0f;
-
-		D3DXMatrixOrthoRH( (D3DXMATRIX*)&_projectionMatrix, _width, _height, _znear, _zfar);
-
-	}
-}
-
-// Orbit around the viewpoint
-void Camera::Orbit(const atcore_float2& delta)
-{
-
-    float heading = D3DXToRadian(delta.x);
-    float pitch = D3DXToRadian(delta.y);
-
-	if (_lhs)
-	{
-		heading *= -1.0f;
-		pitch *= -1.0f;
-	}
-    
-    D3DXQUATERNION rot;
-
-	D3DXVECTOR3 yAxis = MAKEVECTOR3(0.0f, 0.0f, 1.0f);
-	if (IsYUp()) // change up axis if Y is the up axis (for maya)
-	{
-		yAxis = MAKEVECTOR3( 0.0f, 1.0f, 0.0f );
-	}
-
-	D3DXVECTOR3 xAxis = MAKEVECTOR3(1.0f, 0.0f, 0.0f);
-    if (heading != 0.0f)
-    {
-        D3DXQuaternionRotationAxis(&rot, &yAxis, heading);
-        D3DXQuaternionMultiply((D3DXQUATERNION*)&_orientation, &rot, (D3DXQUATERNION*)&_orientation);
-    }
-
-    if (pitch != 0.0f)
-    {
-        D3DXQuaternionRotationAxis(&rot, &xAxis, pitch);
-        D3DXQuaternionMultiply((D3DXQUATERNION*)&_orientation, (D3DXQUATERNION*)&_orientation, &rot);
-    }
-    BuildViewMatrix();
-
-}
-
-// Orbit around the model's center for HAIR-188
-void Camera::OrbitLight(const atcore_float2& delta)
-{
-
-	float heading = D3DXToRadian(delta.x);
-	float pitch = D3DXToRadian(delta.y);
-
-	if (_lhs)
-	{
-		heading *= -1.0f;
-		pitch *= -1.0f;
-	}
-
-	D3DXQUATERNION rot;
-
-	D3DXVECTOR3 yAxis = MAKEVECTOR3(0.0f, 0.0f, 1.0f);
-	if (IsYUp()) // change up axis if Y is the up axis (for maya)
-	{
-		yAxis = MAKEVECTOR3( 0.0f, 1.0f, 0.0f );
-	}
-
-	D3DXVECTOR3 xAxis = MAKEVECTOR3(1.0f, 0.0f, 0.0f);
-	if (heading != 0.0f)
-	{
-		D3DXQuaternionRotationAxis(&rot, &yAxis, heading);
-		D3DXQuaternionMultiply((D3DXQUATERNION*)&_orientation, &rot, (D3DXQUATERNION*)&_orientation);
-	}
-
-	if (pitch != 0.0f)
-	{
-		D3DXQuaternionRotationAxis(&rot, &xAxis, pitch);
-		D3DXQuaternionMultiply((D3DXQUATERNION*)&_orientation, &rot, (D3DXQUATERNION*)&_orientation);
-	}
-	BuildViewMatrix();
-
-}
-
-void Camera::Pan(const atcore_float2& delta)
-{
-	//Scale the movement by the current view
-	//float depth = depthRange.y - depthRange.x;
-
-	atcore_float3 viewDir = GetEye() - GetAt();
-	float depth = gfsdk_length(viewDir);
-	if (depth <= 0.0f)
-		depth = 1.0f;
-
-	atcore_float3 xAxis = GetXAxis();
-	atcore_float3 yAxis = GetYAxis();
-
-	if (_isPerspective)
-	{
-		float fov2 = ((float)-tan(0.5 * _fov) * (depth));
-		atcore_float2 newDelta = fov2 * delta;
-
-		_at = _at + (-1.0f * yAxis * newDelta.y) + (xAxis * newDelta.x);
-	}
-	else
-	{
-		atcore_float2 newDelta = depth * delta;
-		_at = _at + (yAxis * newDelta.y) + (-1.0f * xAxis * newDelta.x);
-	}
-
-
-	BuildViewMatrix();
-}
-
-atcore_float3 Camera::GetXAxis() const
-{
-	return gfsdk_makeFloat3(_viewMatrix._11, _viewMatrix._21, _viewMatrix._31);
-
-}
-
-atcore_float3 Camera::GetYAxis() const
-{
-	return gfsdk_makeFloat3(_viewMatrix._12, _viewMatrix._22, _viewMatrix._32);
-}
-
-atcore_float3 Camera::GetZAxis() const
-{
-	return gfsdk_makeFloat3(_viewMatrix._13, _viewMatrix._23, _viewMatrix._33);
-}
-
-atcore_float3 Camera::GetViewDirection() const
-{
-	atcore_float3 zAxis = GetZAxis();
-	return _lhs ? -1.0f * zAxis : zAxis;
-}
-
-// Reconstruct the view matrix from the current orientation and eye/look direction.
-void Camera::BuildViewMatrix()
-{
-	// Reconstruct the view matrix.
-	D3DXQuaternionNormalize((D3DXQUATERNION*)&_orientation, (D3DXQUATERNION*)&_orientation);
-	D3DXMatrixRotationQuaternion((D3DXMATRIX*)&_viewMatrix, (D3DXQUATERNION*)&_orientation);
-
-	atcore_float3 xAxis = GetXAxis();
-	atcore_float3 yAxis = GetYAxis();
-	atcore_float3 zAxis = GetZAxis();
-
-	atcore_float3 viewDirection = GetViewDirection();
-
-	_eye = _at + viewDirection * _lookDistance;
-
-	_viewMatrix._41 = - gfsdk_dot(xAxis,_eye);
-	_viewMatrix._42 = - gfsdk_dot(yAxis,_eye);
-	_viewMatrix._43 = - gfsdk_dot(zAxis,_eye);
-}
-
-// Set Z Up or Y Up.
-void Camera::ResetUpDir(bool zup)
-{
-	if (zup == _zup)
-		return;
-
-	_zup = zup;
-
-	atcore_float3 eye = GetEye();
-	atcore_float3 at = GetAt();
-	atcore_float3 up;
-
-	if (IsYUp())
-	{
-		// Swap eye z and y
-		float temp = eye.y;
-		eye.y = eye.z;
-		eye.z = -temp;
-		// Swap at z and y
-		temp = at.y;
-		at.y = at.z;
-		at.z = -temp;
-
-		// Set up dir
-		up = gfsdk_makeFloat3(0.0f, 1.0f, 0.0f);
-	}
-	else
-	{
-		// Swap eye z and y
-		float temp = eye.y;
-		eye.y = -eye.z;
-		eye.z = temp;
-		// Swap at z and y
-		temp = at.y;
-		at.y = -at.z;
-		at.z = temp;
-
-		// Set up dir
-		up = gfsdk_makeFloat3(0.0f, 0.0f, 1.0f);
-	}
-	LookAt(eye, at, up);
-	BuildViewMatrix();
-}
-
-// Set Z Up or Y Up.
-void Camera::ResetLhs(bool lhs)
-{
-	if (lhs == _lhs)
-		return;
-
-	_lhs = lhs;
-
-	atcore_float3 eye = GetEye();
-	atcore_float3 at = GetAt();
-
-	if (_zup)
-	{
-		eye.y *= -1;
-		at.y *= -1;
-	}
-	else
-	{
-		eye.z *= -1;
-		at.z *= -1;
-	}
-
-	if (_isPerspective)
-		Perspective();
-	else
-		Ortho(_width, _height, _znear, _zfar);
-
-	atcore_float3 up = GetUp();
-
-	LookAt(eye, at, up);
-	BuildViewMatrix();
-}
-
-void Camera::FitBounds(const atcore_float3& center, const atcore_float3& extents)
-{
-	SetAt(center);
-	// set center first to get eye
-	BuildViewMatrix();
-	if (_isPerspective)
-	{
-		float size = extents.x;
-		size = max(size, extents.y);
-		size = max(size, extents.z);
-		atcore_float3 eye = GetEye();
-
-		atcore_float3 dir = eye - center;
-		gfsdk_normalize(dir);
-		float distance = size / tanf(_fov/2.f);
-
-		eye = center + distance * dir;
-
-		SetEye(eye);
-		BuildViewMatrix();
-	}
-}
-
-#ifndef NV_ARTISTTOOLS
-#include "ProjectParams.h"
-#endif // NV_ARTISTTOOLS
-
-bool Camera::LoadParameters(void* ptr)
-{
-#ifndef NV_ARTISTTOOLS
-	nvidia::parameterized::HairProjectParametersNS::Camera_Type* param =
-		static_cast<nvidia::parameterized::HairProjectParametersNS::Camera_Type*>(ptr);
-
-	_zup = param->flags == 1;
-	_fov = param->fov;
-	_aspectRatio = param->aspectRatio;
-	_znear = param->znear;
-	_zfar = param->zfar;
-	_isPerspective = param->isPerspective;
-	memcpy(&_eye, &param->eye, sizeof(_eye));
-	memcpy(&_at, &param->at, sizeof(_at));
-	_lookDistance = param->lookDistance;
-	memcpy(&_orientation, &param->orientation, sizeof(_orientation));
-	memcpy(&_viewMatrix, &param->viewMatrix, sizeof(_viewMatrix));
-	memcpy(&_projectionMatrix, &param->projectionMatrix, sizeof(_projectionMatrix));
-#else
-	CoreLib::Inst()->Camera_LoadParameters(ptr, this);
-#endif // NV_ARTISTTOOLS
-	return true;
-}
-
-bool Camera::SaveParameters(void *ptr)
-{
-#ifndef NV_ARTISTTOOLS
-	nvidia::parameterized::HairProjectParametersNS::Camera_Type* outParam =
-		static_cast<nvidia::parameterized::HairProjectParametersNS::Camera_Type*>(ptr);
-
-	outParam->flags = (_zup ? 1 : 2);
-	outParam->fov = _fov;
-	outParam->aspectRatio = _aspectRatio;
-	outParam->znear = _znear;
-	outParam->zfar = _zfar;
-	outParam->width = 0;
-	outParam->height = 0;
-	outParam->isPerspective = _isPerspective;
-	memcpy(&outParam->eye, &_eye, sizeof(outParam->eye));
-	memcpy(&outParam->at, &_at, sizeof(outParam->at));
-	outParam->lookDistance = _lookDistance;
-	memcpy(&outParam->orientation, &_orientation, sizeof(outParam->orientation));
-	memcpy(&outParam->viewMatrix, &_viewMatrix, sizeof(outParam->viewMatrix));
-	memcpy(&outParam->projectionMatrix, &_projectionMatrix, sizeof(outParam->projectionMatrix));
-#else
-	CoreLib::Inst()->Camera_SaveParameters(ptr, this);
-#endif // NV_ARTISTTOOLS
-	return true;
-}
-
-void Camera::getScreenCoord(float x, float y, float z, int &sx, int &sy)
-{
-	atcore_float4x4 view		 = (atcore_float4x4&)GetViewMatrix();
-	atcore_float4x4 projection = (atcore_float4x4&)GetProjectionMatrix();
-
-	atcore_float4x4 viewProjection = view * projection;
-
-	atcore_float4 vp = gfsdk_transform(viewProjection, gfsdk_makeFloat4(x, y, z, 1.0f));
-
-	float nx = vp.x / vp.w;
-	float ny = vp.y / vp.w;
-
-	float w = GetWidth();
-	float h = GetHeight();
-
-	sx = w * (0.5f + 0.5f * nx);
-	sy = h * (0.5f - 0.5f * ny);
-
-}
-
-void Camera::getWorldCoord(int sx, int sy, float &x, float &y, float &z)
-{
-	atcore_float4x4 view = (atcore_float4x4&)GetViewMatrix();
-	atcore_float4x4 projection = (atcore_float4x4&)GetProjectionMatrix();
-
-	float w = GetWidth();
-	float h = GetHeight();
-
-	atcore_float4x4 viewProjection = view * projection;
-	atcore_float4x4 viewProjectionIV = gfsdk_inverse(viewProjection);
-
-	float nx = 2.0f * (sx / w) - 1.0f;
-	float ny = 1.0f - 2.0f * (sy / h);
-	float nz = 0.0f;
-
-	atcore_float4 screenPoint = { nx, ny, nz, 1.0f };
-	atcore_float4 pos = gfsdk_transform(viewProjectionIV, screenPoint);
-
-	pos.w = 1.0f / pos.w;
-
-	x = pos.x * pos.w;
-	y = pos.y * pos.w;
-	z = pos.z * pos.w;
-}
diff --git a/tools/ArtistTools/source/CoreLib/Scene/Camera.h b/tools/ArtistTools/source/CoreLib/Scene/Camera.h
deleted file mode 100644
index c04252a..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/Camera.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "MathUtil.h"
-
-class CORELIB_EXPORT Camera
-{
-public:
-
-	// YUp default
-	Camera(bool zUp = false, bool lhs = false);
-	~Camera();
-
-	void Init(bool zup, bool lhs);
-	void LookAt(const atcore_float3& eye, const atcore_float3& target, const atcore_float3& up);
-	void Perspective();
-	void Ortho(float width, float height, float znear, float zfar);
-	void Dolly(float zoom);
-	void Orbit(const atcore_float2& delta);
-	void OrbitLight(const atcore_float2& delta);   // special for HAIR-188
-	void Pan(const atcore_float2& delta);
-
-	void getScreenCoord(float x, float y, float z, int &sx, int &sy);
-	void getWorldCoord(int sx, int sy, float &x, float &y, float &z);
-
-	float GetZNear() { return _znear; }
-	float GetZFar() { return _zfar; }
-
-	const atcore_float3& GetAt() const { return _at; }
-	const atcore_float3& GetEye() const { return _eye; }
-
-	float GetWidth() const { return _width; }
-	float GetHeight() const { return _height; }
-
-	void  SetFOV(float fov) { _fov = fov; }
-	void  SetAspetRatio(float aspect) { _aspectRatio = aspect; }
-	void  SetZNear(float znear) { _znear = znear; }
-	void  SetZFar(float zfar) { _zfar = zfar; }
-
-	void SetSize(int w, int h) { _width = w; _height = h; }
-
-	atcore_float3 GetXAxis() const;
-	atcore_float3 GetYAxis() const;
-	atcore_float3 GetZAxis() const;
-
-	atcore_float3 GetViewDirection() const;
-
-	void SetViewMatrix(const atcore_float3& xAxis, const atcore_float3& yAxis, const atcore_float3& zAxis);
-
-	float GetLookDistance() const { return _lookDistance; }
-	atcore_float3 GetUp() const;
-
-	void SetEye(const atcore_float3& eye);
-	void SetAt(const atcore_float3& at);
-
-	atcore_float2 GetZRange() const { return gfsdk_makeFloat2(_znear, _zfar); }
-
-	const atcore_float4x4& GetProjectionMatrix() const { return _projectionMatrix; }
-	const atcore_float4x4& GetViewMatrix() const { return _viewMatrix; }
-
-	// Change Up Dir and reset internal eye and at.
-	void ResetUpDir(bool zup);
-	void ResetLhs(bool lhs);
-
-	bool IsYUp() const { return _zup == false; }
-	bool UseLHS() const { return _lhs; }
-
-	bool LoadParameters(void* param);
-	bool SaveParameters(void* outParam);
-    
-    void BuildViewMatrix();
-
-	void SetDefaults();
-
-	void FitBounds(const atcore_float3& center, const atcore_float3& extents);
-
-
-//private:
-	// coordinate axis
-	bool	_zup;
-	bool	_lhs;
-
-	// Perspective
-	bool	_isPerspective;
-	float	_fov;
-    float	_aspectRatio;
-
-	float	_znear;
-    float	_zfar;
-	float	_width;
-	float	_height;
-
-    float			_lookDistance;
-
-	atcore_float3	_eye;
-    atcore_float3	_at;
-
-	atcore_float4		_orientation;
-    atcore_float4x4		_viewMatrix;
-    atcore_float4x4		_projectionMatrix;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Scene/Gamepad.cpp b/tools/ArtistTools/source/CoreLib/Scene/Gamepad.cpp
deleted file mode 100644
index 246ce04..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/Gamepad.cpp
+++ /dev/null
@@ -1,1307 +0,0 @@
-#include <windows.h>
-#include <SDL.h>
-#include <QtWidgets/QApplication>
-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include <QtCore/QString>
-#include <QtCore/QList>
-
-#include "Gamepad.h"
-
-#include "Camera.h"
-#include "SimpleScene.h"
-#include "AppMainWindow.h"
-#include "DisplayLightPanel.h"
-#include "DisplayScenePanel.h"
-
-#include "DXUT.h"
-//#include "D3D11RendererWindow.h"
-#include "sdkmisc.h"
-#include "GlobalSettings.h"
-#include "Light.h"
-#include "DisplayPreferencesPanel.h"
-#include "ViewerOutput.h"
-#include "D3DWidget.h"
-#include <stdarg.h>
-#include <vector>
-#include <string>
-
-#ifndef NV_ARTISTTOOLS
-#include "BlastToolbar.h"
-#include "DisplayVisualizersPanel.h"
-#include "FurCharacter.h"
-#include "HairParams.h"
-#endif // NV_ARTISTTOOLS
-
-const bool bSaveLogToDisk = true;
-bool bDefaultDemoMode = false;
-
-static QList<QString> demoProjects;
-
-static int curentPrjIdx = -1;
-static int iQuitState = 0;
-
-static std::string strAppDir;
-
-SimpleScene* theScene = NV_NULL;
-
-bool bUseOldLightCam = false, bUseOldSceneCam = false;
-
-enum ButtonState
-{
-	BUTTON_NOTHING,
-	BUTTON_DOWN,
-	BUTTON_HOLDING,
-	BUTTON_UP,
-};
-
-class GamepadHandler
-{
-public:
-	GamepadHandler()
-		:joystick(0)
-	{
-	}
-
-	~GamepadHandler()
-	{
-		DisConnect();
-	}
-
-	void DisConnect()
-	{
-		if(joystick)
-		{
-			SDL_JoystickClose(joystick);
-			joystick = NV_NULL;
-		}
-	}
-
-	void Process();
-
-	inline ButtonState ButtonState(int button)
-	{
-		if (button >= 0 && button < iButtonState.size())
-		{
-			if (iButtonState[button] && iButtonStateOld[button] == 0)
-				return BUTTON_DOWN;
-			else if (iButtonState[button] && iButtonStateOld[button])
-				return BUTTON_HOLDING;
-			else if (iButtonState[button] == 0 && iButtonStateOld[button])
-				return BUTTON_UP;
-		}
-		return BUTTON_NOTHING;
-	}
-
-	inline int AxisChange(int idx)
-	{
-		if (idx >= 0 && idx < iAxisState.size())
-		{
-			return (iAxisState[idx] - iAxisStateAtBegin[idx]);
-		}
-		return 0;
-	}
-
-	const char* pjsName;
-	int numAxis;
-	int numTrackballs;
-	int numPov;
-	int numButtons;
-
-	std::vector<int> bKeyHolding; 
-	std::vector<int> iAxisStateAtBegin;
-	std::vector<int> iAxisStateOld;
-	std::vector<int> iAxisState;
-	std::vector<int> iButtonStateOld;
-	std::vector<int> iButtonState;
-
-	SDL_Joystick* joystick;
-	SDL_JoystickGUID jsGuid;
-};
-
-std::vector<GamepadHandler> gHandlers;
-
-//
-// Gamepad thresholds taken from XINPUT API
-//
-//#define GAMEPAD_LEFT_THUMB_DEADZONE  7849
-//#define GAMEPAD_RIGHT_THUMB_DEADZONE  8689
-//#define GAMEPAD_TRIGGER_THRESHOLD    30
-
-#define GAMEPAD_BUMPER_DEADZONE  9000
-inline int ClampAxis(int value)
-{
-	if((value>GAMEPAD_BUMPER_DEADZONE) || (value<-GAMEPAD_BUMPER_DEADZONE))
-		return value;
-	return 0;
-}
-
-std::vector<std::string> keylog;
-
-void LogAdd(const char *fmt,...)
-{
-	if(bSaveLogToDisk)
-	{
-		static char logBuf[2048];
-		va_list arg;
-		va_start( arg, fmt );
-		vsprintf(logBuf, fmt, arg);
-		va_end(arg);
-		keylog.push_back(logBuf);
-	}
-}
-
-void SaveLog()
-{
-	if(keylog.size())
-	{
-		std::string fn = strAppDir + "\\buttonLog.txt";
-		FILE* fp = fopen(fn.c_str(), "w+");
-		if(fp)
-		{
-			for(int i = 0; i < keylog.size(); ++i)
-			{
-				std::string& info = keylog[i];
-				fputs(info.c_str(), fp);
-				fputs("\n", fp);
-			}
-			fclose(fp);
-		}
-	}
-}
-
-//XBOX 360 AXIS
-static int	AXIS_LS_X = 0;
-static int	AXIS_LS_Y = 1;
-static int	AXIS_RS_X = 2;
-static int	AXIS_RS_Y = 3;
-static int	AXIS_LT = 4;
-static int	AXIS_RT = 5;
-
-// XBox 360 Key codes
-static int GAMEPAD_KEY_DPAD_UP = 0;
-static int GAMEPAD_KEY_DPAD_DOWN = 1;
-static int GAMEPAD_KEY_DPAD_LEFT = 2;
-static int GAMEPAD_KEY_DPAD_RIGHT = 3;
-static int GAMEPAD_KEY_START = 4;
-static int GAMEPAD_KEY_BACK = 5;
-static int GAMEPAD_KEY_LS = 6;
-static int GAMEPAD_KEY_RS = 7;
-static int GAMEPAD_KEY_LEFT_BUMP = 8;
-static int GAMEPAD_KEY_RIGHT_BUMP = 9;
-static int GAMEPAD_KEY_A = 10;
-static int GAMEPAD_KEY_B = 11;
-static int GAMEPAD_KEY_X = 12;
-static int GAMEPAD_KEY_Y = 13;
-
-double GetSeconds()
-{
-	static LARGE_INTEGER lastTime;
-	static LARGE_INTEGER freq;
-	static bool first = true;
-
-	if (first)
-	{	
-		QueryPerformanceCounter(&lastTime);
-		QueryPerformanceFrequency(&freq);
-
-		first = false;
-	}
-
-	static double time = 0.0;
-
-	LARGE_INTEGER t;
-	QueryPerformanceCounter(&t);
-
-	__int64 delta = t.QuadPart-lastTime.QuadPart;
-	double deltaSeconds = double(delta) / double(freq.QuadPart);
-
-	time += deltaSeconds;
-
-	lastTime = t;
-
-	return time;
-
-}
-
-Gamepad::Gamepad()
-{
-}
-
-Gamepad::~Gamepad()
-{
-}
-
-Gamepad& Gamepad::Instance()
-{
-	static Gamepad gmpad;
-	return gmpad;
-}
-
-void ChangeMode()
-{
-	AppMainWindow::Inst().shortcut_expert();
-}
-
-void ToggleSimulation()
-{
-#ifndef NV_ARTISTTOOLS
-	BlastToolbar* toolbar = AppMainWindow::Inst().GetMainToolbar();
-	toolbar->on_btnEnableSimulation_clicked();
-	// read simulation state; have to call it twice to avoid change it.
-	GlobalSettings::Inst().toggleSimulation();
-
-	bool anim = GlobalSettings::Inst().toggleSimulation();
-	DisplayFurVisualizersPanel*  furPanel = AppMainWindow::Inst().GetFurVisualizersPanel();
-	if(furPanel)
-	{
-		furPanel->on_btnShowHair_stateChanged(anim);
-		furPanel->updateValues();
-	}
-#else
-	CoreLib::Inst()->Gamepad_ToggleSimulation();
-#endif // NV_ARTISTTOOLS
-}
-
-void PlaySample()
-{
-#ifndef NV_ARTISTTOOLS
-	GlobalSettings::Inst().toggleSimulation();
-	bool simulating = GlobalSettings::Inst().toggleSimulation();  // call it twice to get right state
-
-	GlobalSettings::Inst().toggleAnimation();
-	bool animating = GlobalSettings::Inst().toggleAnimation();  // call it twice to get right state
-
-	BlastToolbar* toolbar = AppMainWindow::Inst().GetMainToolbar();
-	if(!simulating)
-		toolbar->on_btnEnableSimulation_clicked();
-
-	if(!animating)
-		toolbar->on_btnPlayAnimation_clicked();
-
-	// reset animation
-	//toolbar->on_btnResetAnimation_clicked();
-#else
-	CoreLib::Inst()->Gamepad_PlaySample();
-#endif // NV_ARTISTTOOLS
-}
-
-void ButtonAPressed()
-{
-	// Play/Pause the animation
-	Gamepad::PlayPauseAnimation();
-}
-
-void ButtonBPressed()
-{
-	// Stops and re-starts animation
-	Gamepad::ResetAnimation();
-}
-
-void Gamepad::ShowProjectName()
-{
-	bool bExpertMode = AppMainWindow::IsExpertMode();
-	// need change title
-	char msg[1024];
-	// show title
-	if(curentPrjIdx != -1)
-	{
-		QString fn = demoProjects.at(curentPrjIdx);
-		sprintf(msg, "Blast Viewer - %s %s", fn.toUtf8().data(), (bExpertMode ? "Demo Mode" : ""));
-		AppMainWindow::Inst().setWindowTitle(msg);
-	}
-	else
-	{
-		if (bExpertMode)
-		{
-			sprintf(msg, "Blast Viewer - Expert Mode");
-		}
-		else
-		{
-			sprintf(msg, "Blast Viewer");
-		}
-		AppMainWindow::Inst().setWindowTitle(msg);
-	}
-}
-
-void LoadSamples(bool bNext)
-{
-	bUseOldLightCam = bUseOldSceneCam = false;
-	int prjCount = demoProjects.size();
-	if(prjCount==0)
-	{
-		DisplayPreferencesPanel*  pPanel = AppMainWindow::Inst().GetDisplayPreferencesPanel();
-		if (pPanel)
-		{
-			pPanel->assignPlayPlaylistToGamepad();
-		}
-		if (0)
-		{
-			static int iLimitSampleCount = 20;
-			QString appDir = strAppDir.c_str();
-			QString projectPath;
-			// load from a specific file first
-			QString fn = appDir + "\\samples.txt";
-			FILE* fp = fopen(fn.toUtf8().data(), "r");
-			if (fp)
-			{
-				char Line[1024], FileName[2014];
-				while (fgets(Line, sizeof(Line), fp) != NV_NULL)
-				{
-					QString t = QString(Line).trimmed();
-					if (t.length() == 0)
-						continue;
-					QString fn = t.toLower();
-					std::string strFN = fn.toUtf8().data();
-					const char* ptest = strstr(strFN.c_str(), ".blastProj");
-					if (ptest)
-					{
-						const char* pchar = strchr(strFN.c_str(), ':');
-						if (pchar)
-						{
-							demoProjects.append(fn);
-						}
-						else
-						{
-							const char* pFirst = strFN.c_str();
-							if (pFirst[0] == '/' || pFirst[0] == '\\')
-							{
-								fn = appDir + fn;
-								demoProjects.append(fn);
-							}
-							else
-							{
-								fn = appDir + QString("/") + fn;
-								demoProjects.append(fn);
-							}
-						}
-					}
-				}
-				fclose(fp);
-			}
-		}
-		if(0)
-		{
-			QString appDir = strAppDir.c_str();
-			QString projectPath;
-			// search some relative folders
-			QDir dirTmp(appDir);
-			if(dirTmp.cd("./media"))
-				projectPath = dirTmp.absolutePath();
-			else if(dirTmp.cd("../media"))
-				projectPath = dirTmp.absolutePath();
-			else if(dirTmp.cd("../../media"))
-				projectPath = dirTmp.absolutePath();
-			else if(dirTmp.cd("../../media"))
-				projectPath = dirTmp.absolutePath();
-			if(!projectPath.isEmpty())
-			{
-				QStringList filters; 
-				filters<<QString("*.blastProj"); 
-				QDirIterator dir_iterator(projectPath, filters, QDir::Files | QDir::NoSymLinks,QDirIterator::Subdirectories);
-				while(dir_iterator.hasNext())
-				{
-					dir_iterator.next();
-					QFileInfo file_info = dir_iterator.fileInfo();
-					QString absolute_file_path = file_info.absoluteFilePath();
-					demoProjects.append(absolute_file_path);
-					//if(demoProjects.size()>iLimitSampleCount)
-					//	break;
-				}
-			}
-			else
-			{
-				const char* msg = "Fail to find any Blast projects!";
-				viewer_msg(msg);
-			}
-		}
-		prjCount = demoProjects.size();
-	}
-	if(prjCount)
-	{
-		if (bNext)
-		{
-			++curentPrjIdx;
-			if (curentPrjIdx >= prjCount)
-				curentPrjIdx = 0;
-		}
-		else
-		{
-			--curentPrjIdx;
-			if (curentPrjIdx < 0)
-				curentPrjIdx = prjCount - 1;
-		}
-		// load sample
-		QString fn = demoProjects[curentPrjIdx];
-		AppMainWindow::Inst().openProject(fn);
-	}
-	Gamepad::ShowProjectName();
-}
-
-void StartButtonPressed()
-{
-	Gamepad& gp = Gamepad::Instance();
-	gp.ShowUsage();
-}
-
-void BackButtonPressed()
-{
-	Gamepad::DemoEscape();
-	return;
-
-	++iQuitState;
-	switch(iQuitState)
-	{
-	case 0:
-		// do nothing
-		break;
-	case 1:
-		{
-			AppMainWindow::Inst().startProgress();
-			AppMainWindow::Inst().setProgressMaximum(2);
-			AppMainWindow::Inst().setProgress("Press Back again to quit. Press other buttons to cancel it.", 1);
-		}
-		break;
-	case 2:
-		{
-			AppMainWindow::Inst().setProgress("Quitting...", 2);
-			//AppMainWindow::Inst().close();
-			Gamepad::DemoEscape();
-		}
-		break;
-	default:
-		iQuitState = 0;
-		break;
-	}
-}
-
-void Gamepad::HandleJoySticks()
-{
-	int numJoysticks = SDL_NumJoysticks();
-	int numUsedJoysticks = gHandlers.size();
-	if (numUsedJoysticks != numJoysticks)
-	{
-		gHandlers.clear();
-	}
-	if(numUsedJoysticks < 1)
-	{
-		//static int iSkipCount = 0;
-		//if (++iSkipCount >= 60)
-		//{
-		//	iSkipCount = 0;
-		static int iDoOnce = 1;
-		if (iDoOnce)
-		{
-			iDoOnce = 0;
-
-			Initialize();
-			numJoysticks = SDL_NumJoysticks();
-			for (int i = 0; i < numJoysticks; ++i)
-			{
-				SDL_Joystick* joystick = SDL_JoystickOpen(i);
-				if (joystick)
-				{
-					numUsedJoysticks = gHandlers.size();
-					gHandlers.resize(numUsedJoysticks + 1);
-					GamepadHandler& handler = gHandlers[numUsedJoysticks];
-					handler.joystick = joystick;
-					handler.pjsName = SDL_JoystickName(joystick);
-					handler.numAxis = SDL_JoystickNumAxes(joystick);
-					handler.numTrackballs = SDL_JoystickNumBalls(joystick);
-					handler.numPov = SDL_JoystickNumHats(joystick);
-					handler.numButtons = SDL_JoystickNumButtons(joystick);
-					handler.jsGuid = SDL_JoystickGetGUID(joystick);
-
-					LogAdd("Device Name: %s", handler.pjsName);
-					LogAdd("Num of Axis: %d", handler.numAxis);
-					LogAdd("Num of Trackballs: %d", handler.numTrackballs);
-					LogAdd("Num of POV: %d", handler.numPov);
-					LogAdd("Num of Buttons: %d", handler.numButtons);
-					LogAdd("Initial Axis States:");
-
-					handler.iAxisState.resize(handler.numAxis);
-					handler.iAxisStateAtBegin.resize(handler.numAxis);
-					handler.iAxisStateOld.resize(handler.numAxis);
-
-					handler.iButtonState.resize(handler.numButtons);
-					handler.iButtonStateOld.resize(handler.numButtons);
-
-					if (handler.numAxis == 6)
-					{
-						// XBOX 360 has 6 axis
-						AXIS_LS_X = 0;
-						AXIS_LS_Y = 1;
-						AXIS_RS_X = 2;
-						AXIS_RS_Y = 3;
-						AXIS_LT = 4;
-						AXIS_RT = 5;
-
-						GAMEPAD_KEY_DPAD_UP = 0;
-						GAMEPAD_KEY_DPAD_DOWN = 1;
-						GAMEPAD_KEY_DPAD_LEFT = 2;
-						GAMEPAD_KEY_DPAD_RIGHT = 3;
-						GAMEPAD_KEY_START = 4;
-						GAMEPAD_KEY_BACK = 5;
-						GAMEPAD_KEY_LS = 6;
-						GAMEPAD_KEY_RS = 7;
-						GAMEPAD_KEY_LEFT_BUMP = 8;
-						GAMEPAD_KEY_RIGHT_BUMP = 9;
-						GAMEPAD_KEY_A = 10;
-						GAMEPAD_KEY_B = 11;
-						GAMEPAD_KEY_X = 12;
-						GAMEPAD_KEY_Y = 13;
-					}
-					else if (handler.numAxis == 5)
-					{
-						// Betop has 5 axis when xbox mode
-						AXIS_LS_X = 0;
-						AXIS_LS_Y = 1;
-						AXIS_RS_X = 3;
-						AXIS_RS_Y = 4;
-						AXIS_LT = 2;
-						AXIS_RT = 2;
-
-						GAMEPAD_KEY_DPAD_UP = 10;    // POV
-						GAMEPAD_KEY_DPAD_DOWN = 11;  // POV
-						GAMEPAD_KEY_DPAD_LEFT = 12;  // POV
-						GAMEPAD_KEY_DPAD_RIGHT = 13; // POV
-						GAMEPAD_KEY_START = 7;
-						GAMEPAD_KEY_BACK = 6;
-						GAMEPAD_KEY_LS = 8;
-						GAMEPAD_KEY_RS = 9;
-						GAMEPAD_KEY_LEFT_BUMP = 4;
-						GAMEPAD_KEY_RIGHT_BUMP = 5;
-						GAMEPAD_KEY_A = 0;
-						GAMEPAD_KEY_B = 1;
-						GAMEPAD_KEY_X = 2;
-						GAMEPAD_KEY_Y = 3;
-
-						if (handler.numPov == 1)
-						{
-							// BETOP xbox mode
-							handler.iButtonState.resize(handler.numButtons + 4);    // POV fake buttons
-							handler.iButtonStateOld.resize(handler.numButtons + 4);
-							for (int i = GAMEPAD_KEY_DPAD_UP; i <= GAMEPAD_KEY_DPAD_RIGHT; ++i)
-							{
-								handler.iButtonStateOld[i] = handler.iButtonState[i] = 0;
-							}
-						}
-					}
-					for (int i = 0; i < handler.numAxis; ++i)
-					{
-						int value = ClampAxis(SDL_JoystickGetAxis(handler.joystick, i));
-						handler.iAxisStateAtBegin[i] = handler.iAxisStateOld[i] = handler.iAxisState[i] = value;
-						LogAdd("Axis %d State %d", i, value);
-					}
-					LogAdd("Initial Button States:");
-					for (int i = 0; i < handler.numButtons; ++i)
-					{
-						int state = SDL_JoystickGetButton(handler.joystick, i);
-						handler.iButtonStateOld[i] = handler.iButtonState[i] = state;
-						LogAdd("Button %d State %d", i, state);
-					}
-					if (handler.numPov == 1)
-					{
-						LogAdd("Initial POV Button States:");
-						Uint8 pov = SDL_JoystickGetHat(joystick, 0);
-						char msg[512];
-						sprintf(msg, "POV State: %d", pov);
-						viewer_msg(msg);
-						LogAdd(msg);
-						// BETOP xbox mode
-						handler.iButtonState.resize(handler.numButtons + 4);    // POV fake buttons
-						handler.iButtonStateOld.resize(handler.numButtons + 4);
-						for (int i = GAMEPAD_KEY_DPAD_UP; i <= GAMEPAD_KEY_DPAD_RIGHT; ++i)
-						{
-							handler.iButtonStateOld[i] = handler.iButtonState[i] = 0;
-							LogAdd("POV Button %d State %d", i, 0);
-						}
-					}
-					SDL_JoystickEventState(SDL_IGNORE);
-				}
-			}
-		}
-	}
-	else
-	{
-		ManualReadGamepad();
-	}
-}
-
-bool Gamepad::Initialize()
-{
-	if (strAppDir.size() < 1)
-	{
-		strAppDir = qApp->applicationDirPath().toUtf8().data();
-	}
-
-	SDL_Quit();
-	// init SDL
-	// my Gamepad does not work with SDL_INIT_EVERYTHING. Just init the ones we use.
-	int ret = SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER | SDL_INIT_EVENTS);
-	return (ret == 0);
-}
-
-void Gamepad::Free()
-{
-	if (bSaveLogToDisk)
-	{
-		SaveLog();
-	}
-
-	if(int count = gHandlers.size())
-	{
-		for(int i = 0; i<count; ++i)
-			gHandlers[i].DisConnect();
-	}
-	SDL_Quit();
-}
-
-void ShowUsageInViewport()
-{
-	bool bDemoMode = AppMainWindow::IsExpertMode();
-	if(bDemoMode && bDefaultDemoMode)
-	{
-		int w = theScene->GetCamera()->GetWidth();
-		int h = theScene->GetCamera()->GetHeight();
-		//CDXUTTextHelper* pTxtHelper = theScene->GetRenderWindow()->GetTextHelper();
-
-		//pTxtHelper->Begin();
-		//pTxtHelper->SetInsertionPos(w/5, h-80);
-		//pTxtHelper->SetForegroundColor(D3DXCOLOR(1.0f, 1.0f, 0.0f, 0.8f));
-
-		//pTxtHelper->DrawTextLine(L"Start: Load a sample        Back: Quit Demo");
-		//pTxtHelper->DrawTextLine(L"A: Stop/Restart Animation   B: Pause/Continue Animation    X: Start/Pause Simulation      Y: Demo/Export Switch");
-		//pTxtHelper->DrawTextLine(L"Left Stick: Zoom In/Out     Right Stick: Control Camera    Cross/Trigger: Scene HUD and Stats On/Off");
-		//pTxtHelper->DrawTextLine(L"RB & LS: Wind Direction     RB & RS: Wind Strength         LB & LS: Light Control");
-		//pTxtHelper->End();
-	}
-}
-
-void Gamepad::ShowUsage()
-{
-	viewer_msg("Start: Show Gamepad Usage");
-	viewer_msg("Back: Quit the Blast Viewer");
-	viewer_msg("LBump: Load previous demo            RBump: Load next sample");
-	viewer_msg("B: Reset Animation                   A: Play/Pause Animation");
-	viewer_msg("Y: Demo View On/Off                  X: Show/Hide the selected Hair");
-	viewer_msg("LStick: Zoom in and out              RStick: Rotate the camera");
-	viewer_msg("D-Pad Up: Show/Hide HUD              D-Pad Left: Show/Hide Stats");
-	viewer_msg("RTrigger & LStick: Wind Direction    RTrigger & RStick: Wind Strength");
-	viewer_msg("LTrigger & LStick: Move Light");
-}
-
-
-void Gamepad::ResetScene()
-{
-#ifndef NV_ARTISTTOOLS
-	BlastToolbar* toolbar = AppMainWindow::Inst().GetMainToolbar();
-
-	GlobalSettings::Inst().toggleSimulation();
-	bool bSimulating = GlobalSettings::Inst().toggleSimulation();  // call it twice to get right state
-	if(bSimulating)
-	{
-		toolbar->on_btnEnableSimulation_clicked(); // stop simulation when stop animation
-	}
-
-	DisplayFurVisualizersPanel*  furPanel = AppMainWindow::Inst().GetFurVisualizersPanel();
-	if(furPanel)
-	{
-		furPanel->on_btnShowHair_stateChanged(true);   // show hair
-		furPanel->updateValues();
-	}
-
-	GlobalSettings::Inst().toggleAnimation();
-	bool anim = GlobalSettings::Inst().toggleAnimation();  // call it twice to get right state
-	if(anim)
-	{
-		toolbar->on_btnPlayAnimation_clicked();   // stop animation
-	}
-
-	toolbar->on_btnResetAnimation_clicked();       // reset animation
-
-	toolbar->on_spinWindStrength_valueChanged(0.0f);
-	toolbar->updateValues();
-#else
-	CoreLib::Inst()->Gamepad_ResetScene();
-#endif // NV_ARTISTTOOLS
-
-	Light* pLight = NV_NULL;
-	pLight = Light::GetFirstSelectedLight();
-	
-	static Camera oldLightCam, oldSceneCam;
-	// restore old camera
-	if(bUseOldSceneCam)
-	{
-		*(theScene->GetCamera()) = oldSceneCam;
-		//theScene->FitCamera();
-	}
-	else
-	{
-		oldSceneCam = *theScene->GetCamera();
-		bUseOldSceneCam = true;
-	}
-	// restore light camera
-	if(pLight)
-	{
-		//pLight->FitBounds(true);
-		if(bUseOldLightCam)
-		{
-//			pLight->getCamera() = oldLightCam;
-		}
-		else
-		{
-//			oldLightCam = pLight->getCamera();
-//			pLight->FitBounds();
-			bUseOldLightCam = true;
-		}
-	}
-	theScene->SetProjectModified(true);
-}
-
-bool Gamepad::IsDemoMode()
-{
-	return AppMainWindow::IsExpertMode();
-}
-
-void Gamepad::SetDemoProjects(QList<QString>& projects)
-{
-	demoProjects = projects;
-}
-
-void Gamepad::Process()
-{
-	if (AppMainWindow::IsExpertMode() == false)
-	{
-		static bool bFirstTime = true;
-		if (bFirstTime)
-		{
-			bFirstTime = false;
-			DisplayPreferencesPanel*  pPanel = AppMainWindow::Inst().GetDisplayPreferencesPanel();
-			if (pPanel)
-			{
-				pPanel->runDemoCommandline();
-				return;
-			}
-		}
-	}
-
-	HandleJoySticks();
-
-	if (theScene == 0)
-	{
-		theScene = SimpleScene::Inst();
-		return;
-	}
-
-	//ShowUsageInViewport();
-}
-
-
-void Gamepad::ManualReadGamepad()
-{
-	SDL_JoystickUpdate();
-	if(int count = gHandlers.size())
-	{
-		for(int i = 0; i < count; ++i)
-			gHandlers[i].Process();
-	}
-}
-
-void GamepadHandler::Process()
-{
-	for(int i = 0; i < numAxis; ++i)
-	{
-		int value = ClampAxis(SDL_JoystickGetAxis(joystick, i));
-		iAxisState[i] = value;
-		if(iAxisStateOld[i] != value)
-		{
-			char msg[512];
-			sprintf(msg, "Axis changes: %d %d", i, value);
-#ifdef _DEBUG
-			viewer_msg(msg);
-#endif
-			LogAdd(msg);
-		}
-	}
-
-	bool bCancelQuit = false;
-	for(int i = 0; i < numButtons; ++i)
-	{
-		int state = SDL_JoystickGetButton(joystick, i);
-		iButtonState[i] = state;
-		if(iButtonStateOld[i] != state)
-		{
-			char msg[512];
-			sprintf(msg, "Button changes: %d %d (%d)", i, state, iButtonStateOld[i]);
-#ifdef _DEBUG
-			viewer_msg(msg);
-#endif
-			LogAdd(msg);
-		}
-		if(i != GAMEPAD_KEY_BACK && ButtonState(i) == BUTTON_UP)
-		{
-			//bCancelQuit = true;
-		}
-	}
-
-	if (numPov == 1)
-	{
-		// BETOP xbox mode
-		Uint8 pov = SDL_JoystickGetHat(joystick, 0);
-		switch (pov)
-		{
-		case SDL_HAT_UP:
-			iButtonState[GAMEPAD_KEY_DPAD_UP] = 1;
-			break;
-		case SDL_HAT_RIGHT:
-			iButtonState[GAMEPAD_KEY_DPAD_RIGHT] = 1;
-			break;
-		case SDL_HAT_DOWN:
-			iButtonState[GAMEPAD_KEY_DPAD_DOWN] = 1;
-			break;
-		case SDL_HAT_LEFT:
-			iButtonState[GAMEPAD_KEY_DPAD_LEFT] = 1;
-			break;
-		case SDL_HAT_RIGHTUP:
-			iButtonState[GAMEPAD_KEY_DPAD_RIGHT] = 1;
-			iButtonState[GAMEPAD_KEY_DPAD_UP] = 1;
-			break;
-		case SDL_HAT_RIGHTDOWN:
-			iButtonState[GAMEPAD_KEY_DPAD_RIGHT] = 1;
-			iButtonState[GAMEPAD_KEY_DPAD_DOWN] = 1;
-			break;
-		case SDL_HAT_LEFTUP:
-			iButtonState[GAMEPAD_KEY_DPAD_LEFT] = 1;
-			iButtonState[GAMEPAD_KEY_DPAD_UP] = 1;
-			break;
-		case SDL_HAT_LEFTDOWN:
-			iButtonState[GAMEPAD_KEY_DPAD_LEFT] = 1;
-			iButtonState[GAMEPAD_KEY_DPAD_DOWN] = 1;
-			break;
-		default:
-			for (int i = GAMEPAD_KEY_DPAD_UP; i <= GAMEPAD_KEY_DPAD_RIGHT; ++i)
-			{
-				iButtonState[i] = 0;
-			}
-		}
-		if (pov != SDL_HAT_CENTERED)
-		{
-			char msg[512];
-			sprintf(msg, "POV State: %d", pov);
-			viewer_msg(msg);
-			LogAdd(msg);
-			for (int i = GAMEPAD_KEY_DPAD_UP; i <= GAMEPAD_KEY_DPAD_RIGHT; ++i)
-			{
-				if (ButtonState(i) == BUTTON_DOWN)
-				{
-					sprintf(msg, "POV Button Down: %d", i);
-					viewer_msg(msg);
-					LogAdd(msg);
-				}
-			}
-		}
-	}
-
-	//bool bLeftBump = iButtonState[GAMEPAD_KEY_LEFT_BUMP], bRightBump = iButtonState[GAMEPAD_KEY_RIGHT_BUMP];
-	bool bLeftTrigger = false, bRightTrigger = false;
-	double currentTime = GetSeconds();	// real elapsed frame time
-	static double lastJoyTime = currentTime;
-
-	if(ButtonState(GAMEPAD_KEY_BACK) == BUTTON_UP)
-	{
-		BackButtonPressed();
-	}
-	if(iQuitState && bCancelQuit)
-	{
-		AppMainWindow::Inst().setProgress("Cancel quitting.", 2);
-		iQuitState = 0;
-	}
-	else
-	{
-		bCancelQuit = false;
-	}
-
-	if(!bCancelQuit)
-	{
-		if(ButtonState(GAMEPAD_KEY_START) == BUTTON_UP)
-		{
-			StartButtonPressed();
-		}
-		if (ButtonState(GAMEPAD_KEY_RIGHT_BUMP) == BUTTON_UP)
-		{
-			// next proj
-			Gamepad::DemoNext();
-		}
-		if (ButtonState(GAMEPAD_KEY_LEFT_BUMP) == BUTTON_UP)
-		{
-			// prev proj
-			Gamepad::DemoPrev();
-		}
-		if (ButtonState(GAMEPAD_KEY_B) == BUTTON_UP)
-		{
-			viewer_msg("B Pressed");
-			ButtonBPressed();
-		}
-		if(ButtonState(GAMEPAD_KEY_A) == BUTTON_UP)
-		{
-			viewer_msg("A Pressed");
-			ButtonAPressed();
-		}
-		if (ButtonState(GAMEPAD_KEY_Y) == BUTTON_UP)
-		{
-			viewer_msg("Y Pressed");
-			ChangeMode();
-		}
-		if(ButtonState(GAMEPAD_KEY_X) == BUTTON_UP)
-		{
-			viewer_msg("X Pressed");
-#ifndef NV_ARTISTTOOLS
-			// Show/hide selected hair
-			bool v = false;
-			theScene->GetFurCharacter().GetHairParam(HAIR_PARAMS_DRAW_RENDER_HAIRS, &v);
-			DisplayFurVisualizersPanel*  furPanel = AppMainWindow::Inst().GetFurVisualizersPanel();
-			if (furPanel)
-			{
-				furPanel->on_btnShowHair_stateChanged(!v);
-			}
-#else
-			CoreLib::Inst()->GamepadHandler_ShowHair();
-#endif // NV_ARTISTTOOLS
-		}
-		if(ButtonState(GAMEPAD_KEY_DPAD_LEFT) == BUTTON_DOWN)
-		{
-			// Show/Hide Stats
-			Gamepad::ShowHideStats();
-		}
-		if(ButtonState(GAMEPAD_KEY_DPAD_RIGHT) == BUTTON_DOWN)
-		{
-		}
-		if(ButtonState(GAMEPAD_KEY_DPAD_UP) == BUTTON_DOWN)
-		{
-			// show/hide HUD
-			Gamepad::ShowHideHud();
-		}
-		if(ButtonState(GAMEPAD_KEY_DPAD_DOWN) == BUTTON_DOWN)
-		{
-		}
-	}
-
-	//const float g_dt = 1.0f/120.0f;	// the time delta used for simulation
-	if (numAxis == 6)
-	{
-		// XBOX 360 has 6 axis
-		int iLTChange = AxisChange(AXIS_LT);
-		int iRTChange = AxisChange(AXIS_RT);
-		if (iLTChange > 30000)
-		{
-			bLeftTrigger = true;
-		}
-		if (iRTChange > 30000)
-		{
-			bRightTrigger = true;
-		}
-	}
-	else if(numAxis == 5)
-	{
-		// Betop has 5 axis when x360 mode
-		int iLTChange = AxisChange(AXIS_LT);
-		int iRTChange = AxisChange(AXIS_RT);
-		if (iLTChange>15000)
-		{
-			bLeftTrigger = true;
-		}
-		if (iRTChange < -15000)
-		{
-			bRightTrigger = true;
-		}
-	}
-	if (1)
-	{
-		static float zoomSpeed = 0.1f;
-		static float rotateSpeed = 2.5f;
-
-		float deltaTime = (currentTime - lastJoyTime);
-		lastJoyTime = currentTime;
-
-		const float jsFactor = 1.0f/32768.0f;
-		int iLSX = AxisChange(AXIS_LS_X);
-		int iLSY = AxisChange(AXIS_LS_Y);
-		if(iLSX != 0 || iLSY != 0)
-		{
-			// left stick
-			float forceLSX = iLSX * jsFactor;
-			float forceLSY = iLSY * jsFactor;
-			if(bLeftTrigger || bRightTrigger)
-			{
-				if(bRightTrigger)
-				{
-					// wind direction
-					atcore_float3 direct = gfsdk_makeFloat3(forceLSX, forceLSY, 0.1f);
-					gfsdk_normalize(direct);
-
-					GlobalSettings::Inst().m_windDir = direct;
-					theScene->SetProjectModified(true);
-				}
-				if(bLeftTrigger)
-				{
-					// light direction
-					{
-						Light* pLight = Light::GetFirstSelectedLight();
-						if (pLight)
-						{
-							atcore_float2 delta = gfsdk_makeFloat2(forceLSX, forceLSY);
-							delta = 10.0f * delta;
-							pLight->Orbit(delta);  // unit is in degree(s)
-							theScene->SetProjectModified(true);
-						}
-					}
-				}
-			}
-			else
-			{
-				if(iLSY != 0)
-				{
-					// zoom in/out
-					theScene->GetCamera()->Dolly(zoomSpeed * forceLSY);
-					theScene->SetProjectModified(true);
-				}
-			}
-		}
-		int iRSX = AxisChange(AXIS_RS_X);
-		int iRSY = AxisChange(AXIS_RS_Y);
-		if(iRSX != 0 || iRSY != 0)
-		{
-			float forceX = iRSX * jsFactor;
-			float forceY = iRSY * jsFactor;
-			if(bRightTrigger)
-			{
-				if (iRSX != 0)
-				{
-					// wind strength, Press right to increase. Press left to decrease 
-					static float windStrength = 0.0f;
-					static float fStep = 0.1f;
-					if (iRSX > 0)
-						windStrength += fStep;
-					else
-						windStrength -= fStep;
-					if (windStrength > 10.0f)
-						windStrength = 10.0f;
-					if (windStrength < 0.0f)
-						windStrength = 0.0f;
-
-#ifndef NV_ARTISTTOOLS
-					BlastToolbar* toolbar = AppMainWindow::Inst().GetMainToolbar();
-					toolbar->on_spinWindStrength_valueChanged(windStrength);
-					toolbar->updateValues();
-#else
-					CoreLib::Inst()->GamepadHandler_SpinWindStrength(windStrength);
-#endif // NV_ARTISTTOOLS
-				}
-			}
-			else
-			{
-				// rotate camera
-				atcore_float2 moveRightStick = gfsdk_makeFloat2(forceX, forceY);
-				theScene->GetCamera()->Orbit(moveRightStick*rotateSpeed);
-				theScene->SetProjectModified(true);
-			}
-		}
-	}
-	//if(numAxis>5)
-	//{
-		//// XBOX 360 has 6 axis
-		//if((iAxisState[4]>=0) && (iAxisStateOld[4]<0))
-		//{
-		//	bool bShow = ! GlobalSettings::Inst().m_showHUD;
-		//	DisplayScenePanel* pspanel = AppMainWindow::Inst().GetDisplayScenePanel();
-		//	if(pspanel)
-		//	{
-		//		pspanel->on_btnShowHUD_stateChanged(bShow);
-		//		pspanel->on_btnComputeStats_stateChanged(false);
-		//	}
-		//}
-		//if((iAxisState[5]>=0) && (iAxisStateOld[5]<0))
-		//{
-		//	bool bShow = ! GlobalSettings::Inst().m_computeStatistics;
-		//	DisplayScenePanel* pspanel = AppMainWindow::Inst().GetDisplayScenePanel();
-		//	if(pspanel)
-		//	{
-		//		DisplayScenePanel* pspanel = AppMainWindow::Inst().GetDisplayScenePanel();
-		//		if(pspanel)
-		//		{
-		//			// HUD controls stats
-		//			pspanel->on_btnComputeStats_stateChanged(bShow);
-		//			pspanel->on_btnShowHUD_stateChanged(bShow);
-		//		}
-		//	}
-		//}
-	//}
-	for(int i = 0; i < numAxis; ++i)
-	{
-		//if(iAxisStateOld[i] != iAxisState[i])
-		//{
-		//	char msg[512];
-		//	sprintf(msg, "Axis: %d %d", i, iAxisState[i]);
-		//	viewer_msg(msg);
-		//}
-		iAxisStateOld[i] = iAxisState[i];
-	}
-
-	for(int i = 0; i < numButtons; ++i)
-	{
-		iButtonStateOld[i] = iButtonState[i];
-	}
-
-	if (numPov == 1)
-	{
-		for (int i = GAMEPAD_KEY_DPAD_UP; i <= GAMEPAD_KEY_DPAD_RIGHT; ++i)
-		{
-			iButtonStateOld[i] = iButtonState[i];
-		}
-	}
-}
-
-//void Gamepad::ClearStates()
-//{
-//	for(int i = 0; i < iStateSize; ++i)
-//	{
-//		bKeyHolding[i] = 0;
-//
-//		iAxisStateOld[i] = 0;
-//		iAxisState[i] = 0;
-//		iButtonStateOld[i] = 0;
-//		iButtonState[i] = 0;
-//	}
-//}
-
-void Gamepad::ShowHideHud()
-{
-	static bool bShowHud = true;
-	DisplayScenePanel* pspanel = AppMainWindow::Inst().GetDisplayScenePanel();
-	if (pspanel)
-	{
-		// HUD controls stats
-		pspanel->on_btnShowHUD_stateChanged(bShowHud);
-		pspanel->on_btnComputeStats_stateChanged(false);
-		bShowHud = !bShowHud;
-	}
-}
-
-void Gamepad::ShowHideStats()
-{
-	static bool bShowStats = true;
-	DisplayScenePanel* pspanel = AppMainWindow::Inst().GetDisplayScenePanel();
-	if (pspanel)
-	{
-		// HUD controls stats
-		pspanel->on_btnComputeStats_stateChanged(bShowStats);
-		pspanel->on_btnShowHUD_stateChanged(bShowStats);
-		bShowStats = !bShowStats;
-	}
-}
-
-void Gamepad::QuitApp()
-{
-	AppMainWindow::Inst().close();
-}
-
-void Gamepad::ResetAnimation()
-{
-#ifndef NV_ARTISTTOOLS
-	GlobalSettings::Inst().toggleSimulation();
-	bool simulating = GlobalSettings::Inst().toggleSimulation();  // call it twice to get right state
-
-	GlobalSettings::Inst().toggleAnimation();
-	bool animating = GlobalSettings::Inst().toggleAnimation();  // call it twice to get right state
-
-	BlastToolbar* toolbar = AppMainWindow::Inst().GetMainToolbar();
-	if (!simulating)
-	{
-		toolbar->on_btnEnableSimulation_clicked();
-	}
-	if (!animating)
-	{
-		toolbar->on_btnPlayAnimation_clicked();
-	}
-	toolbar->on_btnResetAnimation_clicked();
-#else
-	CoreLib::Inst()->Gamepad_ResetAnimation();
-#endif // NV_ARTISTTOOLS
-}
-
-void Gamepad::PlayPauseAnimation()
-{
-#ifndef NV_ARTISTTOOLS
-	GlobalSettings::Inst().toggleSimulation();
-	bool simulating = GlobalSettings::Inst().toggleSimulation();  // call it twice to get right state
-
-	GlobalSettings::Inst().toggleAnimation();
-	bool animating = GlobalSettings::Inst().toggleAnimation();  // call it twice to get right state
-
-	BlastToolbar* toolbar = AppMainWindow::Inst().GetMainToolbar();
-	if (simulating != animating)
-	{
-		toolbar->on_btnEnableSimulation_clicked();
-	}
-	toolbar->on_btnEnableSimulation_clicked();
-	toolbar->on_btnPlayAnimation_clicked();
-#else
-	CoreLib::Inst()->Gamepad_PlayPauseAnimation();
-#endif // NV_ARTISTTOOLS
-}
-
-void Gamepad::DemoModeOnOff()
-{
-	ChangeMode();
-}
-
-void Gamepad::DemoNext()
-{
-	LoadSamples(true);
-	PlaySample();
-}
-
-void Gamepad::DemoPrev()
-{
-	LoadSamples(false);
-	PlaySample();
-}
-
-void Gamepad::SetDemoMode(bool onOff)
-{
-	//if (AppMainWindow::IsExpertMode() != onOff)
-	//{
-	//	ChangeMode();
-	//}
-	if (onOff)
-	{
-		curentPrjIdx = -1;  // make it start from first demo
-		DemoNext();
-	}
-	else
-	{
-		ShowUsage();
-	}
-	ChangeMode();
-}
-
-void Gamepad::DemoEscape()
-{
-	if (AppMainWindow::IsExpertMode())
-	{
-		ChangeMode();
-		// hide HUD if it is on. for GWDCC - 393 Blast Viewer - play list stats
-		DisplayScenePanel* pspanel = AppMainWindow::Inst().GetDisplayScenePanel();
-		if (pspanel)
-		{
-			// HUD controls stats
-			pspanel->on_btnShowHUD_stateChanged(false);
-			pspanel->on_btnComputeStats_stateChanged(false);
-		}
-	}
-	//else
-	//{
-	//	QuitApp();
-	//}
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Scene/Gamepad.h b/tools/ArtistTools/source/CoreLib/Scene/Gamepad.h
deleted file mode 100644
index 46d45ba..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/Gamepad.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-class SimpleScene;
-
-class Gamepad
-{
-public:
-    Gamepad();
-    ~Gamepad();
-
-	static Gamepad& Instance();
-
-	void Process();
-	bool Initialize();
-	void Free();
-
-	bool IsDemoMode();
-
-	void SetDemoProjects(QList<QString>& projects);
-
-	static void DemoNext();
-	static void DemoPrev();
-	static void ShowProjectName();
-	static void ShowHideHud();
-	static void ShowHideStats();
-	static void QuitApp();
-	static void ResetAnimation();
-	static void PlayPauseAnimation();
-	static void DemoModeOnOff();
-	static void DemoEscape();
-	static void SetDemoMode(bool onOff);
-	static void ShowUsage();
-
-private:
-	void ResetScene();
-	void ManualReadGamepad();
-
-	void HandleJoySticks();
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Scene/GlobalSettings.cpp b/tools/ArtistTools/source/CoreLib/Scene/GlobalSettings.cpp
deleted file mode 100644
index 6a826ca..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/GlobalSettings.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#include "GlobalSettings.h"
-#include <QtCore/QTimer>
-#include "Settings.h"
-#include "Shlwapi.h"
-
-static GlobalSettings g_settings;
-static QTimer g_frameTimer(NV_NULL);
-
-////////////////////////////////////////////////////////////////////////////////////////////
-GlobalSettings::GlobalSettings()
-{
-	Init();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-GlobalSettings& GlobalSettings::Inst()
-{
-	return g_settings;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-QTimer& GlobalSettings::GetFrameTimer()
-{
-	return g_frameTimer;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-const char* GlobalSettings::MakeFileName(const char* path, const char* name)
-{
-	static char filename[MAX_PATH];
-	PathCombineA(filename, path, name);
-	return filename;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-void	
-GlobalSettings::Init()
-{
-	m_animate = false;
-	m_simulate = true;
-	m_simulateStep = false;
-	m_firstFrame = true;
-	m_resetAnimationOnLoop = true;
-
-	m_animationFps = 24.0f;
-	m_repeatAnimation = true;
-	m_frameTime = 0.0f;
-	m_animationSpeed = 1.0f;
-	m_playStopped = false;
-	m_currentBoneIndex = 0;
-
-	m_simulationFrameCalc.init(0, 1.0f / 60.0f);
-	m_simulationFps = 60.0f;
-	m_timeStep = 0.0f;
-
-	m_visualizeWind = false;
-	m_showGraphicsMesh = true;
-	m_showWireframe	= false;
-	m_showHUD = false;
-	m_visualizeBoneNames = false;
-
-	m_computeStatistics = false;
-	m_computeProfile = false;
-	m_previewLOD = false;
-	m_renderStyle = MESH_RENDER_TEXTURED;
-
-	m_sceneLoaded	= false;
-	m_useDQ			= false;
-	m_zup			= false;
-	m_lhs			= false;
-
-	m_sceneUnitIndex = SCENE_UNIT_CENTIMETER;  // default to use cm
-
-	m_showGrid = true;
-	m_showAxis = true;
-
-	m_fovAngle = 75.0f;
-
-	m_loadTextures	= true;
-	m_loadMaterials	= true;
-	m_loadGroom	= true;
-	m_loadCollision	= true;
-	m_loadConstraints	= true;
-
-	m_msaaOption = 0;
-
-	m_windDir.x = 0;
-	m_windDir.y = -1.0f;
-	m_windDir.z = 0.5f;
-	m_windStrength = 0.0f;
-	m_windNoise	= 0.0f;
-
-	m_frameStartTime = 0.0f;
-	m_frameEndTime = 100.0f;
-
-	m_animationIndex = 0;
-	
-	m_lockRootBone = false;
-	
-	m_controlTextureOption = 0;
-	m_showSkinnedMeshOnly = false;
-
-	m_useLighting = true;
-	m_showFPS = true;
-
-	m_renderFrameCnt = 0;
-	m_renderFps = 60.0f;
-
-	m_projectFileDir = "";
-	m_projectFileName = "";
-	m_backgroundTextureFilePath = "";
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool GlobalSettings::toggleSimulation()
-{
-	m_simulate = !m_simulate;
-	m_simulateStep = false;
-
-	return m_simulate;
-} 
- 
-///////////////////////////////////////////////////////////////////////////////
-void GlobalSettings::stepSimulation()
-{
-	m_simulateStep = true;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void GlobalSettings::setRenderFps(float fps)
-{
-	m_renderFps = fps;
-
-	OptionValue* option = nullptr;
-
-	option = AppSettings::Inst().GetOptionValue("User/PerfMode");
-	if (option)
-	{
-		if (option->Value.Bool == OA_TRUE)
-		{
-			g_frameTimer.setInterval(0);
-		}
-		else
-			g_frameTimer.setInterval((int)(1000 / fps));
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void GlobalSettings::setSimulationFps(float fps)
-{
-	m_simulationFps = fps;
-	m_simulationFrameCalc.setTimeStep(1.0f/ fps);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void GlobalSettings::resetAnimation()
-{
-	m_frameTime = m_frameStartTime;
-	m_firstFrame = m_resetAnimationOnLoop ? true : false;
-	m_playStopped = false;
-	m_simulateStep = true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void GlobalSettings::toggleAnimationRepeat()
-{
-	m_repeatAnimation = !m_repeatAnimation;
-} 
-
-///////////////////////////////////////////////////////////////////////////////
-bool GlobalSettings::toggleAnimation()
-{
-	m_animate = !m_animate;
-
-	if (m_animate && m_playStopped)
-		resetAnimation();
-
-	return m_animate;
-} 
- 
-///////////////////////////////////////////////////////////////////////////////
-void GlobalSettings::stepAnimation()
-{
-	if (!m_sceneLoaded)
-		return;
-
-	if (m_repeatAnimation)
-		m_playStopped = false;
-
-	if (!m_playStopped)
-		m_frameTime += m_animationSpeed * m_animationFps * m_timeStep; 
-
-	if (m_frameTime > m_frameEndTime)
-	{
-		if (m_repeatAnimation)
-			resetAnimation();
-		else
-		{
-			m_frameTime = m_frameEndTime;
-			m_playStopped = true;
-			m_animate = false;
-		}
-	}
-
-	if (!m_animate)
-	{
-		stepSimulation();
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void GlobalSettings::setSceneUnitIndex(int i)
-{
-	if (i < 0)
-		return;
-
-	if (i >= SCENE_UNIT_END)
-		return;
-
-	m_sceneUnitIndex = i;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-bool GlobalSettings::isSupportedUnitByUnitInCm(float fUnitInCm)
-{
-	int unit = identifyUnitByUnitInCm(fUnitInCm);
-	return unit != SCENE_UNIT_UNKNOWN;
-}
-
-int GlobalSettings::identifyUnitByUnitInCm(float fUnitInCm)
-{
-	float fError = 0.001f;
-	if (fabs(fUnitInCm - 1.0f) < fError)
-	{
-		return SCENE_UNIT_CENTIMETER;
-	}
-	if (fabs(fUnitInCm - 2.54f) < fError)
-	{
-		return SCENE_UNIT_INCH;
-	}
-	if (fabs(fUnitInCm - 100.0f) < fError)
-	{
-		return SCENE_UNIT_METER;
-	}
-	if (fabs(fUnitInCm - 10.0f) < fError)
-	{
-		return SCENE_UNIT_DECIMETER;
-	}
-	return SCENE_UNIT_UNKNOWN;   // should never happen
-}
-
-void GlobalSettings::setSceneUnitByUnitInCm(float fUnitInCm)
-{
-	m_sceneUnitIndex = identifyUnitByUnitInCm(fUnitInCm);
-}
-
-float GlobalSettings::getSceneUnitInCentimeters()
-{
-	return getSceneUnitInCentimeters(m_sceneUnitIndex);
-}
-
-float GlobalSettings::getSceneUnitInCentimeters(int unitIndex)
-{
-	float unit = 1.0f;
-
-	switch (unitIndex)
-	{
-	case SCENE_UNIT_CENTIMETER:
-		unit = 1.0f;
-		break;
-	case SCENE_UNIT_METER:
-		unit = 100.0f;
-		break;
-	case SCENE_UNIT_INCH:
-		unit = 2.54f;
-		break;
-	case SCENE_UNIT_DECIMETER:
-		unit = 10.0f;
-		break;
-	}
-
-	return unit;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-atcore_float3 GlobalSettings::getGravityDir()
-{
-	atcore_float3 gravityDir;	
-
-	if (m_zup)
-	{
-		gravityDir.x = 0.0f;
-		gravityDir.y = 0.0f;
-		gravityDir.z = -1.0f;
-	}
-	else
-	{
-		gravityDir.x = 0.0f;
-		gravityDir.y = -1.0f;
-		gravityDir.z = 0.0f;
-	}
-
-	return gravityDir;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-std::string	GlobalSettings::getAbsoluteFilePath()
-{
-	return m_projectFileDir + "\\" + m_projectFileName;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-std::string GlobalSettings::getAbsoluteFilePath(const char* fileName)
-{
-	return m_projectFileDir + "\\" + fileName;
-}
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-
-///////////////////////////////////////////////////////////////////////////////
-std::string GlobalSettings::getRelativePath(const char* filePath)
-{
-	QDir projectDir(m_projectFileDir.c_str());
-	QByteArray relPath = projectDir.relativeFilePath(filePath).toLocal8Bit();
-
-	return (const char*)relPath;
-}
diff --git a/tools/ArtistTools/source/CoreLib/Scene/GlobalSettings.h b/tools/ArtistTools/source/CoreLib/Scene/GlobalSettings.h
deleted file mode 100644
index 7c1e666..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/GlobalSettings.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "MathUtil.h"
-#include <string>
-
-#include <Nv/Common/Animation/NvCoFrameCalculator.h>
-
-class QTimer;
-
-enum 
-{
-	MESH_RENDER_WIREFRAME,
-	MESH_RENDER_FLAT,
-	MESH_RENDER_SHADED,
-	MESH_RENDER_TEXTURED,
-	MESH_RENDER_END,
-};
-
-enum
-{
-	SCENE_UNIT_UNKNOWN,
-	SCENE_UNIT_CENTIMETER,
-	SCENE_UNIT_METER,
-	SCENE_UNIT_INCH,
-	SCENE_UNIT_DECIMETER,
-	SCENE_UNIT_END,
-};
-
-//////////////////////////////////////////////////////////////////////////////////////
-// Placeholder for all the global settings used in hairworks viewer.
-// This stores all simple options that are not part of hair instance descriptor
-// such as animation logic in UI, scene settings, scene visualization options etc.
-//////////////////////////////////////////////////////////////////////////////////////
-class CORELIB_EXPORT GlobalSettings
-{
-public:
-	GlobalSettings();
-
-	void	Init();
-	static	GlobalSettings& Inst();
-	static QTimer& GetFrameTimer();
-	static const char* MakeFileName(const char* path, const char* name);
-
-public:
-
-	// animation settings
-	bool	m_animate;
-	float	m_animationFps;
-	int		m_animationIndex;
-	float	m_animationSpeed;
-	int		m_currentBoneIndex;
-	bool	m_firstFrame;
-	float	m_frameTime;
-	float	m_frameStartTime;
-	float	m_frameEndTime;
-	bool	m_lockRootBone;
-	bool	m_playStopped;
-	bool	m_repeatAnimation;
-	bool	m_resetAnimationOnLoop;
-
-	bool	m_simulate;
-	bool	m_simulateStep;
-
-	float m_timeStep;
-	NvCo::FrameCalculator m_simulationFrameCalc;
-	float	m_simulationFps;
-	
-	// scene settings
-	bool	m_useDQ;
-	bool	m_zup;
-	bool	m_lhs;
-	bool	m_sceneLoaded;
-	int		m_sceneUnitIndex;
-	std::string m_backgroundTextureFilePath;
-
-	// statistics and profiling
-	bool	m_computeStatistics;
-	bool	m_computeProfile;
-
-	// render option
-	float	m_fovAngle;
-	bool	m_useLighting;
-	int		m_msaaOption;
-	int		m_renderFrameCnt;
-	float	m_renderFps;
-
-	// viusialization
-	int		m_controlTextureOption;
-	bool	m_previewLOD;
-	int		m_renderStyle;
-	bool	m_showAxis;
-	bool	m_showHUD;
-	bool    m_showFPS;
-	bool	m_showGraphicsMesh;
-	bool	m_showGrid;
-	bool	m_showWireframe;
-	bool	m_showSkinnedMeshOnly;
-	bool	m_visualizeShadowMap;
-	bool	m_visualizeWind;
-	bool	m_visualizeBoneNames;
-
-	// global wind
-	atcore_float3	m_windDir;
-	float			m_windStrength;
-	float			m_windNoise;
-
-	// import settings
-	bool	m_loadTextures;
-	bool	m_loadMaterials;
-	bool	m_loadGroom;
-	bool	m_loadCollision;
-	bool	m_loadConstraints;
-
-	// file path
-	std::string		m_projectFileDir;
-	std::string		m_projectFileName;
-
-	// convenience access functions
-public:
-
-	bool isBindPose() { return m_animationIndex == 0; }
-	float getSceneUnitInCentimeters();
-	static float getSceneUnitInCentimeters(int unitIndex);
-	void setSceneUnitIndex(int i);
-	void setSceneUnitByUnitInCm(float fUnitInCm);
-	static int identifyUnitByUnitInCm(float fUnitInCm);
-	static bool isSupportedUnitByUnitInCm(float fUnitInCm);
-
-	void setTimeStep(float timeStep) { m_timeStep = timeStep; }
-
-	bool toggleSimulation();
-	void stepSimulation();
-
-	void setRenderFps(float fps);
-	void setSimulationFps(float fps);
-
-	void resetAnimation();
-	void stepAnimation();
-	bool toggleAnimation();
-	void toggleAnimationRepeat();
-	void getAnimationRange( float& start, float& end);
-
-	std::string getAbsoluteFilePath();
-	std::string getAbsoluteFilePath(const char* fileName);
-	std::string getRelativePath(const char* filePath);
-
-	atcore_float3 getGravityDir();
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Scene/Light.cpp b/tools/ArtistTools/source/CoreLib/Scene/Light.cpp
deleted file mode 100644
index 5f17e66..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/Light.cpp
+++ /dev/null
@@ -1,744 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "Light.h"
-
-#include "GlobalSettings.h"
-#include "ShadowMap.h"
-#include "SimpleRenderable.h"
-#include "MeshShaderParam.h"
-
-#include "RenderInterface.h"
-
-//////////////////////////////////////////////////////////////////////////////
-inline int GetShadowMapResolution(int index)
-{
-	switch (index)
-	{
-	case 0: // default
-		return 2048;
-		break;
-	case 1:
-		return 4096;
-		break;
-	case 2:
-		return 1024;
-		break;
-	case 3:
-		return 512;
-		break;
-	case 4:
-		return 8192;
-		break;
-	case 5:
-		return 16384;
-		break;
-	}
-
-	return 1024;
-}
-
-namespace
-{
-	std::vector<Light>			g_Lights;
-	static bool					g_LinkLightOption = false;
-	std::string					m_envTextureFilePath;
-	GPUShaderResource*			m_pEnvTextureSRV;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-Light::Light()	
-{
-	m_enable		= true;
-	m_useShadows	= false;
-	m_visualize		= false;
-	m_isEnvLight	= false;
-	m_useEnvMap		= false;
-
-	m_selected		= false;
-
-	m_color			= gfsdk_makeFloat3(1.0f, 1.0f, 1.0f);
-	m_intensity		= 1.0f;
-
-	m_pShadowMap = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-Light::~Light()
-{
-	if (m_pShadowMap)
-	{
-		delete m_pShadowMap;
-		m_pShadowMap = 0;
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-bool Light::UseLHS() const { 
-	return m_lightCamera.UseLHS(); 
-}
-
-//////////////////////////////////////////////////////////////////////////////
-GPUShaderResource* Light::GetShadowSRV()
-{
-	if (!m_pShadowMap)
-		return 0;
-
-	return m_pShadowMap->GetShadowSRV();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::SetShadowMapResolution(int index)
-{
-	if (m_shadowMapResolutionIndex == index)
-		return;
-
-	m_lightMapResolution = GetShadowMapResolution(index);
-
-	if (m_pShadowMap)
-	{
-		m_pShadowMap->Release();
-		delete m_pShadowMap;
-	}
-
-	m_pShadowMap = ShadowMap::Create(m_lightMapResolution);
-
-	float minZ = 1.0f;
-	float maxZ = 10000.0f;	// should calculate dynamically
-
-	m_lightCamera.Ortho(m_lightMapResolution, m_lightMapResolution, minZ, maxZ);
-
-	m_shadowMapResolutionIndex = index;
-
-	FitBounds();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::Init()	
-{
-	m_shadowMapResolutionIndex = 2;
-	m_lightMapResolution = GetShadowMapResolution(m_shadowMapResolutionIndex);
-
-	m_pShadowMap = ShadowMap::Create(m_lightMapResolution);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::Release()
-{
-	if (m_pShadowMap)
-	{
-		delete m_pShadowMap;
-		m_pShadowMap = 0;
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::InitCamera(const atcore_float3& from, const atcore_float3& lookAt)
-{
-	m_lightCamera.Init(false, false);
-
-//	atcore_float3 up = gfsdk_makeFloat3(0.0f, 1.0f, 0.0f);
-	atcore_float3 up = gfsdk_makeFloat3(0.0f, 0.0f, 1.0f);
-
-	m_lightCamera.LookAt(from, lookAt, up);
-
-	float minZ = 1.0f;
-	float maxZ = 10000.0f;	// should calculate dynamically
-
-	m_lightCamera.Ortho(m_lightMapResolution, m_lightMapResolution, minZ, maxZ);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-atcore_float3 
-Light::getLightDirection() const
-{
-	return (atcore_float3&)m_lightCamera.GetViewDirection();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::SetBounds(atcore_float3* bbCenter, atcore_float3* bbExtents)
-{
-	if (bbCenter)
-		m_bbCenter = *bbCenter;
-	if (bbExtents)
-		m_bbExtent = *bbExtents;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::FitBounds(bool updateCenter)
-{
-	////////////////////////////////////////////////////////
-	atcore_float3 bbCenter = m_bbCenter;
-	atcore_float3 bbExtents =m_bbExtent;
-
-	////////////////////////////////////////////////////////////////////////
-	if (updateCenter)
-	{
-		atcore_float3 lightPos		= m_lightCamera.GetEye();
-		atcore_float3 lightAt		= m_lightCamera.GetAt();
-
-		atcore_float3 disp = bbCenter - lightAt;
-
-		lightAt		= lightAt + disp;
-		lightPos	= lightPos + disp;
-
-		m_lightCamera.SetEye(lightPos);
-		m_lightCamera.SetAt(lightAt);
-		m_lightCamera.BuildViewMatrix();
-	}
-
-	////////////////////////////////////////////////////////////////////////
-	float size = bbExtents.x;
-	
-	size = max(size, bbExtents.y);
-	size = max(size, bbExtents.z);
-
-	atcore_float4x4 view = m_lightCamera.GetViewMatrix();
-
-	atcore_float3 c = gfsdk_transformCoord(view, bbCenter);
-
-	size *= 3.0f;
-
-	float minZ = c.z - size;
-	float maxZ = c.z + size;
-
-	float orthoW = size;
-	float orthoH = size;
-
-	if (m_lightCamera.UseLHS())
-		m_lightCamera.Ortho(orthoW, orthoH, minZ, maxZ);
-	else // rhs camera flips Z
-		m_lightCamera.Ortho(orthoW, orthoH, -maxZ, -minZ);
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::resetUpDir(bool zup)
-{
-	m_lightCamera.ResetUpDir(zup);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::resetLhs(bool lhs)
-{
-	m_lightCamera.ResetLhs(lhs);
-	FitBounds();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::Orbit(const atcore_float2& delta)
-{
-	m_lightCamera.OrbitLight(gfsdk_makeFloat2(-delta.x, delta.y));
-
-	FitBounds();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::Pan(const atcore_float2& delta, const atcore_float3& axisX, const atcore_float3& axisY)
-{
-	atcore_float3 lightPos	= m_lightCamera.GetEye();
-	atcore_float3 lightAt	= m_lightCamera.GetAt();
-	atcore_float3 lightDir 	= m_lightCamera.GetZAxis();
-
-	float depth = GetDistance();
-
-	atcore_float2 newDelta = depth * delta;
-
-	atcore_float3 disp = -1.0f * axisY * newDelta.y + axisX * newDelta.x;
-
-	lightAt = lightAt + disp;
-	lightPos = lightPos + disp;
-
-	m_lightCamera.SetEye(lightPos);
-	m_lightCamera.SetAt(lightAt);
-	m_lightCamera.BuildViewMatrix();
-
-	FitBounds();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-float Light::GetDistance() const
-{
-	return m_lightCamera.GetLookDistance();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-bool Light::SetDistance(float newdistance)
-{
-	atcore_float3 lightPos		= m_lightCamera.GetEye();
-	atcore_float3 lightAt		= m_lightCamera.GetAt();
-	atcore_float3 lightDir 		= m_lightCamera.GetZAxis();
-
-	lightPos = lightAt + newdistance * lightDir;
-
-	m_lightCamera.SetEye(lightPos);
-	m_lightCamera.BuildViewMatrix();
-
-	FitBounds();
-
-	return true;
-}
-//////////////////////////////////////////////////////////////////////////////
-void Light::BeginShadowMapRendering()
-{
-	if (!m_pShadowMap) return;
-
-	float clearDepth = m_lightCamera.UseLHS() ? FLT_MAX : -FLT_MAX;
-	m_pShadowMap->BeginRendering(clearDepth);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::EndShadowMapRendering()
-{
-	if (!m_pShadowMap) return;
-
-	m_pShadowMap->EndRendering();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-atcore_float4x4 Light::GetViewMatrix() const
-{
-	return m_lightCamera.GetViewMatrix();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-atcore_float4x4 Light::GetProjectionMatrix() const
-{
-	return m_lightCamera.GetProjectionMatrix();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-atcore_float4x4 Light::GetLightMatrix() const
-{
-	atcore_float4x4 view = m_lightCamera.GetViewMatrix();
-	atcore_float4x4 projection = m_lightCamera.GetProjectionMatrix();
-
-	float mClip2Tex[] = { 
-				0.5,    0,    0,   0,
-				0,	   -0.5,  0,   0,
-				0,     0,     1,   0,
-				0.5,   0.5,   0,   1 
-			};
-	atcore_float4x4 clip2Tex = (atcore_float4x4&)mClip2Tex;
-
-	atcore_float4x4 viewProjection = view * projection;
-
-	atcore_float4x4 lightMatrix = viewProjection * clip2Tex;
-
-	return lightMatrix;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void Light::FillLightShaderParam(LightShaderParam &param)
-{
-	const std::vector<Light> &lights = g_Lights;
-
-	for (int i = 0; i < lights.size(); i++)
-	{
-		if (i >= 4)
-			break;
-
-		LightParam& lparam = param.m_lightParam[i];
-		memset(&lparam, 0, sizeof(LightParam));
-
-		const Light& light= lights[i];
-
-		lparam.m_enable		= light.m_enable;
-		lparam.m_useShadows	= light.m_useShadows;
-
-		lparam.m_dir		= light.getLightDirection();
-		lparam.m_intensity	= light.m_intensity;
-		lparam.m_color      = light.m_color;
-		lparam.m_isEnvLight = light.m_isEnvLight;
-		lparam.m_useEnvMap	= light.m_isEnvLight && (m_pEnvTextureSRV != 0);
-
-		float sceneUnit = GlobalSettings::Inst().getSceneUnitInCentimeters();
-		lparam.m_depthBias  = (sceneUnit > 0.0f) ? 1.0f / sceneUnit : 1.0f;
-
-		if (light.UseLHS())
-		{
-			lparam.m_depthBias *= -1.0f;
-			lparam.m_depthGain = -1.0f;
-			lparam.m_lhs = true;
-		}
-		else
-		{
-			lparam.m_depthGain = 1.0f;
-			lparam.m_lhs = false;
-		}
-
-		lparam.m_viewMatrix = light.GetViewMatrix();
-		lparam.m_lightMatrix = light.GetLightMatrix();
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::draw(Camera* pCamera)
-{
-	atcore_float3 lightPos	= m_lightCamera.GetEye();
-	atcore_float3 lightAt	= m_lightCamera.GetAt();
-
-	atcore_float4 color = gfsdk_makeFloat4(m_color.x, m_color.y, m_color.z, 1);
-	if (m_enable == false)
-		color = gfsdk_makeFloat4(0.5, 0.5, 0.5, 1);
-
-	// draw light shape
-	atcore_float4x4 lightMat = gfsdk_transpose(m_lightCamera.GetViewMatrix());
-		gfsdk_setPosition(lightMat, lightPos);
-
-	SimpleShaderParam param;
-	{
-		param.world		= lightMat;
-		param.view		= pCamera->GetViewMatrix();
-		param.projection = pCamera->GetProjectionMatrix();
-		param.useVertexColor = false;
-		param.color = color;
-	}
-
-	RenderInterface::CopyShaderParam(RenderInterface::SHADER_TYPE_SIMPLE_COLOR,
-		(void*)&param, sizeof(SimpleShaderParam) );
-
-	SimpleRenderable::Draw(SimpleRenderable::LIGHT);
-	
-	// draw light ray
-	gfsdk_makeIdentity(param.world);
-	RenderInterface::CopyShaderParam(RenderInterface::SHADER_TYPE_SIMPLE_COLOR,
-		(void*)&param, sizeof(SimpleShaderParam) );
-
-	SimpleRenderable::DrawLine(lightAt, lightPos);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-bool Light::loadParameters(NvParameterized::Handle& handle)
-{
-#ifndef NV_ARTISTTOOLS
-	NvParameterized::NvParameters* params = static_cast<NvParameterized::NvParameters*>(handle.getInterface());
-	size_t offset = 0;
-	nvidia::parameterized::HairProjectParametersNS::Light_Type* param = nullptr;
-	params->getVarPtr(handle, (void*&)param, offset);
-
-	m_enable = param->enable;
-	m_useShadows = param->useShadows;
-	m_visualize = param->visualize;
-	m_intensity = param->intensity;
-
-	memcpy(&m_color, &param->color, sizeof(atcore_float3));
-
-	atcore_float3 axisX, axisY, axisZ, lightPos;
-	memcpy(&axisX, &param->lightAxisX, sizeof(atcore_float3));
-	memcpy(&axisY, &param->lightAxisY, sizeof(atcore_float3));
-	memcpy(&axisZ, &param->lightAxisZ, sizeof(atcore_float3));
-	memcpy(&lightPos, &param->lightPos, sizeof(atcore_float3));
-	
-	this->SetShadowMapResolution(param->shadowMapResolution);
-
-	m_lightCamera.SetEye(lightPos);
-	m_lightCamera.SetViewMatrix(axisX, axisY, axisZ);
-	m_lightCamera.BuildViewMatrix();
-#else
-	CoreLib::Inst()->Light_loadParameters(handle, this);
-#endif // NV_ARTISTTOOLS
-
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-bool Light::saveParameters(NvParameterized::Handle& handle)
-{
-#ifndef NV_ARTISTTOOLS
-	NvParameterized::NvParameters* params = static_cast<NvParameterized::NvParameters*>(handle.getInterface());
-	size_t offset = 0;
-	nvidia::parameterized::HairProjectParametersNS::Light_Type* param = nullptr;
-	params->getVarPtr(handle, (void*&)param, offset);
-
-	param->enable = m_enable;
-	param->useShadows = m_useShadows;
-	param->visualize = m_visualize;
-	param->intensity = m_intensity;
-
-	param->shadowMapResolution = m_shadowMapResolutionIndex;
-
-	memcpy(&param->color, &m_color, sizeof(atcore_float3));
-
-	{
-		atcore_float3 axisX = m_lightCamera.GetXAxis();
-		atcore_float3 axisY = m_lightCamera.GetYAxis();
-		atcore_float3 axisZ = m_lightCamera.GetZAxis();
-		atcore_float3 lightPos = m_lightCamera.GetEye();
-
-		memcpy(&param->lightAxisX, &axisX, sizeof(atcore_float3));
-		memcpy(&param->lightAxisY, &axisY, sizeof(atcore_float3));
-		memcpy(&param->lightAxisZ, &axisZ, sizeof(atcore_float3));
-		memcpy(&param->lightPos, &lightPos, sizeof(atcore_float3));
-	}
-#else
-	CoreLib::Inst()->Light_saveParameters(handle, this);
-#endif // NV_ARTISTTOOLS
-
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-bool Light::SetEnvTextureFromFilePath(const char* textureFilePath)
-{
-	Light* pLight = Light::GetFirstSelectedLight();
-	if (!pLight || !pLight->m_isEnvLight)
-		return false;
-
-	m_envTextureFilePath = (textureFilePath) ? textureFilePath : "";
-
-	SAFE_RELEASE(m_pEnvTextureSRV);
-	if ((textureFilePath) && (strlen(textureFilePath) > 0))
-		m_pEnvTextureSRV = RenderInterface::CreateTextureResource(textureFilePath);
-
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-const std::string& Light::GetEnvTextureFilePath()
-{
-	return m_envTextureFilePath;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-GPUShaderResource* Light::GetEnvTextureSRV()
-{
-	return m_pEnvTextureSRV;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-GPUShaderResource* Light::GetShadowSRV(int i)
-{
-	if ((i >= 3) || (i < 0))
-		return 0;
-
-	return g_Lights[i].GetShadowSRV();
-}
-
-bool Light::GetLinkLightOption()
-{
-	return g_LinkLightOption;
-}
-
-void Light::SetLinkLightOption(bool val)
-{
-	g_LinkLightOption = val;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-std::vector<Light>& Light::GetDefaultLights()
-{
-	return g_Lights;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-Light* Light::GetFirstSelectedLight()
-{
-	for (int i = 0; i < g_Lights.size(); i++)
-	{
-		if (g_Lights[i].m_selected)
-			return &g_Lights[i];
-	}
-
-	return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-Light* Light::GetLight(int index)
-{
-	if (index < 0)
-		return 0;
-	if (index >= g_Lights.size())
-		return 0;
-
-	return &g_Lights[index];
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::Initialize()
-{
-	g_Lights.resize(4);
-
-	Light& keyLight		= g_Lights[0];
-	Light& fillLight	= g_Lights[1];
-	Light& rimLight		= g_Lights[2];
-	Light& envLight		= g_Lights[3];
-
-	atcore_float3 lookAt = gfsdk_makeFloat3(0.0f, 0.0f, 0.0f);
-
-	keyLight.m_selected = true;
-	keyLight.m_enable = true;
-	keyLight.m_color = gfsdk_makeFloat3(1, 1, 1);
-	keyLight.m_useShadows = true;
-	keyLight.m_isEnvLight = false;
-	keyLight.InitCamera(gfsdk_makeFloat3(100.0f, 25.0f, 0.0f), lookAt);
-	keyLight.m_name = "Key Light";
-
-	fillLight.m_enable = false;
-	fillLight.m_color = gfsdk_makeFloat3(0.5, 0.5, 0.5);
-	fillLight.m_useShadows = false;
-	fillLight.m_isEnvLight = false;
-	fillLight.InitCamera(gfsdk_makeFloat3(-100.0f, 0.0f, 25.0f), lookAt);
-	fillLight.m_name = "Fill Light";
-	
-	rimLight.m_enable = false;
-	rimLight.m_color = gfsdk_makeFloat3(0.25, 0.25, 0.25);
-	rimLight.m_useShadows = false;
-	rimLight.m_isEnvLight = false;
-	rimLight.InitCamera(gfsdk_makeFloat3(0.0f, 100.0f, -25.0f), lookAt);
-	rimLight.m_name = "Rim Light";
-
-	envLight.m_enable = false;
-	envLight.m_color = gfsdk_makeFloat3(0.25, 0.25, 0.25);
-	envLight.m_useShadows = false;
-	envLight.m_isEnvLight = true;
-	envLight.InitCamera(gfsdk_makeFloat3(0.0f, 0.0f, 0.0f), lookAt);
-	envLight.m_name = "Env Light";
-
-	for (int i = 0; i < g_Lights.size(); i++)
-		g_Lights[i].Init();
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::Shutdown()
-{
-	for (int i = 0; i < g_Lights.size(); i++)
-		g_Lights[i].Release();
-
-	g_Lights.clear();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::FitLightCameras(atcore_float3& center, atcore_float3& extent)
-{
-	for (int i = 0; i < g_Lights.size(); i++)
-	{
-		if (g_LinkLightOption && (i == FILL_LIGHT || i == RIM_LIGHT))
-			continue;
-
-		Light& light = g_Lights[i];
-		light.SetBounds(&center, &extent);
-		light.FitBounds(true);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::ResetUpDir(bool zup)
-{
-	for (int i = 0; i < g_Lights.size(); i++)
-	{
-		Light& li = g_Lights[i];
-		li.resetUpDir(zup);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::ResetLhs(bool lhs)
-{
-	for (int i = 0; i < g_Lights.size(); i++)
-	{
-		Light& li = g_Lights[i];
-		li.resetLhs(lhs);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::DrawLights(Camera* pCamera)
-{
-	for (int i = 0; i < g_Lights.size(); i++)
-	{
-		Light& light = g_Lights[i];
-		if (light.m_visualize)
-			light.draw(pCamera);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void Light::RenderShadowMap()
-{
-	Light* pLight = Light::GetFirstSelectedLight();
-	if (pLight)
-	{
-		float zNear = pLight->m_lightCamera.GetZNear();
-		float zFar = pLight->m_lightCamera.GetZFar();
-
-		if (pLight->UseLHS())
-			RenderInterface::RenderShadowMap(pLight->GetShadowSRV(), zNear, zFar);
-		else
-			RenderInterface::RenderShadowMap(pLight->GetShadowSRV(), -zFar, -zNear);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-bool Light::LoadParameters(NvParameterized::Handle& handle)
-{
-	// load lights
-	NvParameterized::Handle lightsHandle(handle);
-	if (handle.getChildHandle(handle.getInterface(), "lights", lightsHandle) == NvParameterized::ERROR_NONE)
-	{
-		int numLights = 0;
-		lightsHandle.getArraySize(numLights);
-		if (numLights > g_Lights.size()) 
-			numLights = g_Lights.size();
-
-		for (int idx = 0; idx < numLights; ++idx)
-		{
-			NvParameterized::Handle lightHandle(lightsHandle);
-			if (lightsHandle.getChildHandle(idx, lightHandle) == NvParameterized::ERROR_NONE)
-			{
-				g_Lights[idx].loadParameters(lightHandle);
-			}
-		}
-	}
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-bool Light::SaveParameters(NvParameterized::Handle& outHandle)
-{
-	NvParameterized::Handle lightsHandle(outHandle);
-	if (outHandle.getChildHandle(outHandle.getInterface(), "lights", lightsHandle) == NvParameterized::ERROR_NONE)
-	{
-		int numLights = (int)g_Lights.size();
-
-		lightsHandle.resizeArray(numLights);
-
-		for (int idx = 0; idx < numLights; ++idx)
-		{
-			NvParameterized::Handle lightHandle(outHandle);
-			if (lightsHandle.getChildHandle(idx, lightHandle) == NvParameterized::ERROR_NONE)
-			{
-				g_Lights[idx].saveParameters(lightHandle);
-			}
-		}
-	}
-	return true;
-}
-
-// END OF STATIC FUNCTIONS
-
diff --git a/tools/ArtistTools/source/CoreLib/Scene/Light.h b/tools/ArtistTools/source/CoreLib/Scene/Light.h
deleted file mode 100644
index bbe4ef3..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/Light.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "MathUtil.h"
-#ifndef NV_ARTISTTOOLS
-#include "ProjectParams.h"
-#else
-#include "NvParametersTypes.h"
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "NvParameterized.h"
-#include "NvParameters.h"
-#include "NvParameterizedTraits.h"
-#include "NvTraitsInternal.h"
-#endif
-#endif // NV_ARTISTTOOLS
-#include "Camera.h"
-
-#include <string>
-#include <vector>
-
-#include "LightShaderParam.h"
-
-class GPUShaderResource;
-class ShadowMap;
-
-/////////////////////////////////////////////////////////////////////////
-// Utility class for light object
-/////////////////////////////////////////////////////////////////////////
-class CORELIB_EXPORT Light
-{
-public:
-	bool			m_enable;
-	bool			m_useShadows;
-	bool			m_visualize;
-	bool			m_isEnvLight;
-	bool			m_useEnvMap;
-
-	bool			m_selected;
-
-	float			m_intensity;
-	atcore_float3	m_color;
-
-	std::string		m_name;
-	int				m_shadowMapResolutionIndex;
-	int				m_lightMapResolution;
-
-	// public API to access 4 lights
-	static std::vector<Light>& GetDefaultLights();
-	static Light* GetLight(int index);
-	static Light* GetFirstSelectedLight();
-
-	static void Initialize();
-	static void Shutdown();
-	static void FitLightCameras(atcore_float3& center, atcore_float3& extent);
-	static void ResetUpDir(bool zup);
-	static void ResetLhs(bool lhs);
-	static void DrawLights(Camera* pCamera);
-	static void FillLightShaderParam(LightShaderParam &param);
-	static bool LoadParameters(NvParameterized::Handle& handle);
-	static bool SaveParameters(NvParameterized::Handle& outHandle);
-	static void RenderShadowMap();
-
-	static bool SetEnvTextureFromFilePath(const char* textureFilePath);
-	static const std::string & GetEnvTextureFilePath();
-	static GPUShaderResource* GetEnvTextureSRV();
-	static GPUShaderResource* GetShadowSRV(int);
-
-	static bool GetLinkLightOption();
-	static void SetLinkLightOption(bool val);
-
-public:
-	Light();
-	~Light();
-
-	enum
-	{
-		KEY_LIGHT,
-		FILL_LIGHT,
-		RIM_LIGHT,
-		ENV_LIGHT,
-	};
-
-	void Orbit(const atcore_float2& delta);
-	void Pan(const atcore_float2& delta, const atcore_float3& axisX, const atcore_float3& axisY);
-
-	bool UseLHS() const;
-
-	float GetDistance() const;
-	bool SetDistance(float newdistsance);
-
-	void SetShadowMapResolution(int option);
-	void BeginShadowMapRendering();
-	void EndShadowMapRendering();
-
-	GPUShaderResource* GetShadowSRV();
-
-	atcore_float4x4 GetViewMatrix() const;
-	atcore_float4x4 GetProjectionMatrix() const;
-	atcore_float4x4 GetLightMatrix() const;
-
-protected:
-	void Init();
-	void Release();
-
-	bool loadParameters(NvParameterized::Handle& handle);
-	bool saveParameters(NvParameterized::Handle& outHandle);
-
-	void SetBounds(atcore_float3* center, atcore_float3* extents = 0);
-	void FitBounds(bool updateCenter = false);
-
-	atcore_float3 getLightDirection() const;
-	void InitCamera(const atcore_float3& from, const atcore_float3& lookAt);
-
-	void draw(Camera* pCamera);
-	void resetUpDir(bool zup);
-	void resetLhs(bool zup);
-
-public:
-
-	Camera			m_lightCamera;
-	ShadowMap*		m_pShadowMap;
-
-	atcore_float3	m_bbCenter;
-	atcore_float3	m_bbExtent;
-};
diff --git a/tools/ArtistTools/source/CoreLib/Scene/MeshData.cpp b/tools/ArtistTools/source/CoreLib/Scene/MeshData.cpp
deleted file mode 100644
index 295ac7f..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/MeshData.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "MeshData.h"
-
-#include "AnimUtil.h"
-#include "RenderResources.h"
-
-///////////////////////////////////////////////////////////////////////////////
-void CreateCPUResource(MeshData* pMeshData, const MeshDesc &meshDesc)
-{
-	if (!pMeshData)
-		return;
-
-	pMeshData->m_NumVertices = meshDesc.m_NumVertices;
-	pMeshData->m_NumIndices = meshDesc.m_NumTriangles * 3;
-
-	int numIndices = pMeshData->m_NumIndices;
-
-	pMeshData->m_pIndices = new NvUInt32[numIndices];
-	pMeshData->m_pMeshVertices = new MeshData::MeshVertex[numIndices];
-
-	NvUInt32* pVertUsed = new NvUInt32[meshDesc.m_NumVertices];
-	memset(pVertUsed, meshDesc.m_NumVertices, sizeof(NvUInt32) * meshDesc.m_NumVertices);
-	for (NvUInt32 i = 0; i < numIndices; i++)
-	{
-		NvUInt32 vidx = pMeshData->m_pIndices[i] = meshDesc.m_pIndices[i];
-
-		MeshData::MeshVertex&v = pMeshData->m_pMeshVertices[i];
-
-		v.pos			= meshDesc.m_pVertices[vidx];
-		v.vertexNormal	= meshDesc.m_pVertexNormals[i];
-		v.faceNormal	= meshDesc.m_pFaceNormals[i];
-		v.tangent		= meshDesc.m_pTangents[i];
-		v.texcoord		= meshDesc.m_pTexCoords[i];
-		v.vertexId		= (float)vidx;
-		pVertUsed[vidx]	= i;
-	}
-	int numUniqueIndices = 0;
-	for (NvUInt32 i = 0; i < meshDesc.m_NumVertices; i++)
-	{
-		if (meshDesc.m_NumVertices != pVertUsed[i])
-			++numUniqueIndices;
-	}
-	pMeshData->m_NumUniqueIndices = numUniqueIndices;
-	pMeshData->m_pUniqueIndices = new NvUInt32[numUniqueIndices];
-	for (NvUInt32 i = 0, idx = 0; i < meshDesc.m_NumVertices; i++)
-	{
-		if (meshDesc.m_NumVertices != pVertUsed[i])
-		{
-			pMeshData->m_pUniqueIndices[idx++] = pVertUsed[i];
-		}
-	}
-	delete[] pVertUsed;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-MeshData* MeshData::Create(MeshDesc &meshDesc, SkinData& skinData)
-{
-	MeshData* pMeshData = new MeshData;
-
-	CreateCPUResource(pMeshData, meshDesc);
-
-	pMeshData->m_GPUMeshResources = GPUMeshResources::Create(pMeshData, skinData);
-
-	return pMeshData;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void MeshData::Release()
-{
-	if (m_pMeshVertices) 
-		delete [] m_pMeshVertices;
-
-	if (m_pIndices) 
-		delete [] m_pIndices;
-
-	if (m_pUniqueIndices)
-		delete[] m_pUniqueIndices;
-
-	m_GPUMeshResources->Release();
-	delete m_GPUMeshResources;
-	m_GPUMeshResources = NULL;
-}
diff --git a/tools/ArtistTools/source/CoreLib/Scene/MeshData.h b/tools/ArtistTools/source/CoreLib/Scene/MeshData.h
deleted file mode 100644
index f05207e..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/MeshData.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "MathUtil.h"
-
-#include "RenderResources.h"
-
-class MeshDesc;
-class SkinData;
-
-//////////////////////////////////////////////////////////////////////////////////////
-// Helper for rendering graphics mesh
-//////////////////////////////////////////////////////////////////////////////////////
-class CORELIB_EXPORT MeshData
-{
-public:
-
-	struct MeshVertex
-	{
-		atcore_float3  pos;
-		atcore_float3  vertexNormal;
-		atcore_float3  faceNormal;
-		atcore_float3  tangent;
-		atcore_float2  texcoord;
-		float		  vertexId;
-	};
-
-public:
-	static MeshData* Create(MeshDesc &meshDesc, SkinData& skinData);
-	void Release();
-
-public:
-	int					m_NumVertices;
-	int					m_NumIndices;
-
-	MeshVertex*			m_pMeshVertices;
-	NvUInt32*			m_pIndices;
-
-	// m_pUniqueIndices and m_NumUniqueIndices are used to boost bounding calculation in FurMesh.cpp
-	NvUInt32*			m_pUniqueIndices;
-	NvUInt32			m_NumUniqueIndices;
-
-	// gpu resources
-	GPUMeshResources*	m_GPUMeshResources;
-};
-
-
diff --git a/tools/ArtistTools/source/CoreLib/Scene/Mouse.cpp b/tools/ArtistTools/source/CoreLib/Scene/Mouse.cpp
deleted file mode 100644
index f321157..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/Mouse.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-
-#include "Mouse.h"
-
-//#include "windows.h"
-
-Mouse::Mouse()
-{
-}
-
-Mouse::~Mouse()
-{
-    Free();
-}
-
-bool Mouse::Initialize(HINSTANCE hInstance, HWND hWnd)
-{
-	/*
-    if (FAILED(DirectInput8Create(hInstance, DIRECTINPUT_VERSION,
-            IID_IDirectInput8, reinterpret_cast<void**>(&_pDirectInput), 0)))
-        return false;
-
-    if (FAILED(_pDirectInput->CreateDevice(GUID_SysMouse, &_pDevice, 0)))
-        return false;
-
-    if (FAILED(_pDevice->SetDataFormat(&c_dfDIMouse)))
-        return false;
-
-    if (FAILED(_pDevice->SetCooperativeLevel(hWnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE)))
-        return false;
-
-    if (FAILED(_pDevice->Acquire()))
-        return false;
-	*/
-    return true;
-}
-
-void Mouse::Free()
-{
-	/*
-    if (_pDevice)
-    {
-        _pDevice->Unacquire();
-        _pDevice = NULL;
-    }
-
-	_pDirectInput = NULL;
-	*/
-}
-
-void Mouse::Update()
-{
-	/*
-    if (!_pDirectInput || !_pDevice)
-    {
-		return;
-    }
-
-    HRESULT hr;
-
-    while (true)
-    {
-        hr = _pDevice->GetDeviceState(sizeof(DIMOUSESTATE), &_mouseState);
-
-        if (FAILED(hr))
-        {
-            if (hr == DIERR_INPUTLOST || hr == DIERR_NOTACQUIRED)
-            {
-                if (FAILED(_pDevice->Acquire()))
-                    return;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-	*/
-}
diff --git a/tools/ArtistTools/source/CoreLib/Scene/Mouse.h b/tools/ArtistTools/source/CoreLib/Scene/Mouse.h
deleted file mode 100644
index 3cbd598..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/Mouse.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-/*
-#define DIRECTINPUT_VERSION 0x0800
-#include <dinput.h>
-*/
-#include "windows.h"
-#include "MathUtil.h"
-
-class Mouse
-{
-public:
-    Mouse();
-    ~Mouse();
-
-	/*
-    enum Button
-    {
-        LEFT   = 0x00,
-        RIGHT  = 0x01,
-        MIDDLE = 0x02
-    };
-
-    bool IsButtonPressed(Button button) const
-	{
-		if (_mouseState.rgbButtons[button] & 0x80) 
-			return true;
-		return false;
-	}
-	*/
-	void SetPosition(atcore_float2 position)
-	{
-		m_Position = position;
-	}
-
-    atcore_float2 GetDelta() const 
-	{
-		return m_Delta;
-	}
-
-	void SetDelta(atcore_float2 position)
-	{
-		m_Delta = gfsdk_makeFloat2(
-			static_cast<float>(position.x - m_Position.x),
-			static_cast<float>(position.y - m_Position.y));
-		m_Position = position;
-	}
-
-    float GetDeltaWheel() const
-	{
-	    if (m_DeltaWheel > 0)
-			return 1.0f;
-		else if (m_DeltaWheel < 0)
-			return -1.0f;
-		else
-			return 0.0f;
-	}
-
-	void SetDeltaWheel(float deltaWheel)
-	{
-		m_DeltaWheel = deltaWheel;
-	}
-
-    void Update();
-	bool Initialize(HINSTANCE hInstance, HWND hWnd);
-	void Free();         
-	/*
-    IDirectInput8* _pDirectInput;
-    IDirectInputDevice8* _pDevice;
-    DIMOUSESTATE _mouseState;
-	*/
-	atcore_float2 m_Position;
-	atcore_float2 m_Delta;
-	float m_DeltaWheel;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/Scene/SimpleScene.cpp b/tools/ArtistTools/source/CoreLib/Scene/SimpleScene.cpp
deleted file mode 100644
index dd89e4d..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/SimpleScene.cpp
+++ /dev/null
@@ -1,1257 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#include "SimpleScene.h"
-
-#include "AppMainWindow.h"
-#include "Automate.h"
-#include "Backdoor.h"
-#include "Gamepad.h"
-#include "GlobalSettings.h"
-#include "Light.h"
-#include "Mouse.h"
-#include "SimpleRenderable.h"
-#include "Stats.h"
-#include "CorelibUtils.h"
-//#include "Timer.h"
-#include "ViewerOutput.h"
-
-#include "FoundationHolder.h"
-
-#include <NvAllocatorCallback.h>
-#include <NvErrorCallback.h>
-#include <NsAlignedMalloc.h>
-#include <NsVersionNumber.h>
-
-#include <Nv/Common/NvCoMemoryAllocator.h>
-
-#include "RenderInterface.h"
-#include "DeviceManager.h"
-
-#ifndef NV_ARTISTTOOLS
-#include "FurCharacter.h"
-#include "FurRenderer.h"
-#include "ProjectParams.h"
-#include "HairInstance.h"
-#include "HairSDK.h"
-
-namespace { // anonymous
-
-class ErrorCallback: public nvidia::NvErrorCallback
-{
-	public:
-	void reportError(nvidia::NvErrorCode::Enum code, const char* message, const char* file, int line) NV_OVERRIDE
-	{
-		if (code & (nvidia::NvErrorCode::eDEBUG_WARNING | nvidia::NvErrorCode::ePERF_WARNING))
-		{
-			viewer_warn("%s", message);
-			return;
-		}
-		viewer_err("%s", message);
-		if (code != nvidia::NvErrorCode::eNO_ERROR)
-		{
-			viewer_err("%s", message);
-		}
-	}
-};
-
-class AllocatorCallback: public nvidia::NvAllocatorCallback
-{
-	public:
-
-	void* allocate(size_t size, const char* typeName, const char* filename, int line) NV_OVERRIDE
-	{
-		return NvCo::MemoryAllocator::getInstance()->simpleAllocate(size);
-	}
-
-	void deallocate(void* ptr) NV_OVERRIDE
-	{
-		NvCo::MemoryAllocator::getInstance()->simpleDeallocate(ptr);
-	}
-};
-
-} // namespace anonymous
-
-static AllocatorCallback s_allocator;
-static ErrorCallback s_error;
-
-// global singletons (can't create more than one instance)
-struct ProjectParamsContext*	g_projectParamsContext = 0;
-
-class CustomLogger : public NvCo::Logger
-{
-public:
-	virtual void log(NvCo::LogSeverity::Enum severity, const char* message, const char* functionName, const char* file, int line) NV_OVERRIDE
-	{
-		using namespace NvCo;
-
-		switch (severity)
-		{
-			default:
-			case LogSeverity::FATAL_ERROR:
-			case LogSeverity::NON_FATAL_ERROR:
-				viewer_err("%s", message);
-				break;
-			case LogSeverity::WARNING:
-				viewer_warn("%s", message);
-				break;
-			case LogSeverity::INFO:
-				viewer_info("%s", message);
-				break;
-			case LogSeverity::DEBUG_INFO:
-				viewer_msg("%s", message);
-				break;
-		}
-	}
-	virtual void flush() NV_OVERRIDE {}
-};
-
-CustomLogger g_logHandler;
-#else
-#include "GPUProfiler.h"
-#include "MeshShaderParam.h"
-#include <Nv\Common\NvCoLogger.h>
-#endif // NV_ARTISTTOOLS
-
-Gamepad& theGamepad = Gamepad::Instance();
-Mouse							g_mouse;
-Timer							g_fpsTimer;
-Backdoor*						g_pBackdoor;
-
-///////////////////////////////////////////////////////////////////////////////
-SimpleScene* SimpleScene::Inst()
-{
-	static SimpleScene scene;
-	return &scene;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-SimpleScene::SimpleScene()
-	:
-	m_pCamera(0),
-	m_pWindCamera(0),
-	m_isProjectModified(false),
-	m_isFurModified(false),
-	m_isSceneLoading(false)
-{
-#ifndef NV_ARTISTTOOLS
-	m_pFurCharacter = new FurCharacter;
-#endif // NV_ARTISTTOOLS
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::Initialize( HWND hWnd, int backdoor)
-{
-	g_fpsTimer.Start();
-
-	if(!InitCameraMouse(hWnd)) 
-		return false;
-
-	if (!SimpleRenderable::Initialize())
-		return false;
-
-	Light::Initialize();
-
-	//nvidia::shdfnd::initializeSharedFoundation(NV_FOUNDATION_VERSION, s_allocator, s_error);
-
-	FoundationHolder::GetFoundation();
-
-	GPUProfiler_Initialize();
-
-
-	if (backdoor == 1) // master mode
-		g_pBackdoor = createBackdoor("BACKDOOR_SERVER","BACKDOOR_CLIENT");
-
-	SetFurModified(false);
-	SetProjectModified(false);
-
-	CoreLib::Inst()->SimpleScene_Initialize(backdoor);
-
-	AppMainWindow::Inst().updateUI();
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::Shutdown()
-{
-#ifndef SAFE_DELETE
-#define SAFE_DELETE(x) {if(x!=NV_NULL){delete x;x=NV_NULL;}}
-#endif
-	
-	SAFE_DELETE(m_pCamera);
-	SAFE_DELETE(m_pWindCamera);
-
-	GPUProfiler_Shutdown();
-
-	SimpleRenderable::Shutdown();
-	Light::Shutdown();
-
-	if (g_pBackdoor)
-	{
-		g_pBackdoor->release();
-		g_pBackdoor = nullptr;
-	}
-
-#ifndef NV_ARTISTTOOLS
-	GetFurCharacter().Clear();
-
-	ShutdownBlastSDK();
-
-	if (g_projectParamsContext)
-	{
-		ReleaseProjectParamsContext(g_projectParamsContext);
-		g_projectParamsContext = nullptr;
-	}
-#else
-	CoreLib::Inst()->SimpleScene_Shutdown();
-#endif // NV_ARTISTTOOLS
-
-	RenderInterface::Shutdown();
-
-	nvidia::shdfnd::terminateSharedFoundation();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::Clear()
-{
-	GlobalSettings::Inst().m_sceneLoaded = false;
-	GlobalSettings::Inst().m_firstFrame = true;
-
-#ifndef NV_ARTISTTOOLS
-	GetFurCharacter().Clear();
-#else
-	CoreLib::Inst()->SimpleScene_Clear();
-#endif // NV_ARTISTTOOLS
-
-	m_cameraBookmarks.clear();
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::InitCameraMouse(HWND hAppWnd)
-{
-	// default camera pose settings
-	m_pCamera = new Camera(GlobalSettings::Inst().m_zup, false);
-	m_pCamera->SetDefaults();
-
-	// init wind camera
-	{
-		m_pWindCamera = new Camera(false);
-		m_pWindCamera->SetDefaults();
-
-		GlobalSettings::Inst().m_windDir = m_pWindCamera->GetZAxis();
-	}
-
-	// init mouse
-	g_mouse.Initialize(::GetModuleHandle(NV_NULL), (HWND)hAppWnd/*_hWidget*/);
-
-	theGamepad.Initialize();
-	return true;
-}
-
-float SimpleScene::NextTimeStep()
-{
-	static LONGLONG g_lastRenderTicks = 0;
-
-	// Work out the timestep
-	LONGLONG ticks = g_fpsTimer.GetTicksElapsed();
-	LONGLONG deltaTicks = ticks - g_lastRenderTicks;
-	g_lastRenderTicks = ticks;
-
-	float timeStep = deltaTicks / float(g_fpsTimer.GetTicksPerSecond());
-
-	const float maxTimeStep = 0.1f;
-
-	timeStep = (timeStep < 0.0f) ? 0.0f : timeStep;
-	timeStep = (timeStep > maxTimeStep) ? maxTimeStep : timeStep;
-
-	return timeStep;
-}
-
-Timer& SimpleScene::GetTimer()
-{
-	return g_fpsTimer;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::Draw()
-{
-	if (IsSceneLoading())
-		return;
-
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	// draw background
-	RenderInterface::ClearRenderWindow(0.35f, 0.35f, 0.35f);
-	RenderInterface::RenderBackgroundTexture();
-	
-	globalSettings.setTimeStep(NextTimeStep());
-	//globalSettings.setTimeStep(1.0f/60.0f);
-
-	// increment frame timer
-	if (globalSettings.m_animate)
-	{
-		globalSettings.stepAnimation();
-	}
-
-	if (globalSettings.m_playStopped)
-		AppMainWindow::Inst().updateMainToolbar();
-
-	// update camera 
-	UpdateCamera();
-
-	// show ground grid
-	if (globalSettings.m_showGrid)
-		DrawGround();
-
-	// draw wind icon
-	if (globalSettings.m_visualizeWind)
-		DrawWind();
-
-	// draw axis lines
-	if (globalSettings.m_showAxis)
-		DrawAxis();
-
-	// handle game pad
-	theGamepad.Process();
-
-	// visualize shadow map
-	if (GlobalSettings::Inst().m_visualizeShadowMap)
-		Light::RenderShadowMap();
-
-	CoreLib::Inst()->SimpleScene_Draw_DX12();
-
-	RenderInterface::SwitchToDX11();
-
-	CoreLib::Inst()->SimpleScene_Draw_DX11();
-
-	RenderInterface::FlushDX11();
-
-	// draw lights
-	Light::DrawLights(m_pCamera);
-
-	// present current window
-	RenderInterface::PresentRenderWindow();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::Timeout()
-{
-	if (m_pCamera == nullptr)
-	{
-		// this could be called when quiting. have to check nullptr
-		return;
-	}
-
-	g_mouse.Update();
-
-	if (IsAutomateMode())
-	{
-		AutomateRun();
-	}
-
-	Draw();
-
-	if (g_pBackdoor)
-	{
-		int argc;
-		const char **argv = g_pBackdoor->getInput(argc);
-		if (argc > 0)
-		{
-			char message[1024];
-			strcpy(message,"");
-			for (int i = 0; i < argc; i++)
-			{
-				strcat(message, argv[i]);
-				strcat(message," ");
-			}
-
-			viewer_info("Message received: %s", message);
-		}
-	}
-
-}
-
-#include <Shlwapi.h>
-#include <FbxUtil.h>
-
-///////////////////////////////////////////////////////////////////////////////
-bool 
-SimpleScene::LoadSceneFromFbx(const char* dir, const char* fbxName)
-{
-	return CoreLib::Inst()->SimpleScene_LoadSceneFromFbx(dir, fbxName);
-
-	/*
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	char fbxFilePath[MAX_PATH];
-
-	float sceneUnit = globalSettings.getSceneUnitInCentimeters();
-
-	PathCombineA(fbxFilePath, dir, fbxName);
-
-	AppMainWindow::Inst().setProgress("Initializing FBX loader", 0);
-	FbxUtil::Initialize(fbxFilePath, sceneUnit);
-
-	char rootBoneName[MAX_PATH];
-	int upAxis = 0;
-
-	FbxUtil::GetGlobalSettings(
-		&globalSettings.m_frameStartTime, 
-		&globalSettings.m_frameEndTime, 
-		&globalSettings.m_animationFps, 
-		&upAxis, rootBoneName);
-
-	if (upAxis == 1)
-		SimpleScene::Inst()->ResetUpDir(false);
-	else if (upAxis = 2)
-		SimpleScene::Inst()->ResetUpDir(true);
-
-#ifndef NV_ARTISTTOOLS
-	SimpleScene::Inst()->GetFurCharacter().LoadMeshFromFbx(dir, fbxName);
-#else
-	CoreLib::Inst()->SimpleScene_LoadSceneFromFbx(dir, fbxName);
-#endif // NV_ARTISTTOOLS
-
-	FbxUtil::Release();
-
-	globalSettings.m_sceneLoaded = true;
-	globalSettings.m_animationIndex = 1;
-	globalSettings.m_firstFrame = true;
-
-	//globalSettings.m_currentBoneIndex = findBoneByName(rootBoneName);
-	globalSettings.resetAnimation();
-
-	return true;
-	*/
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::LoadProject(const char* dir, const char* file)
-{
-	Clear();
-
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-	globalSettings.m_projectFileDir = dir;
-	globalSettings.m_projectFileName = file;
-
-	CoreLib::Inst()->SimpleScene_LoadProject(dir, file);
-
-	SetProjectModified(false);
-	
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::LoadParameters(NvParameterized::Interface* iface)
-{
-	m_isSceneLoading = true;
-
-	AppMainWindow::Inst().startProgress();
-
-#ifndef NV_ARTISTTOOLS
-	nvidia::parameterized::HairProjectParameters* params = static_cast<nvidia::parameterized::HairProjectParameters*>(iface);
-
-	nvidia::parameterized::HairProjectParametersNS::ParametersStruct& srcDesc = params->parameters();
-
-	if (m_pCamera)
-	{
-		m_pCamera->LoadParameters(&srcDesc.camera);
-	}
-
-	LoadCameraBookmarks(iface);
-
-	if (m_pWindCamera)
-	{
-		m_pWindCamera->LoadParameters(&srcDesc.windCamera);
-	}
-	
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	// Load scene settings
-	globalSettings.m_repeatAnimation	= srcDesc.scene.repeatAnimation;
-	globalSettings.m_animationSpeed		= srcDesc.scene.animationSpeed;
-	globalSettings.m_showGrid			= srcDesc.scene.showGrid;
-	globalSettings.m_showAxis			= srcDesc.scene.showAxis;
-	globalSettings.m_zup				= srcDesc.scene.upAxis == 1;
-	globalSettings.m_sceneUnitIndex		= srcDesc.scene.sceneUnitIndex;
-
-	// Load renderer settings
-	NvParameterized::Handle handle(iface);
-
-	// Load fbx paths
-	if (iface->getParameterHandle("fbxFilePaths", handle) == NvParameterized::ERROR_NONE)
-	{
-		int arraySize;
-		handle.getArraySize(arraySize);
-		char** strArray = new char*[arraySize];
-		handle.getParamStringArray(strArray, arraySize);
-		for (int idx = 0; idx < arraySize; ++idx)
-		{
-			LoadSceneFromFbx(
-				globalSettings.m_projectFileDir.c_str(),
-				strArray[idx]);
-		}
-		delete [] strArray;
-	}
-
-	// get general fur renderer settings
-	if (iface->getParameterHandle("renderer", handle) == NvParameterized::ERROR_NONE)
-		FurRenderer::LoadParameters(handle);
-
-	// get fur character mesh setting 
-	if (false == GetFurCharacter().LoadMeshParameters(handle))
-		return false;
-
-	// Load apx paths (hair instances)
-	if (iface->getParameterHandle("apxFilePaths", handle) == NvParameterized::ERROR_NONE)
-	{
-		if (false == GetFurCharacter().LoadHairParameters(handle))
-			return false;
-	}
-#else
-	CoreLib::Inst()->SimpleScene_LoadParameters(iface);
-#endif // NV_ARTISTTOOLS
-	
-	m_isSceneLoading = false;
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::SaveProject(const char* dir, const char* file)
-{
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	globalSettings.m_projectFileDir = dir;
-	globalSettings.m_projectFileName = file;
-
-	std::string saveFilePath = globalSettings.getAbsoluteFilePath();
-	
-	std::string tempFilePath = utils::GetTempFilePath();
-
-#ifndef NV_ARTISTTOOLS
-	if (ProjectParamsSave(g_projectParamsContext, tempFilePath.c_str(), this))
-	{
-		if (!utils::RenameFile(tempFilePath.c_str(), saveFilePath.c_str(), true /* overwrite */))
-		{
-			return false;
-		}
-		SetProjectModified(false);
-		return true;
-	}
-#else
-	return CoreLib::Inst()->SimpleScene_SaveProject(dir, file);
-#endif // NV_ARTISTTOOLS
-
-	return false;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::LoadBackgroundTextureFile()
-{
-	QString texName = AppMainWindow::Inst().OpenTextureFile();
-
-	return RenderInterface::LoadBackgroundTexture(texName.toLocal8Bit());
-}
-
-//////////////////////////////////////////////////////////////////////////
-void SimpleScene::ClearBackgroundTexture()
-{
-	RenderInterface::ClearBackgroundTexture();
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// slots and handlers / mouse / camera
-
-void SimpleScene::Resize( int w, int h )
-{
-	RenderInterface::ResizeRenderWindow(w,h);
-
-	m_pCamera->SetSize(w,h);
-
-	UpdateCamera();
-			
-	SetProjectModified(true);
-}
-
-void SimpleScene::onMouseDown(atcore_float2 position)
-{
-	g_mouse.SetPosition(position);
-}
-
-void SimpleScene::onMouseUp(atcore_float2 position)
-{
-}
-
-void SimpleScene::onMouseMove(atcore_float2 position)
-{
-	g_mouse.SetDelta(position);
-}
-
-void SimpleScene::onMouseWheel(float deltaWheel)
-{
-	g_mouse.SetDeltaWheel(deltaWheel);
-}
-
-QString SimpleScene::createBookmark()
-{
-	QString bookmark = _generateBookmarkName();
-	m_cameraBookmarks.append(CameraBookmark(bookmark, *m_pCamera));
-	return bookmark;
-}
-
-void SimpleScene::removeBookmark(const QString& name)
-{
-	int bookmarksCount = m_cameraBookmarks.size();
-	for (int i = 0; i < bookmarksCount; ++i)
-	{
-		const CameraBookmark& bookmark = m_cameraBookmarks[i];
-		if (bookmark.name == name)
-		{
-			m_cameraBookmarks.removeAt(i);
-			break;
-		}
-	}
-}
-
-void SimpleScene::activateBookmark(const QString& name)
-{
-	int bookmarksCount = m_cameraBookmarks.size();
-	for (int i = 0; i < bookmarksCount; ++i)
-	{
-		const CameraBookmark& bookmark = m_cameraBookmarks[i];
-		if (bookmark.name == name)
-		{
-			*m_pCamera = bookmark.camera;
-			break;
-		}
-	}
-}
-
-void SimpleScene::renameBookmark(const QString& oldName, const QString& newName)
-{
-	int bookmarksCount = m_cameraBookmarks.size();
-	for (int i = 0; i < bookmarksCount; ++i)
-	{
-		CameraBookmark& bookmark = m_cameraBookmarks[i];
-		if (bookmark.name == oldName)
-		{
-			bookmark.name = newName;
-			break;
-		}
-	}
-}
-
-QList<QString> SimpleScene::getBookmarkNames()
-{
-	QList<QString> names;
-	int bookmarksCount = m_cameraBookmarks.size();
-	for (int i = 0; i < bookmarksCount; ++i)
-	{
-		const CameraBookmark& bookmark = m_cameraBookmarks[i];
-		names.append(bookmark.name);
-	}
-
-	return names;
-}
-
-void SimpleScene::Drag( char type )
-{
-	g_mouse.Update();
-	
-	switch(type)
-	{
-	case 'R': RotateCamera(); break;
-	case 'Z': ZoomCamera(); break;
-	case 'P': PanCamera(); break;
-	case 'L': RotateLightDirection(); break;
-	case 'W': RotateWindDirection(); break;
-
-	case 'K': PanLight(); break;
-	}
-	SetProjectModified(true);
-}
-
-void SimpleScene::WheelZoom()
-{
-	WheelZoomCamera();
-	SetProjectModified(true);
-}
-
-void SimpleScene::PanCamera()
-{
-	if (g_mouse.GetDelta().x != 0.0f || g_mouse.GetDelta().y != 0.0f)
-	{
-		int w = m_pCamera->GetWidth();
-		int h = m_pCamera->GetHeight();
-
-		atcore_float2 delta = g_mouse.GetDelta() * 2.0f;
-		delta.x /= (float)(w);
-		delta.y /= (float)(h);
-		m_pCamera->Pan(delta);
-	}
-	SetProjectModified(true);
-}
-
-void SimpleScene::ZoomCamera()
-{
-	float dz = (- g_mouse.GetDelta().y);
-
-	if (dz != 0.0f)
-	{
-		dz *= 5.0f / m_pCamera->GetHeight();
-
-		m_pCamera->Dolly(dz);
-	}
-	SetProjectModified(true);
-}
-
-void SimpleScene::WheelZoomCamera()
-{
-	float dz = - g_mouse.GetDeltaWheel() ;
-
-	if (dz != 0.0f)
-	{
-		dz /= 5.0f;
-
-		m_pCamera->Dolly(dz);
-	}
-	SetProjectModified(true);
-}
-
-void SimpleScene::RotateCamera()
-{
-	if (g_mouse.GetDelta().x != 0.0f || g_mouse.GetDelta().y != 0.0f)
-	{
-		m_pCamera->Orbit(g_mouse.GetDelta() * 0.125f);
-	}
-	SetProjectModified(true);
-}
-
-void SimpleScene::RotateLightDirection()
-{
-	if (g_mouse.GetDelta().x != 0.0f || g_mouse.GetDelta().y != 0.0f)
-	{
-		atcore_float2 delta = g_mouse.GetDelta() * 0.5f;
-		delta.y *= -1.0f;
-
-		if (Light::GetLinkLightOption())
-		{
-			Light* pKeyLight = Light::GetLight(Light::KEY_LIGHT);
-			Light* pFillLight = Light::GetLight(Light::FILL_LIGHT);
-			Light* pRimLight = Light::GetLight(Light::RIM_LIGHT);
-			if (pKeyLight->m_selected)
-			{
-				pKeyLight->Orbit(delta);
-				pFillLight->Orbit(delta);
-				pRimLight->Orbit(delta);
-			}
-			else
-			{
-				if (pFillLight->m_selected)
-				{
-					pFillLight->Orbit(delta);
-				}
-
-				if (pRimLight->m_selected)
-				{
-					pRimLight->Orbit(delta);
-				}
-			}
-
-			Light* pEnvLight = Light::GetLight(Light::ENV_LIGHT);
-			if (pEnvLight->m_selected)
-			{
-				pEnvLight->Orbit(delta);
-			}
-		}
-		else
-		{
-			for (int i = 0; i < 4; i++)
-			{
-				Light* pLight = Light::GetLight(i);
-				if (!pLight)
-					continue;
-
-				if (pLight->m_selected)
-				{
-					pLight->Orbit(delta);
-				}
-			}
-		}
-	}
-	SetProjectModified(true);
-}
-
-void SimpleScene::PanLight()
-{
-	if (g_mouse.GetDelta().x != 0.0f || g_mouse.GetDelta().y != 0.0f)
-	{
-		int w = m_pCamera->GetWidth();
-		int h = m_pCamera->GetHeight();
-
-		atcore_float2 delta = g_mouse.GetDelta() * 2.0f;
-		delta.x /= (float)(w);
-		delta.y /= (float)(h);
-
-		for (int i = 0; i < 4; i++)
-		{
-			Light* pLight = Light::GetLight(i);
-			if (!pLight)
-				continue;
-
-			if (pLight->m_selected)
-				pLight->Pan(delta, m_pCamera->GetXAxis(), m_pCamera->GetYAxis());
-		}
-	}
-	SetProjectModified(true);
-}
-
-void SimpleScene::RotateWindDirection()
-{
-	if (g_mouse.GetDelta().x != 0.0f || g_mouse.GetDelta().y != 0.0f)
-	{
-		m_pWindCamera->Orbit(g_mouse.GetDelta() * 0.5f);
-
-		GlobalSettings::Inst().m_windDir = m_pWindCamera->GetZAxis();		
-	}
-
-	SetProjectModified(true);
-}
-
-QString SimpleScene::_generateBookmarkName()
-{
-	QString name;
-	for (int i = 1; ; i++)
-	{
-		name = QString("View%1").arg(i, 2, 10, QChar('0'));
-		int found = -1;
-		int bookmarksCount = m_cameraBookmarks.size();
-		for (int j = 0; j < bookmarksCount; ++j)
-		{
-			const CameraBookmark& bookmark = m_cameraBookmarks[j];
-			if (bookmark.name == name)
-			{
-				found = j;
-				break;
-			}
-		}
-
-		if (-1 == found)
-			break;
-	}
-	return name;
-}
-
-void SimpleScene::UpdateCamera()
-{
-	if (!m_pCamera)
-		return;
-
-	float sceneUnit = GlobalSettings::Inst().getSceneUnitInCentimeters() ;
-	float fov = (GlobalSettings::Inst().m_fovAngle / 360.0f) * 3.141592653589793;	
-
-	m_pCamera->SetFOV(fov);
-
-	int w = m_pCamera->GetWidth();
-	int h = m_pCamera->GetHeight();
-
-	float aspect = ((float)(w) / (float)(h));
-
-	float minZ = 1.0f;
-	float maxZ = 10000.0f;	// should calculate dynamically
-/*
-	if (sceneUnit != 0.0f)
-	{
-		minZ /= sceneUnit;
-		maxZ /= sceneUnit;
-	}
-*/
-	m_pCamera->SetAspetRatio(aspect);
-	m_pCamera->SetZFar(maxZ);
-	m_pCamera->SetZNear(minZ);
-
-	m_pCamera->Perspective();
-
-	CoreLib::Inst()->SimpleScene_UpdateCamera();
-}
-
-void SimpleScene::FitCamera()
-{
-	if (!m_pCamera)
-		return;
-
-	atcore_float3 center, extents;
-
-#ifndef NV_ARTISTTOOLS
-	if (m_pFurCharacter)
-		m_pFurCharacter->ComputeBounds(center, extents, false);
-#else
-	bool valid = CoreLib::Inst()->SimpleScene_FitCamera(center, extents);
-	if (!valid)
-	{
-		return;
-	}
-#endif // NV_ARTISTTOOLS
-
-	m_pCamera->FitBounds(center, extents);
-}
-
-void SimpleScene::ResetUpDir(bool zup)
-{
-	m_pCamera->ResetUpDir(zup);
-	m_pWindCamera->ResetUpDir(zup);
-	Light::ResetUpDir(zup);
-
-	GlobalSettings::Inst().m_zup = zup;
-
-	CoreLib::Inst()->SimpleScene_ResetUpDir(zup);
-
-	SetProjectModified(true);
-}
-
-void SimpleScene::ResetLhs(bool lhs)
-{
-	m_pCamera->ResetLhs(lhs);
-	m_pWindCamera->ResetLhs(lhs);
-	Light::ResetLhs(lhs);
-
-	GlobalSettings::Inst().m_lhs = lhs;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::SaveParameters(NvParameterized::Interface* iface)
-{
-#ifndef NV_ARTISTTOOLS
-	nvidia::parameterized::HairProjectParameters* params = static_cast<nvidia::parameterized::HairProjectParameters*>(iface);
-	nvidia::parameterized::HairProjectParametersNS::ParametersStruct& targetDesc = params->parameters();
-
-	if (m_pCamera)
-		m_pCamera->SaveParameters(&targetDesc.camera);
-
-	SaveCameraBookmarks(iface);
-
-	if (m_pWindCamera)
-		m_pWindCamera->SaveParameters(&targetDesc.windCamera);
-
-	// Save scene settings
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	targetDesc.scene.repeatAnimation	= globalSettings.m_repeatAnimation;
-	targetDesc.scene.animationSpeed		= globalSettings.m_animationSpeed;
-	targetDesc.scene.showGrid			= globalSettings.m_showGrid;
-	targetDesc.scene.showAxis			= globalSettings.m_showAxis;
-
-	targetDesc.scene.upAxis				= (globalSettings.m_zup) ? 1 : 2;
-	targetDesc.scene.sceneUnitIndex		= globalSettings.m_sceneUnitIndex;
-
-	FurCharacter& character = GetFurCharacter();
-	NvParameterized::Handle handle(iface);
-
-	// Save renderer settings
-	if (iface->getParameterHandle("renderer", handle) == NvParameterized::ERROR_NONE)
-	{
-		FurRenderer::SaveParameters(handle);
-		character.SaveMeshParameters(handle);
-	}
-
-	if (iface->getParameterHandle("renderer.textureFilePath", handle) == NvParameterized::ERROR_NONE)
-	{
-		std::string textureFilePath = globalSettings.getRelativePath(globalSettings.m_backgroundTextureFilePath.c_str());
-		handle.setParamString(textureFilePath.c_str());
-	}
-
-	// save hair path
-	if (iface->getParameterHandle("apxFilePaths", handle) == NvParameterized::ERROR_NONE)
-		character.SaveHairParameters(handle);
-#else
-	CoreLib::Inst()->SimpleScene_SaveParameters(iface);
-#endif // NV_ARTISTTOOLS
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::LoadCameraBookmarks(NvParameterized::Interface* iface)
-{
-#ifndef NV_ARTISTTOOLS
-	nvidia::parameterized::HairProjectParameters* params = static_cast<nvidia::parameterized::HairProjectParameters*>(iface);
-	nvidia::parameterized::HairProjectParametersNS::ParametersStruct& srcDesc = params->parameters();
-	nvidia::parameterized::HairProjectParametersNS::CameraBookmark_DynamicArray1D_Type& bookmarks = srcDesc.cameraBookmarks;
-
-	NvParameterized::Handle cameraBookmarksHandle(iface);
-	if (iface->getParameterHandle("cameraBookmarks", cameraBookmarksHandle) != NvParameterized::ERROR_NONE)
-		return false;
-
-	int numCameraBookmarks = 0;
-	cameraBookmarksHandle.getArraySize(numCameraBookmarks);
-	for (int idx = 0; idx < numCameraBookmarks; ++idx)
-	{
-		NvParameterized::Handle cameraBookmarkHandle(cameraBookmarksHandle);
-		if (cameraBookmarksHandle.getChildHandle(idx, cameraBookmarkHandle) == NvParameterized::ERROR_NONE)
-		{
-			CameraBookmark cameraBookmark;
-			cameraBookmark.camera.LoadParameters((void*)&(bookmarks.buf[idx].camera));
-			cameraBookmark.camera.SetSize(m_pCamera->GetWidth(), m_pCamera->GetHeight());
-			cameraBookmark.name = bookmarks.buf[idx].name.buf;
-			m_cameraBookmarks.append(cameraBookmark);
-		}
-	}
-#else
-	CoreLib::Inst()->SimpleScene_LoadCameraBookmarks(iface);
-#endif // NV_ARTISTTOOLS
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool SimpleScene::SaveCameraBookmarks(NvParameterized::Interface* iface)
-{
-#ifndef NV_ARTISTTOOLS
-	nvidia::parameterized::HairProjectParameters* params = static_cast<nvidia::parameterized::HairProjectParameters*>(iface);
-	nvidia::parameterized::HairProjectParametersNS::ParametersStruct& srcDesc = params->parameters();
-	nvidia::parameterized::HairProjectParametersNS::CameraBookmark_DynamicArray1D_Type& bookmarks = srcDesc.cameraBookmarks;
-
-	NvParameterized::Handle cameraBookmarksHandle(iface);
-	if (iface->getParameterHandle("cameraBookmarks", cameraBookmarksHandle) != NvParameterized::ERROR_NONE)
-		return false;
-
-	int numCameraBookmarks = m_cameraBookmarks.size();
-	cameraBookmarksHandle.resizeArray(numCameraBookmarks);
-
-	for (int idx = 0; idx < numCameraBookmarks; ++idx)
-	{
-		NvParameterized::Handle cameraBookmarkHandle(cameraBookmarksHandle);
-		if (cameraBookmarksHandle.getChildHandle(idx, cameraBookmarkHandle) == NvParameterized::ERROR_NONE)
-		{
-			NvParameterized::Handle tempHandle(cameraBookmarkHandle);
-			CameraBookmark& bookmark = m_cameraBookmarks[idx];
-
-			if (ParamGetChild(cameraBookmarkHandle, tempHandle, "name"))
-			{
-				tempHandle.setParamString(bookmark.name.toStdString().c_str());
-			}
-
-			bookmark.camera.SaveParameters((void*)&(bookmarks.buf[idx].camera));
-		}
-	}
-#else
-	CoreLib::Inst()->SimpleScene_SaveCameraBookmarks(iface);
-#endif // NV_ARTISTTOOLS
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::sendParam(const char *str, NvFloat32 v)
-{
-	if (g_pBackdoor)
-	{
-		char message[1024];
-		sprintf(message, "%s %f", str, v);
-//		viewer_info(message);
-		g_pBackdoor->send("%s", message);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::sendParam(const char *str, NvUInt32 v)
-{
-	if (g_pBackdoor)
-	{
-		char message[1024];
-		sprintf(message, "%s %d", str, v);
-//		viewer_info(message);
-		g_pBackdoor->send("%s", message);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::sendParam(const char *str, atcore_float3 v)
-{
-	if (g_pBackdoor)
-	{
-		char message[1024];
-		sprintf(message, "%s %f %f %f", str, v.x, v.y, v.z);
-//		viewer_info(message);
-		g_pBackdoor->send("%s", message);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::sendParam(const char *str, atcore_float4 v)
-{
-	if (g_pBackdoor)
-	{
-		char message[1024];
-		sprintf(message, "%s %f %f %f %f", str, v.x, v.y, v.z, v.w);
-//		viewer_info(message);
-		g_pBackdoor->send("%s", message);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::sendParam(const char *str, NvBoolean v)
-{
-	if (g_pBackdoor)
-	{
-		char message[1024];
-		sprintf(message, "%s %d", str, int(v));
-//		viewer_info(message);
-		g_pBackdoor->send("%s", message);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::DrawGround()
-{
-	bool zup = GlobalSettings::Inst().m_zup;
-
-	SimpleShaderParam param;
-	{
-		param.useVertexColor = true;
-		gfsdk_makeIdentity(param.world);
-		param.view = m_pCamera->GetViewMatrix();
-		param.projection = m_pCamera->GetProjectionMatrix();
-	}
-	RenderInterface::CopyShaderParam(RenderInterface::SHADER_TYPE_SIMPLE_COLOR,
-		(void*)&param, sizeof(SimpleShaderParam) );
-
-	SimpleRenderable::Draw(
-		zup ? SimpleRenderable::GROUND_ZUP :
-		SimpleRenderable::GROUND_YUP, false);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::DrawWind()
-{
-	// Convert camera axis into world matrix
-	atcore_float4x4 windMat = gfsdk_transpose(m_pWindCamera->GetViewMatrix());
-
-	// Extract rotation axis from the view matrix
-	atcore_float4x4 viewMat = m_pCamera->GetViewMatrix();
-	if (m_pCamera->UseLHS())
-		gfsdk_setPosition(viewMat, gfsdk_makeFloat3(0, 0, 80));
-	else
-		gfsdk_setPosition(viewMat, gfsdk_makeFloat3(0, 0, -80));
-	
-	SimpleShaderParam param;
-	{
-		param.useVertexColor = true;
-		param.world = windMat;
-		param.view = viewMat;
-		param.projection = m_pCamera->GetProjectionMatrix();
-	}
-	RenderInterface::CopyShaderParam(RenderInterface::SHADER_TYPE_SIMPLE_COLOR,
-		(void*)&param, sizeof(SimpleShaderParam) );
-
-	int targetWidth		= m_pCamera->GetWidth();
-	int targetHeight	= m_pCamera->GetHeight();
-	float aspectRatio = (float)targetWidth / (float)targetHeight;
-
-	// Wind view size
-	const int srcHeight = 64;
-	const int srcWidth = aspectRatio*srcHeight;
-	const int originX = 64;
-
-	RenderInterface::Viewport savedVP, vp;
-	RenderInterface::GetViewport(savedVP);
-
-	// set the viewport transform
-	{
-		vp.TopLeftX = originX + ( (srcWidth > srcHeight) ? (srcHeight - srcWidth)/2.0f : 0);
-		vp.TopLeftY = targetHeight-srcHeight;
-		vp.Width    = (float)srcWidth;
-		vp.Height   = (float)srcHeight;
-		vp.MinDepth = 0.0f;
-		vp.MaxDepth = 1.0f;
-	}
-
-	RenderInterface::SetViewport(vp);
-
-	bool zUP = GlobalSettings::Inst().m_zup;
-	SimpleRenderable::Draw(zUP ? 
-		SimpleRenderable::WIND_ZUP : 
-		SimpleRenderable::WIND_YUP, false);
-
-	// Restore states
-	RenderInterface::SetViewport(savedVP);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void SimpleScene::DrawAxis()
-{
-	// Extract rotation axis from the view matrix
-	atcore_float4x4 viewMat = m_pCamera->GetViewMatrix();
-	if (m_pCamera->UseLHS())
-		gfsdk_setPosition(viewMat, gfsdk_makeFloat3(0, 0, 4));
-	else
-		gfsdk_setPosition(viewMat, gfsdk_makeFloat3(0, 0, -4));
-
-	SimpleShaderParam param;
-	{
-		param.useVertexColor = true;
-		gfsdk_makeIdentity(param.world);
-		param.view = viewMat;
-		param.projection = m_pCamera->GetProjectionMatrix();
-	}
-	RenderInterface::CopyShaderParam(RenderInterface::SHADER_TYPE_SIMPLE_COLOR,
-		(void*)&param, sizeof(SimpleShaderParam) );
-
-	int targetWidth		= m_pCamera->GetWidth();
-	int targetHeight	= m_pCamera->GetHeight();
-	float aspectRatio = (float)targetWidth / (float)targetHeight;
-
-	// Axis view size
-	const int srcHeight = 64;
-	const int srcWidth = aspectRatio*srcHeight;
-
-	RenderInterface::Viewport savedVP, vp;
-	RenderInterface::GetViewport(savedVP);
-
-	// set the viewport transform
-	{
-		vp.TopLeftX = (srcWidth > srcHeight) ? (srcHeight - srcWidth)/2.0f : 0; // To make it like a square view
-		vp.TopLeftY = targetHeight-srcHeight;
-		vp.Width    = (float)srcWidth;
-		vp.Height   = (float)srcHeight;
-		vp.MinDepth = 0.0f;
-		vp.MaxDepth = 1.0f;
-	}
-
-	RenderInterface::SetViewport(vp);
-
-	bool zUP = GlobalSettings::Inst().m_zup;
-	SimpleRenderable::Draw(zUP ? 
-		SimpleRenderable::AXIS_ZUP : 
-		SimpleRenderable::AXIS_YUP, false);
-
-	RenderInterface::SetViewport(savedVP);
-}
diff --git a/tools/ArtistTools/source/CoreLib/Scene/SimpleScene.h b/tools/ArtistTools/source/CoreLib/Scene/SimpleScene.h
deleted file mode 100644
index 79597d2..0000000
--- a/tools/ArtistTools/source/CoreLib/Scene/SimpleScene.h
+++ /dev/null
@@ -1,213 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include <Windows.h>
-#include "MathUtil.h"
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include "Camera.h"
-#include "Timer.h"
-#include <DirectXMath.h>
-class FurCharacter;
-
-class DeviceManager;
-class SampleManager;
-
-namespace NvParameterized
-{
-	class Interface;
-}
-
-struct CameraBookmark
-{
-	CameraBookmark()
-	{
-	}
-	CameraBookmark(const QString& inName, const Camera& inCamera)
-		: name(inName)
-		, camera(inCamera)
-	{
-	}
-	QString name;
-	Camera camera;
-};
-
-//////////////////////////////////////////////////////////////////////////////////////
-// This scene object does the followings
-//	-	handles the overall project settings load/save
-//	-	owns and calls FurRenderer's draw functions
-//	-	owns and handle main camera and mouse callbacks
-//	-	owns and handles backdoor communication with the SDK and game engines
-//////////////////////////////////////////////////////////////////////////////////////
-class CORELIB_EXPORT SimpleScene
-{
-public:
-	SimpleScene();
-
-	static SimpleScene*	Inst();
-
-	// prepare shaders, manage objects
-	bool Initialize(HWND hWnd, int backdoor = 0);
-
-	bool LoadProject(const char* dir, const char* file);
-	bool SaveProject(const char* dir, const char* file);
-	bool LoadParameters(NvParameterized::Interface* iface);
-	bool SaveParameters(NvParameterized::Interface* iface);
-	bool LoadCameraBookmarks(NvParameterized::Interface* iface);
-	bool SaveCameraBookmarks(NvParameterized::Interface* iface);
-	bool Clear();
-
-	bool LoadSceneFromFbx(const char* dir, const char* fbxName);
-
-	bool IsUpdatingUI() { return m_isUpdatingUI; }
-	void setIsUpdatingUI(bool b) { m_isUpdatingUI = b;}
-	bool IsSceneLoading() { return 	m_isSceneLoading; }
-
-	Camera*	GetCamera() { return m_pCamera; }
-	FurCharacter& GetFurCharacter() { return *m_pFurCharacter; }
-	void SetFurCharacter(FurCharacter* pFurCharacter) { m_pFurCharacter = pFurCharacter; }
-
-	DeviceManager& GetDeviceManager() { return *m_pDeviceManager; }
-	void SetDeviceManager(DeviceManager* pDeviceManager) { m_pDeviceManager = pDeviceManager; }
-	SampleManager& GetSampleManager() { return *m_pSampleManager; }
-	void SetSampleManager(SampleManager* pSampleManager) { m_pSampleManager = pSampleManager; }
-
-	void ResetUpDir(bool zup);
-	void ResetLhs(bool lhs);
-
-	bool LoadBackgroundTextureFile();
-	void ClearBackgroundTexture();
-
-	// backdoor
-	void sendParam(const char *str, NvFloat32 v);
-	void sendParam(const char *str, NvUInt32 v);
-	void sendParam(const char *str, atcore_float3 v);
-	void sendParam(const char *str, atcore_float4 v);
-	void sendParam(const char *str, NvBoolean v);
-
-	bool IsFurModified() const { return m_isFurModified; }
-	bool IsProjectModified() const { return m_isProjectModified; }
-	void SetFurModified(bool isModified) {	m_isFurModified = isModified; }
-	void SetProjectModified(bool isModified) {	m_isProjectModified = isModified; }
-
-	void UpdateCamera();
-	void FitCamera();
-
-	void Draw();
-	void Timeout();
-	void Resize(int w, int h);
-	void Drag(char type);
-	void WheelZoom();
-	void Shutdown();
-
-	void onMouseDown(atcore_float2 position);
-	void onMouseUp(atcore_float2 position);
-	void onMouseMove(atcore_float2 position);
-	void onMouseWheel(float deltaWheel);
-
-	QString createBookmark();
-	void removeBookmark(const QString& name);
-	void activateBookmark(const QString& name);
-	void renameBookmark(const QString& oldName, const QString& newName);
-	QList<QString> getBookmarkNames();
-
-	static float NextTimeStep();
-
-	Timer& GetTimer();
-
-	DirectX::XMMATRIX GetViewMatrix() const
-	{
-		atcore_float4x4& matrix = m_pCamera->_viewMatrix;
-		return DirectX::XMMATRIX(
-			matrix._11, matrix._12, matrix._13, matrix._14,
-			matrix._21, matrix._22, matrix._23, matrix._24,
-			matrix._31, matrix._32, matrix._33, matrix._34,
-			matrix._41, matrix._42, matrix._43, matrix._44);
-	}
-	DirectX::XMMATRIX GetProjMatrix() const
-	{
-		atcore_float4x4& matrix = m_pCamera->_projectionMatrix;
-		return DirectX::XMMATRIX(
-			matrix._11, matrix._12, matrix._13, matrix._14,
-			matrix._21, matrix._22, matrix._23, matrix._24,
-			matrix._31, matrix._32, matrix._33, matrix._34,
-			matrix._41, matrix._42, matrix._43, matrix._44);
-	}
-	DirectX::XMVECTOR GetEyePt() const 
-	{ 
-		return DirectX::XMLoadFloat3(
-			reinterpret_cast<const DirectX::XMFLOAT3*>(&m_pCamera->_eye));
-	}
-	DirectX::XMVECTOR GetLookAtPt() const 
-	{ 
-		return DirectX::XMLoadFloat3(
-			reinterpret_cast<const DirectX::XMFLOAT3*>(&m_pCamera->_at));
-	}
-private:
-	// initialize scene components
-	bool InitCameraMouse(HWND hAppWnd);
-	bool InitFurSDK();
-
-	void DrawGround();
-	void DrawAxis();
-	void DrawHUD();
-	void DrawWind();
-
-	// camera / mouse
-	void PanCamera();
-	void ZoomCamera();
-	void WheelZoomCamera();
-	void RotateCamera();
-
-	void RotateLightDirection();
-	void PanLight();
-
-	void RotateWindDirection();
-
-	QString _generateBookmarkName();
-
-public:
-
-	Camera*				m_pCamera;
-	Camera*				m_pWindCamera;
-
-	QList<CameraBookmark>	m_cameraBookmarks;
-
-	FurCharacter*		m_pFurCharacter;
-
-	DeviceManager*		m_pDeviceManager;
-	SampleManager*		m_pSampleManager;
-
-	bool				m_isProjectModified;
-	bool				m_isFurModified;
-	bool				m_isSceneLoading;
-	bool				m_isUpdatingUI;
-};
-
diff --git a/tools/ArtistTools/source/CoreLib/UI/AppMainWindow.qrc b/tools/ArtistTools/source/CoreLib/UI/AppMainWindow.qrc
deleted file mode 100644
index 3ec3217..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/AppMainWindow.qrc
+++ /dev/null
@@ -1,36 +0,0 @@
-<RCC>
-    <qresource prefix="AppMainWindow">
-      <file>images/TextureBox.bmp</file>
-      <file>images/CheckBox.png</file>
-      <file>images/ArrowUp.png</file>
-      <file>images/ArrowDown.png</file>
-      <file>images/transportLoop.png</file>
-      <file>images/transportPlay.png</file>
-      <file>images/transportRewind.png</file>
-      <file>images/transportStepForward.png</file>
-      <file>images/transportStop.png</file>
-      <file>images/simulationPlay.png</file>
-      <file>images/simulationStop.png</file>
-      <file>images/simulationStep.png</file>
-      <file>images/DarkBorder.png</file>
-      <file>images/openFile.png</file>
-      <file>images/importFile.png</file>
-      <file>images/saveDisc.png</file>
-      <file>images/refreshReload.png</file>
-      <file>images/TextureEnabled_icon.png</file>
-      <file>images/TextureDisabled_icon.png</file>
-      <file>images/TextureIsUsed_icon.png</file>
-      <file>images/Remove_icon.png</file>
-      <file>images/Refresh_icon.png</file>
-      <file>images/CurveEditor.png</file>
-      <file>images/Add.png</file>
-      <file>images/Up.png</file>
-      <file>images/Down.png</file>
-      <file>images/EditWrench.png</file>
-      <file>images/playlist.png</file>
-      <file>images/visibilityToggle_notVisible.png</file>
-      <file>images/visibilityToggle_visible.png</file>
-      <file>ThemeDark.qss</file>
-    </qresource>
-</RCC>
-  
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/UI/AppMainWindow.ui b/tools/ArtistTools/source/CoreLib/UI/AppMainWindow.ui
deleted file mode 100644
index da546fa..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/AppMainWindow.ui
+++ /dev/null
@@ -1,428 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AppMainWindowClass</class>
- <widget class="QMainWindow" name="AppMainWindowClass">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1078</width>
-    <height>683</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Blast Viewer</string>
-  </property>
-  <property name="styleSheet">
-   <string notr="true"/>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="spacing">
-     <number>0</number>
-    </property>
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
-     <number>0</number>
-    </property>
-    <item>
-     <layout class="QHBoxLayout" name="renderLayout"/>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>1078</width>
-     <height>21</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QStatusBar" name="statusBar"/>
-  <widget class="QDockWidget" name="dockWidget">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>370</width>
-     <height>140</height>
-    </size>
-   </property>
-   <property name="maximumSize">
-    <size>
-     <width>524287</width>
-     <height>10000</height>
-    </size>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"/>
-   </property>
-   <property name="features">
-    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
-   </property>
-   <property name="allowedAreas">
-    <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
-   </property>
-   <property name="windowTitle">
-    <string>Attributes</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>2</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <property name="leftMargin">
-      <number>3</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QTabWidget" name="sideBarTab">
-       <property name="currentIndex">
-        <number>0</number>
-       </property>
-	   <!--
-       <widget class="QWidget" name="tabFur">
-        <attribute name="title">
-         <string>Hair</string>
-        </attribute>
-        <layout class="QGridLayout" name="gridLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item row="1" column="0">
-          <widget class="QFrame" name="furMaterialEditorArea">
-           <layout class="QVBoxLayout" name="furMaterialEditorAreaLayout">
-            <property name="leftMargin">
-             <number>2</number>
-            </property>
-            <property name="topMargin">
-             <number>2</number>
-            </property>
-            <property name="rightMargin">
-             <number>2</number>
-            </property>
-            <property name="bottomMargin">
-             <number>2</number>
-            </property>
-           </layout>
-          </widget>
-         </item>
-         <item row="0" column="0">
-          <widget class="QScrollArea" name="furScrollArea">
-           <property name="horizontalScrollBarPolicy">
-            <enum>Qt::ScrollBarAsNeeded</enum>
-           </property>
-           <property name="widgetResizable">
-            <bool>true</bool>
-           </property>
-           <widget class="QWidget" name="furScrollAreaContents">
-            <property name="geometry">
-             <rect>
-              <x>0</x>
-              <y>0</y>
-              <width>359</width>
-              <height>481</height>
-             </rect>
-            </property>
-            <layout class="QVBoxLayout" name="furScrollAreaLayout">
-             <property name="spacing">
-              <number>3</number>
-             </property>
-             <property name="leftMargin">
-              <number>2</number>
-             </property>
-             <property name="topMargin">
-              <number>2</number>
-             </property>
-             <property name="rightMargin">
-              <number>2</number>
-             </property>
-             <property name="bottomMargin">
-              <number>2</number>
-             </property>
-             <item>
-              <spacer name="verticalSpacer">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-	   -->
-       <widget class="QWidget" name="tabDisplay">
-        <attribute name="title">
-         <string>Settings</string>
-        </attribute>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QScrollArea" name="displayScrollArea">
-           <property name="horizontalScrollBarPolicy">
-            <enum>Qt::ScrollBarAsNeeded</enum>
-           </property>
-           <property name="widgetResizable">
-            <bool>true</bool>
-           </property>
-           <widget class="QWidget" name="displayScrollAreaContents">
-            <property name="geometry">
-             <rect>
-              <x>0</x>
-              <y>0</y>
-              <width>359</width>
-              <height>491</height>
-             </rect>
-            </property>
-            <layout class="QVBoxLayout" name="displayScrollAreaLayout">
-             <property name="spacing">
-              <number>3</number>
-             </property>
-             <property name="leftMargin">
-              <number>2</number>
-             </property>
-             <property name="topMargin">
-              <number>2</number>
-             </property>
-             <property name="rightMargin">
-              <number>2</number>
-             </property>
-             <property name="bottomMargin">
-              <number>2</number>
-             </property>
-             <item>
-              <spacer name="verticalSpacer_2">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QDockWidget" name="dockOutputWindow">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>256</width>
-     <height>100</height>
-    </size>
-   </property>
-   <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
-   </property>
-   <property name="allowedAreas">
-    <set>Qt::AllDockWidgetAreas</set>
-   </property>
-   <property name="windowTitle">
-    <string>Output Window</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>8</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_2">
-    <property name="sizePolicy">
-     <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
-      <horstretch>0</horstretch>
-      <verstretch>0</verstretch>
-     </sizepolicy>
-    </property>
-    <layout class="QVBoxLayout" name="verticalLayout_4">
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="OutputWindow" name="outputWindow" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="openExternalLinks" stdset="0">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-   <!--
-  <widget class="QDockWidget" name="dockWidgetCurveEditor">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>160</width>
-     <height>50</height>
-    </size>
-   </property>
-   <property name="windowTitle">
-    <string>Curve Editor</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>8</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_3">
-    <layout class="QVBoxLayout" name="verticalLayout_5">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QFrame" name="furCurveEditorArea">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QVBoxLayout" name="furCurveEditorAreaLayout">
-        <property name="spacing">
-         <number>3</number>
-        </property>
-        <property name="leftMargin">
-         <number>2</number>
-        </property>
-        <property name="topMargin">
-         <number>2</number>
-        </property>
-        <property name="rightMargin">
-         <number>2</number>
-        </property>
-        <property name="bottomMargin">
-         <number>2</number>
-        </property>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
- -->
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <customwidgets>
-  <customwidget>
-   <class>OutputWindow</class>
-   <extends>QWidget</extends>
-   <header>outputwindow.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="AppMainWindow.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/CoreLib/UI/CameraBookmarksDialog.ui b/tools/ArtistTools/source/CoreLib/UI/CameraBookmarksDialog.ui
deleted file mode 100644
index e914b60..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/CameraBookmarksDialog.ui
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CameraBookmarksDialog</class>
- <widget class="QDialog" name="CameraBookmarksDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>CameraBookmarksDialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QListWidget" name="listWidgetBookmarks"/>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="labelBookmarkName">
-       <property name="text">
-        <string>Bookmark name:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="editBookmarkName"/>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="btnRename">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>23</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>rename</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnDelete">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>23</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>delete</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/CoreLib/UI/DisplayLightPanel.ui b/tools/ArtistTools/source/CoreLib/UI/DisplayLightPanel.ui
deleted file mode 100644
index 41514f5..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/DisplayLightPanel.ui
+++ /dev/null
@@ -1,645 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DisplayLightPanel</class>
- <widget class="QWidget" name="DisplayLightPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>315</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="10" column="0" colspan="2">
-      <widget class="QListWidget" name="listSelectedLight">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>320</width>
-         <height>60</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>320</width>
-         <height>60</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="12" column="1">
-      <widget class="QCheckBox" name="btnLightEnable">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="20" column="0">
-      <widget class="QLabel" name="label_1">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>130</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Color</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="20" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
-       <property name="spacing">
-        <number>4</number>
-       </property>
-       <item>
-        <widget class="QPushButton" name="btnLightColor">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-         <property name="accessibleName">
-          <string/>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="flat">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnLightColorTex">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="accessibleName">
-          <string/>
-         </property>
-         <property name="accessibleDescription">
-          <string/>
-         </property>
-         <property name="autoFillBackground">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnLightColorTexReload">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="accessibleName">
-          <string/>
-         </property>
-         <property name="accessibleDescription">
-          <string/>
-         </property>
-         <property name="autoFillBackground">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnLightColorTexClear">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="accessibleName">
-          <string/>
-         </property>
-         <property name="accessibleDescription">
-          <string/>
-         </property>
-         <property name="autoFillBackground">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item row="30" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>130</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Intensity</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="30" column="1">
-      <widget class="SlideSpinBox&lt;QDoubleSpinBox, double&gt;" name="spinLightIntensity" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>20</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="40" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>130</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Cast Shadow</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="40" column="1">
-      <widget class="QCheckBox" name="btnLightUseShadow">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="50" column="0">
-      <widget class="QLabel" name="label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>138</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Shadow Map Resolution</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="50" column="1">
-      <widget class="QComboBox" name="cbShadowMapResolution">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <item>
-        <property name="text">
-         <string>2048 (Default)</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>4096</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>1024</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>512</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>8192</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>16384</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="12" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Enable</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="11" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Link Light</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="11" column="1">
-      <widget class="QCheckBox" name="btnLinkLightEnable">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>320</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Visualize</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string>Light</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="btnVisualizeLight">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="15" column="0">
-       <widget class="QLabel" name="label_shadow">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="text">
-         <string>Shadow Map</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="15" column="1">
-       <widget class="QCheckBox" name="btnVisualizeShadowMap">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="30" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Distance</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="30" column="1">
-       <widget class="SlideSpinBox&lt;QDoubleSpinBox, double&gt;" name="spinLightDistance" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>20</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SlideSpinBox&lt;QDoubleSpinBox, double&gt;</class>
-   <extends>QWidget</extends>
-   <header>SlideSpinBox.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/CoreLib/UI/DisplayPreferencesPanel.ui b/tools/ArtistTools/source/CoreLib/UI/DisplayPreferencesPanel.ui
deleted file mode 100644
index 0cdbcac..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/DisplayPreferencesPanel.ui
+++ /dev/null
@@ -1,885 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DisplayPreferencesPanel</class>
- <widget class="QWidget" name="DisplayPreferencesPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>320</width>
-    <height>515</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetFixedSize</enum>
-     </property>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="cbAntialiasing">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <item>
-        <property name="text">
-         <string>Hardware MSAA</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Custom MSAA 2x</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Custom MSAA 4x</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Custom MSAA 8x</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="labelRenderPlayRateFPS">
-       <property name="text">
-        <string>Render Play Rate FPS</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QDoubleSpinBox" name="spinRenderPlayRateFPS">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>80</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="decimals">
-        <number>0</number>
-       </property>
-       <property name="minimum">
-        <double>10.000000000000000</double>
-       </property>
-       <property name="maximum">
-        <double>1000.000000000000000</double>
-       </property>
-       <property name="value">
-        <double>60.000000000000000</double>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
-       <property name="sizeConstraint">
-        <enum>QLayout::SetMinimumSize</enum>
-       </property>
-       <item>
-        <widget class="QPushButton" name="btnBackgroundTex">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnBackgroundTexClear">
-         <property name="minimumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>110</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>138</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Navigation Style</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="labelCustomMSAA">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>138</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Custom Hair MSAA</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QComboBox" name="cbUpAxis">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <item>
-        <property name="text">
-         <string>Y</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Z</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>138</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Background Image</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="1">
-      <widget class="SlideSpinBox&lt;QDoubleSpinBox, double&gt;" name="spinCameraFOV" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>20</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="QComboBox" name="cbHandedness">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <item>
-        <property name="text">
-         <string>Right Handed</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Left Handed</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QComboBox" name="cbSceneUnit">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="currentText">
-        <string>Unknown</string>
-       </property>
-       <item>
-        <property name="text">
-         <string>Unknown</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Centimeter</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Meter</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Inch</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label1">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>138</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Handedness</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>138</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Scene Unit</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>138</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Up Axis</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1">
-      <widget class="QComboBox" name="cbNavigationStyle">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
-       <item>
-        <property name="text">
-         <string>Maya</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>3ds Max</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="8" column="0">
-      <widget class="QLabel" name="labelCameraFOV">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>138</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Camera FOV</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="labelSimulationRateFPS">
-       <property name="text">
-        <string>Simulation Rate FPS</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QDoubleSpinBox" name="spinSimulationRateFPS">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>80</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="decimals">
-        <number>0</number>
-       </property>
-       <property name="minimum">
-        <double>10.000000000000000</double>
-       </property>
-       <property name="maximum">
-        <double>1000.000000000000000</double>
-       </property>
-       <property name="value">
-        <double>60.000000000000000</double>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>300</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>300</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Playlists</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="30" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>60</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnPlaylistAddProj">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnPlaylistRemoveProj">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnPlaylistProjGoUp">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnPlaylistProjGoDown">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="1" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QPushButton" name="btnPlaylistsRename">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnPlaylistsAdd">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnPlaylistsReload">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnPlaylistsRemove">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>60</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item row="1" column="0">
-       <widget class="QComboBox" name="cbPlaylists">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" rowspan="3" colspan="2">
-       <widget class="TipListView" name="listWidgetPlaylist" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>280</width>
-          <height>90</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="31" column="1">
-       <widget class="QPushButton" name="btnPlaylistsPlay">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>24</width>
-          <height>24</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>24</width>
-          <height>24</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SlideSpinBox&lt;QDoubleSpinBox, double&gt;</class>
-   <extends>QWidget</extends>
-   <header>SlideSpinBox.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>TipListView</class>
-   <extends>QWidget</extends>
-   <header>tiplistview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/CoreLib/UI/DisplayScenePanel.ui b/tools/ArtistTools/source/CoreLib/UI/DisplayScenePanel.ui
deleted file mode 100644
index 5b24c41..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/DisplayScenePanel.ui
+++ /dev/null
@@ -1,616 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DisplayScenePanel</class>
- <widget class="QWidget" name="DisplayScenePanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>320</width>
-    <height>282</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="12" column="1">
-      <widget class="QCheckBox" name="btnComputeProfile">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="9" column="1">
-      <widget class="QCheckBox" name="btnShowAxis">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="1">
-      <widget class="QCheckBox" name="btnShowGrid">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="0">
-      <widget class="QLabel" name="label_1">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Show Grid</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1">
-      <widget class="QCheckBox" name="btnVisualizeWind">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="10" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Show HUD</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="9" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Show Axis</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="10" column="1">
-      <widget class="QCheckBox" name="btnShowHUD">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="2">
-      <widget class="QLabel" name="label_4">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>138</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Visualize Wind</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="11" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Compute Stats</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="11" column="1">
-      <widget class="QCheckBox" name="btnComputeStats">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="12" column="0">
-      <widget class="QLabel" name="label_7">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>80</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Compute Profile</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-	<item row="13" column="0">
-	<widget class="QLabel" name="labelGizmoWithLocal">
-	 <property name="sizePolicy">
-	  <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-	   <horstretch>0</horstretch>
-	   <verstretch>0</verstretch>
-	  </sizepolicy>
-	 </property>
-	 <property name="minimumSize">
-	  <size>
-	   <width>130</width>
-	   <height>0</height>
-	  </size>
-	 </property>
-	 <property name="maximumSize">
-	  <size>
-	   <width>130</width>
-	   <height>16777215</height>
-	  </size>
-	 </property>
-	 <property name="text">
-	  <string>Gizmo With Local</string>
-	 </property>
-	 <property name="alignment">
-	  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-	 </property>
-	</widget>
-	</item>
-	<item row="13" column="1">
-	<widget class="QCheckBox" name="checkBoxGizmoWithLocal"/>
-	</item>
-	<item row="14" column="0">
-	<widget class="QLabel" name="labelGizmoWithDepthTest">
-	 <property name="sizePolicy">
-	  <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-	   <horstretch>0</horstretch>
-	   <verstretch>0</verstretch>
-	  </sizepolicy>
-	 </property>
-	 <property name="minimumSize">
-	  <size>
-	   <width>130</width>
-	   <height>0</height>
-	  </size>
-	 </property>
-	 <property name="maximumSize">
-	  <size>
-	   <width>130</width>
-	   <height>16777215</height>
-	  </size>
-	 </property>
-	 <property name="text">
-	  <string>Gizmo With DepthTest</string>
-	 </property>
-	 <property name="alignment">
-	  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-	 </property>
-	</widget>
-	</item>
-	<item row="14" column="1">
-	<widget class="QCheckBox" name="checkBoxGizmoWithDepthTest"/>
-	</item>
-	<item row="15" column="0">
-	<widget class="QLabel" name="labelShowPlane">
-	 <property name="sizePolicy">
-	  <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-	   <horstretch>0</horstretch>
-	   <verstretch>0</verstretch>
-	  </sizepolicy>
-	 </property>
-	 <property name="minimumSize">
-	  <size>
-	   <width>130</width>
-	   <height>0</height>
-	  </size>
-	 </property>
-	 <property name="maximumSize">
-	  <size>
-	   <width>130</width>
-	   <height>16777215</height>
-	  </size>
-	 </property>
-	 <property name="text">
-	  <string>Show Plane</string>
-	 </property>
-	 <property name="alignment">
-	  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-	 </property>
-	</widget>
-	</item>
-	<item row="15" column="1">
-	<widget class="QCheckBox" name="checkBoxShowPlane"/>
-	</item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Mesh Rendering</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_8">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>130</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string>Render Type</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QComboBox" name="cbRenderType">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>150</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="currentIndex">
-         <number>0</number>
-        </property>
-        <property name="frame">
-         <bool>true</bool>
-        </property>
-        <item>
-         <property name="text">
-          <string>Wireframe</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Flat</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Shaded</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Textured</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string>Show Wireframe Over</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <widget class="QCheckBox" name="btnShowWireframe">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="label_10">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string>Use Mesh Lighting</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="1">
-       <widget class="QCheckBox" name="btnUseLighting">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0">
-       <widget class="QLabel" name="label_11">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string>Show Graphics Mesh</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1">
-       <widget class="QCheckBox" name="btnShowGraphicsMesh">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="0">
-       <widget class="QLabel" name="label_12">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string>Use Skinned Mesh Only</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="1">
-       <widget class="QCheckBox" name="btnShowSkinnedOnly">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="10" column="0">
-       <widget class="QLabel" name="label_13">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>80</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text">
-         <string>Use DQ Skinning</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="10" column="1">
-       <widget class="QCheckBox" name="btnSkinningDQ">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/CoreLib/UI/OutputWindow.ui b/tools/ArtistTools/source/CoreLib/UI/OutputWindow.ui
deleted file mode 100644
index accef7b..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/OutputWindow.ui
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OutputWindow</class>
- <widget class="QTextBrowser" name="textBrowser">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>676</width>
-    <height>430</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/tools/ArtistTools/source/CoreLib/UI/ThemeDark.qss b/tools/ArtistTools/source/CoreLib/UI/ThemeDark.qss
deleted file mode 100644
index f742ff0..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/ThemeDark.qss
+++ /dev/null
@@ -1,457 +0,0 @@
-AppMainWindow *
-{
-	background-color:rgb(68,68,68); color:rgb(200,200,200);
-}
-
-AppMainWindow::separator
-{
-	background-color: rgb(68, 68, 68);
-
-	/*trick: qdockwidget stylesheet seems to have bugs, use the separator border*/
-	
-	border-right-width: 2px;
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2; 
-}
-
-AppMainWindow::separator:hover
-{
-	background-color: #666666;
-}
-
-AppMainWindow QDockWidget::title
-{
-	text-align: center;
-	/*
-	border-top-color: rgb(45,45,45);
-	border-top-width: 2px;
-	 border-top-style: groove;
-	*/
-	
-	background-color: rgb(68,68,68);
-	border-width: 2px;
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2; 
-	 
-}
-
-AppMainWindow QTextBrowser
-{
-	/*
-	border-width: 1px;
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2;
-	*/
-	border: 1px solid gray;
-	background-color:rgb(40,40,40);
-}
-
-AppMainWindow QCheckBox::indicator::unchecked
-{
-	background-color:rgb(40,40,40);
-}
-
-AppMainWindow QCheckBox::indicator::checked
-{
-	image:url(:/AppMainWindow/images/CheckBox.png);
-}
-
-AppMainWindow QPushButton 
-{
-	border: 1px solid gray;
-}
-
-AppMainWindow QPushButton:pressed 
-{
-	border: 2px solid rgb(118,185,0);
-	/*background-color: rgb(118,185,0);*/
-}
-
-AppMainWindow QPushButton:checked
-{
-	border: 2px solid rgb(118,185,0); 
-	/*background-color: rgb(118,185,0);*/
-}
-
-/****** QScrollbar Styles ******/
-AppMainWindow QScrollBar:vertical 
-{
-	width: 22px;
-	/*
-	border-width: 2px;
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2;
-	*/
-	border: 1px solid rgb(40,40,40);
-	margin: 20px 1px 20px 0px;
-}
-
-AppMainWindow QScrollBar::handle:vertical 
-{
-	border-top: 1px solid rgb(40,40,40);
-	border-bottom: 1px solid rgb(40,40,40);
-	background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
-                 stop:0 rgb(116,116,116), stop: 1 rgb(95,95,95));
-	min-height: 20px;
-}
-
-AppMainWindow QScrollBar::add-line:vertical 
-{
-	border: 1px solid rgb(40,40,40);
-	background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
-                 stop:0 rgb(116,116,116), stop: 1 rgb(95,95,95));
-
-	margin-right: 1px;
-	margin-bottom: 1px;
-	height: 18px;
-	subcontrol-position: bottom;
-	subcontrol-origin: margin;
-}
-
-AppMainWindow QScrollBar::sub-line:vertical 
-{
-	margin-top: 1px;
-	margin-right: 1px;
-	border: 1px solid rgb(40,40,40);
-	background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
-                 stop:0 rgb(116,116,116), stop: 1 rgb(95,95,95));
-	height: 18px;
-	subcontrol-position: top;
-	subcontrol-origin: margin;
-}
-
-QScrollBar::up-arrow:vertical
-{
-	image: url(:/AppMainWindow/images/ArrowUp.png);
-}
-
-QScrollBar::up-arrow:vertical:pressed
-{
-	top: 1px;
-}
-
-QScrollBar::down-arrow:vertical 
-{
-	image: url(:/AppMainWindow/images/ArrowDown.png);
-}
-
-QScrollBar::down-arrow:vertical:pressed
-{
-	top: 1px;
-}
-
-AppMainWindow QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical 
-{
-    background: none;
-}
-
-/****** ListWidget Styles ******/
-AppMainWindow QListWidget {
-	alternate-background-color: yellow;
-     border: 1px solid gray;
-     border-radius: 0px;
- }
-
-AppMainWindow QListWidget {
-     show-decoration-selected: 1; /* make the selection span the entire width of the view */
- }
-
- AppMainWindow QListWidget::item:alternate {
-     background: #EEEEEE;
- }
-
- AppMainWindow QListWidget::item:selected {
-     border: 1px solid #6a6ea9;
- }
-
- AppMainWindow QListWidget::item:selected:!active {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 #00aa00, stop: 1 #00dd00);
- }
-
- AppMainWindow QListWidget::item:selected:active {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-								stop: 0 #00aa00, stop: 1 #00dd00);
- }
-
- AppMainWindow QListWidget::item:hover {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 #DDFFDD, stop: 1 #CCFFCC);
- }
-
- /****** TreeWidget Styles ******/
-AppMainWindow QTreeWidget {
-	alternate-background-color: yellow;
-     border: 1px solid gray;
-     border-radius: 0px;
- }
-
-AppMainWindow QTreeWidget {
-     show-decoration-selected: 1; /* make the selection span the entire width of the view */
- }
-
- AppMainWindow QTreeWidget::item:alternate {
-     background: #EEEEEE;
- }
-
- AppMainWindow QTreeWidget::item:selected {
-     border: 1px solid #6a6ea9;
- }
-
- AppMainWindow QTreeWidget::item:selected:!active {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 #00aa00, stop: 1 #00dd00);
- }
-
- AppMainWindow QTreeWidget::item:selected:active {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-								stop: 0 #00aa00, stop: 1 #00dd00);
- }
-
- AppMainWindow QTreeWidget::item:hover {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 #DDFFDD, stop: 1 #CCFFCC);
- }
- 
-/****** ComboBox Styles ******/
-AppMainWindow QComboBox {
-     border: 1px solid gray;
-     border-radius: 0px;
- }
-
-AppMainWindow QComboBox QAbstractItemView 
-{
-	background-color: rgb(68,68,68);
-    selection-background-color: rgb(118,185,0);
-}
- 
- AppMainWindow QComboBox::drop-down {
-     subcontrol-origin: padding;
-     subcontrol-position: top right;
-     /*width: 15px;*/
-
-     border-left-width: 1px;
-     border-left-color: gray;
-     border-left-style: solid; 
-
- }
-
-AppMainWindow QComboBox::down-arrow {
-     image: url(:/AppMainWindow/images/ArrowDown.png);
- }
-
-AppMainWindow QComboBox::down-arrow:on { 
-     top: 1px;
- 
- }
-
-/****** QTabWidget Styles ******/
-AppMainWindow QTabWidget::pane  
-{ 
-	/* The tab widget frame */
-    border-top: 0px solid transparent;
-	
-}
-
-AppMainWindow QTabWidget::tab-bar  
-{
-    left: 5px;
-}
-
-AppMainWindow QTabBar::tab  {
-	margin-top: 1px;
-    background-color: rgb(68,68,68);
-    border: 1px solid gray;
-    border-bottom-color: rgb(68,68,68); /* same as the pane color */
-    min-width: 10ex;
-    padding: 2px 8px;
-}
-
-AppMainWindow QTabBar::tab:selected  
-{
-    background-color: #666666;
-    border-color: gray;
-    border-bottom-color: transparent;
-}
-
-AppMainWindow QTabBar::tab:!selected  {
-    margin-top: 3px; /* make non-selected tabs look smaller */
-}
-
-/****** Spin And DoubleSpin Styles ******/
-
-AppMainWindow QDoubleSpinBox
- {
-	border: 1px solid gray;
-	background-color: rgb(40,40,40);
- }
-
-AppMainWindow QSpinBox
- {
-	border: 1px solid gray;
-	background-color: rgb(40,40,40);
- }
-
-AppMainWindow QSpinBox::up-button
-{
-	background-color:rgb(68,68,68);
-	border: 1px solid gray;
-	margin-top: 1px;
-	margin-right: 1px;
-}
-
-AppMainWindow QSpinBox::up-button:pressed  {
-    border: 1px solid rgb(118,185,0);
-}
-
-AppMainWindow QSpinBox::down-button
-{
-	background-color:rgb(68,68,68);
-	border: 1px solid gray;
-	margin-bottom: 1px;
-	margin-right: 1px;
-}
-
-AppMainWindow QSpinBox::down-button:pressed  {
-    border: 1px solid rgb(118,185,0);
-}
-
-AppMainWindow QSpinBox::up-arrow
-{
-    image: url(:/AppMainWindow/images/ArrowUp.png);
-    width: 4px;
-}
-AppMainWindow QSpinBox::down-arrow
-{
-    image: url(:/AppMainWindow/images/ArrowDown.png);
-    width: 4px;
-}
-
-AppMainWindow QDoubleSpinBox::up-button
-{
-	background-color:rgb(68,68,68);
-	border: 1px solid gray;
-	margin-top: 1px;
-	margin-right: 1px;
-}
-
-AppMainWindow QDoubleSpinBox::up-button:pressed  {
-    border: 1px solid rgb(118,185,0);
-}
-
-AppMainWindow QDoubleSpinBox::down-button
-{
-	background-color:rgb(68,68,68);
-	border: 1px solid gray;
-	margin-bottom: 1px;
-	margin-right: 1px;
-}
-
-AppMainWindow QDoubleSpinBox::down-button:pressed  {
-    border: 1px solid rgb(118,185,0);
-}
-
-AppMainWindow QDoubleSpinBox::up-arrow
-{
-    image: url(:/AppMainWindow/images/ArrowUp.png);
-    width: 4px;
-}
-
-AppMainWindow QDoubleSpinBox::down-arrow
-{
-    image: url(:/AppMainWindow/images/ArrowDown.png);
-    width: 4px;
-}
-
-AppMainWindow QDoubleSpinBox::disabled
-{
-	background-color:rgb(32,32,32);
-	color:rgb(68,68,68);
-	border: 1px solid rgb(68,68,68);
-}
-
-AppMainWindow QDoubleSpinBox::up-button:disabled  {
-    border: 1px solid rgb(68,68,68);
-}
-
-AppMainWindow QDoubleSpinBox::down-button:disabled  {
-    border: 1px solid rgb(68,68,68);
-}
-
-/****** Menu Styles ******/
-QMenuBar
-{
-	border-image: url(:/AppMainWindow/images/DarkBorder.png) 2;
-	border-bottom-width: 2px;
-}
-
-AppMainWindow QMenuBar::item  
-{
-    spacing: 3px; /* spacing between menu bar items */
-    padding: 1px 4px;
-	margin-bottom: 2px;
-    background: transparent;
-    border-radius: 0px;
-}
- 
-AppMainWindow QMenuBar::item:selected:enabled  { /* when selected using mouse or keyboard */
-    background: #666666;
-}
- 
-AppMainWindow QMenuBar::item:pressed:enabled  {
-    background: rgb(118,185,0);
-}
-
-AppMainWindow QMenu  {
-	border: 1px solid rgb(50,50,50);
-    
-}
-
-AppMainWindow QMenuBar:disabled
-{
-	color:rgb(0,0,0);
-}
-
-AppMainWindow QMenu:disabled
-{
-	color:rgb(0,0,0);
-}
-
-AppMainWindow QMenu::item  {
-    padding: 2px 25px 2px 20px;
-    border: 1px solid transparent; /* reserve space for selection border */
-}
- 
-AppMainWindow QMenu::item:selected:enabled  {
-    border-color: rgb(70,70,70);
-    background: rgba(118,185,0, 250);
-}
-/****** ExpandablePanel Styles ******/
-
-AppMainWindow QGroupBox 
-{
-	margin-top: 1.5ex; 
-	border: 1px solid gray; 
-	border-radius: 0px;
-}
-		
-AppMainWindow QGroupBox::title 
-{
-	subcontrol-origin: margin; 
-	left: 10px; 
-	padding: 0px 3px;
-}
-	
-/*	
-ExpandablePanel QPushButton[flat="true"] 
-{
-	border-color: rgb(40,40,40);
-	image:url(:/AppMainWindow/images/TextureBox.bmp)
-}
-
-ExpandablePanel QPushButton[flat="true"]:pressed
-{
-	margin: 2px;
-}
-*/
-
-ExpandablePanel TitleLabel
-{
-	background:rgb(78, 78, 78);
-}
diff --git a/tools/ArtistTools/source/CoreLib/UI/ThemeDefault.qss b/tools/ArtistTools/source/CoreLib/UI/ThemeDefault.qss
deleted file mode 100644
index f59dd25..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/ThemeDefault.qss
+++ /dev/null
@@ -1,76 +0,0 @@
-/****** General Styles ******/
-
-AppMainWindow QPushButton 
-{
-	/*border: 1px solid gray;*/
-	background-color: rgb(230,230,230);
-	border-left: 1px solid rgb(200,200,200);
-	border-top: 1px solid rgb(200,200,200);
-	border-right: 1px solid rgb(60,60,60);
-	border-bottom: 1px solid rgb(60,60,60);
-}
-
-
-AppMainWindow QPushButton:pressed 
-{
-	/*border: 2px solid gray;*/
-	border-left: 1px solid rgb(60,60,60);
-	border-top: 1px solid rgb(60,60,60);
-	border-right: 1px solid rgb(200,200,200);
-	border-bottom: 1px solid rgb(200,200,200);
-}
-
-AppMainWindow QPushButton:checked
-{
-	border: 1px solid gray;
-	border-left: 1px solid rgb(60,60,60);
-	border-top: 1px solid rgb(60,60,60);
-	border-right: 1px solid rgb(200,200,200);
-	border-bottom: 1px solid rgb(200,200,200);
-}
-/****** MainToolbar Styles ******/
-
-MainToolbar QPushButton[flat="true"] 
-{
-	border:0px;
-}
-
-
-/****** ExpandablePanel Styles ******/
-
-ExpandablePanel 
-{
-	background:rgb(240,240,240);
-}
-
-ExpandablePanel QGroupBox 
-{
-	margin-top: 1.5ex; 
-	border: 1px solid gray; 
-	border-radius: 0px;
-}
-		
-ExpandablePanel QGroupBox::title 
-{
-	subcontrol-origin: margin; 
-	left: 10px; 
-	padding: 0px 3px;
-}
-		
-ExpandablePanel QPushButton[flat="true"] 
-{
-	border: 1px solid rgb(60,60,60);
-	image:url(:/AppMainWindow/images/TextureBox.bmp)
-}
-
-ExpandablePanel QPushButton[flat="true"]:pressed
-{
-	border: 2px solid rgb(60,60,60);
-	image:url(:/AppMainWindow/images/TextureBox.bmp)
-}
-
-ExpandablePanel TitleLabel
-{
-	background:rgb(219, 219, 219);
-	border-bottom:1px solid rgb(185,185,185);
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/Add.png b/tools/ArtistTools/source/CoreLib/UI/images/Add.png
deleted file mode 100644
index 35fd8ed..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/Add.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/ArrowDown.png b/tools/ArtistTools/source/CoreLib/UI/images/ArrowDown.png
deleted file mode 100644
index 9b55420..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/ArrowDown.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/ArrowUp.png b/tools/ArtistTools/source/CoreLib/UI/images/ArrowUp.png
deleted file mode 100644
index fea1fbe..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/ArrowUp.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/CheckBox.png b/tools/ArtistTools/source/CoreLib/UI/images/CheckBox.png
deleted file mode 100644
index ac53487..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/CheckBox.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/CurveEditor.png b/tools/ArtistTools/source/CoreLib/UI/images/CurveEditor.png
deleted file mode 100644
index f92c6e4..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/CurveEditor.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/DarkBorder.png b/tools/ArtistTools/source/CoreLib/UI/images/DarkBorder.png
deleted file mode 100644
index 9771804..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/DarkBorder.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/Down.png b/tools/ArtistTools/source/CoreLib/UI/images/Down.png
deleted file mode 100644
index 376a821..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/Down.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/EditWrench.png b/tools/ArtistTools/source/CoreLib/UI/images/EditWrench.png
deleted file mode 100644
index 563a602..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/EditWrench.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/Refresh_icon.png b/tools/ArtistTools/source/CoreLib/UI/images/Refresh_icon.png
deleted file mode 100644
index c189dd5..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/Refresh_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/Remove_icon.png b/tools/ArtistTools/source/CoreLib/UI/images/Remove_icon.png
deleted file mode 100644
index ebb63d9..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/Remove_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/TextureBox.bmp b/tools/ArtistTools/source/CoreLib/UI/images/TextureBox.bmp
deleted file mode 100644
index 43f95b2..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/TextureBox.bmp
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/TextureDisabled_icon.png b/tools/ArtistTools/source/CoreLib/UI/images/TextureDisabled_icon.png
deleted file mode 100644
index 3a727f4..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/TextureDisabled_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/TextureEnabled_icon.png b/tools/ArtistTools/source/CoreLib/UI/images/TextureEnabled_icon.png
deleted file mode 100644
index a8f11d5..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/TextureEnabled_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/TextureIsUsed_icon.png b/tools/ArtistTools/source/CoreLib/UI/images/TextureIsUsed_icon.png
deleted file mode 100644
index 75d52dc..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/TextureIsUsed_icon.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/Up.png b/tools/ArtistTools/source/CoreLib/UI/images/Up.png
deleted file mode 100644
index 6f8903c..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/Up.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/importFile.png b/tools/ArtistTools/source/CoreLib/UI/images/importFile.png
deleted file mode 100644
index e4ffc91..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/importFile.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/openFile.png b/tools/ArtistTools/source/CoreLib/UI/images/openFile.png
deleted file mode 100644
index b91e69c..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/openFile.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/playlist.png b/tools/ArtistTools/source/CoreLib/UI/images/playlist.png
deleted file mode 100644
index 3c6db13..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/playlist.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/refreshReload.png b/tools/ArtistTools/source/CoreLib/UI/images/refreshReload.png
deleted file mode 100644
index 745c9cb..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/refreshReload.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/saveDisc.png b/tools/ArtistTools/source/CoreLib/UI/images/saveDisc.png
deleted file mode 100644
index c0dc719..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/saveDisc.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/simulationPlay.png b/tools/ArtistTools/source/CoreLib/UI/images/simulationPlay.png
deleted file mode 100644
index e5bc551..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/simulationPlay.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/simulationStep.png b/tools/ArtistTools/source/CoreLib/UI/images/simulationStep.png
deleted file mode 100644
index 8ab9e49..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/simulationStep.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/simulationStop.png b/tools/ArtistTools/source/CoreLib/UI/images/simulationStop.png
deleted file mode 100644
index 8576b5b..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/simulationStop.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/transportLoop.png b/tools/ArtistTools/source/CoreLib/UI/images/transportLoop.png
deleted file mode 100644
index 3e13e2f..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/transportLoop.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/transportPlay.png b/tools/ArtistTools/source/CoreLib/UI/images/transportPlay.png
deleted file mode 100644
index e5e593e..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/transportPlay.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/transportRewind.png b/tools/ArtistTools/source/CoreLib/UI/images/transportRewind.png
deleted file mode 100644
index 95664d2..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/transportRewind.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/transportStepForward.png b/tools/ArtistTools/source/CoreLib/UI/images/transportStepForward.png
deleted file mode 100644
index 4d35753..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/transportStepForward.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/transportStop.png b/tools/ArtistTools/source/CoreLib/UI/images/transportStop.png
deleted file mode 100644
index 27f3cbd..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/transportStop.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/visibilityToggle_notVisible.png b/tools/ArtistTools/source/CoreLib/UI/images/visibilityToggle_notVisible.png
deleted file mode 100644
index 56b24fe..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/visibilityToggle_notVisible.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/UI/images/visibilityToggle_visible.png b/tools/ArtistTools/source/CoreLib/UI/images/visibilityToggle_visible.png
deleted file mode 100644
index 3e5a88e..0000000
--- a/tools/ArtistTools/source/CoreLib/UI/images/visibilityToggle_visible.png
+++ /dev/null
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Automate.cpp b/tools/ArtistTools/source/CoreLib/Utils/Automate.cpp
deleted file mode 100644
index 6c7d551..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Automate.cpp
+++ /dev/null
@@ -1,530 +0,0 @@
-#include <windows.h>
-
-#include <QtWidgets/QApplication>
-
-#include "AppMainWindow.h"
-//#include "SimpleScene.h"
-
-#include "OpenAutomate.h"
-#include "Automate.h"
-#include "Settings.h"
-
-//#define OPEN_CONSOLE
-#ifdef OPEN_CONSOLE
-#include <Windows.h>
-#endif
-
-#include <cassert>
-#include <string>
-
-#include <Nv/Common/NvCoCommon.h>
-
-#define KEYSTR  ("Software\\OpenAutomate\\RegisteredApps\\NVIDIA\\FurViewer\\v1.0\\")
-
-const oaChar *Benchmarks[] = {
-	"HairBall",
-	"Teapot",
-	"Manjaladon",
-	"WitcherHorse",
-	NV_NULL
-};
-oaInt NumBenchmarks = 1;
-
-static void ParseArgs(int argc, char *argv[]);
-
-static void OAMainLoop(const char *opt);
-static bool RegisterAppItself();
-static int RunApp(QApplication& a);
-static void GetAllOptions(void);
-static void GetCurrentOptions(void);
-
-static bool g_isAutomateMode = false;
-static int InstallModeFlag = 0;
-static char *OAOpt = NV_NULL;
-
-bool AutomateInstallApp()
-{
-	return RegisterAppItself();
-}
-
-static bool RegisterAppItself()
-{
-	char exePath[MAX_PATH];
-	if(!GetExePath(exePath))
-	{
-		fprintf(stderr, "Cannot get exe path\r\n");
-		return false; 
-	}
-
-	HKEY hKey;
-	DWORD dwRes = RegOpenKeyExA(
-		HKEY_LOCAL_MACHINE, 
-		KEYSTR, 
-		0, 
-		KEY_WRITE | KEY_READ, 
-		&hKey);
-
-	DWORD dwSize = MAX_PATH;
-	char buf[MAX_PATH];
-	if(dwRes == ERROR_SUCCESS)
-	{
-		dwRes = RegQueryValueExA(
-			hKey,
-			"INSTALL_ROOT_PATH",
-			NV_NULL,
-			NV_NULL,
-			(LPBYTE)buf,
-			&dwSize);
-		if(dwRes == ERROR_SUCCESS && !lstrcmpiA(buf, exePath))
-		{
-			RegCloseKey(hKey);
-			return true;      
-		}
-	}
-	else
-	{
-		dwRes = RegCreateKeyExA(
-			HKEY_LOCAL_MACHINE,
-			KEYSTR,
-			0,
-			NV_NULL,
-			REG_OPTION_NON_VOLATILE,
-			KEY_WRITE, NV_NULL,
-			&hKey,
-			&dwSize);
-		if(ERROR_SUCCESS != dwRes)
-		{
-			RegCloseKey(hKey);
-			return false;
-		}
-	}
-
-	bool bRet = false;
-	do 
-	{
-		dwRes = RegSetValueExA(
-			hKey,
-			"INSTALL_ROOT_PATH",
-			0,
-			REG_SZ,
-			(BYTE*)exePath,
-			(DWORD)strlen(exePath));
-		if(ERROR_SUCCESS != dwRes)
-		{
-			fprintf(stderr, "Write INSTALL_ROOT_PATH Failed\r\n");
-			break;
-		}
-
-#ifdef _WIN64
-#ifdef _DEBUG
-		strcat(exePath, "FurViewer.win64.D.exe");
-#else
-		strcat(exePath, "FurViewer.win64.exe");
-#endif
-#else
-#ifdef _DEBUG
-		strcat(exePath, "FurViewer.win32.D.exe");
-#else
-		strcat(exePath, "FurViewer.win32.exe");
-#endif
-#endif
-
-		dwRes = RegSetValueExA(
-			hKey,
-			"ENTRY_EXE",
-			0,
-			REG_SZ,
-			(BYTE*)exePath,
-			(DWORD)strlen(exePath));
-		if(ERROR_SUCCESS != dwRes)
-		{
-			fprintf(stderr, "Write ENTRY_EXE Failed\r\n");
-			break;
-		}
-
-		ZeroMemory(buf, sizeof(buf));
-		SYSTEMTIME  tm;
-		GetLocalTime(&tm);
-		sprintf( 
-			buf,
-			"%04d-%02d-%02d %02d:%02d:%02d",
-			tm.wYear,
-			tm.wMonth,
-			tm.wDay,
-			tm.wHour,
-			tm.wMinute,
-			tm.wSecond);
-		dwRes = RegSetValueExA(
-			hKey,
-			"INSTALL_DATETIME",
-			0,
-			REG_SZ,
-			(BYTE*)buf,
-			(DWORD)strlen(buf));
-		if(ERROR_SUCCESS != dwRes)
-		{
-			fprintf(stderr, "Write INSTALL_DATETIME Failed\r\n");
-			break;
-		}
-
-		dwRes = RegSetValueExA(
-			hKey,
-			"REGION",
-			0,
-			REG_SZ,
-			(BYTE*)"en_US",
-			(DWORD)strlen("en_US"));
-		if(ERROR_SUCCESS != dwRes)
-		{
-			fprintf(stderr, "Write REGION Failed\r\n");
-			break;
-		}  
-
-		bRet = true;
-	} while(0);
-
-	RegCloseKey(hKey);
-	return bRet;
-}
-
-static const char *FormatDataType(oaOptionDataType value_type)
-{
-	switch(value_type)
-	{
-	case OA_TYPE_STRING:
-		return "String";
-	case OA_TYPE_INT:
-		return "Int";
-	case OA_TYPE_FLOAT:
-		return "Float";
-	case OA_TYPE_ENUM:
-		return "Enum";
-	case OA_TYPE_BOOL:
-		return "Bool";
-	default:
-		return "Unknown";
-	}
-}
-
-static const char *FormatCompareOp(oaComparisonOpType op_value)
-{  
-	switch(op_value)
-	{
-	case OA_COMP_OP_EQUAL:
-		return "Equal";
-	case OA_COMP_OP_NOT_EQUAL:
-		return "NotEqual";
-	case OA_COMP_OP_GREATER:
-		return "Greater";
-	case OA_COMP_OP_LESS:
-		return "Less";
-	case OA_COMP_OP_GREATER_OR_EQUAL:
-		return "GreaterOrEqual";
-	case OA_COMP_OP_LESS_OR_EQUAL:
-		return "LessOrEqual";
-	default:
-		return "Unknown";
-	}
-}
-
-static void ConvertOAValue(oaOptionDataType value_type, 
-	const oaValue *value,
-	char *result)
-{
-	switch(value_type)
-	{
-	case OA_TYPE_STRING:
-	case OA_TYPE_ENUM:
-		if (value->String) strcpy(result, value->String);
-		else result[0] = '\0';
-		break;
-	case OA_TYPE_INT:
-		sprintf(result, "%d", value->Int);
-		break;
-	case OA_TYPE_FLOAT:
-		sprintf(result, "%f", value->Float);
-		break;
-	case OA_TYPE_BOOL:
-		sprintf(result, "%1d", value->Bool);
-		break;
-	default:
-		return;
-	}
-}
-
-static void PrintOptions(const oaNamedOption *option)
-{
-	char buf[MAX_PATH];
-	ConvertOAValue(option->DataType, &option->Value, buf);
-
-	fprintf(stderr, "name=%s,type=%s,value=%s\r\n", option->Name, FormatDataType(option->DataType), buf);
-	if(option->MaxValue.Int && option->MinValue.Int)
-	{
-		fprintf(stderr,"  numsteps=%d", option->NumSteps);
-		ConvertOAValue(option->DataType, &option->MinValue, buf);
-		fprintf(stderr, "minvalue=%s", buf);
-		ConvertOAValue(option->DataType, &option->MaxValue, buf);
-		fprintf(stderr,"maxvalue=%s\r\n", buf);
-	}
-
-	if(option->Dependency.ParentName)
-	{
-		ConvertOAValue(option->Dependency.ComparisonValType, &option->Dependency.ComparisonVal, buf);
-		fprintf(stderr, "  parentname=%s,comparisionop=%s,comparisiontype=%s,comparisionvalue=%s\r\n", 
-			option->Dependency.ParentName,
-			FormatCompareOp(option->Dependency.ComparisonOp),
-			FormatDataType(option->Dependency.ComparisonValType),
-			buf);
-	}
-}
-
-#if (0) // Remove this!
-int main(int argc, char *argv[])
-{
-	SetConsoleTitleA("OA - simple application");
-	ParseArgs(argc, argv);
-
-	AppSettings::Inst().InitOptions();
-
-	if(InstallModeFlag)
-	{
-		InstallApp();
-	}
-	else if(OAModeFlag)
-	{
-		OAMainLoop(OAOpt);
-	}
-	else
-	{
-		RunApp();
-	}
-
-	return(0);
-}
-#endif
-
-void GetAllOptions(void)
-{
-	fprintf(stderr, "All Options: \r\n");
-	for(oaInt i=0; i < AppSettings::Inst().GetNumOptions(); ++i)
-	{
-		oaNamedOption* option = AppSettings::Inst().GetOption(i);
-		if (!strcmp(option->Name, "User/ProjectPath"))
-			continue;
-		if (!strcmp(option->Name, "User/FurAssetPath"))
-			continue;
-		PrintOptions(AppSettings::Inst().GetOption(i));
-		oaAddOption(AppSettings::Inst().GetOption(i));
-	}
-}
-
-void GetCurrentOptions(void)
-{
-	fprintf(stderr, "Current Options: \r\n");
-
-	std::map<std::string, OptionValue>::const_iterator Iter = AppSettings::Inst().GetCurrentOptionMap()->begin();
-
-	oaNamedOption option;
-	oaInitOption(&option);
-
-	for(; Iter != AppSettings::Inst().GetCurrentOptionMap()->end(); ++Iter)
-	{
-		if (!strcmp(Iter->second.Name, "User/ProjectPath"))
-			continue;
-		if (!strcmp(Iter->second.Name, "User/FurAssetPath"))
-			continue;
-
-		option.Name = Iter->second.Name;
-		option.Value = Iter->second.Value;
-		option.DataType = Iter->second.Type;
-		PrintOptions(&option);
-
-		oaAddOptionValue(Iter->second.Name,
-			Iter->second.Type,
-			&Iter->second.Value);
-	}
-}
-
-void SetOptions(void)
-{
-	oaNamedOption *Option;
-
-	fprintf(stderr, "Set Options: \r\n");
-	while ((Option = oaGetNextOption()) != NV_NULL)
-	{
-		/*
-		* Set option value to persist for subsequent runs of the game 
-		* to the given value.  Option->Name will be the name of the value, 
-		* and Option->Value will contain the appropriate value.
-		*/
-		PrintOptions(Option);
-		AppSettings::Inst().SetOptionValue(Option->Name, Option->DataType, &Option->Value);
-	}
-
-	AppSettings::Inst().WriteOptionsFile();
-}
-
-void GetBenchmarks(void)
-{
-	/* foreach known available benchmark call oaAddBenchmark() with a unique string identifying it */
-	for(oaInt i=0; i < NumBenchmarks; ++i)
-		oaAddBenchmark(Benchmarks[i]);
-}
-
-void RunBenchmark(const oaChar *benchmark_name)
-{
-	oaValue Val;
-	int i;
-
-	bool FoundBenchmark = false;
-	for(i=0; i < NumBenchmarks; ++i)
-		if(!strcmp(Benchmarks[i], benchmark_name))
-		{
-			FoundBenchmark = true;
-			break;
-		}
-
-		/* Check if the requested benchark is valid */
-		if(!FoundBenchmark)
-		{
-			char Msg[1024];
-			sprintf(Msg, "'%s' is not a valid benchmark.", benchmark_name);
-			OA_RAISE_ERROR(INVALID_BENCHMARK, benchmark_name);
-		}
-
-		/* Setup everything to run the benchmark */
-		
-		/* oaStartBenchmark() must be called right before the first frame */ 
-		oaStartBenchmark();
-
-		/* 
-		* Run the benchmark, and call oaDisplayFrame() right before the final
-		* present call for each frame
-		*/
-		//for(i=0; i < 50; ++i)
-		//{
-		//	SLEEP(20);
-
-		//	oaValue FrameValue;
-		//	FrameValue.Int = i;
-		//	oaValue OtherInt;
-		//	OtherInt.Int = i+1000;
-		//	oaChar str[100];
-		//	sprintf(str, "frame number: %d\00", i);
-		//	oaValue Str;
-		//	Str.String = str;
-
-		//	oaAddFrameValue("FrameCount", OA_TYPE_INT, &FrameValue);
-		//	oaAddFrameValue("OtherInt", OA_TYPE_INT, &OtherInt);
-		//	oaAddFrameValue("String", OA_TYPE_STRING, &Str);
-
-		//	oaDisplayFrame((oaFloat)(i * 20) / (oaFloat)1000);
-		//}
-		{
-//			SimpleScene* scene = SimpleScene::Inst();
-			AppMainWindow::Inst().menu_clearScene();
-		}
-
-		/* Return some result values */
-		Val.Int = 18249;
-		oaAddResultValue("Score", OA_TYPE_INT, &Val);
-
-		Val.Float = 29.14;
-		oaAddResultValue("Some other score", OA_TYPE_FLOAT, &Val);
-
-		/* oaStartBenchmark() must be called right after the last frame */ 
-		oaEndBenchmark();
-}
-
-int AutomateInit(const char* opt)
-{
-	oaVersion Version;
-	if (!oaInit((const oaString)opt, &Version))
-	{
-		Error("OA did not initialize properly.");
-		return 1;
-	}
-	g_isAutomateMode = true;
-	return 0;
-}
-
-void AutomateRun()
-{
-	oaCommand Command;
-
-	oaInitCommand(&Command);
-	switch(oaGetNextCommand(&Command))
-	{
-		/* No more commands, exit program */
-	case OA_CMD_EXIT: 
-		AppMainWindow::Inst().close();
-		return;
-
-		/* Run as normal */
-	case OA_CMD_RUN: 
-		break;
-
-		/* Enumerate all in-game options */
-	case OA_CMD_GET_ALL_OPTIONS: 
-		GetAllOptions();
-		break;
-
-		/* Return the option values currently set */
-	case OA_CMD_GET_CURRENT_OPTIONS:
-		GetCurrentOptions();
-		break;
-
-		/* Set all in-game options */
-	case OA_CMD_SET_OPTIONS: 
-		SetOptions();
-		break;
-
-		/* Enumerate all known benchmarks */
-	case OA_CMD_GET_BENCHMARKS: 
-		GetBenchmarks();
-		break;
-
-		/* Run benchmark */
-	case OA_CMD_RUN_BENCHMARK: 
-		RunBenchmark(Command.BenchmarkName);
-		break;
-	}
-}
-
-bool IsAutomateMode()
-{
-	return g_isAutomateMode;
-}
-
-bool GetAutomateInstallModeOption(int argc, char* argv[])
-{
-	for (int idx = 1; idx < argc; ++idx)
-	{
-		if (!strcmp(argv[idx], "-install"))
-		{
-			return true;
-		}
-	}
-	return false;
-}
-
-
-std::string GetAutomateOption(int argc, char* argv[])
-{
-	for (int idx = 1; idx < argc; ++idx)
-	{
-		if (!strcmp(argv[idx], "-openautomate"))
-		{
-			if ((idx + 1) < argc)
-			{
-				return argv[idx+1];
-			}
-			else
-			{
-				Error("-openautomate option must have an argument.");
-				return "";
-			}
-		}
-	}
-	return "";
-}
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Automate.h b/tools/ArtistTools/source/CoreLib/Utils/Automate.h
deleted file mode 100644
index 6f5de4f..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Automate.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// Wrapper functions for OpenAutomate
-
-// Add application info into registry key for Automate
-// Return true if succeeded
-bool AutomateInstallApp();
-
-// Initialize OpenAutomate with its command line option. No need to cleanup
-int AutomateInit(const char* opt);
-
-// Call this function when the application is idle when IsAutomateMode() is true
-void AutomateRun();
-
-// Returns true if automate mode is initialized by AutomateInit() call
-bool IsAutomateMode();
-
-// Utility function to parse the command line option for OpenAutomate
-// Returns OpenAutomate option if it has. If not, returns empty string
-std::string GetAutomateOption(int argc, char* argv[]);
-
-// Returns true if it has "-install" in the command line option
-bool GetAutomateInstallModeOption(int argc, char* argv[]);
-
diff --git a/tools/ArtistTools/source/CoreLib/Utils/CoreLibUtils.h b/tools/ArtistTools/source/CoreLib/Utils/CoreLibUtils.h
deleted file mode 100644
index 6decd0c..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/CoreLibUtils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#pragma once
-
-#include <QtCore/QFile>
-#include <QtCore/QTemporaryFile>
-
-namespace utils {
-
-inline std::string GetTempFilePath()
-{
-	QByteArray tempFilePath;
-	QTemporaryFile tempFile;
-	// temp file will be automatically deleted after this function
-	tempFile.open();
-	tempFilePath = tempFile.fileName().toLocal8Bit();
-	return std::string(tempFilePath);
-}
-
-inline bool RenameFile(const char* srcFilePath, const char* targetFilePath, bool isOvewrite = false)
-{
-	if (QFile::exists(targetFilePath))
-	{
-		if (isOvewrite == false) return false;
-		if (!QFile::remove(targetFilePath)) return false;
-	}
-	return QFile::rename(srcFilePath, targetFilePath);
-}
-
-inline bool CopyFile(const char* srcFilePath, const char* targetFilePath, bool isOverwrite = false)
-{
-	if (QFile::exists(targetFilePath))
-	{
-		if (isOverwrite == false) return false;
-		if (!QFile::remove(targetFilePath)) return false;
-	}
-	return QFile::copy(srcFilePath, targetFilePath);
-}
-
-} // end of utils
diff --git a/tools/ArtistTools/source/CoreLib/Utils/MathUtil.cpp b/tools/ArtistTools/source/CoreLib/Utils/MathUtil.cpp
deleted file mode 100644
index bdb3a77..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/MathUtil.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file contains wrapper functions to make hair lib easy to setup and use
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#include "MathUtil.h"
-#include <string.h>
-
-////////////////////////////////////////////////////////////////////////////////////////
-void gfsdk_makeIdentity(atcore_float4x4& transform)
-{
-	memset(&transform, 0, sizeof(atcore_float4x4));
-	transform._11 = 1.0f;
-	transform._22 = 1.0f;
-	transform._33 = 1.0f;
-	transform._44 = 1.0f;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-void gfsdk_makeTranslation(atcore_float4x4& m, const atcore_float3& t)
-{
-	gfsdk_makeIdentity(m);
-	m._41 = t.x;
-	m._42 = t.y;
-	m._43 = t.z;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-void gfsdk_makeScale(atcore_float4x4& m, const atcore_float3& s)
-{
-	gfsdk_makeIdentity(m);
-	m._11 = s.x;
-	m._12 = s.y;
-	m._13 = s.z;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void gfsdk_makeRotation(atcore_float4x4& m, const atcore_float4& q)
-{
-	gfsdk_makeIdentity(m);
-
-	const float x = q.x;
-	const float y = q.y;
-	const float z = q.z;
-	const float w = q.w;
-
-	const float x2 = x + x;
-	const float y2 = y + y;
-	const float z2 = z + z;
-
-	const float xx = x2*x;
-	const float yy = y2*y;
-	const float zz = z2*z;
-
-	const float xy = x2*y;
-	const float xz = x2*z;
-	const float xw = x2*w;
-
-	const float yz = y2*z;
-	const float yw = y2*w;
-	const float zw = z2*w;
-
-	m._11 = 1.0f - yy - zz;
-	m._12 = xy + zw;
-	m._13 = xz - yw;
-
-	m._21 = xy - zw;
-	m._22 = 1.0f - xx - zz;
-	m._23 = yz + xw;
-
-	m._31 = xz + yw;
-	m._32 = yz - xw;
-	m._33 = 1.0f - xx - yy;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-atcore_float4x4 gfsdk_makeTransform(const atcore_float4& q, const atcore_float3& t, const atcore_float3 &s)
-{
-	atcore_float4x4 m;
-
-	gfsdk_makeRotation(m, q);
-
-	m._11 *= s.x; m._12 *= s.x; m._13 *= s.x;
-	m._21 *= s.y; m._22 *= s.y; m._23 *= s.y;
-	m._31 *= s.z; m._32 *= s.z; m._33 *= s.z;
-
-	m._41 = t.x; 
-	m._42 = t.y;
-	m._43 = t.z;
-
-	return m;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-atcore_float4 gfsdk_getRotation(const atcore_float4x4& sm)
-{
-	atcore_float4x4 m = sm;
-
-	gfsdk_orthonormalize(m);
-
-	atcore_float4 q;
-
-	float x,y,z,w;
-
-	float tr = m._11 + m._22 + m._33, h;
-	if(tr >= 0)
-	{
-		h = sqrt(tr +1);
-		w = float(0.5) * h;
-		h = float(0.5) / h;
-
-		x = (m._23 - m._32) * h;
-		y = (m._31 - m._13) * h;
-		z = (m._12 - m._21) * h;
-	}
-	else
-	{
-		float max = m._11;
-		int i = 0; 
-		if (m._22 > m._11)
-		{
-			i = 1; 
-			max = m._22;
-		}
-		if (m._33 > max)
-			i = 2; 
-		switch (i)
-		{
-		case 0:
-			h = sqrt((m._11 - (m._22 + m._33)) + 1);
-			x = float(0.5) * h;
-			h = float(0.5) / h;
-
-			y = (m._21 + m._12) * h; 
-			z = (m._13 + m._31) * h;
-			w = (m._23 - m._32) * h;
-			break;
-		case 1:
-			h = sqrt((m._22 - (m._33 + m._11)) + 1);
-			y = float(0.5) * h;
-			h = float(0.5) / h;
-
-			z = (m._32 + m._23) * h;
-			x = (m._21 + m._12) * h;
-			w = (m._31 - m._13) * h;
-			break;
-		case 2:
-			h = sqrt((m._33 - (m._11 + m._22)) + 1);
-			z = float(0.5) * h;
-			h = float(0.5) / h;
-
-			x = (m._13 + m._31) * h;
-			y = (m._32 + m._23) * h;
-			w = (m._12 - m._21) * h;
-			break;
-		default: // Make compiler happy
-			x = y = z = w = 0;
-			break;
-		}
-	}	
-
-	return gfsdk_makeFloat4(x,y,z,w);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-atcore_float4x4 gfsdk_lerp(atcore_float4x4& start, atcore_float4x4& end, float t)
-{
-	atcore_float4 sq = gfsdk_getRotation(start);
-	atcore_float4 eq = gfsdk_getRotation(end);
-	atcore_float3 st = gfsdk_getTranslation(start);
-	atcore_float3 et = gfsdk_getTranslation(end);
-
-	atcore_float3 ss = gfsdk_getScale(start);
-	atcore_float3 es = gfsdk_getScale(end);
-	atcore_float3 s = gfsdk_lerp(ss, es, t);
-
-	atcore_dualquaternion sdq = gfsdk_makeDQ(sq, st);
-	atcore_dualquaternion edq = gfsdk_makeDQ(eq, et);
-
-	atcore_dualquaternion dq = gfsdk_lerp(sdq, edq, t);
-
-	atcore_float4 gr = getRotation(dq);
-	atcore_float3 gt = getTranslation(dq);
-
-	return gfsdk_makeTransform(gr, gt, s);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-atcore_float4x4 operator*(const atcore_float4x4& in1, const atcore_float4x4& in2)
-{
-#define MATRIX_SUM(OUT, IN1, IN2, ROW, COL) OUT._##ROW##COL = IN1._##ROW##1 * IN2._1##COL + IN1._##ROW##2 * IN2._2##COL + IN1._##ROW##3 * IN2._3##COL + IN1._##ROW##4 * IN2._4##COL;
-
-	atcore_float4x4 out;
-
-	MATRIX_SUM(out, in1, in2, 1, 1); 
-	MATRIX_SUM(out, in1, in2, 1, 2);
-	MATRIX_SUM(out, in1, in2, 1, 3);
-	MATRIX_SUM(out, in1, in2, 1, 4);
-
-	MATRIX_SUM(out, in1, in2, 2, 1); 
-	MATRIX_SUM(out, in1, in2, 2, 2);
-	MATRIX_SUM(out, in1, in2, 2, 3);
-	MATRIX_SUM(out, in1, in2, 2, 4);
-
-	MATRIX_SUM(out, in1, in2, 3, 1); 
-	MATRIX_SUM(out, in1, in2, 3, 2);
-	MATRIX_SUM(out, in1, in2, 3, 3);
-	MATRIX_SUM(out, in1, in2, 3, 4);
-
-	MATRIX_SUM(out, in1, in2, 4, 1); 
-	MATRIX_SUM(out, in1, in2, 4, 2);
-	MATRIX_SUM(out, in1, in2, 4, 3);
-	MATRIX_SUM(out, in1, in2, 4, 4);
-
-#undef MATRIX_SUM
-
-	return out;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-float 
-gfsdk_getDeterminant(const atcore_float4x4& m)
-{
-	const float* matrix = (const float*)&m;
-	
-	atcore_float3 p0 = gfsdk_makeFloat3(matrix[0*4+0], matrix[0*4+1], matrix[0*4+2]);
-	atcore_float3 p1 = gfsdk_makeFloat3(matrix[1*4+0], matrix[1*4+1], matrix[1*4+2]);
-	atcore_float3 p2 = gfsdk_makeFloat3(matrix[2*4+0], matrix[2*4+1], matrix[2*4+2]);
-
-	atcore_float3 tempv = gfsdk_cross(p1,p2);
-
-	return gfsdk_dot(p0, tempv);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-atcore_float4x4
-gfsdk_getSubMatrix(int ki,int kj, const atcore_float4x4& m)
-{
-	atcore_float4x4 out;
-	gfsdk_makeIdentity(out);
-
-	float* pDst = (float*)&out;
-	const float* matrix = (const float*)&m;
-
-	int row, col;
-	int dstCol = 0, dstRow = 0;
-
-	for ( col = 0; col < 4; col++ )
-	{
-		if ( col == kj )
-		{
-			continue;
-		}
-		for ( dstRow = 0, row = 0; row < 4; row++ )
-		{
-			if ( row == ki )
-			{
-				continue;
-			}
-			pDst[dstCol*4+dstRow] = matrix[col*4+row];
-			dstRow++;
-		}
-		dstCol++;
-	}
-
-	return out;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-atcore_float4x4 gfsdk_inverse(const atcore_float4x4& m)
-{
-	atcore_float4x4 im;
-
-	float* inverse_matrix = (float*)&im;
-
-	float det = gfsdk_getDeterminant(m);
-	det = 1.0f / det;
-	for (int i = 0; i < 4; i++ )
-	{
-		for (int j = 0; j < 4; j++ )
-		{
-			int sign = 1 - ( ( i + j ) % 2 ) * 2;
-
-			atcore_float4x4 subMat = gfsdk_getSubMatrix(i, j, m);
-			float subDeterminant = gfsdk_getDeterminant(subMat);
-	
-			inverse_matrix[i*4+j] = ( subDeterminant * sign ) * det;
-		}
-	}
-
-	return im;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-atcore_dualquaternion gfsdk_makeDQ(const atcore_float4x4& m)
-{
-	atcore_float4 q = gfsdk_getRotation(m);
-	atcore_float3 t = gfsdk_getTranslation(m);
-
-	return gfsdk_makeDQ(q, t);
-}
diff --git a/tools/ArtistTools/source/CoreLib/Utils/MathUtil.h b/tools/ArtistTools/source/CoreLib/Utils/MathUtil.h
deleted file mode 100644
index 7b7a2a5..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/MathUtil.h
+++ /dev/null
@@ -1,557 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-#pragma once
-
-#include "corelib_global.h"
-#include "CoreLib.h"
-#include "math.h"
-#include "float.h"
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_lerp(float v1, float v2, float t)
-{
-	return (1.0f - t) * v1 + t * v2;
-}
-
-inline float gfsdk_min(float x, float y) {
-	return (x < y) ? x : y;
-}
-
-inline float gfsdk_max(float x, float y) {
-	return (x > y) ? x : y;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float2 gfsdk_makeFloat2(float x, float y)
-{
-	atcore_float2 v;
-	v.x = x;
-	v.y = y;
-	return v;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float2 operator*(float s, const atcore_float2 &p) 
-{
-	return gfsdk_makeFloat2(s * p.x, s * p.y);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float2 operator*(const atcore_float2 &p, float s) 
-{
-	return gfsdk_makeFloat2(s * p.x, s * p.y);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_makeFloat3(float x, float y, float z)
-{
-	atcore_float3 v;
-	v.x = x;
-	v.y = y;
-	v.z = z;
-	return v;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 operator+(const atcore_float3 &p0, const atcore_float3 &p1) 
-{
-	return gfsdk_makeFloat3(p0.x + p1.x, p0.y + p1.y, p0.z + p1.z);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3& operator+=(atcore_float3 &v, const atcore_float3 & v1)
-{
-	v.x += v1.x; v.y += v1.y; v.z += v1.z;
-	return v;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 operator-(const atcore_float3 &p0, const atcore_float3 &p1) 
-{
-	return gfsdk_makeFloat3(p0.x - p1.x, p0.y - p1.y, p0.z - p1.z);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3& operator-=(atcore_float3 &v, const atcore_float3 & v1)
-{
-	v.x -= v1.x; v.y -= v1.y; v.z -= v1.z;
-	return v;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 operator*(float s, const atcore_float3 &p) 
-{
-	return gfsdk_makeFloat3(s * p.x, s * p.y, s * p.z);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 operator*(const atcore_float3 &p, float s) 
-{
-	return gfsdk_makeFloat3(s * p.x, s * p.y, s * p.z);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_dot(const atcore_float3& v0, const atcore_float3 &v1) {
-	return v0.x * v1.x + v0.y * v1.y + v0.z * v1.z;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_lengthSquared(const atcore_float3& v) {
-	return gfsdk_dot(v,v);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_length(const atcore_float3 &v) {
-	return sqrt(gfsdk_lengthSquared(v));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_distance(const atcore_float3 &v1, const atcore_float3 &v2) {
-	return gfsdk_length(v2-v1);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline const atcore_float3& gfsdk_normalize(atcore_float3 &v) {
-	float l = gfsdk_length(v);
-	if (l != 0) {	v.x /= l;	v.y /= l;	v.z /= l; }
-	return v;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_cross(const atcore_float3& v1, const atcore_float3& v2)
-{
-	return gfsdk_makeFloat3(
-		v1.y * v2.z - v1.z * v2.y, 
-		v1.z * v2.x - v1.x * v2.z,
-		v1.x * v2.y - v1.y * v2.x);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_lerp(const atcore_float3& v1, const atcore_float3& v2, float t)
-{
-	return gfsdk_makeFloat3(gfsdk_lerp(v1.x, v2.x, t), gfsdk_lerp(v1.y, v2.y, t), gfsdk_lerp(v1.z, v2.z, t));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_min(const atcore_float3& v1, const atcore_float3 &v2)
-{
-	return gfsdk_makeFloat3(
-		gfsdk_min(v1.x, v2.x),
-		gfsdk_min(v1.y, v2.y),
-		gfsdk_min(v1.z, v2.z)
-		);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_max(const atcore_float3& v1, const atcore_float3 &v2)
-{
-	return gfsdk_makeFloat3(
-		gfsdk_max(v1.x, v2.x),
-		gfsdk_max(v1.y, v2.y),
-		gfsdk_max(v1.z, v2.z)
-		);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_min(const atcore_float3 &v)
-{
-	return gfsdk_min(gfsdk_min(v.x, v.y), v.z);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_max(const atcore_float3 &v)
-{
-	return gfsdk_max(gfsdk_max(v.x, v.y), v.z);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// float4
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4 gfsdk_makeFloat4(float x = 0.0f, float y = 0.0f, float z = 0.0f, float w = 0.0f)
-{
-	atcore_float4 v;
-	v.x = x;
-	v.y = y;
-	v.z = z;
-	v.w = w;
-	return v;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4 gfsdk_makeFloat4(const atcore_float3& v, float w)
-{
-	return gfsdk_makeFloat4(v.x, v.y, v.z, w);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4& operator+=(atcore_float4 &v, const atcore_float4 & v1)
-{
-	v.x += v1.x; v.y += v1.y; v.z += v1.z; v.w += v1.w;
-	return v;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4 operator*(float s, const atcore_float4 &p) 
-{
-	return gfsdk_makeFloat4(s * p.x, s * p.y, s * p.z, s * p.w);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4 operator*(const atcore_float4 &p, float s) 
-{
-	return gfsdk_makeFloat4(s * p.x, s * p.y, s * p.z, s * p.w);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_dot(const atcore_float4& v0, const atcore_float4 &v1) {
-	return v0.x * v1.x + v0.y * v1.y + v0.z * v1.z + v0.w * v1.w;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_lengthSquared(const atcore_float4& v) {
-	return gfsdk_dot(v,v);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline float gfsdk_length(const atcore_float4 &v) {
-	return sqrt(gfsdk_lengthSquared(v));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline const atcore_float4 gfsdk_normalize(const atcore_float4 &v) {
-	atcore_float4 nv = v;
-
-	float l = gfsdk_length(nv);
-	if (l > FLT_EPSILON)
-	{
-		const float s = 1.0f / l;
-
-		nv.x *= s; 
-		nv.y *= s; 
-		nv.z *= s; 
-		nv.w *= s;
-	}
-
-	return nv;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4 gfsdk_lerp(const atcore_float4& v1, const atcore_float4& v2, float t)
-{
-	return gfsdk_makeFloat4(
-		gfsdk_lerp(v1.x, v2.x, t), 
-		gfsdk_lerp(v1.y, v2.y, t), 
-		gfsdk_lerp(v1.z, v2.z, t),
-		gfsdk_lerp(v1.w, v2.w, t)
-		);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// quaternion
-///////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-inline atcore_float4 gfsdk_quaternionConjugate(const atcore_float4& in)
-{
-	return gfsdk_makeFloat4(-in.x, -in.y, -in.z, in.w);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4 gfsdk_quaternionMultiply(const atcore_float4& q0, const atcore_float4& q1)
-{
-	atcore_float4 q;
-
-	const float tx = q0.w * q1.x + q0.x * q1.w + q0.y * q1.z - q0.z * q1.y;
-	const float ty = q0.w * q1.y + q0.y * q1.w + q0.z * q1.x - q0.x * q1.z;
-	const float tz = q0.w * q1.z + q0.z * q1.w + q0.x * q1.y - q0.y * q1.x;
-
-	q.w = q0.w * q1.w - q0.x * q1.x - q0.y * q1.y - q0.z  * q1.z;
-	q.x = tx;
-	q.y = ty;
-	q.z = tz;
-
-	return q;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 4x4 matrix
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////////////
-CORELIB_EXPORT void gfsdk_makeIdentity(atcore_float4x4& transform);
-CORELIB_EXPORT void gfsdk_makeTranslation(atcore_float4x4& m, const atcore_float3& t);
-CORELIB_EXPORT void gfsdk_makeScale(atcore_float4x4& m, const atcore_float3& s);
-CORELIB_EXPORT void gfsdk_makeRotation(atcore_float4x4& m, const atcore_float4& q);
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4x4& operator*=(atcore_float4x4& m, float s)
-{
-	float* data = (float*)&m;
-	for (int i = 0; i < 16; i++)
-		data[i] *= s;
-
-	return m;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline void gfsdk_setPosition(atcore_float4x4&m, const atcore_float3& v)
-{
-	m._41 = v.x;
-	m._42 = v.y;
-	m._43 = v.z;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4x4 gfsdk_transpose(const atcore_float4x4& m)
-{
-	atcore_float4x4 om;
-
-	om._11 = m._11; om._12 = m._21;	om._13 = m._31;	om._14 = m._41;
-	om._21 = m._12; om._22 = m._22;	om._23 = m._32;	om._24 = m._42;
-	om._31 = m._13; om._32 = m._23;	om._33 = m._33;	om._34 = m._43;
-	om._41 = m._14; om._42 = m._24;	om._43 = m._34;	om._44 = m._44;
-
-	return om;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4x4& operator+=(atcore_float4x4& m1, const atcore_float4x4& m2)
-{
-	float* data1 = (float*)&m1;
-	float* data2 = (float*)&m2;
-
-	for (int i = 0; i < 16; i++)
-		data1[i] += data2[i];
-
-	return m1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4 gfsdk_transform(const atcore_float4x4 &m, atcore_float4 op)
-{
-	atcore_float4 p;
-	
-	p.x = op.x * m._11 + op.y * m._21 + op.z * m._31 + op.w * m._41;
-	p.y = op.x * m._12 + op.y * m._22 + op.z * m._32 + op.w * m._42;
-	p.z = op.x * m._13 + op.y * m._23 + op.z * m._33 + op.w * m._43;
-	p.w = op.x * m._14 + op.y * m._24 + op.z * m._34 + op.w * m._44;
-
-	return p;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_transformCoord(const atcore_float4x4 &m, atcore_float3 op)
-{
-	atcore_float3 p;
-	
-	p.x = op.x * m._11 + op.y * m._21 + op.z * m._31 + m._41;
-	p.y = op.x * m._12 + op.y * m._22 + op.z * m._32 + m._42;
-	p.z = op.x * m._13 + op.y * m._23 + op.z * m._33 + m._43;
-
-	return p;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_transformVector(const atcore_float4x4 &m, atcore_float3 op)
-{
-	atcore_float3 p;
-	
-	p.x = op.x * m._11 + op.y * m._21 + op.z * m._31;
-	p.y = op.x * m._12 + op.y * m._22 + op.z * m._32;
-	p.z = op.x * m._13 + op.y * m._23 + op.z * m._33;
-
-	return p;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_getScale(const atcore_float4x4& m)
-{
-	atcore_float3 ax = gfsdk_makeFloat3(m._11, m._12, m._13);
-	atcore_float3 ay = gfsdk_makeFloat3(m._21, m._22, m._23);
-	atcore_float3 az = gfsdk_makeFloat3(m._31, m._32, m._33);
-
-	return gfsdk_makeFloat3(gfsdk_length(ax), gfsdk_length(ay), gfsdk_length(az));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_getTranslation(const atcore_float4x4& m)
-{
-	return gfsdk_makeFloat3(m._41, m._42, m._43);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline void gfsdk_setTranslation(atcore_float4x4& m, const atcore_float3 &v)
-{
-	m._41 = v.x;
-	m._42 = v.y;
-	m._43 = v.z;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline const atcore_float4x4& gfsdk_orthonormalize(atcore_float4x4& m)
-{
-	atcore_float3 ax = gfsdk_makeFloat3(m._11, m._12, m._13);
-	atcore_float3 ay = gfsdk_makeFloat3(m._21, m._22, m._23);
-	atcore_float3 az = gfsdk_makeFloat3(m._31, m._32, m._33);
-
-	gfsdk_normalize(ax);
-	gfsdk_normalize(ay);
-	gfsdk_normalize(az);
-
-	m._11 = ax.x; m._12 = ax.y; m._13 = ax.z;
-	m._21 = ay.x; m._22 = ay.y; m._23 = ay.z;
-	m._31 = az.x; m._32 = az.y; m._33 = az.z;
-
-	return m;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-CORELIB_EXPORT atcore_float4x4 gfsdk_lerp(atcore_float4x4& start, atcore_float4x4& end, float t);
-
-////////////////////////////////////////////////////////////////////////////////
-CORELIB_EXPORT atcore_float4 gfsdk_getRotation(const atcore_float4x4& m);
-
-////////////////////////////////////////////////////////////////////////////////
-CORELIB_EXPORT atcore_float4x4 gfsdk_makeTransform(const atcore_float4& q, const atcore_float3& t, const atcore_float3 &s);
-
-////////////////////////////////////////////////////////////////////////////////
-CORELIB_EXPORT atcore_float4x4 operator*(const atcore_float4x4& in1, const atcore_float4x4& in2);
-
-////////////////////////////////////////////////////////////////////////////////
-CORELIB_EXPORT atcore_float4x4 gfsdk_inverse(const atcore_float4x4& m);
-
-////////////////////////////////////////////////////////////////////////////////
-// dual quaternion 
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_dualquaternion gfsdk_makeDQ(const atcore_float4& q, const atcore_float3& t)
-{
-	atcore_dualquaternion dq;
-
-	dq.q0 = gfsdk_normalize(q);
-	dq.q1 = gfsdk_quaternionMultiply(gfsdk_makeFloat4(t, 0), dq.q0) * 0.5f;
-
-	return dq;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-atcore_dualquaternion gfsdk_makeDQ(const atcore_float4x4& m);
-
-////////////////////////////////////////////////////////////////////////////////
-inline const atcore_dualquaternion& gfsdk_normalize(atcore_dualquaternion & dq)
-{
-	float mag = gfsdk_dot( dq.q0, dq.q0);
-	float deLen = 1.0f / sqrt(mag+FLT_EPSILON);
-	
-	dq.q0 = dq.q0 * deLen;
-	dq.q1 = dq.q1 * deLen;
-
-	return dq;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_dualquaternion operator*(float s, const atcore_dualquaternion & dq)
-{
-	return atcore_dualquaternion(s * dq.q0, s * dq.q1);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_dualquaternion operator*(const atcore_dualquaternion & dq, float s)
-{
-	return atcore_dualquaternion(s * dq.q0, s * dq.q1);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_dualquaternion& operator+=(atcore_dualquaternion &dq, const atcore_dualquaternion & dq2)
-{
-	// hemispherization
-	float sign = (gfsdk_dot(dq.q0, dq2.q0) < -FLT_EPSILON) ? -1.0f: 1.0f;
-
-	dq.q0 += sign * dq2.q0;
-	dq.q1 += sign * dq2.q1;
-
-	return dq;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_dualquaternion gfsdk_lerp(const atcore_dualquaternion &dq1, const atcore_dualquaternion & dq2, float t)
-{
-	atcore_dualquaternion dq = dq1 * (1.0f - t);
-
-	float sign = (gfsdk_dot(dq1.q0, dq2.q0) < -FLT_EPSILON) ? -1.0f: 1.0f;
-
-	dq += (t * sign) * dq2;
-	gfsdk_normalize(dq);
-
-	return dq;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_transformCoord(const atcore_dualquaternion& dq, const atcore_float3 &vecIn) 
-{
-	atcore_float3 d0 = gfsdk_makeFloat3(dq.q0.x, dq.q0.y, dq.q0.z);
-	atcore_float3 de = gfsdk_makeFloat3(dq.q1.x, dq.q1.y, dq.q1.z);
-	float a0 = dq.q0.w;
-	float ae = dq.q1.w;
-
-	atcore_float3 temp = gfsdk_cross( d0, vecIn ) + a0 * vecIn;
-	atcore_float3 temp2 = 2.0f * (a0 * de - ae * d0 + gfsdk_cross(d0, de));
-
-	return vecIn + temp2 + 2.0f * gfsdk_cross( d0, temp);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 gfsdk_transformVector(const atcore_dualquaternion& dq, const atcore_float3 &vecIn) 
-{
-	atcore_float3 d0 = gfsdk_makeFloat3(dq.q0.x, dq.q0.y, dq.q0.z);
-	atcore_float3 de = gfsdk_makeFloat3(dq.q1.x, dq.q1.y, dq.q1.z);
-	float a0 = dq.q0.w;
-	float ae = dq.q1.w;
-
-	atcore_float3 temp = gfsdk_cross( d0, vecIn ) + a0 * vecIn;
-	return vecIn + 2.0f * gfsdk_cross( d0, temp);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float4 getRotation(const atcore_dualquaternion& dq)
-{
-	return dq.q0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-inline atcore_float3 getTranslation(const atcore_dualquaternion& dq)
-{
-	atcore_float4 dual = 2.0f * dq.q1;
-	atcore_float4 t = gfsdk_quaternionMultiply(dual, gfsdk_quaternionConjugate( dq.q0 ));
-
-	return gfsdk_makeFloat3(t.x, t.y, t.z);
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Profiler.cpp b/tools/ArtistTools/source/CoreLib/Utils/Profiler.cpp
deleted file mode 100644
index aab4de3..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Profiler.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "nvToolsExt.h"
-#include <stdlib.h> // for rand()
-
-void ProfilerRangePush(const char* name) {
-	unsigned int color = 0xFF000000 | ((rand()%256) << 16) | ((rand()%256) << 8) | (rand()%256);
-	// Zero the structure
-	nvtxEventAttributes_t event_attrib = {0};
-	// Set the version and the size information
-	event_attrib.version = NVTX_VERSION;
-	event_attrib.size = NVTX_EVENT_ATTRIB_STRUCT_SIZE;
-	// Configure the attributes.  0 is the default for all attributes
-	event_attrib.colorType = NVTX_COLOR_ARGB;
-	event_attrib.color = color;
-	event_attrib.messageType = NVTX_MESSAGE_TYPE_ASCII;
-	event_attrib.message.ascii = name;
-	nvtxRangePushEx(&event_attrib);
-}
-
-void ProfilerRangePush(const char* name, unsigned int color) {
-	// Zero the structure
-	nvtxEventAttributes_t event_attrib = {0};
-	// Set the version and the size information
-	event_attrib.version = NVTX_VERSION;
-	event_attrib.size = NVTX_EVENT_ATTRIB_STRUCT_SIZE;
-	// Configure the attributes.  0 is the default for all attributes
-	event_attrib.colorType = NVTX_COLOR_ARGB;
-	event_attrib.color = color;
-	event_attrib.messageType = NVTX_MESSAGE_TYPE_ASCII;
-	event_attrib.message.ascii = name;
-	nvtxRangePushEx(&event_attrib);
-}
-
-void ProfilerRangePop() {
-	nvtxRangePop();
-}
-
-#include "Profiler.h"
-
-ScopedProfiler::ScopedProfiler(const char* name)
-{
-	ProfilerRangePush(name);
-}
-
-ScopedProfiler::ScopedProfiler(const char* name, unsigned int color)
-{
-	ProfilerRangePush(name, color);
-}
-
-ScopedProfiler::~ScopedProfiler()
-{
-	ProfilerRangePop();
-}
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Profiler.h b/tools/ArtistTools/source/CoreLib/Utils/Profiler.h
deleted file mode 100644
index 5f00175..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Profiler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "corelib_global.h"
-
-// name - the name to be displayed
-void ProfilerRangePush(const char* name);
-
-// name - the name to be displayed
-// color - ARGB color. ex) 0xFFFF0000 = Red, 0xFF0000FF = Blue
-void ProfilerRangePush(const char* name, unsigned int color);
-
-void ProfilerRangePop();
-
-struct CORELIB_EXPORT ScopedProfiler
-{
-	ScopedProfiler(const char* name);
-
-	ScopedProfiler(const char* name, unsigned int color);
-
-	~ScopedProfiler();
-};
-
-#define FUNCTION_PROFILER() ScopedProfiler _scoped_function_profiler(__FUNCTION__);
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Settings.cpp b/tools/ArtistTools/source/CoreLib/Utils/Settings.cpp
deleted file mode 100644
index 5445bef..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Settings.cpp
+++ /dev/null
@@ -1,767 +0,0 @@
-/*******************************************************************************
-* NVIDIA Corporation 
-* Software License Agreement - OpenAutomate SDK 
-* 
-* IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING
-* Do not use or load the OpenAutomate SDK and any associated materials
-* provided by NVIDIA on NVIDIA�s website (collectively, the "Software")
-* until You have carefully read the following terms and conditions. By
-* loading or using the Software, You agree to fully comply with the terms
-* and conditions of this Software License Agreement ("Agreement") by and
-* between NVIDIA Corporation, a Delaware corporation with its principal
-* place of business at 2701 San Tomas Expressway, Santa Clara, California
-* 95050 U.S.A. ("NVIDIA"), and You. If You do not wish to so agree, do not
-* install or use the Software. 
-* 
-* For the purposes of this Agreement: 
-* 
-* "Licensee," "You" and/or "Your" shall mean, collectively and
-* individually, Original Equipment Manufacturers, Independent Hardware
-* Vendors, Independent Software Vendors, and End-Users of the Software
-* pursuant to the terms and conditions of this Agreement.   
-* 
-* "Derivative Works" shall mean derivatives of the Software created by You
-* or a third party on Your behalf, which term shall include:  (a) for
-* copyrightable or copyrighted material, any translation, abridgement,
-* revision or other form in which an existing work may be recast,
-* transformed or adapted; (b) for work protected by topography or mask
-* right, any translation, abridgement, revision or other form in which an
-* existing work may be recast, transformed or adapted; (c) for patentable
-* or patented material, any Improvement; and (d) for material protected by
-* trade secret, any new material derived from or employing such existing
-* trade secret.
-* 
-* "Excluded License" is any license that requires as a condition of use,
-* modification and/or distribution of software subject to the Excluded
-* License, that such software or other software distributed and/or
-* combined with such software be (i) disclosed or distributed in source
-* code form, (ii) licensed for the purpose of making derivative works, or
-* (iii) redistributable at no charge.
-* 
-* SECTION 1 - GRANT OF LICENSE.
-* NVIDIA agrees to provide the Software and any associated materials
-* pursuant to the terms and conditions of this Agreement.  Subject to the
-* terms of this Agreement, NVIDIA grants to You a nonexclusive,
-* transferable, worldwide, revocable, limited, royalty-free, fully paid-up
-* license under NVIDIA�s copyrights to 
-* 
-* (a) install, deploy, use, have used execute, reproduce, display,
-* perform, run, modify the source code of the Software, or to prepare and
-* have prepared Derivative Works thereof the Software for Your own
-* internal development, testing and maintenance purposes to incorporate
-* the Software or Derivative Works thereof, in part or whole, into Your
-* software applications; 
-* 
-* (b)	 to transfer, distribute and sublicense the Software (in its
-* unmodified form as delivered to You by NVIDIA pursuant to this
-* Agreement) in any medium or technology for Your sublicensees to
-* incorporate the Software or Derivative Works thereof, in part or whole,
-* into their respective software applications; and
-* 
-* (c) to transfer, distribute and sublicense Derivative Works (in object
-* code only) of the Software (i)_as incorporated in Your application
-* software in any medium or technology; and (ii) certified as OpenAutomate
-* Compatible Software.
-* 
-* You may exercise your license rights pursuant to Subsection 1(b) and (c)
-* above pursuant to the terms and conditions of any form of end-user
-* software license agreement of Your choice, including but not limited to
-* an Excluded License.
-* 
-* In the event NVIDIA certifies Your application software, incorporating
-* the Derivative Works (in object code only) of the Software, as
-* OpenAutomate compatible ("OpenAutomate Compatible Software"), NVIDIA
-* grants You a nonexclusive, worldwide, revocable, paid-up license to use
-* the name and trademark to "OpenAutomate Compatible" solely for the
-* purposes of identifying and/or marketing Your application software as
-* OpenAutomate Compatible Software; provided that Licensee fully complies
-* with the following:	
-* 
-* (x) Licensee agrees that it is strictly prohibited from using the name
-* and trademark of "OpenAutomate Compatible" if Your application software
-* is not OpenAutomate Compatible Software;
-* 
-* (y) if NVIDIA objects to Your improper use of the "OpenAutomate
-* Compatible" name and trademark, You will take all reasonable steps
-* necessary to resolve NVIDIA�s objections. NVIDIA may reasonably monitor
-* the quality of Your application software bearing the "OpenAutomate
-* Compatible" name or trademark pursuant to this Agreement; and
-* 
-* (z) any goodwill attached to NVIDIA�s trademarks, service marks, or
-* trade names belong to NVIDIA and this Agreement does not grant You any
-* right to use them.
-* 
-* If You are not the final manufacturer or vendor of a computer system or
-* software program incorporating the Software, or if Your Contractors (as
-* defined below), affiliates or subsidiaries need to exercise any, some or
-* all of the license grant described above herein to the Software on Your
-* behalf, then You may transfer a copy of the Software, (and related
-* end-user documentation) to such recipient for use in accordance with the
-* terms of this Agreement, provided such recipient agrees to be fully
-* bound by the terms hereof. Except as expressly permitted in this
-* Agreement, Unless otherwise authorized in the Agreement, You shall not
-* otherwise assign, sublicense, lease, or in any other way transfer or
-* disclose Software to any third party. Unless otherwise authorized in the
-* Agreement, You shall not reverse- compile, disassemble,
-* reverse-engineer, or in any manner attempt to derive the source code of
-* the Software from the object code portions of the Software. 
-* 
-* Except as expressly stated in this Agreement, no license or right is
-* granted to You directly or by implication, inducement, estoppel or
-* otherwise. NVIDIA shall have the right to inspect or have an independent
-* auditor inspect Your relevant records to verify Your compliance with the
-* terms and conditions of this Agreement. 
-* 
-* SECTION 2 - CONFIDENTIALITY.
-* If applicable, any exchange of Confidential Information (as defined in
-* the NDA) shall be made pursuant to the terms and conditions of a
-* separately signed Non-Disclosure Agreement ("NDA") by and between NVIDIA
-* and You. For the sake of clarity, You agree that the Software is
-* Confidential Information of NVIDIA.
-* 
-* If You wish to have a third party consultant or subcontractor
-* ("Contractor") perform work on Your behalf which involves access to or
-* use of Software, You shall obtain a written confidentiality agreement
-* from the Contractor which contains terms and obligations with respect to
-* access to or use of Software no less restrictive than those set forth in
-* this Agreement and excluding any distribution or sublicense rights, and
-* use for any other purpose than permitted in this Agreement. Otherwise,
-* You shall not disclose the terms or existence of this Agreement or use
-* NVIDIA's name in any publications, advertisements, or other
-* announcements without NVIDIA's prior written consent.  Unless otherwise
-* provided in this Agreement, You do not have any rights to use any NVIDIA
-* trademarks or logos.
-* 
-* SECTION 3 - OWNERSHIP OF SOFTWARE AND INTELLECTUAL PROPERTY RIGHTS.
-* All rights, title and interest to all copies of the Software remain with
-* NVIDIA, subsidiaries, licensors, or its suppliers. The Software is
-* copyrighted and protected by the laws of the United States and other
-* countries, and international treaty provisions. You may not remove any
-* copyright notices from the Software. NVIDIA may make changes to the
-* Software, or to items referenced therein, at any time and without
-* notice, but is not obligated to support or update the Software. Except
-* as otherwise expressly provided, NVIDIA grants no express or implied
-* right under any NVIDIA patents, copyrights, trademarks, or other
-* intellectual property rights. 
-* 
-* All rights, title and interest in the Derivative Works of the Software
-* remain with You subject to the underlying license from NVIDIA to the
-* Software.  In Your sole discretion, You may grant NVIDIA, upon NVIDIA�s
-* request for such a license described herein, an irrevocable, perpetual,
-* nonexclusive, worldwide, royalty-free paid-up license to make, have
-* made, use, have used, sell, license, distribute, sublicense or otherwise
-* transfer Derivative Works created by You that add functionality or
-* improvement to the Software.  
-* 
-* You has no obligation to give NVIDIA any suggestions, comments or other
-* feedback ("Feedback") relating to the Software.  However, NVIDIA may use
-* and include any Feedback that You voluntarily provide to improve the
-* Software or other related NVIDIA technologies.  Accordingly, if You
-* provide Feedback, You agree NVIDIA and its licensees may freely use,
-* reproduce, license, distribute, and otherwise commercialize the Feedback
-* in the Software or other related technologies without the payment of any
-* royalties or fees.  
-* 
-* You may transfer the Software only if the recipient agrees to be fully
-* bound by these terms and conditions of this Agreement. 
-* 
-* SECTION 4 - NO WARRANTIES. 
-* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY EXPRESS OR IMPLIED WARRANTY
-* OF ANY KIND, INCLUDING WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT,
-* OR FITNESS FOR A PARTICULAR PURPOSE. NVIDIA does not warrant or assume
-* responsibility for the accuracy or completeness of any information,
-* text, graphics, links or other items contained within the Software.
-* NVIDIA does not represent that errors or other defects will be
-* identified or corrected.
-* 
-* SECTION 5 - LIMITATION OF LIABILITY.
-* EXCEPT WITH RESPECT TO THE MISUSE OF THE OTHER PARTY�S INTELLECTUAL
-* PROPERTY OR DISCLOSURE OF THE OTHER PARTY�S CONFIDENTIAL INFORMATION IN
-* BREACH OF THIS AGREEMENT, IN NO EVENT SHALL NVIDIA, SUBSIDIARIES,
-* LICENSORS, OR ITS SUPPLIERS BE LIABLE FOR ANY DAMAGES WHATSOEVER
-* (INCLUDING, WITHOUT LIMITATION,  INDIRECT, LOST PROFITS, CONSEQUENTIAL,
-* BUSINESS INTERRUPTION OR LOST INFORMATION) ARISING OUT OF THE USE OF OR
-* INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS BEEN ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS PROHIBIT EXCLUSION OR
-* LIMITATION OF LIABILITY FOR IMPLIED WARRANTIES OR CONSEQUENTIAL OR
-* INCIDENTAL DAMAGES, SO THE ABOVE LIMITATION MAY NOT APPLY TO YOU. YOU
-* MAY ALSO HAVE OTHER LEGAL RIGHTS THAT VARY FROM JURISDICTION TO
-* JURISDICTION.  NOTWITHSTANDING THE FOREGOING, NVIDIA�S AGGREGATE
-* LIABILITY ARISING OUT OF THIS AGREEMENT SHALL NOT EXCEED ONE HUNDRED
-* UNITED STATES DOLLARS (USD$100).
-* 
-* SECTION 6 - TERM.
-* This Agreement and the licenses granted hereunder shall be effective as
-* of the date You download the applicable Software ("Effective Date") and
-* continue for a period of one (1) year ("Initial Term") respectively,
-* unless terminated earlier in accordance with the "Termination" provision
-* of this Agreement.  Unless either party notifies the other party of its
-* intent to terminate this Agreement at least three (3) months prior to
-* the end of the Initial Term or the applicable renewal period, this
-* Agreement will be automatically renewed for one (1) year renewal periods
-* thereafter, unless terminated in accordance with the "Termination"
-* provision of this Agreement.  
-* 
-* SECTION 7 - TERMINATION.
-* NVIDIA may terminate this Agreement at any time if You violate its
-* terms. Upon termination, You will immediately destroy the Software or
-* return all copies of the Software to NVIDIA, and certify to NVIDIA in
-* writing that such actions have been completed.  Upon termination or
-* expiration of this Agreement the license grants to Licensee shall
-* terminate, except that sublicenses rightfully granted by Licensee under
-* this Agreement in connection with Section 1(b) and (c) of this Agreement
-* provided by Licensee prior to the termination or expiration of this
-* Agreement shall survive in accordance with their respective form of
-* license terms and conditions.
-* 
-* SECTION 8 - MISCELLANEOUS.
-* 
-* SECTION 8.1 - SURVIVAL.
-* Those provisions in this Agreement, which by their nature need to
-* survive the termination or expiration of this Agreement, shall survive
-* termination or expiration of the Agreement, including but not limited to
-* Sections 2, 3, 4, 5, 7, and 8.
-* 
-* SECTION 8.2 - APPLICABLE LAWS.
-* Claims arising under this Agreement shall be governed by the laws of
-* Delaware, excluding its principles of conflict of laws and the United
-* Nations Convention on Contracts for the Sale of Goods. The state and/or
-* federal courts residing in Santa Clara County, California shall have
-* exclusive jurisdiction over any dispute or claim arising out of this
-* Agreement. You may not export the Software in violation of applicable
-* export laws and regulations. 
-* 
-* SECTION 8.3 - AMENDMENT.
-* The Agreement shall not be modified except by a written agreement that
-* names this Agreement and any provision to be modified, is dated
-* subsequent to the Effective Date, and is signed by duly authorized
-* representatives of both parties.
-* 
-* SECTION 8.4 - NO WAIVER.
-* No failure or delay on the part of either party in the exercise of any
-* right, power or remedy under this Agreement or under law, or to insist
-* upon or enforce performance by the other party of any of the provisions
-* of this Agreement or under law, shall operate as a waiver thereof, nor
-* shall any single or partial exercise of any right, power or remedy
-* preclude other or further exercise thereof, or the exercise of any other
-* right, power or remedy; rather the provision, right, or remedy shall be
-* and remain in full force and effect.
-* 
-* SECTION 8.5 - NO ASSIGNMENT. 
-* This Agreement and Licensee�s rights and obligations herein, may not be
-* assigned, subcontracted, delegated, or otherwise transferred by Licensee
-* without NVIDIA�s prior written consent, and any attempted assignment,
-* subcontract, delegation, or transfer in violation of the foregoing will
-* be null and void.  The terms of this Agreement shall be binding upon
-* Licensee�s assignees.
-* 
-* SECTION 8.6 - GOVERNMENT RESTRICTED RIGHTS. 
-* The parties acknowledge that the Software is subject to U.S. export
-* control laws and regulations.   The parties agree to comply with all
-* applicable international and national laws that apply to the Software,
-* including the U.S. Export Administration Regulations, as well as
-* end-user, end-use and destination restrictions issued by U.S. and other
-* governments.
-* 
-* The Software has been developed entirely at private expense and is
-* commercial computer software provided with RESTRICTED RIGHTS. Use,
-* duplication or disclosure of the Software by the U.S. Government or a
-* U.S. Government subcontractor is subject to the restrictions set forth
-* in the Agreement under which the Software was obtained pursuant to DFARS
-* 227.7202-3(a) or as set forth in subparagraphs (c)(1) and (2) of the
-* Commercial Computer Software - Restricted Rights clause at FAR
-* 52.227-19, as applicable. Contractor/manufacturer is NVIDIA, 2701 San
-* Tomas Expressway, Santa Clara, CA 95050. Use of the Software by the
-* Government constitutes acknowledgment of NVIDIA's proprietary rights
-* therein. 
-* 
-* SECTION 8.7 - INDEPENDENT CONTRACTORS.
-* Licensee�s relationship to NVIDIA is that of an independent contractor,
-* and neither party is an agent or partner of the other.  Licensee will
-* not have, and will not represent to any third party that it has, any
-* authority to act on behalf of NVIDIA.
-* 
-* SECTION 8.8 - SEVERABILITY.
-* If for any reason a court of competent jurisdiction finds any provision
-* of this Agreement, or portion thereof, to be unenforceable, that
-* provision of the Agreement will be enforced to the maximum extent
-* permissible so as to affect the intent of the parties, and the remainder
-* of this Agreement will continue in full force and effect. This Agreement
-* has been negotiated by the parties and their respective counsel and will
-* be interpreted fairly in accordance with its terms and without any
-* strict construction in favor of or against either party.
-* 
-* SECTION 8.9 - ENTIRE AGREEMENT.  
-* This Agreement and NDA constitute the entire agreement between the
-* parties with respect to the subject matter contemplated herein, and
-* merges all prior and contemporaneous communications.
-* 
-******************************************************************************/
-
-
-#include "settings.h"
-#include "Nv.h"
-
-char OptionsFileName[] = "FurViewerOptions.txt";
-//std::vector<void *> AllocBlocks;
-
-using namespace std;
-
-void Error(const char *fmt, ...);
-static int HexCharToInt(unsigned char c);
-bool GetExePath(char* exe_path);
-static int Hex2BytesToInt(const unsigned char *buf);
-static oaFloat StrToFloat(const char *buf);
-static void WriteFloat(FILE *fp, oaFloat val);
-static void StripNewLine(char *str);
-void *Alloc(size_t n);
-char *StrDup(const char *str);
-
-bool GetExePath(char* exe_path)
-{
-#if WIN32
-	char delim = '\\';
-#else
-	char delim = '/';
-#endif
-
-	DWORD dwRet;
-	dwRet = GetModuleFileNameA(NV_NULL, exe_path, MAX_PATH);
-	if ( dwRet == 0 )
-	{
-		exe_path[0] = '\0';
-		return false;
-	}
-
-	int i;
-	for ( i = dwRet; i > 0; i-- )
-	{
-		if ( exe_path[i-1] == delim )
-			break;
-	}
-	exe_path[i] = '\0';
-
-	return true;
-}
-
-void Error(const char *fmt, ...)
-{
-	va_list AP;
-	va_start(AP, fmt);
-
-	char msg[1024];
-	//fprintf(msg, "ERROR: ");
-	//vfprintf(msg, fmt, AP);
-	//fprintf(msg, "\n");
-	sprintf(msg, fmt, AP);
-	OutputDebugStringA(msg);
-	assert(0);
-//	exit(-1);
-}
-
-static int HexCharToInt(unsigned char c)
-{
-	if(c >= '0' && c <= '9')
-		return((int)(c - '0'));
-
-	c = tolower(c);
-	if(c >= 'a' && c <= 'f')
-		return((int)(c - 'a' + 10));
-
-	return(0);
-}
-
-static int Hex2BytesToInt(const unsigned char *buf)
-{
-	return(HexCharToInt(buf[0]) << 4 | HexCharToInt(buf[1]));
-}
-
-static oaFloat StrToFloat(const char *buf)
-{
-	size_t Len = strlen(buf);
-	if(Len != sizeof(oaFloat) * 2)
-		return(0.0);
-
-	oaFloat Ret;
-	unsigned char *Buf = (unsigned char *)&Ret;
-	for(int i=0; i < sizeof(oaFloat); ++i)
-	{
-		Buf[i] = Hex2BytesToInt((const unsigned char *)buf);
-		buf += 2;
-	}
-
-	return(Ret);
-}
-
-static void WriteFloat(FILE *fp, oaFloat val)
-{
-	unsigned char *Buf = (unsigned char *)&val;
-	for(int i=0;  i < sizeof(oaFloat); ++i)
-		fprintf(fp, "%02x", Buf[i]);
-}
-
-static void StripNewLine(char *str)
-{
-	size_t StrLen = strlen(str);
-	if(StrLen == 0)
-		return;
-
-	for(size_t i=StrLen-1; i >= 0; --i)
-		if(str[i] == '\n')
-		{
-			str[i] = 0;
-			break;
-		}
-}
-
-void *Alloc(size_t n)
-{
-	void *Ret = malloc(n);
-	assert(n != 0);
-
-	//AllocBlocks.push_back(Ret);
-	return(Ret);
-}
-
-char *StrDup(const char *str)
-{
-	assert(str != NV_NULL);
-	char *Ret = strdup(str);
-
-	//AllocBlocks.push_back(Ret);
-	return(Ret);
-}
-
-AppSettings::AppSettings()
-{
-	int NumOptions = 0;
-}
-
-AppSettings::~AppSettings()
-{
-	Cleanup();
-}
-
-void AppSettings::InitOptions(void)
-{
-	{
-		oaNamedOption *Option;
-
-		// Resolution (enum)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-		Option->Name = "User/Resolution";
-		Option->DataType = OA_TYPE_ENUM;
-		Option->Value.Enum = "640x480";
-
-		Options[NumOptions] = *Option;
-		Option = &Options[NumOptions++];
-		Option->Value.Enum = "1024x768";
-
-		Options[NumOptions] = *Option;
-		Option = &Options[NumOptions++];
-		Option->Value.Enum = "1200x768";
-
-		Options[NumOptions] = *Option;
-		Option = &Options[NumOptions++];
-		Option->Value.Enum = "1600x1200";
-
-		// AA (enum)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-
-		Option->Name = "User/AA";
-		Option->DataType = OA_TYPE_ENUM;
-		Option->Value.Enum = "Off";
-
-		Options[NumOptions] = *Option;
-		Option = &Options[NumOptions++];
-		Option->Value.Enum = "2X";
-
-		Options[NumOptions] = *Option;
-		Option = &Options[NumOptions++];
-		Option->Value.Enum = "4X";
-
-		Options[NumOptions] = *Option;
-		Option = &Options[NumOptions++];
-		Option->Value.Enum = "8X";
-
-		// device id (int)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-		Option->Name = "User/Device";
-		Option->DataType = OA_TYPE_INT;
-
-		Option->Value.Int = -1;  // when -1 to choose a good GPU
-
-		//Backdoor (enum)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-		Option->Name = "User/Backdoor";
-		Option->DataType = OA_TYPE_STRING;
-		Option->Value.String = "";
-
-		// HideUI (bool)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-		Option->Name = "User/HideUI";
-		Option->DataType = OA_TYPE_BOOL;
-
-		Option->Value.Bool = OA_FALSE;
-
-		// Perf mode (bool)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-		Option->Name = "User/PerfMode";
-		Option->DataType = OA_TYPE_BOOL;
-
-		Option->Value.Bool = OA_FALSE;
-
-		// Play (bool)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-		Option->Name = "User/Play";
-		Option->DataType = OA_TYPE_BOOL;
-
-		Option->Value.Bool = OA_FALSE;
-
-		// ProjectPath (string)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-		Option->Name = "User/ProjectPath";
-		Option->DataType = OA_TYPE_STRING;
-		Option->Value.String = "";
-
-		// FurAssetPath (string)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-		Option->Name = "User/FurAssetPath";
-		Option->DataType = OA_TYPE_STRING;
-		Option->Value.String = "";
-
-		// FurDemoPlaylist (string)
-		Option = &Options[NumOptions++];
-		oaInitOption(Option);
-		Option->Name = "User/FurDemoPlaylist";
-		Option->DataType = OA_TYPE_STRING;
-		Option->Value.String = "";
-
-		//Option = &Options[NumOptions++];
-		//oaInitOption(Option);
-		//Option->Name = "r2_slight_fade";
-		//Option->DataType = OA_TYPE_FLOAT;
-		//Option->MinValue.Float = 0.0;
-		//Option->MaxValue.Float = 100.0;
-		//Option->NumSteps = 200;
-	}
-
-	//****************************************************************************
-	//*** Init OptionValues
-	//****************************************************************************
-
-	// Initialize default options
-	for(int i=0; i < NumOptions; ++i)
-	{
-		string Name(Options[i].Name);
-		OptionValueMap[Name].Name = Options[i].Name;
-		OptionValueMap[Name].Type = Options[i].DataType;
-		OptionValueMap[Name].Value = Options[i].Value;
-	}
-
-	InitDefaultOptions();
-	///////////////////////////////////////////////////////
-	// Load any persistent options if they've been previously set
-	ReadOptionsFile();
-}
-
-void AppSettings::InitDefaultOptions(void)
-{
-	oaValue Value;
-
-	Value.Enum = "1200x768";
-	SetOptionValue("User/Resolution", OA_TYPE_ENUM, &Value);
-
-	Value.Enum = "8X";
-	SetOptionValue("User/AA", OA_TYPE_ENUM, &Value);
-}
-
-void AppSettings::SetOptionValue(const char *name, 
-	oaOptionDataType type,
-	const oaValue *value)
-{
-	string Name(name);
-	assert(OptionValueMap.find(Name) != OptionValueMap.end());
-	assert(OptionValueMap[Name].Type == type);
-
-	switch(type)
-	{
-	case OA_TYPE_STRING:
-		OptionValueMap[Name].Value.String = StrDup(value->String);
-		break;
-
-	case OA_TYPE_ENUM:
-		OptionValueMap[Name].Value.Enum = StrDup(value->Enum);
-		break;
-
-	default:
-		OptionValueMap[Name].Value = *value;
-	}
-}
-
-void AppSettings::ReadOptionsFile(void)
-{ 
-	char optionFile[MAX_PATH] = "";
-	if(!GetExePath(optionFile))
-	{
-		fprintf(stderr, "Cannot get exe path\r\n");
-	}
-	strcat(optionFile, OptionsFileName);
-
-
-	FILE *FP = fopen(optionFile, "rb");
-	if(!FP)
-		return;
-
-	fprintf(stderr, "FurViewer: Reading options file \"%s\".\n", 
-		optionFile);
-	fflush(stderr);
-
-	char Line[1024] = "";
-	int LineNum = 1;
-	while (fgets(Line, sizeof(Line), FP) != NV_NULL)
-	{
-		StripNewLine(Line);
-		if(Line[0] == 0)
-			continue;
-
-		char *Name = strtok(Line, "\t");
-		char *Value = strtok(NV_NULL, "");
-
-		if(!Name || !Value)
-		{
-			//Error("Invalid format in options file \"%s\" on line %d\n", 
-			//OptionsFileName, 
-			//LineNum);
-			continue;
-		}
-
-		map<string, OptionValue>::const_iterator OptVal = 
-			OptionValueMap.find(string(Name));
-
-		if(OptVal == OptionValueMap.end())
-			Error("Unknown option \"%s\" defined in options file \"%s\" on line %d.",
-			Name, 
-			OptionsFileName, 
-			LineNum);
-
-		SetOptionValue(Name, OptVal->second.Type, Value);
-
-		LineNum++;
-	}
-
-	fclose(FP);
-} 
-
-void AppSettings::Cleanup(void)
-{
-	//vector<void *>::iterator Iter = AllocBlocks.begin();
-	//for(; Iter != AllocBlocks.end(); Iter++)
-	//	free(*Iter);
-
-	//AllocBlocks.clear();
-}
-
-
-void AppSettings::WriteOptionsFile(FILE *fp)
-{
-	map<string, OptionValue>::const_iterator Iter = OptionValueMap.begin();
-	for(; Iter != OptionValueMap.end(); ++Iter)
-	{
-		fprintf(fp, "%s\t", Iter->second.Name);
-		switch(Iter->second.Type)
-		{
-		case OA_TYPE_INT:
-			fprintf(fp, "%d", Iter->second.Value.Int);
-			break;
-
-		case OA_TYPE_BOOL:
-			fprintf(fp, "%d", (int)Iter->second.Value.Bool);
-			break;
-
-		case OA_TYPE_FLOAT:
-			WriteFloat(fp, Iter->second.Value.Float);
-			break;
-
-		case OA_TYPE_STRING:
-			fprintf(fp, "%s", Iter->second.Value.String);
-			break;
-
-		case OA_TYPE_ENUM:
-			fprintf(fp, "%s", Iter->second.Value.Enum);
-			break;
-
-		}
-
-		fprintf(fp, "\n");
-	}
-}
-
-void AppSettings::WriteOptionsFile(void)
-{
-	char optionFile[MAX_PATH] = "";
-	if(!GetExePath(optionFile))
-	{
-		fprintf(stderr, "Cannot get exe path\r\n");
-	}
-	strcat(optionFile, OptionsFileName);
-
-	fprintf(stderr, "FurViewer: Writing options file \"%s\".\n", 
-		optionFile);
-	fflush(stderr);
-
-	FILE *FP = fopen(optionFile, "wb");
-	if(!FP)
-		Error("Couldn't open \"%s\" for write.\n", optionFile);
-
-	WriteOptionsFile(FP);
-
-	fclose(FP);
-}
-
-void AppSettings::SetOptionValue(const char *name, 
-	oaOptionDataType type,
-	const char *value)
-{
-	assert(name != NV_NULL);
-	assert(type != OA_TYPE_INVALID);
-	assert(value != NV_NULL);
-
-	oaValue Value;
-	switch(type)
-	{
-	case OA_TYPE_INT:
-		Value.Int = atoi(value);
-		break;
-
-	case OA_TYPE_FLOAT:
-		Value.Float = StrToFloat(value);
-		break;
-
-	case OA_TYPE_BOOL:
-		Value.Bool = atoi(value) ? OA_TRUE : OA_FALSE;
-		break;
-
-	case OA_TYPE_STRING:
-		Value.String = (oaString)value;
-		break;
-
-	case OA_TYPE_ENUM:
-		Value.Enum = (oaString)value;
-		break; 
-	}
-
-	SetOptionValue(name, type, &Value);
-}
-
-
-
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Settings.h b/tools/ArtistTools/source/CoreLib/Utils/Settings.h
deleted file mode 100644
index a845732..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Settings.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
-* NVIDIA Corporation 
-* Software License Agreement - OpenAutomate SDK 
-* 
-* IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING
-* Do not use or load the OpenAutomate SDK and any associated materials
-* provided by NVIDIA on NVIDIA�s website (collectively, the "Software")
-* until You have carefully read the following terms and conditions. By
-* loading or using the Software, You agree to fully comply with the terms
-* and conditions of this Software License Agreement ("Agreement") by and
-* between NVIDIA Corporation, a Delaware corporation with its principal
-* place of business at 2701 San Tomas Expressway, Santa Clara, California
-* 95050 U.S.A. ("NVIDIA"), and You. If You do not wish to so agree, do not
-* install or use the Software. 
-* 
-* For the purposes of this Agreement: 
-* 
-* "Licensee," "You" and/or "Your" shall mean, collectively and
-* individually, Original Equipment Manufacturers, Independent Hardware
-* Vendors, Independent Software Vendors, and End-Users of the Software
-* pursuant to the terms and conditions of this Agreement.   
-* 
-* "Derivative Works" shall mean derivatives of the Software created by You
-* or a third party on Your behalf, which term shall include:  (a) for
-* copyrightable or copyrighted material, any translation, abridgement,
-* revision or other form in which an existing work may be recast,
-* transformed or adapted; (b) for work protected by topography or mask
-* right, any translation, abridgement, revision or other form in which an
-* existing work may be recast, transformed or adapted; (c) for patentable
-* or patented material, any Improvement; and (d) for material protected by
-* trade secret, any new material derived from or employing such existing
-* trade secret.
-* 
-* "Excluded License" is any license that requires as a condition of use,
-* modification and/or distribution of software subject to the Excluded
-* License, that such software or other software distributed and/or
-* combined with such software be (i) disclosed or distributed in source
-* code form, (ii) licensed for the purpose of making derivative works, or
-* (iii) redistributable at no charge.
-* 
-* SECTION 1 - GRANT OF LICENSE.
-* NVIDIA agrees to provide the Software and any associated materials
-* pursuant to the terms and conditions of this Agreement.  Subject to the
-* terms of this Agreement, NVIDIA grants to You a nonexclusive,
-* transferable, worldwide, revocable, limited, royalty-free, fully paid-up
-* license under NVIDIA�s copyrights to 
-* 
-* (a) install, deploy, use, have used execute, reproduce, display,
-* perform, run, modify the source code of the Software, or to prepare and
-* have prepared Derivative Works thereof the Software for Your own
-* internal development, testing and maintenance purposes to incorporate
-* the Software or Derivative Works thereof, in part or whole, into Your
-* software applications; 
-* 
-* (b)	 to transfer, distribute and sublicense the Software (in its
-* unmodified form as delivered to You by NVIDIA pursuant to this
-* Agreement) in any medium or technology for Your sublicensees to
-* incorporate the Software or Derivative Works thereof, in part or whole,
-* into their respective software applications; and
-* 
-* (c) to transfer, distribute and sublicense Derivative Works (in object
-* code only) of the Software (i)_as incorporated in Your application
-* software in any medium or technology; and (ii) certified as OpenAutomate
-* Compatible Software.
-* 
-* You may exercise your license rights pursuant to Subsection 1(b) and (c)
-* above pursuant to the terms and conditions of any form of end-user
-* software license agreement of Your choice, including but not limited to
-* an Excluded License.
-* 
-* In the event NVIDIA certifies Your application software, incorporating
-* the Derivative Works (in object code only) of the Software, as
-* OpenAutomate compatible ("OpenAutomate Compatible Software"), NVIDIA
-* grants You a nonexclusive, worldwide, revocable, paid-up license to use
-* the name and trademark to "OpenAutomate Compatible" solely for the
-* purposes of identifying and/or marketing Your application software as
-* OpenAutomate Compatible Software; provided that Licensee fully complies
-* with the following:	
-* 
-* (x) Licensee agrees that it is strictly prohibited from using the name
-* and trademark of "OpenAutomate Compatible" if Your application software
-* is not OpenAutomate Compatible Software;
-* 
-* (y) if NVIDIA objects to Your improper use of the "OpenAutomate
-* Compatible" name and trademark, You will take all reasonable steps
-* necessary to resolve NVIDIA�s objections. NVIDIA may reasonably monitor
-* the quality of Your application software bearing the "OpenAutomate
-* Compatible" name or trademark pursuant to this Agreement; and
-* 
-* (z) any goodwill attached to NVIDIA�s trademarks, service marks, or
-* trade names belong to NVIDIA and this Agreement does not grant You any
-* right to use them.
-* 
-* If You are not the final manufacturer or vendor of a computer system or
-* software program incorporating the Software, or if Your Contractors (as
-* defined below), affiliates or subsidiaries need to exercise any, some or
-* all of the license grant described above herein to the Software on Your
-* behalf, then You may transfer a copy of the Software, (and related
-* end-user documentation) to such recipient for use in accordance with the
-* terms of this Agreement, provided such recipient agrees to be fully
-* bound by the terms hereof. Except as expressly permitted in this
-* Agreement, Unless otherwise authorized in the Agreement, You shall not
-* otherwise assign, sublicense, lease, or in any other way transfer or
-* disclose Software to any third party. Unless otherwise authorized in the
-* Agreement, You shall not reverse- compile, disassemble,
-* reverse-engineer, or in any manner attempt to derive the source code of
-* the Software from the object code portions of the Software. 
-* 
-* Except as expressly stated in this Agreement, no license or right is
-* granted to You directly or by implication, inducement, estoppel or
-* otherwise. NVIDIA shall have the right to inspect or have an independent
-* auditor inspect Your relevant records to verify Your compliance with the
-* terms and conditions of this Agreement. 
-* 
-* SECTION 2 - CONFIDENTIALITY.
-* If applicable, any exchange of Confidential Information (as defined in
-* the NDA) shall be made pursuant to the terms and conditions of a
-* separately signed Non-Disclosure Agreement ("NDA") by and between NVIDIA
-* and You. For the sake of clarity, You agree that the Software is
-* Confidential Information of NVIDIA.
-* 
-* If You wish to have a third party consultant or subcontractor
-* ("Contractor") perform work on Your behalf which involves access to or
-* use of Software, You shall obtain a written confidentiality agreement
-* from the Contractor which contains terms and obligations with respect to
-* access to or use of Software no less restrictive than those set forth in
-* this Agreement and excluding any distribution or sublicense rights, and
-* use for any other purpose than permitted in this Agreement. Otherwise,
-* You shall not disclose the terms or existence of this Agreement or use
-* NVIDIA's name in any publications, advertisements, or other
-* announcements without NVIDIA's prior written consent.  Unless otherwise
-* provided in this Agreement, You do not have any rights to use any NVIDIA
-* trademarks or logos.
-* 
-* SECTION 3 - OWNERSHIP OF SOFTWARE AND INTELLECTUAL PROPERTY RIGHTS.
-* All rights, title and interest to all copies of the Software remain with
-* NVIDIA, subsidiaries, licensors, or its suppliers. The Software is
-* copyrighted and protected by the laws of the United States and other
-* countries, and international treaty provisions. You may not remove any
-* copyright notices from the Software. NVIDIA may make changes to the
-* Software, or to items referenced therein, at any time and without
-* notice, but is not obligated to support or update the Software. Except
-* as otherwise expressly provided, NVIDIA grants no express or implied
-* right under any NVIDIA patents, copyrights, trademarks, or other
-* intellectual property rights. 
-* 
-* All rights, title and interest in the Derivative Works of the Software
-* remain with You subject to the underlying license from NVIDIA to the
-* Software.  In Your sole discretion, You may grant NVIDIA, upon NVIDIA�s
-* request for such a license described herein, an irrevocable, perpetual,
-* nonexclusive, worldwide, royalty-free paid-up license to make, have
-* made, use, have used, sell, license, distribute, sublicense or otherwise
-* transfer Derivative Works created by You that add functionality or
-* improvement to the Software.  
-* 
-* You has no obligation to give NVIDIA any suggestions, comments or other
-* feedback ("Feedback") relating to the Software.  However, NVIDIA may use
-* and include any Feedback that You voluntarily provide to improve the
-* Software or other related NVIDIA technologies.  Accordingly, if You
-* provide Feedback, You agree NVIDIA and its licensees may freely use,
-* reproduce, license, distribute, and otherwise commercialize the Feedback
-* in the Software or other related technologies without the payment of any
-* royalties or fees.  
-* 
-* You may transfer the Software only if the recipient agrees to be fully
-* bound by these terms and conditions of this Agreement. 
-* 
-* SECTION 4 - NO WARRANTIES. 
-* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY EXPRESS OR IMPLIED WARRANTY
-* OF ANY KIND, INCLUDING WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT,
-* OR FITNESS FOR A PARTICULAR PURPOSE. NVIDIA does not warrant or assume
-* responsibility for the accuracy or completeness of any information,
-* text, graphics, links or other items contained within the Software.
-* NVIDIA does not represent that errors or other defects will be
-* identified or corrected.
-* 
-* SECTION 5 - LIMITATION OF LIABILITY.
-* EXCEPT WITH RESPECT TO THE MISUSE OF THE OTHER PARTY�S INTELLECTUAL
-* PROPERTY OR DISCLOSURE OF THE OTHER PARTY�S CONFIDENTIAL INFORMATION IN
-* BREACH OF THIS AGREEMENT, IN NO EVENT SHALL NVIDIA, SUBSIDIARIES,
-* LICENSORS, OR ITS SUPPLIERS BE LIABLE FOR ANY DAMAGES WHATSOEVER
-* (INCLUDING, WITHOUT LIMITATION,  INDIRECT, LOST PROFITS, CONSEQUENTIAL,
-* BUSINESS INTERRUPTION OR LOST INFORMATION) ARISING OUT OF THE USE OF OR
-* INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS BEEN ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS PROHIBIT EXCLUSION OR
-* LIMITATION OF LIABILITY FOR IMPLIED WARRANTIES OR CONSEQUENTIAL OR
-* INCIDENTAL DAMAGES, SO THE ABOVE LIMITATION MAY NOT APPLY TO YOU. YOU
-* MAY ALSO HAVE OTHER LEGAL RIGHTS THAT VARY FROM JURISDICTION TO
-* JURISDICTION.  NOTWITHSTANDING THE FOREGOING, NVIDIA�S AGGREGATE
-* LIABILITY ARISING OUT OF THIS AGREEMENT SHALL NOT EXCEED ONE HUNDRED
-* UNITED STATES DOLLARS (USD$100).
-* 
-* SECTION 6 - TERM.
-* This Agreement and the licenses granted hereunder shall be effective as
-* of the date You download the applicable Software ("Effective Date") and
-* continue for a period of one (1) year ("Initial Term") respectively,
-* unless terminated earlier in accordance with the "Termination" provision
-* of this Agreement.  Unless either party notifies the other party of its
-* intent to terminate this Agreement at least three (3) months prior to
-* the end of the Initial Term or the applicable renewal period, this
-* Agreement will be automatically renewed for one (1) year renewal periods
-* thereafter, unless terminated in accordance with the "Termination"
-* provision of this Agreement.  
-* 
-* SECTION 7 - TERMINATION.
-* NVIDIA may terminate this Agreement at any time if You violate its
-* terms. Upon termination, You will immediately destroy the Software or
-* return all copies of the Software to NVIDIA, and certify to NVIDIA in
-* writing that such actions have been completed.  Upon termination or
-* expiration of this Agreement the license grants to Licensee shall
-* terminate, except that sublicenses rightfully granted by Licensee under
-* this Agreement in connection with Section 1(b) and (c) of this Agreement
-* provided by Licensee prior to the termination or expiration of this
-* Agreement shall survive in accordance with their respective form of
-* license terms and conditions.
-* 
-* SECTION 8 - MISCELLANEOUS.
-* 
-* SECTION 8.1 - SURVIVAL.
-* Those provisions in this Agreement, which by their nature need to
-* survive the termination or expiration of this Agreement, shall survive
-* termination or expiration of the Agreement, including but not limited to
-* Sections 2, 3, 4, 5, 7, and 8.
-* 
-* SECTION 8.2 - APPLICABLE LAWS.
-* Claims arising under this Agreement shall be governed by the laws of
-* Delaware, excluding its principles of conflict of laws and the United
-* Nations Convention on Contracts for the Sale of Goods. The state and/or
-* federal courts residing in Santa Clara County, California shall have
-* exclusive jurisdiction over any dispute or claim arising out of this
-* Agreement. You may not export the Software in violation of applicable
-* export laws and regulations. 
-* 
-* SECTION 8.3 - AMENDMENT.
-* The Agreement shall not be modified except by a written agreement that
-* names this Agreement and any provision to be modified, is dated
-* subsequent to the Effective Date, and is signed by duly authorized
-* representatives of both parties.
-* 
-* SECTION 8.4 - NO WAIVER.
-* No failure or delay on the part of either party in the exercise of any
-* right, power or remedy under this Agreement or under law, or to insist
-* upon or enforce performance by the other party of any of the provisions
-* of this Agreement or under law, shall operate as a waiver thereof, nor
-* shall any single or partial exercise of any right, power or remedy
-* preclude other or further exercise thereof, or the exercise of any other
-* right, power or remedy; rather the provision, right, or remedy shall be
-* and remain in full force and effect.
-* 
-* SECTION 8.5 - NO ASSIGNMENT. 
-* This Agreement and Licensee�s rights and obligations herein, may not be
-* assigned, subcontracted, delegated, or otherwise transferred by Licensee
-* without NVIDIA�s prior written consent, and any attempted assignment,
-* subcontract, delegation, or transfer in violation of the foregoing will
-* be null and void.  The terms of this Agreement shall be binding upon
-* Licensee�s assignees.
-* 
-* SECTION 8.6 - GOVERNMENT RESTRICTED RIGHTS. 
-* The parties acknowledge that the Software is subject to U.S. export
-* control laws and regulations.   The parties agree to comply with all
-* applicable international and national laws that apply to the Software,
-* including the U.S. Export Administration Regulations, as well as
-* end-user, end-use and destination restrictions issued by U.S. and other
-* governments.
-* 
-* The Software has been developed entirely at private expense and is
-* commercial computer software provided with RESTRICTED RIGHTS. Use,
-* duplication or disclosure of the Software by the U.S. Government or a
-* U.S. Government subcontractor is subject to the restrictions set forth
-* in the Agreement under which the Software was obtained pursuant to DFARS
-* 227.7202-3(a) or as set forth in subparagraphs (c)(1) and (2) of the
-* Commercial Computer Software - Restricted Rights clause at FAR
-* 52.227-19, as applicable. Contractor/manufacturer is NVIDIA, 2701 San
-* Tomas Expressway, Santa Clara, CA 95050. Use of the Software by the
-* Government constitutes acknowledgment of NVIDIA's proprietary rights
-* therein. 
-* 
-* SECTION 8.7 - INDEPENDENT CONTRACTORS.
-* Licensee�s relationship to NVIDIA is that of an independent contractor,
-* and neither party is an agent or partner of the other.  Licensee will
-* not have, and will not represent to any third party that it has, any
-* authority to act on behalf of NVIDIA.
-* 
-* SECTION 8.8 - SEVERABILITY.
-* If for any reason a court of competent jurisdiction finds any provision
-* of this Agreement, or portion thereof, to be unenforceable, that
-* provision of the Agreement will be enforced to the maximum extent
-* permissible so as to affect the intent of the parties, and the remainder
-* of this Agreement will continue in full force and effect. This Agreement
-* has been negotiated by the parties and their respective counsel and will
-* be interpreted fairly in accordance with its terms and without any
-* strict construction in favor of or against either party.
-* 
-* SECTION 8.9 - ENTIRE AGREEMENT.  
-* This Agreement and NDA constitute the entire agreement between the
-* parties with respect to the subject matter contemplated herein, and
-* merges all prior and contemporaneous communications.
-* 
-******************************************************************************/
-
-
-#ifndef _SETTINGS_H
-#define _SETTINGS_H
-
-#include <assert.h>
-#include <ctype.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <vector>
-#include <map>
-#include <string>
-#include <conio.h>
-#include <OpenAutomate.h>
-
-#include "corelib_global.h"
-
-#if WIN32
-# include <windows.h>
-# define SLEEP(ms) Sleep(ms)
-#else
-# include <unistd.h>
-# define SLEEP(ms) usleep(1000 * (ms))
-#endif
-
-void Error(const char *fmt, ...);
-bool GetExePath(char* exe_path);
-
-struct OptionValue
-{
-	const char *Name;
-	oaOptionDataType Type;
-	oaValue Value;
-};
-
-class CORELIB_EXPORT AppSettings
-{
-public:
-	AppSettings();
-	~AppSettings();
-
-	static AppSettings& Inst()
-	{
-		static AppSettings s_inst;
-		return s_inst;
-	}
-
-	void InitOptions();
-
-	void WriteOptionsFile();
-
-	void SetOptionValue(const char *name, 
-		oaOptionDataType type,
-		const oaValue *value);
-
-	int GetNumOptions(){return NumOptions;}
-
-	oaNamedOption* GetOption(int i){return &Options[i];}
-
-	OptionValue* GetOptionValue(char* opt_name)
-	{
-		return &OptionValueMap[opt_name];
-	}
-
-	std::map<std::string, OptionValue>* GetCurrentOptionMap()
-	{
-		return &OptionValueMap;
-	}
-
-private:
-
-	void Cleanup();
-
-	void InitDefaultOptions();
-
-	void ReadOptionsFile();
-
-	void WriteOptionsFile(FILE *fp);
-
-	void SetOptionValue(const char *name, 
-		oaOptionDataType type,
-		const char *value);
-
-	oaNamedOption Options[128];
-	std::map<std::string, OptionValue> OptionValueMap;
-
-	int NumOptions;
-};
-
-#endif
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Stats.cpp b/tools/ArtistTools/source/CoreLib/Utils/Stats.cpp
deleted file mode 100644
index d52aa14..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Stats.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////////
-#include "Stats.h"
-
-void Stats::reset()
-{
-	m_totalRenderTime = 0.0f;
-	m_shadowRenderTime = 0.0f;
-	m_meshRenderTime = 0.0f;
-	m_hairRenderTime = 0.0f;
-	m_hairStatsTime = 0.0f;
-	m_totalUpdateTime = 0.0f;
-	m_meshSkinningTime = 0.0f;
-	m_hairSkinningTime = 0.0f;
-	m_hairSimulationTime = 0.0f;
-	m_queryTime = 0.0f;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void Stats::add(const Stats& toAdd)
-{
-	m_totalRenderTime += toAdd.m_totalRenderTime;
-	m_shadowRenderTime += toAdd.m_shadowRenderTime;
-	m_meshRenderTime += toAdd.m_meshRenderTime;
-	m_hairRenderTime += toAdd.m_hairRenderTime;
-	m_hairStatsTime += toAdd.m_hairStatsTime;
-
-	m_totalUpdateTime += toAdd.m_totalUpdateTime;
-	m_meshSkinningTime += toAdd.m_meshSkinningTime;
-	m_hairSkinningTime += toAdd.m_hairSkinningTime;
-	m_hairSimulationTime += toAdd.m_hairSimulationTime;
-
-	m_queryTime += toAdd.m_queryTime;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void Stats::average(float numFrames)
-{
-	m_totalRenderTime /= numFrames;
-	m_shadowRenderTime /= numFrames;
-	m_meshRenderTime /= numFrames;
-	m_hairRenderTime /= numFrames;
-	m_hairStatsTime /= numFrames;
-	m_totalUpdateTime /= numFrames;
-	m_meshSkinningTime /= numFrames;
-	m_hairSkinningTime /= numFrames;
-	m_hairSimulationTime /= numFrames;
-	m_queryTime /= numFrames;
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Stats.h b/tools/ArtistTools/source/CoreLib/Utils/Stats.h
deleted file mode 100644
index fb22e57..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Stats.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include "corelib_global.h"
-
-// scene statistics
-struct CORELIB_EXPORT Stats
-{
-	double	m_totalRenderTime; 
-	double  m_shadowRenderTime;
-	double  m_meshRenderTime;
-	double	m_hairRenderTime;
-	double	m_hairStatsTime;
-
-	double  m_totalUpdateTime;
-	double  m_meshSkinningTime;
-	double  m_hairSkinningTime;
-	double  m_hairSimulationTime;
-
-	double  m_queryTime;
-
-	Stats() { reset(); }
-
-	void reset();
-	void add(const Stats& toAdd);
-	void average(float numFrames);
-};
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Timer.cpp b/tools/ArtistTools/source/CoreLib/Utils/Timer.cpp
deleted file mode 100644
index 2161989..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Timer.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#include "Timer.h"
-
-Timer::Timer(bool isStartNow)
-{
-	::QueryPerformanceFrequency(&m_ticksPerSecond);
-	Reset(isStartNow);
-}
-
-void Timer::Reset(bool isStartNow)
-{
-	m_isPaused = true;
-	m_totalPausedTime.QuadPart = 0;
-	m_lastPausedTime.QuadPart = 0;
-	if (isStartNow)
-	{
-		Start();
-	}
-}
-
-void Timer::Start()
-{
-	if (m_isPaused)
-	{
-		LARGE_INTEGER timeNow;
-		::QueryPerformanceCounter(&timeNow);
-		m_totalPausedTime.QuadPart += timeNow.QuadPart - m_lastPausedTime.QuadPart;
-		m_isPaused = false;
-	}
-}
-
-void Timer::Pause()
-{
-	if (!m_isPaused)
-	{
-		m_isPaused = true;
-		::QueryPerformanceCounter(&m_lastPausedTime);
-	}
-}
-
-LONGLONG Timer::GetTicksElapsed() const
-{
-	LARGE_INTEGER timeNow;
-	if (m_isPaused)
-	{
-		timeNow = m_lastPausedTime;
-	}
-	else
-	{
-		::QueryPerformanceCounter(&timeNow);
-	}
-	return (timeNow.QuadPart - m_totalPausedTime.QuadPart);
-}
diff --git a/tools/ArtistTools/source/CoreLib/Utils/Timer.h b/tools/ArtistTools/source/CoreLib/Utils/Timer.h
deleted file mode 100644
index c14ff97..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/Timer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
-#include "corelib_global.h"
-
-class CORELIB_EXPORT Timer
-{
-public:
-	Timer(bool isStartNow = false);
-	void Start();
-	void Reset(bool isStartNow = false);
-	void Pause();
-	bool IsRunning() const
-	{
-		return !m_isPaused;
-	}
-	double GetTimeInMilliSeconds() const
-	{
-		return double(GetTicksElapsed()*1000.0) / GetTicksPerSecond();
-	}
-	double GetTimeInSeconds() const
-	{
-		return double(GetTicksElapsed()) / GetTicksPerSecond();
-	}
-
-public:
-	bool m_isPaused;
-
-	// Get time ticks elapsed
-	LONGLONG GetTicksElapsed() const;
-	// Get the timer frequency. Time tick count per second
-	LONGLONG GetTicksPerSecond() const {
-		return m_ticksPerSecond.QuadPart;
-	}
-	LARGE_INTEGER m_ticksPerSecond;
-	LARGE_INTEGER m_lastPausedTime;
-	LARGE_INTEGER m_totalPausedTime;
-};
diff --git a/tools/ArtistTools/source/CoreLib/Utils/ViewerOutput.cpp b/tools/ArtistTools/source/CoreLib/Utils/ViewerOutput.cpp
deleted file mode 100644
index d5486bc..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/ViewerOutput.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <windows.h>
-#include "ViewerOutput.h"
-
-ViewerOutput& ViewerOutput::Inst()
-{
-	static ViewerOutput inst;
-	return inst;
-}
-
-void ViewerOutput::RegisterPrinter( FrontPrinter* printer )
-{
-	if(!printer) return;
-
-	_printers.insert(printer);
-}
-
-void ViewerOutput::UnRegisterPrinter( FrontPrinter* printer )
-{
-	if(!printer) return;
-
-	auto itr = _printers.find(printer);
-	if(itr != _printers.end())
-		_printers.erase(itr);
-}
-
-void ViewerOutput::print( FrontPrinter::Effect e, unsigned long color, const char* fmt, ... )
-{
-	va_list args;
-	va_start(args, fmt);
-
-	vsprintf_s(_buf, MAX_BUFFER_SIZE, fmt, args);
-
-	va_end(args);
-
-	for (auto itr = _printers.begin(); itr != _printers.end(); ++itr)
-	{
-		(*itr)->print(_buf, color, e);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////
-ViewerStream::~ViewerStream()
-{
-	flush();
-}
-
-ViewerStream& ViewerStream::flush()
-{
-	this->std::ostream::flush();
-
-	if(_buffer.size() == 0)
-		return (*this);
-
-	ViewerOutput::Inst().print(_effect, _color, _buffer.buf);
-	_buffer.reset();
-
-	return (*this);
-}
-
-ViewerStream::ViewerStreamBuf::ViewerStreamBuf()
-{
-	reset();
-}
-
-std::streamsize ViewerStream::ViewerStreamBuf::size()
-{
-	return (pptr() - pbase());
-}
-
-void ViewerStream::ViewerStreamBuf::reset()
-{
-	memset(buf, 0, sizeof(buf));
-	setp(buf, buf + FURVIEWER_MAX_OUTPUT_CHAR);
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Utils/ViewerOutput.h b/tools/ArtistTools/source/CoreLib/Utils/ViewerOutput.h
deleted file mode 100644
index b1fb9f7..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/ViewerOutput.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#include <set>
-
-#include "corelib_global.h"
-
-/*
- * !! CAUSION: 
- *		Not thread safe, should only output messages in the MAIN thread!
- *		Otherwise, cannot guarantee the Qt Gui behavior.
- */
-
-// DON'T TRY TO WRITE CHARS MORE THAN THE FURVIEWER_MAX_OUTPUT_CHAR
-#define FURVIEWER_MAX_OUTPUT_CHAR 2048
-
-// c-style print
-#define viewer_msg(fmt, ...)	ViewerOutput::Inst().print(FrontPrinter::NONE,	0,				fmt, ##__VA_ARGS__)
-#define viewer_warn(fmt, ...)	ViewerOutput::Inst().print(FrontPrinter::NONE,	RGB(255,200,020), fmt, ##__VA_ARGS__)
-#define viewer_info(fmt, ...)	ViewerOutput::Inst().print(FrontPrinter::NONE,	RGB(118,185,000), fmt, ##__VA_ARGS__)
-#define viewer_err(fmt, ...)	ViewerOutput::Inst().print(FrontPrinter::NONE,	RGB(255,000,000), fmt, ##__VA_ARGS__)
-#define viewer_fatal(fmt, ...)	ViewerOutput::Inst().print(FrontPrinter::BOLD,	RGB(255,000,000), fmt, ##__VA_ARGS__)
-
-// c++ style output stream
-#define viewer_stream_msg	ViewerStream(FrontPrinter::NONE, 0)
-#define viewer_stream_warn	ViewerStream(FrontPrinter::NONE, RGB(255,200,020))
-#define viewer_stream_info	ViewerStream(FrontPrinter::NONE, RGB(118,185,000))
-#define viewer_stream_err	ViewerStream(FrontPrinter::NONE, RGB(255,000,000))
-#define viewer_stream_fatal ViewerStream(FrontPrinter::NONE, RGB(255,000,000))
-
-
-//////////////////////////////////////////////////////////////////////////
-// implementation
-//////////////////////////////////////////////////////////////////////////
-class FrontPrinter
-{
-public:
-	enum Effect
-	{
-		NONE = 0x0,
-		BOLD = 0x1,
-		ITALIC = 0x2,
-		UNDERLINE = 0x4
-	};
-		
-	virtual void print(const char* txt, unsigned long color = 0, Effect e = NONE) = 0;
-};
-
-class CORELIB_EXPORT ViewerOutput
-{
-public:
-	static ViewerOutput& Inst();
-
-	void RegisterPrinter(FrontPrinter* printer);
-	void UnRegisterPrinter(FrontPrinter* printer);
-
-	void print(FrontPrinter::Effect e, unsigned long color, const char* fmt, ...);
-
-private:
-	enum {MAX_BUFFER_SIZE = FURVIEWER_MAX_OUTPUT_CHAR + 1};
-
-	char _buf[MAX_BUFFER_SIZE];
-
-	std::set<FrontPrinter*> _printers;
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// stream to support c++ style output
-
-#include <streambuf>
-#include <sstream>
-
-class ViewerStream : public std::ostream
-{
-public:
-	explicit ViewerStream(FrontPrinter::Effect e, unsigned long color)
-		: std::ostream(&_buffer)
-		, _effect(e)
-		, _color(color)
-	{}
-
-	~ViewerStream();
-
-	ViewerStream& flush();
-
-private:
-	
-	class ViewerStreamBuf : public std::streambuf
-	{
-	public:
-		enum
-		{
-			STATIC_BUFFER_SIZE = FURVIEWER_MAX_OUTPUT_CHAR + 1,
-		};
-
-		ViewerStreamBuf();
-
-		void reset();
-		std::streamsize size();
-
-		// fixed stack buffer
-		char buf[STATIC_BUFFER_SIZE];
-	};
-
-	ViewerStreamBuf _buffer;
-	FrontPrinter::Effect _effect;
-	unsigned long _color;
-};
diff --git a/tools/ArtistTools/source/CoreLib/Utils/XMLHelper.cpp b/tools/ArtistTools/source/CoreLib/Utils/XMLHelper.cpp
deleted file mode 100644
index c48b0dc..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/XMLHelper.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-#include "XMLHelper.h"
-#include <QtXml\QtXml>
-#include "ViewerOutput.h"
-
-static int gcounter = 0;
-static char gbuf[256];
-
-XMLFile::XMLFile(const QString& rootName)
-	: _rootName(rootName)
-{
-}
-
-void XMLFile::load(const QString& filePath)
-{
-	QFile file(filePath);
-
-	if (!file.open(QIODevice::ReadOnly))
-	{
-		return;
-	}
-
-	QDomDocument xmlDoc;
-	if (!xmlDoc.setContent(&file))
-	{
-		file.close();
-		return;
-	}
-	file.close();
-
-	if (xmlDoc.isNull() || xmlDoc.documentElement().tagName() != _rootName)
-	{
-		sprintf(gbuf, "The file you selected is empty or not a speficied file: %s.", filePath.toStdString().c_str());
-		viewer_msg(gbuf);
-		return;
-	}
-
-	loadItems(xmlDoc);
-
-	//QDomNodeList elms = xmlDoc.documentElement().elementsByTagName(QObject::tr("StressSolverPreset"));
-	//for (int i = 0; i < elms.count(); ++i)
-	//{
-	//	StressSolverUserPreset preset("");
-	//	_userPresets.push_back(preset);
-	//	_loadStressSolverPreset(elms.at(i).toElement(), _userPresets[i]);
-	//}
-}
-
-void XMLFile::save(const QString& filePath)
-{
-	std::string rr = filePath.toStdString();
-	rr;
-
-	QFileInfo fileInfo(filePath);
-	QDir fileDir = fileInfo.absoluteDir();
-
-	QString tt = fileDir.absolutePath();
-	std::string hh = tt.toStdString();
-	hh;
-
-	if (!fileDir.exists())
-	{
-		if (!fileDir.mkdir(fileDir.absolutePath()))
-		{
-			sprintf(gbuf, "Failed to crreate the folder: %s.", filePath.toStdString().c_str());
-			viewer_msg(gbuf);
-			return;
-		}
-	}
-	QFile file(filePath);
-	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate))
-	{
-		return;
-	}
-	QTextStream out(&file);
-
-	QDomDocument xmlDoc;
-	QDomElement rootElm = xmlDoc.createElement(_rootName);
-	xmlDoc.appendChild(rootElm);
-
-	saveItems(xmlDoc);
-
-	// 4 is count of indent
-	xmlDoc.save(out, 4);
-}
-
-SingleItemKindFile::SingleItemKindFile(const QString& rootName, const QString& itemName)
-	: XMLFile(rootName)
-	, _itemName(itemName)
-{
-}
-
-void SingleItemKindFile::loadItems(QDomDocument xmlDoc)
-{
-	QDomNodeList elms = xmlDoc.documentElement().elementsByTagName(_itemName);
-	for (int i = 0; i < elms.count(); ++i)
-	{
-		QDomElement elm = elms.at(i).toElement();
-		_items.push_back(elm.attribute(QObject::tr("Value")));
-	}
-}
-
-void SingleItemKindFile::saveItems(QDomDocument xmlDoc)
-{
-	for (int i = 0; i < _items.count(); ++i)
-	{
-		QDomElement elm = xmlDoc.createElement(_itemName);
-		elm.setAttribute(QObject::tr("Value"), _items.at(i));
-		xmlDoc.documentElement().appendChild(elm);
-	}
-}
-
-bool SingleItemKindFile::isItemExist(const QString& item)
-{
-	for (int i = 0; i < _items.count(); ++i)
-	{
-		if (_items.at(i) == item)
-			return true;
-	}
-
-	return false;
-}
diff --git a/tools/ArtistTools/source/CoreLib/Utils/XMLHelper.h b/tools/ArtistTools/source/CoreLib/Utils/XMLHelper.h
deleted file mode 100644
index ca43033..0000000
--- a/tools/ArtistTools/source/CoreLib/Utils/XMLHelper.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-#include <QtCore\QString>
-#include <QtCore\QList>
-#include "corelib_global.h"
-
-class QDomDocument;
-
-class CORELIB_EXPORT XMLFile
-{
-public:
-	XMLFile(const QString& rootName);
-
-	void load(const QString& filePath);
-	void save(const QString& filePath);
-
-protected:
-	virtual void loadItems(QDomDocument xmlDoc) = 0;
-	virtual void saveItems(QDomDocument xmlDoc) = 0;
-protected:
-	QString		_rootName;
-};
-
-class CORELIB_EXPORT SingleItemKindFile : public XMLFile
-{
-public:
-	SingleItemKindFile(const QString& rootName, const QString& itemName);
-
-	virtual void loadItems(QDomDocument xmlDoc);
-	virtual void saveItems(QDomDocument xmlDoc);
-
-	void addItemBack(const QString& item) { _items.push_back(item); }
-	void addItemFront(const QString& item) { _items.push_back(item); }
-	QList<QString>& getItems() { return _items; }
-	bool isItemExist(const QString& item);
-
-private:
-	QString				_itemName;
-	QList<QString>		_items;
-};
diff --git a/tools/ArtistTools/source/CoreLib/Window/AppMainWindow.cpp b/tools/ArtistTools/source/CoreLib/Window/AppMainWindow.cpp
deleted file mode 100644
index 31a5dc5..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/AppMainWindow.cpp
+++ /dev/null
@@ -1,1593 +0,0 @@
-#include <QtWidgets/QShortcut>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QMessageBox>
-#include <QtGui/QDesktopServices>
-#include <QtWidgets/QScrollBar>
-#include <QtWidgets/QGraphicsEllipseItem>
-#include <QtWidgets/QGraphicsView>
-#include <QtWidgets/QProgressDialog>
-
-#include <Windows.h>
-
-#include "AppMainWindow.h"
-#include "ExpandablePanel.h"
-
-#include "D3DWidget.h"
-
-#include "DisplayMeshesPanel.h"
-
-#include "DisplayPreferencesPanel.h"
-#include "DisplayScenePanel.h"
-#include "DisplayLightPanel.h"
-#include "ui_DisplayPreferencesPanel.h"
-#include "ui_DisplayScenePanel.h"
-#include "ui_DisplayLightPanel.h"
-#include "CameraBookmarksDialog.h"
-
-#include "SimpleScene.h"
-#include "GlobalSettings.h"
-
-#include "ViewerOutput.h"
-#include "Gamepad.h"
-#if USE_CURVE_EDITOR
-#include "CurveEditorMainWindow.h"
-#endif
-#ifndef NV_ARTISTTOOLS
-#include "ui_AppMainToolbar.h"
-#include "ui_AssetControlPanel.h"
-#include "ui_GeneralAttributesPanel.h"
-#include "ui_PhysicalMaterialsPanel.h"
-#include "ui_StyleMaterialsPanel.h"
-#include "ui_GraphicalMaterialsPanel.h"
-#include "BlastToolbar.h"
-#include "AssetControlPanel.h"
-#include "GraphicalMaterialPanel.h"
-#include "PhysicalMaterialPanel.h"
-#include "StyleMaterialPanel.h"
-#include "GeneralAttributePanel.h"
-#include "MaterialSetPanel.h"
-#include "LodPanel.h"
-#include "DisplayVisualizersPanel.h"
-#include "ui_DisplayVisualizersPanel.h"
-#include "DisplayMeshMaterialsPanel.h"
-#include "FurCharacter.h"
-#include "HairParams.h"
-#include "AboutDialog.h"
-#else
-#endif // NV_ARTISTTOOLS
-
-class MsgPrinter : public FrontPrinter
-{
-public:
-	MsgPrinter(QTextBrowser* browser):_browser(browser)
-	{
-		
-	}
-
-	void print(const char* txt, unsigned long color /* = 0 */, Effect e /* = NONE */)
-	{
-		if(color == 0 && e == FrontPrinter::NONE)
-		{
-			_browser->insertPlainText(QString(txt)+"\n");
-		}
-		else
-		{
-			// output html text
-			QString surfix;
-			QString postfix;
-			surfix.reserve(64);
-			postfix.reserve(64);
-			if(e & FrontPrinter::BOLD)
-			{
-				surfix = surfix + "<b>";
-				postfix= postfix + "</b>";
-			}
-			else if(e & FrontPrinter::UNDERLINE)
-			{
-				surfix = surfix + "<u>";
-				postfix= QString("</u>") + postfix;
-			}
-			else if(e & FrontPrinter::ITALIC)
-			{
-				surfix = surfix + "<i>";
-				postfix= QString("</i>") + postfix;
-			}
-
-			if(color != 0)
-			{
-				int r = GetRValue(color);
-				int g = GetGValue(color);
-				int b = GetBValue(color);
-			
-				surfix = QString("<div style=\"color:rgb(%1,%2,%3);\">").arg(r).arg(g).arg(b) + surfix;
-				postfix= postfix + QString("</div><br />");
-			}
-
-			QString html = surfix + QString(txt) + postfix;
-			_browser->insertHtml(html);
-		}
-		// auto scroll to the bottom
-		QScrollBar *sb = _browser->verticalScrollBar();
-		if (sb) sb->setValue(sb->maximum());
-	}
-
-private:
-	QTextBrowser* _browser;
-};
-
-int AppMainWindow::_connectionMode = 0;
-bool AppMainWindow::_expertMode = false;
-AppMainWindow* gAppMainWindow = NV_NULL;
-
-void CreateAppMainWindow()
-{
-	gAppMainWindow = new AppMainWindow;
-}
-
-void ReleaseAppMainWindow()
-{
-	delete gAppMainWindow;
-	gAppMainWindow = NV_NULL;
-}
-
-AppMainWindow& AppMainWindow::Inst()
-{
-	return *gAppMainWindow;
-}
-
-AppMainWindow::AppMainWindow(QWidget *parent, Qt::WindowFlags flags)
-	: QMainWindow(parent, flags)
-		, _bookmarksMenu(0)
-		,_displayMeshesPanel(0)
-		, _displayPreferencesPanel(0)
-		, _displayScenePanel(0)
-		,_displayLightPanel(0)
-#if USE_CURVE_EDITOR
-		,_curveEditorInitizlized(false)
-		, _curveEditorMainWindow(nullptr)
-#endif
-		,_bookmarkActionGroup(0)
-		,_actionAddBookmark(0)
-		,_actionEditBookmarks(0)
-		, _recentMenu(NV_NULL)
-		, _recentFileRecordFile("RecentFiles", "File")
-{
-	setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
-	setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
-
-	ui.setupUi(this);
-	//ui.dockOutputWindow->hide();
-
-#ifndef NV_ARTISTTOOLS
-	_mainToolbar = 0;
-	_physicalMaterialPanel = 0;
-	_styleMaterialPanel = 0;
-	_graphicalMaterialPanel = 0;
-	_displayFurVisualizersPanel = 0;
-	_assetControlPanel = 0;
-	_generalAttributePanel = 0;
-	_lodPanel = 0;
-	_displayMeshMaterialsPanel;
-#if USE_MATERIAL_SET
-	_materialSetPanel = 0;
-#endif
-#else
-	CoreLib::Inst()->AppMainWindow_AppMainWindow();
-#endif // NV_ARTISTTOOLS
-
-	_progressDialog.close();    // prevent show one empty progress dialog when it runs.
-
-	m_bGizmoWithLocal = false;
-	m_bGizmoWithDepthTest = false;
-	m_bShowPlane = false;
-}
-
-void AppMainWindow::InitUI()
-{
-	_d3dWidget = new D3DWidget(this);
-	_d3dWidget->setMinimumSize(200, 200);
-	ui.renderLayout->addWidget(_d3dWidget);
-
-	InitShortCuts();
-	InitMenuItems();
-	InitToolbar();
-	InitPluginTab();
-	InitMainTab();
-
-	InitMouseSchemes();
-
-	updateUI();
-
-	if (_connectionMode == 1) // master mode
-		ui.sideBarTab->removeTab(1);
-
-	if (_connectionMode == 2)
-		ui.sideBarTab->removeTab(0);
-
-
-	QString defFilePath;
-
-	QString appDir = qApp->applicationDirPath();
-	QDir dir(appDir);
-	if (dir.cd("../../media"))
-		defFilePath = dir.absolutePath();
-
-	_lastFilePath = defFilePath;
-
-	_navigationStyle = 0;
-
-	// initialize the message printer
-	_printer = new MsgPrinter(this->ui.outputWindow);
-	ViewerOutput::Inst().RegisterPrinter(_printer);
-
-#ifndef NV_ARTISTTOOLS
-	
-	viewer_info(
-		"<a href=\"https://developer.nvidia.com/hairworks\" style=\"color:rgb(118,180,0);\">NVIDIA Blast Version v"
-		NV_HAIR_RELEASE_VERSION_STRING
-		"</a>");
-	
-#else
-	CoreLib::Inst()->AppMainWindow_InitUI();
-#endif // NV_ARTISTTOOLS
-}
-
-AppMainWindow::~AppMainWindow()
-{
-}
-
-void AppMainWindow::setConnectionMode(int m)
-{
-	_connectionMode = m;
-}
-
-void AppMainWindow::startProgress()
-{
-	_progressDialog.setWindowModality(Qt::WindowModal);
-	_progressDialog.show();
-}
-
-void AppMainWindow::setProgress(const char* label, int progress)
-{
-	_progressDialog.setLabelText(label);
-	if (progress >= 0)
-		_progressDialog.setValue(progress);
-
-	_progressDialog.update();
-}
-
-void AppMainWindow::endProgress()
-{
-	_progressDialog.close();
-}
-
-void AppMainWindow::quit()
-{
-	emit aboutToQuit();
-}
-
-void AppMainWindow::setProgressMaximum(int m)
-{
-	_progressDialog.setMaximum(m);
-}
-
-void AppMainWindow::InitMenuItems()
-{
-	QMenuBar* menu = ui.menuBar;
-	QAction* act = NV_NULL;
-
-	// file sub-menu
-	QMenu* fileMenu = menu->addMenu("&File");
-
-	if (_connectionMode != 1)
-	{
-		connect(ui.menuBar, SIGNAL(triggered(QAction*)), this, SLOT(menu_item_triggered(QAction*)));
-
-		act = new QAction("Clear scene", this);
-		act->setShortcut(QKeySequence::New);
-		connect(act, SIGNAL(triggered()), this, SLOT(menu_clearScene()));
-		fileMenu->addAction(act);
-
-		fileMenu->addSeparator();
-
-		act = new QAction("Open fbx file", this);
-		connect(act, SIGNAL(triggered()), this, SLOT(menu_openfbx()));
-		fileMenu->addAction(act);
-
-		fileMenu->addSeparator();
-
-		act = new QAction("Recents", this);
-		fileMenu->addAction(act);
-		_recentMenu = new QMenu("Recents", this);
-		act->setMenu(_recentMenu);
-
-		fileMenu->addSeparator();
-
-		_loadRecentFile();
-
-#ifndef NV_ARTISTTOOLS
-		fileMenu->addSeparator();
-		act = new QAction("Open project file", this);
-		act->setShortcut(QKeySequence::Open);
-		connect(act, SIGNAL(triggered()), this, SLOT(menu_openProject()));
-		fileMenu->addAction(act);
-
-		act = new QAction("Save project file", this);
-		act->setShortcut(QKeySequence::Save);
-		connect(act, SIGNAL(triggered()), this, SLOT(menu_saveProject()));
-		fileMenu->addAction(act);
-
-		act = new QAction("Save project file as...", this);
-		connect(act, SIGNAL(triggered()), this, SLOT(menu_saveProjectAs()));
-		fileMenu->addAction(act);
-
-		fileMenu->addSeparator();
-
-		act = new QAction("&Open hair file", this);
-		connect(act, SIGNAL(triggered()), this, SLOT(menu_openHair()));
-		fileMenu->addAction(act);
-
-		act = new QAction("&Save hair file", this);
-		connect(act, SIGNAL(triggered()), this, SLOT(menu_saveHair()));
-		fileMenu->addAction(act);
-
-		act = new QAction("Save hair file as...", this);
-		act->setShortcut(QKeySequence::SaveAs);
-		connect(act, SIGNAL(triggered()), this, SLOT(menu_saveHairAs()));
-		fileMenu->addAction(act);
-
-		act = new QAction("Save all hairs...", this);
-		connect(act, SIGNAL(triggered()), this, SLOT(menu_saveAllHairs()));
-		fileMenu->addAction(act);
-
-		fileMenu->addSeparator();
-#else
-		CoreLib::Inst()->AppMainWindow_InitMenuItems(ui.menuBar);
-#endif // NV_ARTISTTOOLS
-	}
-
-	act = new QAction("E&xit", this);
-	act->setShortcut(QKeySequence::Quit);
-	connect(act, SIGNAL(triggered()), this, SLOT(close()));
-	fileMenu->addAction(act);
-
-	// view submenu
-	QMenu* viewMenu = menu->addMenu("&View");
-	act = new QAction("Bookmarks", this);
-	//connect(act, SIGNAL(triggered()), this, SLOT(menu_showOutput()));
-	viewMenu->addAction(act);
-	_bookmarksMenu = new QMenu("Bookmarks", this);
-	connect(_bookmarksMenu, SIGNAL(triggered(QAction*)), this, SLOT(menu_bookmarkTriggered(QAction*)));
-	act->setMenu(_bookmarksMenu);
-	act = new QAction("Add Bookmark", this);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_addBookmark()));
-	_bookmarksMenu->addAction(act);
-	_actionAddBookmark = act;
-	act = new QAction("Edit Bookmarks", this);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_editBookmarks()));
-	_bookmarksMenu->addAction(act);
-	_actionEditBookmarks = act;
-	_bookmarksMenu->addSeparator();
-	_bookmarkActionGroup = new QActionGroup(this);
-
-	// window submenu
-	QMenu* windowMenu = menu->addMenu("&Window");
-	act = new QAction("Output", this);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_showOutput()));
-	windowMenu->addAction(act);
-
-	act = new QAction("Attribute Editor", this);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_showAttributeEditor()));
-	windowMenu->addAction(act);
-
-#if USE_CURVE_EDITOR
-	act = new QAction("Curve Editor", this);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_showCurveEditor()));
-	windowMenu->addAction(act);
-#endif
-
-	// help submenu
-	QMenu* helpMenu = menu->addMenu("&Help");
-
-	act = new QAction("Documentation", this);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_opendoc()));
-	helpMenu->addAction(act);
-
-	act = new QAction("&About", this);
-	connect(act, SIGNAL(triggered()), this, SLOT(menu_about()));
-	helpMenu->addAction(act);
-}
-
-void AppMainWindow::InitToolbar()
-{
-	if (_connectionMode != 1)
-	{
-#ifndef NV_ARTISTTOOLS
-		_mainToolbar = new BlastToolbar(ui.centralWidget);
-		ui.verticalLayout->insertWidget(0, _mainToolbar);
-		connect(_mainToolbar->getUI().btnFileOpen, SIGNAL(clicked()), this, SLOT(menu_openProject()));
-#else
-		CoreLib::Inst()->AppMainWindow_InitToolbar(ui.centralWidget, ui.verticalLayout);
-#endif // NV_ARTISTTOOLS
-	}
-}
-
-void AppMainWindow::InitPluginTab()
-{
-#ifndef NV_ARTISTTOOLS
-	QWidget *tabFur;
-	QGridLayout *gridLayout;
-	QFrame *furMaterialEditorArea;
-	QVBoxLayout *furMaterialEditorAreaLayout;
-	QScrollArea *furScrollArea;
-	QWidget *furScrollAreaContents;
-	QVBoxLayout *furScrollAreaLayout;
-	QSpacerItem *verticalSpacer;
-
-	tabFur = new QWidget();
-	tabFur->setObjectName(QStringLiteral("tabFur"));
-	gridLayout = new QGridLayout(tabFur);
-	gridLayout->setSpacing(6);
-	gridLayout->setContentsMargins(11, 11, 11, 11);
-	gridLayout->setObjectName(QStringLiteral("gridLayout"));
-	gridLayout->setContentsMargins(0, 0, 0, 0);
-	furMaterialEditorArea = new QFrame(tabFur);
-	furMaterialEditorArea->setObjectName(QStringLiteral("furMaterialEditorArea"));
-	furMaterialEditorAreaLayout = new QVBoxLayout(furMaterialEditorArea);
-	furMaterialEditorAreaLayout->setSpacing(6);
-	furMaterialEditorAreaLayout->setContentsMargins(11, 11, 11, 11);
-	furMaterialEditorAreaLayout->setObjectName(QStringLiteral("furMaterialEditorAreaLayout"));
-	furMaterialEditorAreaLayout->setContentsMargins(2, 2, 2, 2);
-
-	gridLayout->addWidget(furMaterialEditorArea, 1, 0, 1, 1);
-
-	furScrollArea = new QScrollArea(tabFur);
-	furScrollArea->setObjectName(QStringLiteral("furScrollArea"));
-	furScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-	furScrollArea->setWidgetResizable(true);
-	furScrollAreaContents = new QWidget();
-	furScrollAreaContents->setObjectName(QStringLiteral("furScrollAreaContents"));
-	furScrollAreaContents->setGeometry(QRect(0, 0, 359, 481));
-	furScrollAreaLayout = new QVBoxLayout(furScrollAreaContents);
-	furScrollAreaLayout->setSpacing(3);
-	furScrollAreaLayout->setContentsMargins(11, 11, 11, 11);
-	furScrollAreaLayout->setObjectName(QStringLiteral("furScrollAreaLayout"));
-	furScrollAreaLayout->setContentsMargins(2, 2, 2, 2);
-	verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-	furScrollAreaLayout->addItem(verticalSpacer);
-
-	furScrollArea->setWidget(furScrollAreaContents);
-
-	gridLayout->addWidget(furScrollArea, 0, 0, 1, 1);
-
-	ui.sideBarTab->addTab(tabFur, QString());
-
-	ui.sideBarTab->setTabText(ui.sideBarTab->indexOf(tabFur), QApplication::translate("AppMainWindowClass", "Hair", 0));
-
-	ExpandablePanel* panel = 0;
-	int pannelCnt = 0;
-
-	if (_connectionMode == 0)
-	{
-		panel = new ExpandablePanel(furScrollAreaContents, false);
-		_generalAttributePanel = new GeneralAttributePanel(panel);
-		panel->AddContent(_generalAttributePanel);
-		furScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("Asset Selection");
-
-		panel = new ExpandablePanel(furScrollAreaContents, false);
-		_assetControlPanel = new AssetControlPanel(panel);
-		panel->AddContent(_assetControlPanel);
-		furScrollAreaLayout->insertWidget(pannelCnt++, panel);
-		panel->SetTitle("General Settings");
-
-	}
-
-	panel = new ExpandablePanel(furScrollAreaContents);
-	_displayFurVisualizersPanel = new DisplayFurVisualizersPanel(panel);
-	panel->AddContent(_displayFurVisualizersPanel);
-	furScrollAreaLayout->insertWidget(pannelCnt++, panel);
-	panel->SetTitle("Visualization");
-
-	panel = new ExpandablePanel(furScrollAreaContents);
-	_physicalMaterialPanel = new PhysicalMaterialPanel(panel);
-	panel->AddContent(_physicalMaterialPanel);
-	furScrollAreaLayout->insertWidget(pannelCnt++, panel);
-	panel->SetTitle("Physical");
-
-	panel = new ExpandablePanel(furScrollAreaContents);
-	_styleMaterialPanel = new StyleMaterialPanel(panel);
-	panel->AddContent(_styleMaterialPanel);
-	furScrollAreaLayout->insertWidget(pannelCnt++, panel);
-	panel->SetTitle("Style");
-
-	panel = new ExpandablePanel(furScrollAreaContents);
-	_graphicalMaterialPanel = new GraphicalMaterialPanel(panel);
-	panel->AddContent(_graphicalMaterialPanel);
-	furScrollAreaLayout->insertWidget(pannelCnt++, panel);
-	panel->SetTitle("Graphics");
-
-	panel = new ExpandablePanel(furScrollAreaContents);
-	_lodPanel = new LodPanel(panel);
-	panel->AddContent(_lodPanel);
-	furScrollAreaLayout->insertWidget(pannelCnt++, panel);
-	panel->SetTitle("Level Of Detail");
-
-#if USE_MATERIAL_SET
-	panel = new ExpandablePanel(furScrollAreaContents);
-	_materialSetPanel = new MaterialSetPanel(panel);
-	panel->AddContent(_materialSetPanel);
-	furScrollAreaLayout->insertWidget(pannelCnt++, panel);
-	panel->SetTitle("Control Texture Channels");
-	//_materialSetPanel->hide();
-	//panel->SetCollapsed(true);
-#else
-	ui.furMaterialEditorAreaLayout->setEnabled(false);
-#endif
-#else
-	CoreLib::Inst()->AppMainWindow_InitPluginTab(ui.sideBarTab);
-#endif // NV_ARTISTTOOLS
-
-#if USE_CURVE_EDITOR
-	_curveEditorMainWindow = new nvidia::CurveEditor::CurveEditorMainWindow( this);//nullptr);
-	_curveEditorMainWindow->setResampleEnabled(false);
-	ui.dockWidgetCurveEditor->setWidget(_curveEditorMainWindow);
-	ui.dockWidgetCurveEditor->setWindowTitle(tr("Curve Editor"));
-
-	connect(_curveEditorMainWindow, SIGNAL(CurveAttributeChanged(nvidia::CurveEditor::CurveAttribute*)), this, SLOT(onCurveAttributeChanged(nvidia::CurveEditor::CurveAttribute*)));
-	connect(_curveEditorMainWindow, SIGNAL(ColorAttributeChanged(nvidia::CurveEditor::ColorAttribute*)), this, SLOT(onColorAttributeChanged(nvidia::CurveEditor::ColorAttribute*)));
-	connect(_curveEditorMainWindow, SIGNAL(ReloadColorAttributeTexture(nvidia::CurveEditor::ColorAttribute*, bool, int)), this, SLOT(onReloadColorAttributeTexture(nvidia::CurveEditor::ColorAttribute*, bool, int)));
-//#else
-//	ui.furCurveEditorAreaLayout->setEnabled(false);
-#endif
-}
-
-void AppMainWindow::InitMainTab()
-{
-	int idx = 0;
-
-	if (_connectionMode != 1)
-	{
-		ExpandablePanel* panel = new ExpandablePanel(ui.displayScrollAreaContents);
-		_displayPreferencesPanel = new DisplayPreferencesPanel(panel);
-		panel->AddContent(_displayPreferencesPanel);
-		ui.displayScrollAreaLayout->insertWidget(idx++, panel);
-		panel->SetTitle("Preferences");
-
-		panel = new ExpandablePanel(ui.displayScrollAreaContents);
-		_displayScenePanel = new DisplayScenePanel(panel);
-		panel->AddContent(_displayScenePanel);
-		ui.displayScrollAreaLayout->insertWidget(idx++, panel);
-		panel->SetTitle("Scene");
-
-		panel = new ExpandablePanel(ui.displayScrollAreaContents);
-		_displayLightPanel = new DisplayLightPanel(panel);
-		panel->AddContent(_displayLightPanel);
-		ui.displayScrollAreaLayout->insertWidget(idx++, panel);
-		panel->SetTitle("Light");
-
-		panel = new ExpandablePanel(ui.displayScrollAreaContents);
-		_displayMeshesPanel = new DisplayMeshesPanel(panel);
-		panel->AddContent(_displayMeshesPanel);
-		ui.displayScrollAreaLayout->insertWidget(idx++, panel);
-		panel->SetTitle("Display Meshes");
-		panel->setVisible(false);
-	}
-
-	if (_connectionMode != 1)
-	{
-#ifndef NV_ARTISTTOOLS
-		ExpandablePanel* panel = new ExpandablePanel(ui.displayScrollAreaContents);
-		_displayMeshMaterialsPanel = new DisplayMeshMaterialsPanel(panel);
-		panel->AddContent(_displayMeshMaterialsPanel);
-		ui.displayScrollAreaLayout->insertWidget(idx++, panel);
-		panel->SetTitle("Display Mesh Materials");
-#else
-		CoreLib::Inst()->AppMainWindow_InitMainTab(ui.displayScrollAreaContents, ui.displayScrollAreaLayout, idx);
-#endif // NV_ARTISTTOOLS
-	}
-}
-
-void AppMainWindow::InitShortCuts()
-{
-	QShortcut* shortCut;
-	shortCut = new QShortcut(QKeySequence(Qt::Key_F), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_frameall()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_H), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_hud()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_G), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_statistics()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_Space), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_pause()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_B), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_reset()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_Escape), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_escape()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_V), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_expert()));
-
-	shortCut = new QShortcut(QKeySequence("Ctrl+X"), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_expert()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_D), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(demo_next()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_Right), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(demo_next()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_A), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(demo_prev()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_Left), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(demo_prev()));
-
-	shortCut = new QShortcut(QKeySequence(Qt::Key_F2), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_output()));
-
-	shortCut = new QShortcut(QKeySequence("Ctrl+F"), this);
-	connect(shortCut, SIGNAL(activated()), this, SLOT(shortcut_fitcamera()));
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AppMainWindow::updateBookmarkMenu()
-{
-	// clear old menu items of camera bookmarks
-	while (_bookmarkActionGroup->actions().size() > 0)
-	{
-		QAction* act = _bookmarkActionGroup->actions()[0];
-		_bookmarkActionGroup->removeAction(act);
-		delete act;
-	}
-	_bookmarksMenu->clear();
-	_bookmarksMenu->addAction(_actionAddBookmark);
-	_bookmarksMenu->addAction(_actionEditBookmarks);
-	_bookmarksMenu->addSeparator();
-	
-	QList<QString> bookmarks = SimpleScene::Inst()->getBookmarkNames();
-	int numBookmarks = bookmarks.size();
-	for (int i = 0; i < numBookmarks; ++i)
-	{
-		QString bookmark = bookmarks[i];
-
-		QAction* act = new QAction(bookmark, this);
-		act->setCheckable(true);
-		_bookmarksMenu->addAction(act);
-		_bookmarkActionGroup->addAction(act);
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AppMainWindow::updateUI()
-{
-	if (_bookmarksMenu && _bookmarkActionGroup)
-	{
-		updateBookmarkMenu();
-	}
-
-#ifndef NV_ARTISTTOOLS
-	if (_mainToolbar)
-		_mainToolbar->updateValues();
-
-	if (_graphicalMaterialPanel)
-		_graphicalMaterialPanel->updateValues();
-
-	if (_physicalMaterialPanel)
-		_physicalMaterialPanel->updateValues();
-
-	if (_styleMaterialPanel)
-		_styleMaterialPanel->updateValues();
-
-	if (_displayFurVisualizersPanel)
-		_displayFurVisualizersPanel->updateValues();
-
-	if (_lodPanel)
-		_lodPanel->updateValues();
-
-	if (_generalAttributePanel)
-		_generalAttributePanel->updateValues();
-
-	if (_assetControlPanel)
-		_assetControlPanel->updateValues();
-
-	if (_displayMeshMaterialsPanel)
-		_displayMeshMaterialsPanel->updateValues();
-
-#if USE_MATERIAL_SET
-	if (_materialSetPanel)
-		_materialSetPanel->updateValues();
-#endif
-#else
-	CoreLib::Inst()->AppMainWindow_updateUI();
-#endif // NV_ARTISTTOOLS
-
-	if (_displayPreferencesPanel)
-		_displayPreferencesPanel->updateValues();
-
-	if (_displayScenePanel)
-		_displayScenePanel->updateValues();
-
-	if (_displayLightPanel)	
-		_displayLightPanel->updateValues();
-
-	if (_displayMeshesPanel)	
-		_displayMeshesPanel->updateValues();
-
-#if USE_CURVE_EDITOR
-	if (_curveEditorMainWindow)
-		UpdateCurveEditor();
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-void AppMainWindow::updatePluginUI()
-{
-	SimpleScene::Inst()->setIsUpdatingUI(true);
-
-#ifndef NV_ARTISTTOOLS
-	if (_graphicalMaterialPanel)
-		_graphicalMaterialPanel->updateValues();
-
-	if (_physicalMaterialPanel)
-		_physicalMaterialPanel->updateValues();
-
-	if (_styleMaterialPanel)
-		_styleMaterialPanel->updateValues();
-
-	if (_lodPanel)
-		_lodPanel->updateValues();
-
-	if (_displayFurVisualizersPanel)
-		_displayFurVisualizersPanel->updateValues();
-
-	if (_generalAttributePanel)
-		_generalAttributePanel->updateValues();
-
-	if (_assetControlPanel)
-		_assetControlPanel->updateValues();
-
-#if USE_MATERIAL_SET
-	if (_materialSetPanel)
-		_materialSetPanel->updateValues();
-#endif
-#else
-	CoreLib::Inst()->AppMainWindow_updatePluginUI();
-#endif // NV_ARTISTTOOLS
-
-#if USE_CURVE_EDITOR
-	if (_curveEditorMainWindow)
-		UpdateCurveEditor();
-#endif
-
-	SimpleScene::Inst()->setIsUpdatingUI(false);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// event handlers
-
-
-//////////////////////////////////////////////////////////////////////////
-// event handlers
-bool AppMainWindow::openProject(QString fileName)
-{
-	if (!fileName.isEmpty())
-	{
-		QFileInfo fileInfo(fileName);
-		QByteArray dir = QDir::toNativeSeparators(fileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-		QByteArray file= fileInfo.fileName().toLocal8Bit();
-
-		if (SimpleScene::Inst()->LoadProject(dir, file) == false)
-		{
-			QMessageBox messageBox;
-			messageBox.critical(0,"Error","File open error!");
-			messageBox.setFixedSize(500,200);
-
-			AppMainWindow::Inst().endProgress();
-			char message[1024];
-			sprintf(message, "Failed to open project file(\"%s\")", (const char*)file);
-			viewer_err(message);
-			return false;
-		}
-
-		AppMainWindow::Inst().endProgress();
-		_lastFilePath = fileInfo.absoluteDir().absolutePath();
-
-		updateUI();
-		return true;
-	}
-	return false;
-}
-
-void AppMainWindow::processDragAndDrop(const QStringList& fileNames)
-{
-	CoreLib::Inst()->SimpleScene_OpenFilesByDrop(fileNames);
-	updateUI();
-}
-
-void AppMainWindow::removeBookmark(const QString& name)
-{
-	QList<QAction*> bookmarks = _bookmarkActionGroup->actions();
-	int bookmarkCount = bookmarks.size();
-	for (int i = 0; i < bookmarkCount; ++i)
-	{
-		QAction* act = bookmarks.at(i);
-		if (act->text() == name)
-		{
-			_bookmarkActionGroup->removeAction(act);
-			_bookmarksMenu->removeAction(act);
-			delete act;
-		}
-	}
-}
-
-void AppMainWindow::renameBookmark(const QString& oldName, const QString& newName)
-{
-	QList<QAction*> bookmarks = _bookmarkActionGroup->actions();
-	int bookmarkCount = bookmarks.size();
-	for (int i = 0; i < bookmarkCount; ++i)
-	{
-		QAction* act = bookmarks.at(i);
-		if (act->text() == oldName)
-		{
-			act->setText(newName);
-		}
-	}
-}
-
-#if USE_CURVE_EDITOR
-void AppMainWindow::UpdateCurveEditor()
-{
-#ifndef NV_ARTISTTOOLS
-	_curveEditorMainWindow->setCurveAttributes(SimpleScene::Inst()->GetFurCharacter().GetCurveAttributes());
-	_curveEditorMainWindow->setColorCurveAttributes(SimpleScene::Inst()->GetFurCharacter().GetColorAttributes());
-#else
-	CoreLib::Inst()->AppMainWindow_UpdateCurveEditor();
-#endif // NV_ARTISTTOOLS
-	
-	_curveEditorMainWindow->update();
-}
-
-void AppMainWindow::ShowCurveEditor(int paramId)
-{
-#ifndef NV_ARTISTTOOLS	
-	_curveEditorMainWindow->setCurveAttributes(SimpleScene::Inst()->GetFurCharacter().GetCurveAttributes());
-	_curveEditorMainWindow->setColorCurveAttributes(SimpleScene::Inst()->GetFurCharacter().GetColorAttributes());
-	if (HAIR_PARAMS_ROOT_COLOR == paramId || HAIR_PARAMS_TIP_COLOR == paramId)
-	{
-		std::vector<nvidia::CurveEditor::ColorAttribute*> attributes = SimpleScene::Inst()->GetFurCharacter().GetColorAttributesByParamId(paramId);
-		_curveEditorMainWindow->setSelectedColorAttribute(attributes.size() > 0 ? attributes[0] : nullptr);
-	}
-	else
-		_curveEditorMainWindow->setSelectedCurveAttributes(SimpleScene::Inst()->GetFurCharacter().GetCurveAttributesByParamId(paramId));
-
-#else
-	CoreLib::Inst()->AppMainWindow_ShowCurveEditor(paramId);
-#endif // NV_ARTISTTOOLS
-
-	_curveEditorMainWindow->update();
-}
-#endif
-
-void AppMainWindow::menu_item_triggered(QAction* action)
-{
-	qDebug("%s", __FUNCTION__);
-#ifdef NV_ARTISTTOOLS
-
-	bool clickRecent = false;
-	for (int i = 0; i < _recentFileActions.count(); ++i)
-	{
-		if (_recentFileActions.at(i) == action)
-		{
-			clickRecent = true;
-			break;
-		}
-	}
-
-	if (clickRecent)
-	{
-		QStringList recentFile;
-		recentFile.push_back(action->text());
-		CoreLib::Inst()->SimpleScene_OpenFilesByDrop(recentFile);
-		return;
-	}
-
-	CoreLib::Inst()->menu_item_triggered(action);
-#endif // NV_ARTISTTOOLS
-}
-
-void AppMainWindow::menu_clearScene()
-{
-	SimpleScene::Inst()->Clear();
-	updateUI();
-}
-
-bool AppMainWindow::menu_openfbx()
-{
-	/*
-	QString lastDir = _lastFilePath;
-	QString fileName = QFileDialog::getOpenFileName(this, "Open FBX File", lastDir, "FBX File (*.fbx)");
-	if (!fileName.isEmpty())
-	{
-		QFileInfo fileInfo(fileName);
-		QByteArray dir = QDir::toNativeSeparators(fileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-		QByteArray file= fileInfo.fileName().toLocal8Bit();
-
-		if (SimpleScene::Inst()->LoadSceneFromFbx(dir, file) == false)
-		{
-			QMessageBox messageBox;
-			messageBox.critical(0,"Error","File open error!");
-			messageBox.setFixedSize(500,200);
-
-			AppMainWindow::Inst().endProgress();
-
-			char message[1024];
-			sprintf(message, "Failed to open fbx file(\"%s\")", (const char*)file);
-			viewer_err(message);
-
-			return false;
-		}
-
-		AppMainWindow::Inst().endProgress();
-
-		_lastFilePath = fileInfo.absoluteDir().absolutePath();
-
-		updateUI();
-
-		return true;
-	}
-	return true;
-	*/
-
-	// dir and file will get in blast open asset dialog
-	bool res = SimpleScene::Inst()->LoadSceneFromFbx("", "");
-	updateUI();
-	return res;
-}
-
-void AppMainWindow::menu_addBookmark()
-{
-	QString bookmark = SimpleScene::Inst()->createBookmark();
-
-	QAction* act = new QAction(bookmark, this);
-	act->setCheckable(true);
-	_bookmarksMenu->addAction(act);
-	_bookmarkActionGroup->addAction(act);
-	act->setChecked(true);
-}
-
-void AppMainWindow::menu_editBookmarks()
-{
-	CameraBookmarksDialog dlg(this);
-	dlg.exec(); 
-}
-
-void AppMainWindow::menu_bookmarkTriggered(QAction* act)
-{
-	if (_actionAddBookmark != act && _actionEditBookmarks != act)
-	{
-		SimpleScene::Inst()->activateBookmark(act->text());
-	}
-}
-
-void AppMainWindow::menu_showOutput()
-{
-	bool bVisibal = ui.dockOutputWindow->isVisible();
-	ui.dockOutputWindow->setVisible(!bVisibal);
-}
-
-void AppMainWindow::menu_showAttributeEditor()
-{
-	bool bVisibal = ui.dockWidget->isVisible();
-	ui.dockWidget->setVisible(!bVisibal);
-}
-#if USE_CURVE_EDITOR
-void AppMainWindow::menu_showCurveEditor()
-{
-	bool bVisibal = ui.dockWidgetCurveEditor->isVisible();
-	ui.dockWidgetCurveEditor->setVisible(!bVisibal);
-}
-#endif
-void AppMainWindow::menu_about()
-{
-	qDebug("%s", __FUNCTION__);
-#ifndef NV_ARTISTTOOLS
-	AboutDialog::ShowAboutDialog();
-#else
-	CoreLib::Inst()->AppMainWindow_menu_about();
-#endif // NV_ARTISTTOOLS
-}
-
-void AppMainWindow::menu_opendoc()
-{
-	qDebug("%s", __FUNCTION__);
-
-#ifndef NV_ARTISTTOOLS
-	QString appDir = QApplication::applicationDirPath();
-	QString docsFile = QFileInfo(appDir + "/../../docs/User_Guide/Nvidia Blast.chm").absoluteFilePath();
-
-	QUrl docsUrl = QUrl::fromLocalFile(docsFile);
-	QUrl url = QUrl::fromUserInput(QString("http://docs.nvidia.com/gameworks/content/artisttools/hairworks/index.html"));
-	QDesktopServices::openUrl(url);
-#else
-	CoreLib::Inst()->AppMainWindow_menu_opendoc();
-#endif // NV_ARTISTTOOLS
-}
-
-void AppMainWindow::shortcut_frameall()
-{
-	qDebug("ShortCut_F: frame all");
-}
-
-void AppMainWindow::shortcut_hud()
-{
-	Gamepad::ShowHideHud();
-	qDebug("ShortCut_S: statistics on/off");
-}
-
-void AppMainWindow::shortcut_statistics()
-{
-	Gamepad::ShowHideStats();
-	qDebug("ShortCut_S: statistics on/off");
-}
-
-void AppMainWindow::shortcut_reset()
-{
-	Gamepad::ResetAnimation();
-}
-
-void AppMainWindow::shortcut_pause()
-{
-	//_mainToolbar->on_btnPlayAnimation_clicked();  // this one has some delay
-	//qDebug("ShortCut_Space: play/pause simualtion");
-	Gamepad::PlayPauseAnimation();
-}
-
-bool AppMainWindow::IsExpertMode()
-{
-	return _expertMode;
-}
-
-void AppMainWindow::demo_next()
-{
-	Gamepad::DemoNext();
-}
-
-void AppMainWindow::demo_prev()
-{
-	Gamepad::DemoPrev();
-}
-
-void AppMainWindow::shortcut_escape()
-{
-	Gamepad::DemoEscape();
-}
-
-void AppMainWindow::shortcut_expert()
-{
-	qDebug("ShortCut_F: expert mode on/off");
-
-	_expertMode = !_expertMode;
-	bool mode = !_expertMode;
-
-	ui.menuBar->setVisible(mode);
-	ui.dockWidget->setVisible(mode);
-	ui.dockOutputWindow->setVisible(mode);
-#if USE_CURVE_EDITOR
-	ui.dockWidgetCurveEditor->setVisible(mode);
-#endif
-	ui.statusBar->setVisible(mode);
-
-#ifndef NV_ARTISTTOOLS
-	if (_mainToolbar)
-		_mainToolbar->setVisible(mode);
-#else
-	CoreLib::Inst()->AppMainWindow_shortcut_expert(mode);
-#endif // NV_ARTISTTOOLS
-
-	//bool bDemoMode = AppMainWindow::IsExpertMode();
-	bool bMaxSized = AppMainWindow::Inst().isMaximized();
-	if (!bMaxSized)
-	{
-		// resize before change to demo mode
-		AppMainWindow::Inst().showMaximized();
-	}
-
-	_d3dWidget->update();
-	Gamepad::ShowProjectName();
-}
-
-void AppMainWindow::shortcut_output()
-{
-	ui.dockOutputWindow->show();
-	_d3dWidget->update();
-}
-
-void AppMainWindow::shortcut_meshmat()
-{
-}
-
-void AppMainWindow::shortcut_fitcamera()
-{
-	qDebug("ShortCut_Ctrl+F: fit camera");
-	SimpleScene::Inst()->FitCamera();
-}
-
-#if USE_CURVE_EDITOR
-void AppMainWindow::onCurveAttributeChanged(nvidia::CurveEditor::CurveAttribute* attribute)
-{
-#ifndef NV_ARTISTTOOLS
-	SimpleScene::Inst()->GetFurCharacter().updateCurveAttribute(attribute);
-#else
-	CoreLib::Inst()->AppMainWindow_onCurveAttributeChanged(attribute);
-#endif // NV_ARTISTTOOLS
-}
-
-void AppMainWindow::onColorAttributeChanged(nvidia::CurveEditor::ColorAttribute* attribute)
-{
-#ifndef NV_ARTISTTOOLS
-	SimpleScene::Inst()->GetFurCharacter().updateColorAttribute(attribute);
-	_graphicalMaterialPanel->updateValues();
-#else
-	CoreLib::Inst()->AppMainWindow_onColorAttributeChanged(attribute);
-#endif // NV_ARTISTTOOLS
-}
-
-void AppMainWindow::onReloadColorAttributeTexture(nvidia::CurveEditor::ColorAttribute* attribute, bool reloadColorTex, int selectedCtrlPntIndex)
-{
-#ifndef NV_ARTISTTOOLS
-	SimpleScene::Inst()->GetFurCharacter().reloadColorAttributeTexture(attribute, reloadColorTex, selectedCtrlPntIndex);
-#else
-	CoreLib::Inst()->AppMainWindow_onReloadColorAttributeTexture(attribute, reloadColorTex, selectedCtrlPntIndex);
-#endif // NV_ARTISTTOOLS
-}
-#endif
-
-/*
-	Maya Scheme:
-		ALT + LMB -> Rotate
-		ALT + MMB -> Pan
-		ALT + RMB -> Zoom
-
-		M-wheel -> Zoom
-
-	3dsMax Scheme:
-		ALT + MMB -> Rotate
-		N/A + MMB -> Pan
-		ALT + SHFT + MMB -> Zoom
-
-		M-wheel -> Zoom
-*/
-
-void AppMainWindow::InitMouseSchemes()
-{
-	ShortCut alt_lmb = qMakePair(Qt::KeyboardModifiers(Qt::AltModifier), Qt::MouseButtons(Qt::LeftButton));
-	ShortCut alt_mmb = qMakePair(Qt::KeyboardModifiers(Qt::AltModifier), Qt::MouseButtons(Qt::MiddleButton));
-	ShortCut alt_rmb = qMakePair(Qt::KeyboardModifiers(Qt::AltModifier), Qt::MouseButtons(Qt::RightButton));
-	ShortCut non_mmb = qMakePair(Qt::KeyboardModifiers(Qt::NoModifier), Qt::MouseButtons(Qt::MiddleButton));
-	ShortCut alt_shft_mmb = qMakePair(Qt::KeyboardModifiers(Qt::AltModifier|Qt::ShiftModifier), Qt::MouseButtons(Qt::MiddleButton));
-
-	_mayaScheme[alt_lmb] = 'R';
-	_mayaScheme[alt_mmb] = 'P';
-	_mayaScheme[alt_rmb] = 'Z';
-
-	_maxScheme[alt_mmb] = 'R';
-	_maxScheme[non_mmb] = 'P';
-	_maxScheme[alt_shft_mmb] = 'Z';
-}
-
-char AppMainWindow::TestMouseScheme( Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons )
-{
-	char op = TestDragCamera(modifiers, buttons);
-
-	if (op != 0)
-		return op;
-
-	bool isKeyL = (GetAsyncKeyState('L') && 0x8000);
-	if (isKeyL) //if(modifiers == Qt::KeyboardModifier(Qt::ControlModifier))    // ctrl is used by Selection Tool
-	{
-		if (buttons == Qt::MouseButton(Qt::LeftButton))
-			return 'L';
-		else if (buttons == Qt::MouseButton(Qt::MiddleButton))
-			return 'K';
-	}
-
-	if (modifiers == Qt::KeyboardModifier(Qt::ShiftModifier))
-		return 'W';	
-
-	return 0;
-}
-
-char AppMainWindow::TestDragCamera( Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons )
-{
-	if(modifiers != Qt::NoModifier && modifiers != Qt::AltModifier) return 0;
-
-	ShortCut input = qMakePair(modifiers, buttons);
-
-	int scheme = _navigationStyle;
-
-	// !! MUST MATCH THE ORDER OF ITEMS IN 'cbNavigationStyle'
-	const int MAYA_SCHEME = 0;
-	const int MAX_SCHEME = 1;
-	if(scheme == MAYA_SCHEME)
-	{
-		auto itr = _mayaScheme.find(input);
-		if(itr != _mayaScheme.end())
-			return itr.value();
-	}
-	else
-	{		
-		auto itr = _maxScheme.find(input);
-		if(itr != _maxScheme.end())
-			return itr.value();
-	}
-	return 0;
-}
-
-void AppMainWindow::addRecentFile(const QString filePath)
-{
-	if (filePath.isEmpty())
-		return;
-
-	if (_recentFileRecordFile.getItems().count() > 0 && _recentFileRecordFile.getItems().first() == filePath)
-		return;
-
-	if (_recentFileActions.count() == 8)
-	{
-		QAction* act = _recentFileActions.last();
-		_recentMenu->removeAction(act);
-
-		_recentFileRecordFile.getItems().pop_back();
-		_recentFileActions.pop_back();
-	}
-
-	if (_recentFileRecordFile.isItemExist(filePath))
-	{
-		_resetRecentFile(filePath);
-		return;
-	}
-
-	QAction* act = new QAction(filePath, _recentMenu);
-	if (_recentFileActions.count() > 0)
-		_recentMenu->insertAction(_recentFileActions.first(), act);
-	else
-		_recentMenu->addAction(act);
-
-	_recentFileActions.push_front(act);
-
-	_recentFileRecordFile.getItems().push_front(filePath);
-
-	_saveRecentFile();
-}
-
-void AppMainWindow::_resetRecentFile(const QString filePath)
-{
-	if (filePath.isEmpty())
-		return;
-
-	if (_recentFileRecordFile.getItems().count() > 0 && _recentFileRecordFile.getItems().first() == filePath)
-		return;
-
-	if (!_recentFileRecordFile.isItemExist(filePath))
-		return;
-
-	QList<QAction*> actions;
-	for (int i = 0; i < _recentFileActions.count(); ++i)
-	{
-		QAction* act = _recentFileActions.at(i);
-		if (act->text() == filePath)
-			actions.push_front(act);
-		else
-			actions.push_back(act);
-	}
-
-	_recentMenu->addActions(actions);
-	_recentFileActions = actions;
-
-	QList<QString> filesTMP;
-	QList<QString>& filesCurrent = _recentFileRecordFile.getItems();
-	for (int i = 0; i < filesCurrent.count(); ++i)
-	{
-		QString item = filesCurrent.at(i);
-		if (item == filePath)
-			filesTMP.push_front(item);
-		else
-			filesTMP.push_back(item);
-	}
-	filesCurrent.clear();
-	filesCurrent = filesTMP;
-
-	_saveRecentFile();
-}
-
-void AppMainWindow::_loadRecentFile()
-{
-	QString recentFileRecordFile = QCoreApplication::applicationDirPath() + "/RecentFiles.rfs";
-	_recentFileRecordFile.load(recentFileRecordFile);
-
-	QList<QString> recentFiles = _recentFileRecordFile.getItems();
-	_recentFileRecordFile.getItems().clear();
-
-	for (int i = recentFiles.count() - 1; i >= 0; --i)
-	{
-		addRecentFile(recentFiles.at(i));
-	}
-}
-
-void AppMainWindow::_saveRecentFile()
-{
-	QString recentFileRecordFile = QCoreApplication::applicationDirPath() + "/RecentFiles.rfs";
-	_recentFileRecordFile.save(recentFileRecordFile);
-}
-
-QString AppMainWindow::OpenTextureFile(QString title)
-{
-	QString lastDir = _lastFilePath;
-	QString titleStr = "Open Texture File";
-	if(!title.isEmpty())
-		titleStr = title;
-
-	QString fileName = QFileDialog::getOpenFileName(this, titleStr, lastDir, "Images (*.dds *.png *.bmp *.jpg *.tga)");
-	if(!fileName.isEmpty())
-	{
-		QFileInfo fileInfo(fileName);
-		_lastFilePath = fileInfo.absoluteDir().absolutePath();
-	}
-
-	return fileName;
-}
-
-void AppMainWindow::closeEvent (QCloseEvent *event)
-{
-	ViewerOutput::Inst().UnRegisterPrinter(_printer);
-
-	if (1)
-	{
-#if USE_CURVE_EDITOR
-		_curveEditorMainWindow->setParent(NULL);
-#endif
-		event->accept();
-		emit aboutToQuit();
-		return;
-	}
-	if (SimpleScene::Inst()->IsProjectModified() || SimpleScene::Inst()->IsFurModified())
-	{
-		QMessageBox::StandardButton resBtn = QMessageBox::warning(
-			this, tr("Blast Viewer"),
-			tr("Save changes?\n"),
-			QMessageBox::Cancel | QMessageBox::No | QMessageBox::Yes,
-			QMessageBox::Yes);
-		switch (resBtn)
-		{
-		case QMessageBox::Yes:
-#ifndef NV_ARTISTTOOLS
-			if (!menu_saveHair())
-			{
-				event->ignore();
-				return;
-			}
-			if (!menu_saveProject())
-			{
-				event->ignore();
-				return;
-			}
-#else
-			if (!CoreLib::Inst()->AppMainWindow_closeEvent(event))
-			{
-				event->ignore();
-				return;
-			}
-#endif // NV_ARTISTTOOLS
-			break;
-		case QMessageBox::No:
-			break;
-		default:
-			event->ignore();
-			return;
-		}
-	}
-	event->accept();
-	emit aboutToQuit();
-}
-
-void AppMainWindow::updateMainToolbar()
-{
-#ifndef NV_ARTISTTOOLS
-	if (_mainToolbar)
-		_mainToolbar->updateValues();
-#else
-	CoreLib::Inst()->AppMainWindow_updateMainToolbar();
-#endif // NV_ARTISTTOOLS
-}
-
-#ifndef NV_ARTISTTOOLS
-bool AppMainWindow::menu_openProject()
-{
-	QString lastDir = _lastFilePath;
-	QString fileName = QFileDialog::getOpenFileName(this, "Open Project File", lastDir, "Project File (*.blastProj)");
-
-	return openProject(fileName);
-}
-
-bool AppMainWindow::menu_saveProject()
-{
-	char message[1024];
-
-	std::string projectFilePath = GlobalSettings::Inst().getAbsoluteFilePath();
-	if (projectFilePath != "")
-	{
-		if (SimpleScene::Inst()->SaveProject(
-			GlobalSettings::Inst().m_projectFileDir.c_str(),
-			GlobalSettings::Inst().m_projectFileName.c_str()
-			) == false)
-		{
-			QMessageBox messageBox;
-
-			sprintf(message, "Project file %s could not be saved!", (const char*)projectFilePath.c_str());
-			messageBox.critical(0, "Error", message);
-			messageBox.setFixedSize(500, 200);
-			char message[1024];
-			sprintf(message, "Failed to save project file(\"%s\")", (const char*)projectFilePath.c_str());
-			viewer_err(message);
-			return false;
-		}
-
-		sprintf(message, "Project file %s was saved.", (const char*)projectFilePath.c_str());
-
-		/*
-		QMessageBox messageBox;
-		messageBox.information(0, "Info", message);
-		messageBox.setFixedSize(500,200);
-		*/
-		viewer_msg(message);
-		return true;
-	}
-	else
-	{
-		return menu_saveProjectAs();
-	}
-	return false;
-}
-
-bool AppMainWindow::menu_saveProjectAs()
-{
-	char message[1024];
-
-	QString lastDir = _lastFilePath;
-	QString fileName = QFileDialog::getSaveFileName(this, "Save Project File", lastDir, "Project File (*.blastProj)");
-	if (!fileName.isEmpty())
-	{
-		QFileInfo fileInfo(fileName);
-		QByteArray dir = QDir::toNativeSeparators(fileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-		QByteArray file = fileInfo.fileName().toLocal8Bit();
-
-		if (SimpleScene::Inst()->SaveProject(dir, file) == false)
-		{
-			QMessageBox messageBox;
-			sprintf(message, "Project file %s could not be saved!", (const char*)file);
-			messageBox.critical(0, "Error", message);
-			messageBox.setFixedSize(500, 200);
-			return false;
-		}
-
-		sprintf(message, "Project file %s was saved.", (const char*)file);
-
-		/*
-		QMessageBox messageBox;
-		messageBox.information(0, "Info", message);
-		messageBox.setFixedSize(500,200);
-		*/
-
-		viewer_msg(message);
-
-		_lastFilePath = fileInfo.absoluteDir().absolutePath();
-		return true;
-	}
-	return false;
-}
-
-bool AppMainWindow::menu_openHair()
-{
-	AppMainWindow& window = AppMainWindow::Inst();
-	QString lastDir = window._lastFilePath;
-	QString fileName = QFileDialog::getOpenFileName(&window, "Open Hair File", lastDir, "Apex Hair File (*.apx;*.apb)");
-	if (!fileName.isEmpty())
-	{
-		QFileInfo fileInfo(fileName);
-		QByteArray dir = QDir::toNativeSeparators(fileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-		QByteArray file = fileInfo.fileName().toLocal8Bit();
-
-		if (SimpleScene::Inst()->GetFurCharacter().LoadHairAsset(dir, file) == false)
-		{
-			QMessageBox messageBox;
-			messageBox.critical(0, "Error", "File open error!");
-			messageBox.setFixedSize(500, 200);
-			char message[1024];
-			sprintf(message, "Failed to open hair file(\"%s\")", (const char*)file);
-			viewer_err(message);
-			return false;
-		}
-
-		window._lastFilePath = fileInfo.absoluteDir().absolutePath();
-
-		window.updateUI();
-		return true;
-	}
-
-	return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// event handlers
-bool AppMainWindow::menu_importHair()
-{
-	AppMainWindow& window = AppMainWindow::Inst();
-	QString lastDir = window._lastFilePath;
-	QString fileName = QFileDialog::getOpenFileName(&window, "Import Hair File", lastDir, "Apex Hair File (*.apx;*.apb)");
-	if (!fileName.isEmpty())
-	{
-		QFileInfo fileInfo(fileName);
-		QByteArray dir = QDir::toNativeSeparators(fileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-		QByteArray file = fileInfo.fileName().toLocal8Bit();
-
-		if (SimpleScene::Inst()->GetFurCharacter().ImportSelectedHairAsset(dir, file) == false)
-		{
-			QMessageBox messageBox;
-			messageBox.critical(0, "Error", "File open error!");
-			messageBox.setFixedSize(500, 200);
-			char message[1024];
-			sprintf(message, "Failed to import hair file(\"%s\")", (const char*)file);
-			viewer_err(message);
-			return false;
-		}
-
-		window._lastFilePath = fileInfo.absoluteDir().absolutePath();
-
-		window.updateUI();
-		return true;
-	}
-	return false;
-}
-
-
-bool AppMainWindow::menu_saveHair()
-{
-	return SimpleScene::Inst()->GetFurCharacter().SaveHairAsset();
-}
-
-bool AppMainWindow::menu_saveHairAs()
-{
-	AppMainWindow& window = AppMainWindow::Inst();
-	QString lastDir = window._lastFilePath;
-	QString fileName = QFileDialog::getSaveFileName(&window, "Save as", lastDir, "Apex Hair File (*.apx;*.apb)");
-	if (!fileName.isEmpty())
-	{
-		QFileInfo fileInfo(fileName);
-		QByteArray dir = QDir::toNativeSeparators(fileInfo.absoluteDir().absolutePath()).toLocal8Bit();
-		QByteArray file = fileInfo.fileName().toLocal8Bit();
-
-		if (SimpleScene::Inst()->GetFurCharacter().SaveHairAssetAs(dir, file))
-		{
-			window.updateUI();
-		}
-
-		window._lastFilePath = fileInfo.absoluteDir().absolutePath();
-		return true;
-	}
-	return false;
-}
-
-bool AppMainWindow::menu_saveAllHairs()
-{
-	return SimpleScene::Inst()->GetFurCharacter().SaveAllHairs();
-}
-#endif // NV_ARTISTTOOLS
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Window/AppMainWindow.h b/tools/ArtistTools/source/CoreLib/Window/AppMainWindow.h
deleted file mode 100644
index 823c14f..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/AppMainWindow.h
+++ /dev/null
@@ -1,221 +0,0 @@
-#ifndef APPMAINWINDOW_H
-#define APPMAINWINDOW_H
-
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QProgressDialog>
-
-#include "ui_AppMainWindow.h"
-#include "UIGlobal.h"
-#include "XMLHelper.h"
-
-class StyleMaterialPanel;
-class AssetControlPanel;
-class PhysicalMaterialPanel;
-class GraphicalMaterialPanel;
-class DisplayFurVisualizersPanel;
-class GeneralAttributePanel;
-class BlastToolbar;
-class LodPanel;
-class DisplayMeshesPanel;
-class DisplayPreferencesPanel; 
-class DisplayScenePanel;
-class DisplayLightPanel;
-class DisplayMeshMaterialsPanel;
-
-#if USE_CURVE_EDITOR
-namespace nvidia {
-namespace CurveEditor {
-
-class CurveEditorMainWindow;
-class CurveAttribute;
-class ColorAttribute;
-
-} // namespace CurveEditor
-} // namespace nvidia
-#endif
-
-#if USE_MATERIAL_SET
-class MaterialSetPanel;
-#endif
-
-class D3DWidget;
-class MsgPrinter;
-class AppMainWindow : public QMainWindow
-{
-	Q_OBJECT
-
-public:
-	AppMainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0);
-	~AppMainWindow();
-
-	CORELIB_EXPORT static AppMainWindow& Inst();
-
-	CORELIB_EXPORT void InitUI();
-	CORELIB_EXPORT void updateUI();
-	CORELIB_EXPORT void updatePluginUI();
-
-	static bool IsExpertMode();
-
-	D3DWidget* GetRenderWidget() {return _d3dWidget;}
-	char TestMouseScheme(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons);
-	
-	CORELIB_EXPORT QString OpenTextureFile(QString title = "");
-
-	void setNavigationStyle(int index) { _navigationStyle = index; }
-	int getNavigationStyle() { return _navigationStyle; }
-
-	void closeEvent (QCloseEvent *event);
-
-	CORELIB_EXPORT void startProgress();
-	CORELIB_EXPORT void setProgressMaximum(int m);
-	CORELIB_EXPORT void setProgress(const char* label, int progress = -1);
-	CORELIB_EXPORT void endProgress();
-	CORELIB_EXPORT void quit();
-
-	CORELIB_EXPORT void updateMainToolbar();
-	CORELIB_EXPORT void processDragAndDrop(const QStringList& fileNames);
-	CORELIB_EXPORT bool openProject(QString fileName);
-
-	CORELIB_EXPORT static void setConnectionMode(int);
-
-	DisplayMeshesPanel*	GetDisplayMeshesPanel() { return _displayMeshesPanel; }
-	DisplayPreferencesPanel* GetDisplayPreferencesPanel() { return _displayPreferencesPanel; }
-	DisplayScenePanel* GetDisplayScenePanel() { return _displayScenePanel; }
-	DisplayLightPanel* GetDisplayLightPanel() { return _displayLightPanel; }
-
-	void removeBookmark(const QString& name);
-	void renameBookmark(const QString& oldName, const QString& newName);
-
-#if USE_CURVE_EDITOR
-	CORELIB_EXPORT nvidia::CurveEditor::CurveEditorMainWindow* GetCurveEditorMainWindow() { return _curveEditorMainWindow; }
-	CORELIB_EXPORT void UpdateCurveEditor();
-	CORELIB_EXPORT void ShowCurveEditor(int paramId);
-#endif
-
-	inline QString GetFilePath()		{ return _lastFilePath; }
-signals:
-	void aboutToQuit();
-
-	public slots:
-		CORELIB_EXPORT void menu_item_triggered(QAction* action);
-		CORELIB_EXPORT void menu_clearScene();
-		CORELIB_EXPORT bool menu_openfbx();
-		CORELIB_EXPORT void menu_addBookmark();
-		CORELIB_EXPORT void menu_editBookmarks();
-		CORELIB_EXPORT void menu_bookmarkTriggered(QAction* act);
-		CORELIB_EXPORT void menu_showOutput();
-		CORELIB_EXPORT void menu_showAttributeEditor();
-		CORELIB_EXPORT void menu_about();
-		CORELIB_EXPORT void menu_opendoc();
-		CORELIB_EXPORT void shortcut_frameall();
-		CORELIB_EXPORT void shortcut_hud();
-		CORELIB_EXPORT void shortcut_statistics();
-		CORELIB_EXPORT void shortcut_pause();
-		CORELIB_EXPORT void shortcut_reset();
-		CORELIB_EXPORT void shortcut_escape();
-		CORELIB_EXPORT void shortcut_expert();
-		CORELIB_EXPORT void demo_next();
-		CORELIB_EXPORT void demo_prev();
-		CORELIB_EXPORT void shortcut_output();
-		CORELIB_EXPORT void shortcut_meshmat();
-		CORELIB_EXPORT void shortcut_fitcamera();
-
-#if USE_CURVE_EDITOR
-		CORELIB_EXPORT void menu_showCurveEditor();
-		CORELIB_EXPORT void onCurveAttributeChanged(nvidia::CurveEditor::CurveAttribute* attribute);
-		CORELIB_EXPORT void onColorAttributeChanged(nvidia::CurveEditor::ColorAttribute* attribute);
-		CORELIB_EXPORT void onReloadColorAttributeTexture(nvidia::CurveEditor::ColorAttribute* attribute, bool reloadColorTex, int selectedCtrlPntIndex);
-#endif
-
-		CORELIB_EXPORT void addRecentFile(const QString filePath);
-private:
-	char TestDragCamera(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons);
-
-	void _resetRecentFile(const QString filePath);
-	void _loadRecentFile();
-	void _saveRecentFile();
-
-public:
-	void InitMenuItems();
-	void InitToolbar();
-	void InitPluginTab();
-	void InitMainTab();
-	void InitMouseSchemes();
-	void InitShortCuts();
-	void updateBookmarkMenu();
-
-	Ui::AppMainWindowClass ui;
-
-	D3DWidget* _d3dWidget;
-	QMenu*					_recentMenu;
-	QList<QAction*>			_recentFileActions;
-	SingleItemKindFile		_recentFileRecordFile;
-
-	QMenu*					_bookmarksMenu;
-
-	DisplayMeshesPanel*			_displayMeshesPanel;
-	DisplayPreferencesPanel*	_displayPreferencesPanel;
-	DisplayScenePanel*			_displayScenePanel;
-	DisplayLightPanel*			_displayLightPanel;
-
-
-#if USE_CURVE_EDITOR
-	bool					_curveEditorInitizlized;
-	nvidia::CurveEditor::CurveEditorMainWindow* _curveEditorMainWindow;
-#endif
-
-	typedef QPair<Qt::KeyboardModifiers, Qt::MouseButtons> ShortCut;
-	QMap<ShortCut, char>	_mayaScheme;
-	QMap<ShortCut, char>	_maxScheme;
-	QActionGroup*			_bookmarkActionGroup;
-	QAction*				_actionAddBookmark;
-	QAction*				_actionEditBookmarks;
-
-	QString					_lastFilePath;
-
-	int						_navigationStyle;
-
-	MsgPrinter*				_printer;
-
-	QProgressDialog			_progressDialog;
-
-
-	static bool				_expertMode;
-
-	CORELIB_EXPORT static int				_connectionMode;
-
-#ifndef NV_ARTISTTOOLS	
-	BlastToolbar* GetMainToolbar() { return _mainToolbar; }
-	DisplayFurVisualizersPanel*  GetFurVisualizersPanel() { return _displayFurVisualizersPanel; }
-
-public slots:
-	bool menu_openProject();
-	bool menu_saveProject();
-	bool menu_saveProjectAs();
-	bool menu_openHair();
-	bool menu_importHair();
-	bool menu_saveHair();
-	bool menu_saveHairAs();
-	bool menu_saveAllHairs();
-
-private:
-	BlastToolbar*				_mainToolbar;
-	AssetControlPanel*			_assetControlPanel;
-	GeneralAttributePanel*		_generalAttributePanel;
-	DisplayFurVisualizersPanel* _displayFurVisualizersPanel;
-	StyleMaterialPanel*			_styleMaterialPanel;
-	PhysicalMaterialPanel*		_physicalMaterialPanel;
-	GraphicalMaterialPanel*		_graphicalMaterialPanel;
-	LodPanel*					_lodPanel;
-	DisplayMeshMaterialsPanel*	_displayMeshMaterialsPanel;
-#if USE_MATERIAL_SET
-	MaterialSetPanel*		_materialSetPanel;
-#endif
-#endif // NV_ARTISTTOOLS
-
-	bool m_bGizmoWithLocal;
-	bool m_bGizmoWithDepthTest;
-	bool m_bShowPlane;
-};
-
-#endif // APPMAINWINDOW_H
diff --git a/tools/ArtistTools/source/CoreLib/Window/CameraBookmarksDialog.cpp b/tools/ArtistTools/source/CoreLib/Window/CameraBookmarksDialog.cpp
deleted file mode 100644
index 445067a..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/CameraBookmarksDialog.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "CameraBookmarksDialog.h"
-#include "SimpleScene.h"
-#include "AppMainWindow.h"
-#include <QtWidgets/QMessageBox>
-
-CameraBookmarksDialog::CameraBookmarksDialog(QWidget *parent)
-    : QDialog(parent)
-{
-    ui.setupUi(this);
-
-	ui.buttonBox->button(QDialogButtonBox::Ok)->setFixedWidth(64);
-	ui.buttonBox->button(QDialogButtonBox::Cancel)->setFixedWidth(64);
-	ui.buttonBox->button(QDialogButtonBox::Ok)->setFixedHeight(23);
-	ui.buttonBox->button(QDialogButtonBox::Cancel)->setFixedHeight(23);
-	setWindowFlags(windowFlags()&~Qt::WindowContextHelpButtonHint);
-
-	QObject::connect(ui.buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(accept()));
-	QObject::connect(ui.buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
-
-	ui.editBookmarkName->setEnabled(false);
-	ui.btnRename->setEnabled(false);
-	ui.btnDelete->setEnabled(false);
-
-	_fillListWidget();
-}
-
-CameraBookmarksDialog::~CameraBookmarksDialog()
-{
-
-}
-
-void CameraBookmarksDialog::on_listWidgetBookmarks_itemSelectionChanged()
-{
-	if (ui.listWidgetBookmarks->selectedItems().size() == 0)
-	{
-		ui.editBookmarkName->setEnabled(false);
-		ui.btnRename->setEnabled(false);
-		ui.btnDelete->setEnabled(false);
-	}
-	else
-	{
-		QListWidgetItem* item = ui.listWidgetBookmarks->selectedItems().at(0);
-		ui.editBookmarkName->setEnabled(true);
-		ui.btnRename->setEnabled(true);
-		ui.btnDelete->setEnabled(true);
-
-		ui.editBookmarkName->setText(item->text());
-	}
-}
-
-void CameraBookmarksDialog::on_editBookmarkName_textChanged(QString val)
-{
-
-}
-
-void CameraBookmarksDialog::on_btnRename_clicked()
-{
-	if (ui.editBookmarkName->text().isEmpty())
-	{
-		QListWidgetItem* item = ui.listWidgetBookmarks->selectedItems().at(0);
-		ui.editBookmarkName->setText(item->text());
-	}
-	else
-	{
-		if (_isNameConflict(ui.editBookmarkName->text()))
-		{
-			QMessageBox::warning(this, tr("Warning"), tr("The new name is conflict with name of other camera bookmark!"));
-			return;
-		}
-
-		QListWidgetItem* item = ui.listWidgetBookmarks->selectedItems().at(0);
-		SimpleScene::Inst()->renameBookmark(item->text(), ui.editBookmarkName->text());
-		AppMainWindow::Inst().renameBookmark(item->text(), ui.editBookmarkName->text());
-		item->setText(ui.editBookmarkName->text());
-	}
-
-}
-
-void CameraBookmarksDialog::on_btnDelete_clicked()
-{
-	QListWidgetItem* item = ui.listWidgetBookmarks->selectedItems().at(0);
-	SimpleScene::Inst()->removeBookmark(item->text());
-	AppMainWindow::Inst().removeBookmark(item->text());
-	ui.listWidgetBookmarks->takeItem(ui.listWidgetBookmarks->row(item));
-	delete item;
-
-}
-
-void CameraBookmarksDialog::_fillListWidget()
-{
-	QList<QString> bookmarks = SimpleScene::Inst()->getBookmarkNames();
-	ui.listWidgetBookmarks->addItems(bookmarks);
-}
-
-bool CameraBookmarksDialog::_isNameConflict(const QString& name)
-{
-	QList<QString> bookmarks = SimpleScene::Inst()->getBookmarkNames();
-	int bookmarkCount = bookmarks.size();
-	for (int i = 0; i < bookmarkCount; ++i)
-	{
-		if (bookmarks.at(i) == name)
-			return true;
-	}
-
-	return false;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Window/CameraBookmarksDialog.h b/tools/ArtistTools/source/CoreLib/Window/CameraBookmarksDialog.h
deleted file mode 100644
index 13caa42..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/CameraBookmarksDialog.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef CAMERABOOKMARKSDIALOG_H
-#define CAMERABOOKMARKSDIALOG_H
-
-#include <QtWidgets/QDialog>
-#include "ui_CameraBookmarksDialog.h"
-
-#include "corelib_global.h"
-
-class CameraBookmarksDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    CameraBookmarksDialog(QWidget *parent = 0);
-    ~CameraBookmarksDialog();
-
-private slots:
-CORELIB_EXPORT void on_listWidgetBookmarks_itemSelectionChanged();
-CORELIB_EXPORT void on_editBookmarkName_textChanged(QString val);
-CORELIB_EXPORT void on_btnRename_clicked();
-CORELIB_EXPORT void on_btnDelete_clicked();
-
-private:
-	void _fillListWidget();
-	bool _isNameConflict(const QString& name);
-
-private:
-    Ui::CameraBookmarksDialog ui;
-};
-
-#endif // CAMERABOOKMARKSDIALOG_H
diff --git a/tools/ArtistTools/source/CoreLib/Window/D3DWidget.cpp b/tools/ArtistTools/source/CoreLib/Window/D3DWidget.cpp
deleted file mode 100644
index 73aabfc..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/D3DWidget.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-#include <QtGui/QResizeEvent>
-#include <QtGui/QMouseEvent>
-#include <QtCore/QTimer>
-#include <QtCore/QMimeData>
-
-#include "D3DWidget.h"
-#include "AppMainWindow.h"
-#include "SimpleScene.h"
-
-D3DWidget::D3DWidget( QWidget* parent )
-	: QWidget(parent, Qt::MSWindowsOwnDC)	// Same settings as used in Qt's QGLWidget
-{
-	// same settings as used in QGLWidget to avoid 'white flickering'
-	setAttribute(Qt::WA_PaintOnScreen);
-	setAttribute(Qt::WA_NoSystemBackground);
-
-	// to get rid of 'black flickering'
-	setAttribute(Qt::WA_OpaquePaintEvent, true);
-
-	QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-	sizePolicy.setHorizontalStretch(0);
-	sizePolicy.setVerticalStretch(0);
-	setSizePolicy(sizePolicy);
-
-	_appWindow = qobject_cast<AppMainWindow*>(parent);
-	this->setAcceptDrops(true);
-
-	setMouseTracking(true);
-}
-
-void D3DWidget::dragEnterEvent(QDragEnterEvent *e)
-{
-	CoreLib::Inst()->D3DWidget_dragEnterEvent(e);
-	e->acceptProposedAction();
-}
-
-void D3DWidget::dragMoveEvent(QDragMoveEvent *e)
-{
-	CoreLib::Inst()->D3DWidget_dragMoveEvent(e);
-	e->acceptProposedAction();
-}
-
-void D3DWidget::dragLeaveEvent(QDragLeaveEvent *e)
-{
-	CoreLib::Inst()->D3DWidget_dragLeaveEvent(e);
-	//e->acceptProposedAction();
-}
-
-void D3DWidget::dropEvent(QDropEvent *e)
-{
-	CoreLib::Inst()->D3DWidget_dropEvent(e);
-
-	const QMimeData* data = e->mimeData();
-	QString name = data->objectName();
-
-	bool hasUrls = data->hasUrls();
-	if (!hasUrls)
-		return;
-
-	QList<QUrl> urlList = data->urls();
-    QStringList fileNames;
-    for (int i = 0; i < urlList.size() && i < 32; ++i) {
-		fileNames.append(urlList.at(i).toLocalFile());
-    }
-	
-	e->acceptProposedAction();
-
-	AppMainWindow::Inst().processDragAndDrop(fileNames);
-}
-
-void D3DWidget::paintEvent( QPaintEvent* e )
-{
-	SimpleScene::Inst()->Draw();
-}
-
-void D3DWidget::Shutdown()
-{
-	SimpleScene::Inst()->Shutdown();
-}
-
-void D3DWidget::Timeout()
-{
-	SimpleScene::Inst()->Timeout();
-}
-
-void D3DWidget::resizeEvent( QResizeEvent* e )
-{
-	int w = e->size().width();
-	int h = e->size().height();
-	// resize calls D3D11RenderWindow::Resize
-	SimpleScene::Inst()->Resize(w,h);
-	// D3DWidget_resizeEvent calls resize in DeviceManager
-	CoreLib::Inst()->D3DWidget_resizeEvent(e);
-}
-
-void D3DWidget::mouseMoveEvent( QMouseEvent* e )
-{
-	atcore_float2 pos = gfsdk_makeFloat2(e->x(), e->y());
-	SimpleScene::Inst()->onMouseMove(pos);
-
-	Q_ASSERT(_appWindow != NV_NULL);
-	char mode = _appWindow->TestMouseScheme(e->modifiers(), e->buttons());
-	CoreLib::Inst()->D3DWidget_mouseMoveEvent(e);
-	if (!e->isAccepted())
-	{
-		return;
-	}
-	if(mode == 0) return;
-	SimpleScene::Inst()->Drag(mode);
-}
-
-void D3DWidget::wheelEvent(QWheelEvent* e)
-{
-	SimpleScene::Inst()->onMouseWheel(e->delta());
-	SimpleScene::Inst()->WheelZoom();
-
-	CoreLib::Inst()->D3DWidget_wheelEvent(e);
-}
-
-void D3DWidget::mousePressEvent( QMouseEvent* e )
-{
-	atcore_float2 pos = gfsdk_makeFloat2(e->x(), e->y());
-	SimpleScene::Inst()->onMouseDown(pos);
-
-	CoreLib::Inst()->D3DWidget_mousePressEvent(e);
-}
-
-void D3DWidget::mouseReleaseEvent( QMouseEvent* e )
-{
-	atcore_float2 pos = gfsdk_makeFloat2(e->x(), e->y());
-	SimpleScene::Inst()->onMouseUp(pos);
-
-	CoreLib::Inst()->D3DWidget_mouseReleaseEvent(e);
-}
-
-void D3DWidget::keyPressEvent( QKeyEvent* e )
-{
-	CoreLib::Inst()->D3DWidget_keyPressEvent(e);
-}
-
-void D3DWidget::keyReleaseEvent( QKeyEvent* e )
-{
-	CoreLib::Inst()->D3DWidget_keyReleaseEvent(e);
-}
-
-void D3DWidget::contextMenuEvent(QContextMenuEvent *e)
-{
-	CoreLib::Inst()->D3DWidget_contextMenuEvent(e);
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Window/D3DWidget.h b/tools/ArtistTools/source/CoreLib/Window/D3DWidget.h
deleted file mode 100644
index 0de9a1e..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/D3DWidget.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef D3DWidget_h__
-#define D3DWidget_h__
-
-#include <QtWidgets/QWidget>
-#include "Nv.h"
-
-#include "corelib_global.h"
-
-class AppMainWindow;
-class D3DWidget : public QWidget
-{
-	Q_OBJECT
-
-public:
-
-	D3DWidget(QWidget* parent);
-	virtual ~D3DWidget(){}
-
-signals:
-	void DropSignal();
-
-public slots:
-CORELIB_EXPORT void Timeout();
-CORELIB_EXPORT void Shutdown();
-
-protected:
-	// return NULL to ignore system painter
-	virtual QPaintEngine *paintEngine() const { return NV_NULL; }
-
-	// QWidget events
-	virtual void resizeEvent(QResizeEvent* e);
-	virtual void paintEvent(QPaintEvent* e);
-	virtual void mousePressEvent(QMouseEvent* e);
-	virtual void mouseReleaseEvent(QMouseEvent* e);
-	virtual void mouseMoveEvent(QMouseEvent* e);
-	virtual void wheelEvent ( QWheelEvent * e);
-	virtual void keyPressEvent(QKeyEvent* e);
-	virtual void keyReleaseEvent(QKeyEvent* e);
-
-	virtual void dragEnterEvent(QDragEnterEvent *e);
-    virtual void dragMoveEvent(QDragMoveEvent *e);
-    virtual void dragLeaveEvent(QDragLeaveEvent *e);
-    virtual void dropEvent(QDropEvent *e);
-
-	virtual void contextMenuEvent(QContextMenuEvent *e);
-
-private:
-	AppMainWindow* _appWindow;
-};
-
-#endif // D3DWidget_h__
diff --git a/tools/ArtistTools/source/CoreLib/Window/DisplayLightPanel.cpp b/tools/ArtistTools/source/CoreLib/Window/DisplayLightPanel.cpp
deleted file mode 100644
index ec267a3..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/DisplayLightPanel.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-#include "AppMainWindow.h"
-#include "DisplayLightPanel.h"
-
-#include "Light.h"
-#include "GlobalSettings.h"
-
-#include <QtWidgets/QColorDialog>
-#include <QtCore/QFileInfo>
-
-DisplayLightPanel::DisplayLightPanel(QWidget* parent)
-	:
-	QWidget(parent)
-{
-	ui.setupUi(this);
-	_isUpdatingUI = false;
-
-	ConfigSpinBox<SlideSpinBoxF>(ui.spinLightDistance,	0.0, 1000.0, 0.1);
-	ConfigSpinBox<SlideSpinBoxF>(ui.spinLightIntensity,	0.0, 5.0, 0.01);
-
-	ui.btnLightColorTex->setIcon(QIcon(":/AppMainWindow/images/TextureEnabled_icon.png"));
-	ui.btnLightColorTex->setIconSize(QSize(12,12));
-	ui.btnLightColorTexReload->setIcon(QIcon(":/AppMainWindow/images/Refresh_icon.png"));
-	ui.btnLightColorTexClear->setIcon(QIcon(":/AppMainWindow/images/Remove_icon.png"));
-
-	connect(ui.listSelectedLight, SIGNAL(itemSelectionChanged()), this, SLOT(onListSelectionChanged()));
-}
-
-void DisplayLightPanel::onListSelectionChanged()
-{
-	if (_isUpdatingUI)
-		return;
-
-	int numSelected = ui.listSelectedLight->selectedItems().count();
-
-	// change selection only when there is something selected
-	if (numSelected > 0)
-	{
-		int numItems = ui.listSelectedLight->count();
-		{
-			for (int i = 0; i < numItems; i++)
-			{
-				bool selected = ui.listSelectedLight->item(i)->isSelected();
-				Light::GetLight(i)->m_selected = selected;
-			}
-		}
-	}
-
-	updateUI();
-}
-
-void DisplayLightPanel::on_cbShadowMapResolution_currentIndexChanged( int index )
-{
-	for (int i = 0; i < 4; i++)
-	{
-		Light* pLight = Light::GetLight(i);
-		if (!pLight || !pLight->m_selected)
-			continue;
-
-		pLight->SetShadowMapResolution(index);
-	}
-}
-
-void DisplayLightPanel::on_btnLightUseShadow_stateChanged(int state)
-{
-	for (int i = 0; i < 4; i++)
-	{
-		Light* pLight = Light::GetLight(i);
-		if (!pLight || !pLight->m_selected)
-			continue;
-
-		pLight->m_useShadows = state;
-	}
-}
-
-void DisplayLightPanel::on_btnVisualizeLight_stateChanged(int state)
-{
-	for (int i = 0; i < 4; i++)
-	{
-		Light* pLight = Light::GetLight(i);
-		if (!pLight || !pLight->m_selected)
-			continue;
-
-		pLight->m_visualize = state;
-	}
-}
-
-void DisplayLightPanel::on_btnLightEnable_stateChanged(int state)
-{
-	for (int i = 0; i < 4; i++)
-	{
-		Light* pLight = Light::GetLight(i);
-		if (!pLight || !pLight->m_selected)
-			continue;
-
-		pLight->m_enable = state;
-	}
-}
-
-void DisplayLightPanel::on_btnLinkLightEnable_stateChanged(int state)
-{
-	Light::SetLinkLightOption(state != 0 ? true : false);
-}
-
-void DisplayLightPanel::on_spinLightDistance_valueChanged(double v)
-{
-	for (int i = 0; i < 4; i++)
-	{
-		Light* pLight = Light::GetLight(i);
-		if (!pLight || !pLight->m_selected)
-			continue;
-	
-		pLight->SetDistance(v);
-	}
-}
-
-void DisplayLightPanel::on_spinLightIntensity_valueChanged(double v)
-{
-	for (int i = 0; i < 4; i++)
-	{
-		Light* pLight = Light::GetLight(i);
-		if (!pLight || !pLight->m_selected)
-			continue;
-
-		pLight->m_intensity = v;
-	}
-}
-
-void DisplayLightPanel::on_btnVisualizeShadowMap_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_visualizeShadowMap = state;
-}
-
-void DisplayLightPanel::setButtonColor(QPushButton *button, float r, float g, float b)
-{
-	QColor specColor;
-	specColor.setRgbF(r,g,b);
-	QString specBtnStyle = QString("background-color: rgb(%1,%2,%3);")
-		.arg(specColor.red())
-		.arg(specColor.green())
-		.arg(specColor.blue());
-	button->setStyleSheet(specBtnStyle);
-}
-
-
-static bool getNewColor(atcore_float3& color)
-{
-	QColor currentColor;
-	currentColor.setRgbF(color.x, color.y, color.z);
-
-	QColor newColor = QColorDialog::getColor(currentColor, NV_NULL);
-	if(newColor.isValid())
-	{
-		qreal r,g,b;
-		newColor.getRgbF(&r, &g, &b);
-
-		color.x = r;
-		color.y = g;
-		color.z = b;
-		return true;
-	}
-
-	return false;
-}
-
-void DisplayLightPanel::on_btnLightColor_clicked()
-{
-	Light* pLight = Light::GetFirstSelectedLight();
-
-	atcore_float3 color = pLight->m_color;
-
-	if (getNewColor(color))
-		setButtonColor(ui.btnLightColor, color.x, color.y, color.z);
-
-	for (int i = 0; i < 4; i++)
-	{
-		Light* pLight = Light::GetLight(i);
-		if (!pLight || !pLight->m_selected)
-			continue;
-
-		pLight->m_color = color;
-	}
-}
-
-inline void SetTextureIcon(QPushButton* pButton, bool enabled)
-{
-	if (enabled)
-		pButton->setIcon(QIcon(":/AppMainWindow/images/TextureEnabled_icon.png"));
-	else
-		pButton->setIcon(QIcon(":/AppMainWindow/images/TextureIsUsed_icon.png"));
-}
-
-void DisplayLightPanel::on_btnLightColorTex_clicked()
-{
-	QString texName = AppMainWindow::Inst().OpenTextureFile();
-	QFileInfo fileInfo(texName);
-	QByteArray ba = fileInfo.absoluteFilePath().toLocal8Bit();
-
-	if (Light::SetEnvTextureFromFilePath((const char*)ba))
-		SetTextureIcon(ui.btnLightColorTex, Light::GetEnvTextureFilePath().empty());
-}
-
-void DisplayLightPanel::on_btnLightColorTexReload_clicked()
-{
-	std::string path = Light::GetEnvTextureFilePath();
-	if (Light::SetEnvTextureFromFilePath(path.c_str()))
-		SetTextureIcon(ui.btnLightColorTex, Light::GetEnvTextureFilePath().empty());
-}
-
-void DisplayLightPanel::on_btnLightColorTexClear_clicked()
-{
-	Light::SetEnvTextureFromFilePath(nullptr);
-	SetTextureIcon(ui.btnLightColorTex, Light::GetEnvTextureFilePath().empty());
-}
-
-void DisplayLightPanel::updateUI()
-{
-	Light* pLight = Light::GetFirstSelectedLight();
-	if (!pLight)
-		return;
-
-	atcore_float3& color = pLight->m_color;
-	setButtonColor(ui.btnLightColor, color.x, color.y, color.z);
-
-	ui.btnVisualizeLight->setChecked(pLight->m_visualize);
-		
-	ui.spinLightDistance->setValue(pLight->GetDistance());
-	ui.spinLightIntensity->setValue(pLight->m_intensity);
-
-	ui.btnLightUseShadow->setChecked(pLight->m_useShadows);
-	ui.btnLightEnable->setChecked(pLight->m_enable);
-
-	ui.btnVisualizeShadowMap->setChecked(GlobalSettings::Inst().m_visualizeShadowMap);
-
-	ui.cbShadowMapResolution->setCurrentIndex(pLight->m_shadowMapResolutionIndex);
-
-	ui.btnLinkLightEnable->setChecked(Light::GetLinkLightOption());
-
-	SetTextureIcon(ui.btnLightColorTex, Light::GetEnvTextureFilePath().empty());
-}
-
-void DisplayLightPanel::updateValues()
-{
-	_isUpdatingUI = true;
-
-	ui.listSelectedLight->clear();
-	for (int i = 0; i < 4; i++)
-	{
-		Light* pLight = Light::GetLight(i);
-		if (!pLight)
-			continue;
-
-		const char* lightName = pLight->m_name.c_str();
-		bool selected = pLight->m_selected;
-
-		ui.listSelectedLight->addItem(lightName);
-		ui.listSelectedLight->item(i)->setSelected(selected);
-	}
-	ui.listSelectedLight->setSelectionMode(QAbstractItemView::ExtendedSelection);
-
-	updateUI();
-
-	_isUpdatingUI = false;
-}
diff --git a/tools/ArtistTools/source/CoreLib/Window/DisplayLightPanel.h b/tools/ArtistTools/source/CoreLib/Window/DisplayLightPanel.h
deleted file mode 100644
index e22eae4..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/DisplayLightPanel.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef DisplayLightPanel_h__
-#define DisplayLightPanel_h__
-
-#include <QtWidgets/QWidget>
-#include "ui_DisplayLightPanel.h"
-
-#include "corelib_global.h"
-
-class DisplayLightPanel : public QWidget
-{
-	Q_OBJECT
-
-public:
-	DisplayLightPanel(QWidget* parent);
-
-	public:
-		CORELIB_EXPORT void updateValues();
-
-	public slots:
-	CORELIB_EXPORT void onListSelectionChanged();
-
-	CORELIB_EXPORT void on_spinLightDistance_valueChanged(double v);
-	CORELIB_EXPORT void on_spinLightIntensity_valueChanged(double v);
-
-	CORELIB_EXPORT void on_btnLightUseShadow_stateChanged(int state);
-	CORELIB_EXPORT void on_btnVisualizeLight_stateChanged(int state);
-	CORELIB_EXPORT void on_btnLightEnable_stateChanged(int state);
-	CORELIB_EXPORT void on_btnLinkLightEnable_stateChanged(int state);
-
-	CORELIB_EXPORT void on_btnLightColor_clicked();
-	CORELIB_EXPORT void on_btnLightColorTex_clicked();
-	CORELIB_EXPORT void on_btnLightColorTexReload_clicked();
-	CORELIB_EXPORT void on_btnLightColorTexClear_clicked();
-
-	CORELIB_EXPORT void on_btnVisualizeShadowMap_stateChanged(int state);
-
-	CORELIB_EXPORT void on_cbShadowMapResolution_currentIndexChanged(int index);
-
-private:
-	Ui::DisplayLightPanel ui;
-	bool _isUpdatingUI;
-	void setButtonColor(QPushButton *button, float r, float g, float b);
-
-	void updateUI();
-};
-
-#endif
diff --git a/tools/ArtistTools/source/CoreLib/Window/DisplayMeshesPanel.cpp b/tools/ArtistTools/source/CoreLib/Window/DisplayMeshesPanel.cpp
deleted file mode 100644
index 67ca141..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/DisplayMeshesPanel.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-#include "DisplayMeshesPanel.h"
-
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QPushButton>
-
-#include "AppMainWindow.h"
-
-#include "SimpleScene.h"
-
-#ifndef NV_ARTISTTOOLS
-#include "FurCharacter.h"
-#else
-#endif // NV_ARTISTTOOLS
-
-//////////////////////////////////////////////////////////////////////////
-// DisplayMeshItem
-
-StateViewItem::StateViewItem( QWidget* parent, unsigned int id, MeshViewState view /*= VS_VISIABLE*/ )
-	: _id(id)
-{
-	static QIcon iconVisible(":/AppMainWindow/images/visibilityToggle_visible.png");
-	static QIcon iconNotVisible(":/AppMainWindow/images/visibilityToggle_notVisible.png");
-
-	_parent = qobject_cast<DisplayMeshesPanel*>(parent);
-
-	_layout = new QHBoxLayout(this);
-	_layout->setObjectName(QString::fromUtf8("boxLayout"));
-	_layout->setMargin(0);
-
-	this->setLayout(_layout);
-	
-	_btn = new QPushButton(this);
-	
-	_btn->setObjectName(QString::fromUtf8("btnToggleView"));
-	QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Fixed);
-	sizePolicy1.setHorizontalStretch(0);
-	sizePolicy1.setVerticalStretch(0);
-	sizePolicy1.setHeightForWidth(_btn->sizePolicy().hasHeightForWidth());
-	_btn->setSizePolicy(sizePolicy1);
-	_btn->setMinimumSize(QSize(16, 16));
-	_btn->setMaximumSize(QSize(16, 16));
-	_btn->setAutoFillBackground(false);
-	_btn->setCheckable(true);
-	_btn->setChecked(view == VS_VISIABLE);
-	_btn->setIcon( (view == VS_VISIABLE) ? iconVisible : iconNotVisible);
-
-	_layout->addWidget(_btn);
-
-	_spacer = new QSpacerItem(20, 40, QSizePolicy::Expanding, QSizePolicy::Ignored);
-	_layout->addItem(_spacer);
-
-	QMetaObject::connectSlotsByName(this);
-}
-
-void StateViewItem::on_btnToggleView_clicked()
-{
-	static QIcon iconVisible(":/AppMainWindow/images/visibilityToggle_visible.png");
-	static QIcon iconNotVisible(":/AppMainWindow/images/visibilityToggle_notVisible.png");
-
-	bool bVis = _btn->isChecked();
-	_btn->setIcon(bVis ? iconVisible : iconNotVisible);
-
-	_parent->EmitToggleSignal(_id, bVis);
-
-	qDebug("%s", __FUNCTION__);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-DisplayMeshesPanel::DisplayMeshesPanel( QWidget* parent )
-	:QFrame(parent)
-{
-	_layout = new QGridLayout(this);
-	_layout->setObjectName(QString::fromUtf8("gridLayout"));
-
-	this->setLayout(_layout);
-
-	//QString styleSheet = 
-	//	"QPushButton#btnToggleView:checked {border:2px solid gray; background:rgb(118,180,0);} \n"	\
-	//	"QPushButton#btnToggleView:pressed {border:2px solid gray; background:rgb(118,180,0);}";
-	//setStyleSheet(styleSheet);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-void DisplayMeshesPanel::updateValues()
-{
-	ClearItems();
-
-#ifndef NV_ARTISTTOOLS
-	FurCharacter& character = SimpleScene::Inst()->GetFurCharacter();
-	int nMesh = character.GetMeshCount();
-	for (int i = 0; i < nMesh; ++i)
-	{
-		bool used = character.GetMeshUsed(i);
-		if (!used)
-			continue;
-
-		const char* name = character.GetMeshName(i);
-		bool visible = character.GetMeshVisible(i);
-
-		StateViewItem::MeshViewState visState = visible ? StateViewItem::VS_VISIABLE : StateViewItem::VS_INVISIBLE;
-
-		AddMeshItem(QString(name), i, visState);
-	}
-#else
-	CoreLib::Inst()->DisplayMeshesPanel_updateValues();
-#endif // NV_ARTISTTOOLS
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-void DisplayMeshesPanel::AddMeshItem( QString name, unsigned int id, StateViewItem::MeshViewState view )
-{
-	StateViewItem* item;
-	item = new StateViewItem(this, id, view);
-
-	QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Fixed);
-	sizePolicy1.setHorizontalStretch(0);
-	sizePolicy1.setVerticalStretch(0);
-
-	QLabel* label = new QLabel(name, this);
-	label->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-	label->setSizePolicy(sizePolicy1);
-
-	int row = _items.size();
-	_layout->addWidget(label, row, 0, 1, 1);
-
-	_layout->addWidget(item, row, 1, 1, 1);
-	
-	Q_ASSERT(_items.find(id) == _items.end());
-
-	ItemUI ui;
-	ui.label = label;
-	ui.viewItem = item;
-	_items[id] = ui;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-void DisplayMeshesPanel::EmitToggleSignal( unsigned int id, bool visible )
-{
-	emit MeshViewSignal(id, visible);
-
-#ifndef NV_ARTISTTOOLS
-	FurCharacter& character = SimpleScene::Inst()->GetFurCharacter();
-	character.SetMeshVisible(id, visible);
-#else
-	CoreLib::Inst()->DisplayMeshesPanel_EmitToggleSignal(id, visible);
-#endif // NV_ARTISTTOOLS
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-void DisplayMeshesPanel::RemoveMeshItem( unsigned int id )
-{
-	if(_items.find(id) != _items.end())
-	{
-		ItemUI ui = _items[id];
-		delete ui.label;
-		delete ui.viewItem;
-		_items.remove(id);
-	}
-	else
-	{
-		Q_ASSERT("Mesh item doesn't exist!!");
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-void DisplayMeshesPanel::ClearItems()
-{
-	Q_FOREACH(ItemUI ui, _items)
-	{
-		delete ui.label;
-		delete ui.viewItem;
-	}
-
-	_items.clear();
-}
diff --git a/tools/ArtistTools/source/CoreLib/Window/DisplayMeshesPanel.h b/tools/ArtistTools/source/CoreLib/Window/DisplayMeshesPanel.h
deleted file mode 100644
index ecc5b49..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/DisplayMeshesPanel.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef DisplayMeshesPanel_h__
-#define DisplayMeshesPanel_h__
-
-#include <QtWidgets/QFrame>
-#include <QtCore/QMap>
-#ifndef NV_ARTISTTOOLS
-#include "ui_LodPanel.h"
-#else
-#include <QtWidgets/QLabel>
-#endif // NV_ARTISTTOOLS
-
-#include "corelib_global.h"
-
-class QPushButton;
-class QGridLayout;
-class QHBoxLayout;
-class QSpacerItem;
-
-class DisplayMeshesPanel;
-class StateViewItem : public QWidget
-{
-	Q_OBJECT
-
-public:
-	enum MeshViewState
-	{
-		VS_INVISIBLE = 0,	
-		VS_VISIABLE	 = 1,
-	};
-
-	StateViewItem(QWidget* parent, unsigned int id, MeshViewState view = VS_VISIABLE);
-
-	public slots:
-	CORELIB_EXPORT void on_btnToggleView_clicked();
-
-private:
-	unsigned int _id;
-
-	QHBoxLayout* _layout;
-	QPushButton* _btn;
-	QSpacerItem* _spacer;
-
-	DisplayMeshesPanel* _parent;
-};
-
-class DisplayMeshesPanel : public QFrame
-{
-	Q_OBJECT
-
-public:
-	DisplayMeshesPanel(QWidget* parent);
-
-	void updateValues();
-	
-	// client code should make sure the 'id' is unique!
-	CORELIB_EXPORT void AddMeshItem(QString name, unsigned int id, StateViewItem::MeshViewState view = StateViewItem::VS_VISIABLE);
-	CORELIB_EXPORT void RemoveMeshItem(unsigned int id);
-	CORELIB_EXPORT void ClearItems();
-
-signals:
-	void MeshViewSignal(unsigned int id, bool visible);
-	
-protected:
-	virtual void EmitToggleSignal(unsigned int id, bool visible);
-
-private:
-	QGridLayout* _layout;
-
-	struct ItemUI
-	{
-		StateViewItem* viewItem;
-		QLabel*	label;
-	};
-
-	QMap<unsigned int, ItemUI> _items;
-
-	friend class StateViewItem;
-};
-
-#endif // GraphicalMaterialPanel_h__
diff --git a/tools/ArtistTools/source/CoreLib/Window/DisplayPreferencesPanel.cpp b/tools/ArtistTools/source/CoreLib/Window/DisplayPreferencesPanel.cpp
deleted file mode 100644
index 3f010fb..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/DisplayPreferencesPanel.cpp
+++ /dev/null
@@ -1,915 +0,0 @@
-#include "DisplayPreferencesPanel.h"
-
-#include "AppMainWindow.h"
-
-#include "SimpleScene.h"
-#include "GlobalSettings.h"
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QFileDialog>
-
-#include "PlaylistParams.h"
-//#include <Nv/Blast/NvHairCommon.h>
-#include "NvParameterized.h"
-#include "XmlSerializer.h"
-#include "NsFileBuffer.h"
-#include "NvTraits.h"
-#include "NsMemoryBuffer.h"
-#include "ViewerOutput.h"
-#include "Settings.h"
-
-#include "Gamepad.h"
-
-const QString sPlaylistExt = "plist";
-bool bRefreshingComboBox = false;
-
-DisplayPreferencesPanel::DisplayPreferencesPanel(QWidget* parent)
-	:
-	QWidget(parent)
-	, idxCurrentPlaylist(-1)
-	, idxCurrentProj(-1)
-	, playlistProjectsDirty(false)
-{
-	ui.setupUi(this);
-
-	ui.btnBackgroundTex->setIcon(QIcon(":/AppMainWindow/images/TextureEnabled_icon.png"));
-	ui.btnBackgroundTex->setIconSize(QSize(12,12));
-	ui.btnBackgroundTexClear->setIcon(QIcon(":/AppMainWindow/images/Remove_icon.png"));
-
-	ui.btnPlaylistsRename->setIcon(QIcon(":/AppMainWindow/images/EditWrench.png")); 
-	ui.btnPlaylistsAdd->setIcon(QIcon(":/AppMainWindow/images/Add.png"));
-	ui.btnPlaylistsReload->setIcon(QIcon(":/AppMainWindow/images/refreshReload.png"));
-	ui.btnPlaylistsRemove->setIcon(QIcon(":/AppMainWindow/images/Remove_icon.png"));
-
-	ui.btnPlaylistAddProj->setIcon(QIcon(":/AppMainWindow/images/Add.png"));
-	ui.btnPlaylistRemoveProj->setIcon(QIcon(":/AppMainWindow/images/Remove_icon.png"));
-	ui.btnPlaylistProjGoUp->setIcon(QIcon(":/AppMainWindow/images/Up.png"));
-	ui.btnPlaylistProjGoDown->setIcon(QIcon(":/AppMainWindow/images/Down.png"));
-
-	ui.btnPlaylistsPlay->setIcon(QIcon(":/AppMainWindow/images/playlist.png"));
-
-	//QObject::connect(ui.listWidgetPlaylist, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(playlistDoubleClicked(QListWidgetItem*)));
-
-	ConfigSpinBox<SlideSpinBoxF>(ui.spinCameraFOV,	5.0, 180.0, 1.0);
-}
-
-DisplayPreferencesPanel::~DisplayPreferencesPanel()
-{
-}
-
-void DisplayPreferencesPanel::on_spinRenderPlayRateFPS_valueChanged(double v)
-{
-	GlobalSettings::Inst().setRenderFps((float)v);
-}
-
-void DisplayPreferencesPanel::on_spinSimulationRateFPS_valueChanged(double v)
-{
-	GlobalSettings::Inst().setSimulationFps((float)v);
-}
-
-void DisplayPreferencesPanel::on_spinCameraFOV_valueChanged(double v)
-{
-	GlobalSettings::Inst().m_fovAngle = v;
-}
-
-void DisplayPreferencesPanel::on_cbAntialiasing_currentIndexChanged( int index )
-{
-	GlobalSettings::Inst().m_msaaOption = index;
-}
-
-void DisplayPreferencesPanel::on_cbUpAxis_currentIndexChanged( int index )
-{
-	switch (index)
-	{
-	case 0: // y up
-		SimpleScene::Inst()->ResetUpDir(false);
-		break;
-	case 1: // z up
-		SimpleScene::Inst()->ResetUpDir(true);
-		break;
-	}
-	SimpleScene::Inst()->SetProjectModified(true);
-}
-
-void DisplayPreferencesPanel::on_cbHandedness_currentIndexChanged( int index )
-{
-	switch (index)
-	{
-	case 0: // rhs
-		SimpleScene::Inst()->ResetLhs(false);
-		break;
-	case 1: // lhs
-		SimpleScene::Inst()->ResetLhs(true);
-		break;
-	}
-	SimpleScene::Inst()->SetProjectModified(true);
-}
-
-void DisplayPreferencesPanel::on_cbSceneUnit_currentIndexChanged( int index )
-{
-	GlobalSettings::Inst().m_sceneUnitIndex = index;
-}
-
-void DisplayPreferencesPanel::on_cbNavigationStyle_currentIndexChanged( int index )
-{
-	AppMainWindow::Inst().setNavigationStyle(index);
-}
-
-void DisplayPreferencesPanel::on_btnBackgroundTex_clicked()
-{
-	if (SimpleScene::Inst()->LoadBackgroundTextureFile())
-		ui.btnBackgroundTex->setIcon(QIcon(":/AppMainWindow/images/TextureIsUsed_icon.png"));
-	else
-		ui.btnBackgroundTex->setIcon(QIcon(":/AppMainWindow/images/TextureEnabled_icon.png"));
-
-	updateValues();
-	SimpleScene::Inst()->SetProjectModified(true);
-}
-
-void DisplayPreferencesPanel::on_btnBackgroundTexClear_clicked()
-{
-	SimpleScene::Inst()->ClearBackgroundTexture();
-	ui.btnBackgroundTex->setIcon(QIcon(":/AppMainWindow/images/TextureEnabled_icon.png"));
-	updateValues();
-}
-
-void DisplayPreferencesPanel::updateValues()
-{
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	ui.spinRenderPlayRateFPS->setValue(globalSettings.m_renderFps);
-	ui.spinSimulationRateFPS->setValue(globalSettings.m_simulationFps);
-	ui.cbUpAxis->setCurrentIndex(globalSettings.m_zup);
-	ui.cbHandedness->setCurrentIndex(globalSettings.m_lhs);
-	ui.spinCameraFOV->setValue(globalSettings.m_fovAngle);
-	ui.cbSceneUnit->setCurrentIndex(globalSettings.m_sceneUnitIndex);
-	ui.cbNavigationStyle->setCurrentIndex(AppMainWindow::Inst().getNavigationStyle());
-	ui.cbAntialiasing->setCurrentIndex(globalSettings.m_msaaOption);
-
-	savePlaylistProjects();
-	reloadComboxBoxPlaylists();
-
-	//// sync playlist to gamepad
-	//static bool bOnce = true;
-	//if (bOnce)
-	//{
-	//	bOnce = false;
-	//	assignPlayPlaylistToGamepad(0);
-	//}
-}
-
-void DisplayPreferencesPanel::reloadComboxBoxPlaylists()
-{
-	playlistsLoader.loadPlaylistsFromMediaPath();
-	// set playlist combo box
-	//idxCurrentPlaylist = ui.cbPlaylists->currentIndex();
-	bRefreshingComboBox = true;
-	ui.cbPlaylists->clear();
-	int count = playlistsLoader.playlists.size();
-	for (int i = 0; i < count; ++i)
-	{
-		QFileInfo& fi = playlistsLoader.playlists[i];
-		std::string fn = fi.fileName().toUtf8().data();
-		ui.cbPlaylists->addItem(fi.fileName());
-	}
-	bRefreshingComboBox = false;
-	if (idxCurrentPlaylist > count || idxCurrentPlaylist < 0)
-		idxCurrentPlaylist = 0;
-
-	ui.cbPlaylists->setCurrentIndex(idxCurrentPlaylist);
-
-	// refresh project list
-	reloadListboxPorjectsFromPlayist();
-}
-
-void DisplayPreferencesPanel::runDemoCommandline()
-{
-	// run demos if command line asks
-	static bool once = true;
-	if (once)
-	{
-		once = false;
-		std::string demoPlaylist = AppSettings::Inst().GetOptionValue("User/FurDemoPlaylist")->Value.String;
-		if (demoPlaylist.size() > 1)
-		{
-			QString demoList = QString(demoPlaylist.c_str()).toUpper();
-			int count = playlistsLoader.playlists.size();
-			for (int i = 0; i < count; ++i)
-			{
-				QFileInfo& fi = playlistsLoader.playlists[i];
-				QString fname = fi.fileName().toUpper();
-				if (fname == demoList)
-				{
-					idxCurrentPlaylist = i;
-					ui.cbPlaylists->setCurrentIndex(idxCurrentPlaylist);
-					playPlaylist(idxCurrentPlaylist);
-					return;
-				}
-			}
-			viewer_msg(QString("Cannot find playlist, " + demoList).toUtf8().data());
-		}
-	}
-}
-
-void DisplayPreferencesPanel::reloadListboxPorjectsFromPlayist()
-{
-	int count = playlistsLoader.getProjectsInPlaylist(idxCurrentPlaylist, playlistProjects);
-	refreshListboxPorjects();
-}
-
-void DisplayPreferencesPanel::savePlaylistProjects()
-{
-	if (playlistProjectsDirty)
-	{
-		playlistsLoader.saveProjectsInPlaylist(idxCurrentPlaylist, playlistProjects);
-		playlistProjectsDirty = false;
-	}
-}
-
-void DisplayPreferencesPanel::refreshListboxPorjects()
-{
-	int count = playlistProjects.size();
-	ui.listWidgetPlaylist->clear();
-	ui.listWidgetPlaylist->setSortingEnabled(false);
-	ui.listWidgetPlaylist->setSelectionMode(QAbstractItemView::SingleSelection);
-	QStringList tips;
-	for (int i = 0; i < count; ++i)
-	{
-		QString fullName = playlistsLoader.convertToAbsoluteFilePath(playlistProjects[i]);
-		QFileInfo fi(fullName);
-		tips.append(fi.absoluteFilePath());
-		std::string tmp = fi.absoluteFilePath().toUtf8().data();
-		ui.listWidgetPlaylist->addItem(fi.fileName());
-	}
-	ui.listWidgetPlaylist->setTips(tips);
-	if (idxCurrentProj > count || idxCurrentProj < 0)
-	{
-		idxCurrentProj = 0;
-	}
-	ui.listWidgetPlaylist->setCurrentRow(idxCurrentProj);
-}
-
-void DisplayPreferencesPanel::SelectPlayList(QString& name)
-{
-	QString newName = name.toUpper();
-	int count = playlistsLoader.playlists.size();
-	for (int i = 0; i < count; ++i)
-	{
-		QFileInfo& fi = playlistsLoader.playlists[i];
-		if (fi.baseName().toUpper() == newName)
-		{
-			ui.cbPlaylists->setCurrentIndex(i);
-			break;
-		}
-	}
-}
-
-void DisplayPreferencesPanel::on_cbPlaylists_currentIndexChanged(int index)
-{
-	savePlaylistProjects();
-	if (!bRefreshingComboBox)
-	{
-		idxCurrentPlaylist = ui.cbPlaylists->currentIndex();
-		reloadListboxPorjectsFromPlayist();
-	}
-}
-
-void DisplayPreferencesPanel::SelectProject(QString& name)
-{
-	QString newName = name.toUpper();
-	std::string strNew = newName.toUtf8().data();
-	int count = playlistProjects.size();
-	for (int i = 0; i < count; ++i)
-	{
-		QString& str = playlistProjects[i];
-		//QFileInfo fi(str);
-		//std::string stmp = fi.absoluteFilePath().toUtf8().data();
-		//if (fi.absoluteFilePath().toUpper() == newName)
-		if (str.toUpper() == newName)
-		{
-			ui.listWidgetPlaylist->setCurrentRow(i);
-			break;
-		}
-	}
-}
-
-void DisplayPreferencesPanel::on_listWidgetPlaylist_itemSelectionChanged()
-{
-	idxCurrentProj = ui.listWidgetPlaylist->currentRow();
-}
-
-void DisplayPreferencesPanel::on_listWidgetPlaylist_itemDoubleClicked(QListWidgetItem* pItem)
-{
-	idxCurrentProj = ui.listWidgetPlaylist->currentRow();
-	if (idxCurrentProj < 0)
-		return;
-	QString fn = playlistProjects[idxCurrentProj];
-	QString fullname = PlaylistsLoader::convertToAbsoluteFilePath(fn);
-	AppMainWindow::Inst().openProject(fullname);
-	char msg[1024];
-	sprintf(msg, "Blast Viewer - %s", fullname.toUtf8().data());
-	AppMainWindow::Inst().setWindowTitle(msg);
-}
-
-void DisplayPreferencesPanel::on_btnPlaylistsRename_clicked()
-{
-	idxCurrentPlaylist = ui.cbPlaylists->currentIndex();
-	if (idxCurrentPlaylist < 0)
-		return;
-
-	QFileInfo& fi = playlistsLoader.playlists[idxCurrentPlaylist];
-	bool isOK = false;
-	QString newBaseName = QInputDialog::getText(NULL, "Rename Playlist - " + fi.fileName(),
-		"Input a new name for the playlist, " + fi.fileName(), QLineEdit::Normal,
-		fi.baseName(), &isOK);
-	if (isOK)
-	{
-		bool ok = playlistsLoader.rename(idxCurrentPlaylist, newBaseName);
-		if (ok)
-		{
-			reloadComboxBoxPlaylists();
-			SelectPlayList(newBaseName);
-		}
-		else
-		{
-			QMessageBox::warning(this, "Fail to rename a playlist",
-				"Fail to rename a playlist. The failure could relate to name duplication or hardware failure.",
-				QMessageBox::Close);
-		}
-	}
-}
-
-void DisplayPreferencesPanel::on_btnPlaylistsAdd_clicked()
-{
-	savePlaylistProjects();
-
-	bool isOK = false;
-	QString sInput = QInputDialog::getText(NULL, "Create New Playlist", "Input a name for the new playlist.", QLineEdit::Normal, "", &isOK);
-	if (isOK)
-	{
-		QString newName = sInput.trimmed();
-		bool ok = playlistsLoader.add(newName);
-		if (ok)
-		{
-			reloadComboxBoxPlaylists();
-			// select the new one
-			SelectPlayList(newName);
-		}
-		else
-		{
-			QMessageBox::warning(this, "Fail to add new playlist",
-				"Fail to add new playlist. The failure could relate to name duplication or hardware failure.",
-				QMessageBox::Close);
-		}
-	}
-}
-
-void DisplayPreferencesPanel::on_btnPlaylistsReload_clicked()
-{
-	savePlaylistProjects();
-	reloadComboxBoxPlaylists();
-}
-
-void DisplayPreferencesPanel::on_btnPlaylistsRemove_clicked()
-{
-	savePlaylistProjects();
-	idxCurrentPlaylist = ui.cbPlaylists->currentIndex();
-	if (idxCurrentPlaylist < 0)
-		return;
-
-	bool ok = playlistsLoader.remove(idxCurrentPlaylist);
-	if (ok)
-	{
-		reloadComboxBoxPlaylists();
-	}
-	else
-	{
-		QMessageBox::warning(this, "Fail to remove a playlist",
-			"Fail to remove a playlist. The failure could relate to hardware.",
-			QMessageBox::Close);
-	}
-}
-
-void DisplayPreferencesPanel::on_btnPlaylistAddProj_clicked()
-{
-	static QString lastPath;
-	if (lastPath.size() < 1)
-	{
-		lastPath = PlaylistsLoader::mediaPath;
-	}
-	QString fileNameInput = QFileDialog::getOpenFileName(this, "Open Project File", lastPath, "Project File (*.blastProj)");
-	if (!QFile::exists(fileNameInput))
-		return;
-	std::string tmp = fileNameInput.toUtf8().data();
-	QString fileName = PlaylistsLoader::convertToSaveingFilePath(fileNameInput);
-	if (fileName.size() < 1)
-	{
-		return;
-	}
-	lastPath = QFileInfo(fileNameInput).absolutePath();
-	std::string tmp2 = fileName.toUtf8().data();
-	playlistProjects.append(fileName);
-	refreshListboxPorjects();
-	//QFileInfo fi(fileName);
-	SelectProject(fileName);// fi.absoluteFilePath());
-	playlistProjectsDirty = true;
-}
-
-void DisplayPreferencesPanel::on_btnPlaylistProjGoUp_clicked()
-{
-	idxCurrentProj = ui.listWidgetPlaylist->currentRow();
-	if (idxCurrentProj <= 0)
-		return;
-
-	QString tmp = playlistProjects[idxCurrentProj];
-	playlistProjects[idxCurrentProj] = playlistProjects[idxCurrentProj - 1];
-	playlistProjects[idxCurrentProj - 1] = tmp;
-
-	refreshListboxPorjects();
-	SelectProject(tmp);
-
-	playlistProjectsDirty = true;
-}
-
-void DisplayPreferencesPanel::on_btnPlaylistProjGoDown_clicked()
-{
-	int count = playlistProjects.size();
-	idxCurrentProj = ui.listWidgetPlaylist->currentRow();
-	if (idxCurrentProj < 0 || idxCurrentProj>= count -1)
-		return;
-
-	QString tmp = playlistProjects[idxCurrentProj];
-	playlistProjects[idxCurrentProj] = playlistProjects[idxCurrentProj + 1];
-	playlistProjects[idxCurrentProj + 1] = tmp;
-
-	refreshListboxPorjects();
-	SelectProject(tmp);
-
-	playlistProjectsDirty = true;
-}
-
-void DisplayPreferencesPanel::on_btnPlaylistRemoveProj_clicked()
-{
-	int count = playlistProjects.size();
-	idxCurrentProj = ui.listWidgetPlaylist->currentRow();
-	if (idxCurrentProj < 0 || idxCurrentProj >= count)
-	{
-		return;
-	}
-
-	playlistProjects.removeAt(idxCurrentProj);
-
-	refreshListboxPorjects();
-	playlistProjectsDirty = true;
-}
-
-void DisplayPreferencesPanel::assignPlayPlaylistToGamepad(int idx)
-{
-	if (idx == -1)
-		idx = idxCurrentPlaylist;
-	int count = playlistsLoader.getProjectsInPlaylist(idx, playlistProjects);
-	if (count < 1)
-	{
-		viewer_msg("Playlist is empty.");
-		return;
-	}
-	QList<QString> files;
-	for (int i = 0; i < count; ++i)
-	{
-		QString fname = PlaylistsLoader::convertToAbsoluteFilePath(playlistProjects[i]);
-		if (fname.size() > 0)
-		{
-			files.append(fname);
-		}
-	}
-
-	Gamepad& theGamepad = Gamepad::Instance();
-	theGamepad.SetDemoProjects(files);
-}
-
-void DisplayPreferencesPanel::playPlaylist(int idx)
-{
-	assignPlayPlaylistToGamepad(idx);
-	Gamepad& theGamepad = Gamepad::Instance();
-	theGamepad.SetDemoMode(true);
-}
-
-void DisplayPreferencesPanel::on_btnPlaylistsPlay_clicked()
-{
-	savePlaylistProjects();
-
-	idxCurrentPlaylist = ui.cbPlaylists->currentIndex();
-	if (idxCurrentPlaylist < 0)
-	{
-		viewer_msg("No available playlists.");
-		return;
-	}
-	playPlaylist(idxCurrentPlaylist);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-using namespace nvidia; 
-using namespace nvidia::parameterized;
-
-QString PlaylistsLoader::projectPath;
-QString PlaylistsLoader::mediaPath;
-
-#include "FoundationHolder.h"
-
-struct PlaylistParamsContext
-{
-	//nvidia::NvFoundation* mFoundation;
-	NvParameterized::Traits* mTraits;
-	PlaylistParamsFactory* mPlaylistParamsFactory;
-};
-
-PlaylistsLoader::PlaylistsLoader()
-	:pContext(nullptr)
-{
-}
-
-PlaylistsLoader::~PlaylistsLoader()
-{
-}
-
-void PlaylistsLoader::CreatePlaylistParamsContext()
-{
-	if (pContext)
-		return;
-
-	PlaylistParamsContext* context = new PlaylistParamsContext;
-	//context->mFoundation = FoundationHolder::GetFoundation();
-	FoundationHolder::GetFoundation();
-	//assert(context->mFoundation != NV_NULL);
-	
-	context->mTraits = NvParameterized::createTraits();
-	context->mPlaylistParamsFactory = new PlaylistParamsFactory;
-	context->mTraits->registerFactory(*context->mPlaylistParamsFactory);
-	pContext = context;
-}
-
-void PlaylistsLoader::ReleasePlaylistParamsContext()
-{
-	if (pContext)
-	{
-		pContext->mTraits->release();
-		delete pContext->mPlaylistParamsFactory;
-		delete pContext;
-		pContext = nullptr;
-	}
-}
-
-void PlaylistsLoader::loadPlaylistsFromMediaPath()
-{
-	std::string t1 = projectPath.toUtf8().data();
-	if (projectPath.isEmpty())
-	{
-		QString appDir = qApp->applicationDirPath();
-		QDir dirTmp(appDir);
-		if (dirTmp.cd("./media/playlists"))
-			projectPath = dirTmp.absolutePath();
-		else if (dirTmp.cd("../media/playlists"))
-			projectPath = dirTmp.absolutePath();
-		else if (dirTmp.cd("../../media/playlists"))
-			projectPath = dirTmp.absolutePath();
-		else if (dirTmp.cd("../../media"))
-		{
-			bool ok = dirTmp.mkdir("playlists");
-			if (dirTmp.cd("playlists"))
-			{
-				projectPath = dirTmp.absolutePath();
-			}
-		}
-		if (projectPath.isEmpty())
-		{
-			projectPath = qApp->applicationDirPath();
-			mediaPath = projectPath;
-		}
-		else
-		{
-			if (dirTmp.cd(".."))
-			{
-				mediaPath = dirTmp.absolutePath();
-			}
-			else
-			{
-				mediaPath = projectPath + "/..";
-			}
-		}
-	}
-	if (!projectPath.isEmpty())
-	{
-		playlists.clear();
-
-		QStringList filters;
-		filters << (QString("*.") + sPlaylistExt);
-		QDirIterator dir_iterator(projectPath, filters, QDir::Files | QDir::NoSymLinks, QDirIterator::NoIteratorFlags);  //QDirIterator::Subdirectories
-		while (dir_iterator.hasNext())
-		{
-			dir_iterator.next();
-			QFileInfo file_info = dir_iterator.fileInfo();
-			std::string absolute_file_path = file_info.absoluteFilePath().toUtf8().data();
-			playlists.append(file_info);
-		}
-	}
-}
-
-bool PlaylistsLoader::rename(int idx, QString& newBaseName)
-{
-	int count = playlists.size();
-	if (idx >= 0 && idx < count)
-	{
-		QFileInfo& finfo = playlists[idx];
-		QString fn = finfo.baseName().toUpper();
-		QString fnNew = newBaseName.toUpper();
-		if (fn != fnNew)
-		{
-			QFileInfo nfi(projectPath, newBaseName + "." + sPlaylistExt);
-			QString fullNewName = nfi.absoluteFilePath();
-			std::string fntmp = fullNewName.toUtf8().data();
-			bool exist = QFile::exists(fullNewName);
-			if (exist)
-			{
-				return false;
-			}
-			bool ok = QFile::rename(finfo.absoluteFilePath(), fullNewName);
-			if (ok)
-			{
-				finfo.setFile(fullNewName);
-				exist = QFile::exists(fullNewName);
-				if (!exist)
-				{
-					return false;
-				}
-			}
-			return ok;
-		}
-		return true;
-	}
-	return false;
-}
-
-bool PlaylistsLoader::remove(int idx)
-{
-	int count = playlists.size();
-	if (idx >= 0 && idx < count)
-	{
-		QFileInfo& finfo = playlists[idx];
-		std::string fn = finfo.fileName().toUtf8().data();
-		bool ok = QFile::remove(finfo.absoluteFilePath());
-		if (ok)
-		{
-			playlists.removeAt(idx);
-		}
-		return ok;
-	}
-	return false;
-}
-
-bool PlaylistsLoader::saveProjectsInPlaylist(int idx, QList<QString>& projects)
-{ 
-	int count = playlists.size();
-	if (idx < 0 || idx >= count)
-		return false;
-
-	CreatePlaylistParamsContext();
-	if (!pContext)
-		return false;
-
-	std::string tempFilePath = playlists[idx].absoluteFilePath().toUtf8().data();
-	NvParameterized::XmlSerializer serializer(pContext->mTraits);
-	NvFileBuf* stream = new NvFileBufferBase(tempFilePath.c_str(), NvFileBuf::OPEN_WRITE_ONLY);
-	if (!stream || !stream->isOpen())
-	{
-		// file open error
-		if (stream) stream->release();
-		return false;
-	}
-	NvParameterized::Traits* traits = pContext->mTraits;
-	int numObjects = 0;
-	const int kMaxObjects = 1;
-	NvParameterized::Interface* objects[kMaxObjects];
-
-	PlaylistParams* params = new PlaylistParams(traits);
-	objects[numObjects++] = params;
-	NvParameterized::Interface* iface = static_cast<NvParameterized::Interface*>(params);
-
-	std::vector<std::string> strArray;
-	std::vector<const char*> strOutput;
-
-	if (1)
-	{
-		nvidia::parameterized::PlaylistParams* params = static_cast<nvidia::parameterized::PlaylistParams*>(iface);
-		nvidia::parameterized::PlaylistParamsNS::ParametersStruct& targetDesc = params->parameters();
-
-		NvParameterized::Handle handle(iface);
-		if (iface->getParameterHandle("blastProjFilePaths", handle) == NvParameterized::ERROR_NONE)
-		{
-			int num = projects.size();
-			strArray.resize(num);
-			strOutput.resize(num);
-
-			for (int i = 0; i < num; i++)
-			{
-				std::string proj = projects[i].toUtf8().data();
-				strArray[i] = proj;
-				strOutput[i] = strArray[i].c_str();
-			}
-
-			handle.resizeArray(num);
-			handle.setParamStringArray(&strOutput[0], num);
-		}
-	}
-
-	NV_ASSERT(numObjects <= kMaxObjects);
-	NvParameterized::Serializer::ErrorType serError = NvParameterized::Serializer::ERROR_NONE;
-	bool isUpdate = false;
-	serError = serializer.serialize(*stream, (const NvParameterized::Interface**)&objects[0], numObjects, isUpdate);
-	for (int idx = 0; idx < numObjects; ++idx)
-	{
-		delete objects[idx];
-	}
-	stream->release();
-	ReleasePlaylistParamsContext();
-	return true;
-}
-
-QString PlaylistsLoader::convertToAbsoluteFilePath(QString& filePath)
-{
-	QString fname;
-	bool bCanBeRelativePath = false;
-	bool bAbsPath = (filePath.indexOf(':') >= 0);
-	if (bAbsPath)
-	{
-		if (QFile::exists(filePath))
-		{
-			fname = filePath;
-		}
-		else
-		{
-			viewer_msg(QString(filePath + " does not exist.").toUtf8().data());
-		}
-		std::string tmp2 = fname.toUtf8().data();
-		return fname;
-	}
-	else
-	{
-		QFileInfo fi(mediaPath + "/" + filePath);
-		fname = fi.absoluteFilePath();
-		if (!QFile::exists(fname))
-		{
-			viewer_msg(QString(filePath + " does not exist.").toUtf8().data());
-			fname = "";
-		}
-		std::string tmp2 = fname.toUtf8().data();
-		return fname;
-	}
-}
-
-QString PlaylistsLoader::convertToSaveingFilePath(QString& filePath)
-{
-	std::string t1 = mediaPath.toUtf8().data();
-	std::string t2 = projectPath.toUtf8().data();
-	QString fname;
-	bool bCanBeRelativePath = false;
-	bool bAbsPath = (filePath.indexOf(':') >= 0);
-	if (bAbsPath)
-	{
-		if (QFile::exists(filePath))
-		{
-			QFileInfo fi(filePath);
-			int pos = fi.absoluteFilePath().indexOf(mediaPath, Qt::CaseInsensitive);
-			if (pos >= 0 && mediaPath.length())
-			{
-				// convert to relative path
-				fname = filePath.right(filePath.size() - (pos + mediaPath.size() + 1));
-			}
-			else
-			{
-				fname = fi.absoluteFilePath();
-			}
-		}
-		else
-		{
-			fname = "";
-			viewer_msg(QString(filePath + " does not exist.").toUtf8().data());
-		}
-		std::string tmp = fname.toUtf8().data();
-		return fname;
-	}
-	// do more try
-	QString tag = "media";
-	int pos = filePath.indexOf(tag, Qt::CaseInsensitive);
-	if (pos >= 0)
-	{
-		fname = filePath.right(filePath.size() - (pos + tag.size() + 1));
-	}
-	else
-	{
-		fname = filePath;
-	}
-	std::string tmp3 = fname.toUtf8().data();
-	QFileInfo fi(mediaPath + "/" + fname);
-	std::string tmp = fi.absoluteFilePath().toUtf8().data();
-	if (!QFile::exists(fi.absoluteFilePath()))
-	{
-		viewer_msg(QString(filePath + " does not exist.").toUtf8().data());
-		fname = "";
-	}
-	std::string tmp2 = fname.toUtf8().data();
-	return fname;
-}
-
-int PlaylistsLoader::getProjectsInPlaylist(int idx, QList<QString>& projects)
-{
-	projects.clear();
-
-	int count = playlists.size();
-	if (idx < 0 || idx >= count)
-		return 0;
-
-	CreatePlaylistParamsContext();
-	if (!pContext)
-		return 0;
-
-	std::string tempFilePath = playlists[idx].absoluteFilePath().toUtf8().data();
-	NvFileBuf* stream = new NvFileBufferBase(tempFilePath.c_str(), NvFileBuf::OPEN_READ_ONLY);
-	if (!stream || !stream->isOpen())
-	{
-		// file open error
-		if (stream)
-			stream->release();
-		return 0;
-	}
-
-	NvParameterized::Serializer::DeserializedData data;
-	NvParameterized::Serializer::ErrorType serError = NvParameterized::Serializer::ERROR_NONE;
-	NvParameterized::XmlSerializer serializer(pContext->mTraits);
-	bool isUpdated = false;
-	serError = serializer.deserialize(*stream, data, isUpdated);
-	if (data.size() < 1)
-	{
-		if (stream)
-			stream->release();
-		return 0;
-	}
-
-	for (int idx = 0; idx < (int)data.size(); ++idx)
-	{
-		NvParameterized::Interface* iface = data[idx];
-		if (::strcmp(iface->className(), PlaylistParams::staticClassName()) == 0)
-		{
-			nvidia::parameterized::PlaylistParams* params = static_cast<nvidia::parameterized::PlaylistParams*>(iface);
-			nvidia::parameterized::PlaylistParamsNS::ParametersStruct& srcDesc = params->parameters();
-			NvParameterized::Handle handle(iface);
-			if (iface->getParameterHandle("blastProjFilePaths", handle) == NvParameterized::ERROR_NONE)
-			{
-				int arraySize;
-				handle.getArraySize(arraySize);
-				char** strArray = new char*[arraySize];
-				handle.getParamStringArray(strArray, arraySize);
-				for (int idx = 0; idx < arraySize; ++idx)
-				{
-					QString fileName = PlaylistsLoader::convertToSaveingFilePath(QString(strArray[idx]));
-					if (fileName.size() > 0)
-					{
-						std::string tmp = fileName.toUtf8().data();
-						projects.append(fileName);
-					}
-				}
-				delete[] strArray;
-			}
-		}
-	}
-	stream->release();
-	ReleasePlaylistParamsContext();
-	return projects.size();
-}
-
-bool PlaylistsLoader::add(QString& name)
-{
-	int count = playlists.size();
-	for (int i = 0; i < count; ++i)
-	{
-		QFileInfo& fi = playlists[i];
-		if (fi.baseName().toUpper() == name.toUpper())
-		{
-			return false;
-		}
-	}
-	QFileInfo nfi(projectPath, name + "." + sPlaylistExt);
-	QFile newFile(nfi.absoluteFilePath());
-	if (newFile.exists())
-	{
-		return false;
-	}
-	newFile.open(QIODevice::WriteOnly);
-	newFile.close();
-	bool exist = QFile::exists(nfi.absoluteFilePath());
-	if (!exist)
-	{
-		return false;
-	}
-	playlists.append(nfi);
-	return true;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/Window/DisplayPreferencesPanel.h b/tools/ArtistTools/source/CoreLib/Window/DisplayPreferencesPanel.h
deleted file mode 100644
index eb57b12..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/DisplayPreferencesPanel.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef DisplayPreferencesPanel_h__
-#define DisplayPreferencesPanel_h__
-
-#include <QtWidgets/QWidget>
-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include "TipListView.h"
-#include "ui_DisplayPreferencesPanel.h"
-
-#include "corelib_global.h"
-
-struct PlaylistParamsContext;
-
-class PlaylistsLoader
-{
-public:
-	PlaylistsLoader();
-	~PlaylistsLoader();
-
-	void loadPlaylistsFromMediaPath();
-	bool rename(int idx, QString& newName);
-	bool remove(int idx);
-	bool add(QString& name);
-	bool saveProjectsInPlaylist(int idx, QList<QString>& projects);
-	int getProjectsInPlaylist(int idx, QList<QString>& projects);
-
-	static QString convertToSaveingFilePath(QString& filePath);
-	static QString convertToAbsoluteFilePath(QString& filePath);
-
-	QList<QFileInfo> playlists;
-	static QString projectPath;
-	static QString mediaPath;
-
-private:
-	void CreatePlaylistParamsContext();
-	void ReleasePlaylistParamsContext();
-	PlaylistParamsContext* pContext;
-};
-
-class DisplayPreferencesPanel : public QWidget
-{
-	Q_OBJECT
-
-public:
-	DisplayPreferencesPanel(QWidget* parent);
-	~DisplayPreferencesPanel();
-
-	public:
-		void updateValues();
-
-	public slots:
-	CORELIB_EXPORT void on_spinRenderPlayRateFPS_valueChanged(double v);
-	CORELIB_EXPORT void on_spinSimulationRateFPS_valueChanged(double v);
-	CORELIB_EXPORT void on_spinCameraFOV_valueChanged(double v);
-
-	CORELIB_EXPORT void on_cbSceneUnit_currentIndexChanged(int index);
-	CORELIB_EXPORT void on_cbAntialiasing_currentIndexChanged(int index);
-	CORELIB_EXPORT void on_cbUpAxis_currentIndexChanged(int index);
-	CORELIB_EXPORT void on_cbHandedness_currentIndexChanged(int index);
-	CORELIB_EXPORT void on_cbNavigationStyle_currentIndexChanged(int index);
-	CORELIB_EXPORT void on_btnBackgroundTex_clicked();
-	CORELIB_EXPORT void on_btnBackgroundTexClear_clicked();
-
-	CORELIB_EXPORT void on_cbPlaylists_currentIndexChanged(int index);
-	CORELIB_EXPORT void SelectPlayList(QString& name);
-	CORELIB_EXPORT void on_listWidgetPlaylist_itemSelectionChanged();
-	CORELIB_EXPORT void on_listWidgetPlaylist_itemDoubleClicked(QListWidgetItem* pItem);
-	CORELIB_EXPORT void SelectProject(QString& name);
-
-	CORELIB_EXPORT void on_btnPlaylistsRename_clicked();
-	CORELIB_EXPORT void on_btnPlaylistsAdd_clicked();
-	CORELIB_EXPORT void on_btnPlaylistsReload_clicked();
-	CORELIB_EXPORT void on_btnPlaylistsRemove_clicked();
-
-	CORELIB_EXPORT void on_btnPlaylistAddProj_clicked();
-	CORELIB_EXPORT void on_btnPlaylistProjGoUp_clicked();
-	CORELIB_EXPORT void on_btnPlaylistProjGoDown_clicked();
-	CORELIB_EXPORT void on_btnPlaylistRemoveProj_clicked();
-
-	CORELIB_EXPORT void on_btnPlaylistsPlay_clicked();
-	CORELIB_EXPORT void assignPlayPlaylistToGamepad(int idx = -1);
-	CORELIB_EXPORT void playPlaylist(int idx);
-
-	CORELIB_EXPORT void reloadComboxBoxPlaylists();
-	CORELIB_EXPORT void refreshListboxPorjects();
-	CORELIB_EXPORT void reloadListboxPorjectsFromPlayist();
-	CORELIB_EXPORT void savePlaylistProjects();
-
-	CORELIB_EXPORT void runDemoCommandline();
-
-private:
-	Ui::DisplayPreferencesPanel ui;
-	PlaylistsLoader playlistsLoader;
-	QList<QString>  playlistProjects;
-	bool playlistProjectsDirty;
-	int idxCurrentPlaylist;
-	int idxCurrentProj;
-};
-
-#endif // DisplayScene_h__
diff --git a/tools/ArtistTools/source/CoreLib/Window/DisplayScenePanel.cpp b/tools/ArtistTools/source/CoreLib/Window/DisplayScenePanel.cpp
deleted file mode 100644
index 7c0e382..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/DisplayScenePanel.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "DisplayScenePanel.h"
-
-#include "AppMainWindow.h"
-
-#include "SimpleScene.h"
-#include "GlobalSettings.h"
-
-DisplayScenePanel::DisplayScenePanel(QWidget* parent)
-	:
-	QWidget(parent)
-{
-	ui.setupUi(this);
-}
-
-void DisplayScenePanel::on_btnVisualizeWind_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_visualizeWind = state;
-}
-
-void DisplayScenePanel::on_btnShowGrid_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_showGrid = state;
-}
-
-void DisplayScenePanel::on_btnShowAxis_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_showAxis = state;
-}
-
-void DisplayScenePanel::on_btnShowWireframe_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_showWireframe = state;
-}
-
-void DisplayScenePanel::on_btnUseLighting_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_useLighting = state;
-}
-
-void DisplayScenePanel::on_cbRenderType_currentIndexChanged(int index)
-{
-	GlobalSettings::Inst().m_renderStyle = index;
-}
-
-void DisplayScenePanel::on_btnShowHUD_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_showHUD = state;
-}
-
-void DisplayScenePanel::on_btnComputeStats_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_computeStatistics = state;
-}
-
-void DisplayScenePanel::on_btnComputeProfile_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_computeProfile = state;
-}
-
-void DisplayScenePanel::on_btnShowGraphicsMesh_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_showGraphicsMesh = state;
-}
-
-void DisplayScenePanel::on_btnShowSkinnedOnly_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_showSkinnedMeshOnly = state;
-	AppMainWindow::Inst().updateUI();
-}
-
-void DisplayScenePanel::on_btnSkinningDQ_stateChanged(int state)
-{
-	GlobalSettings::Inst().m_useDQ = state;
-}
-
-void DisplayScenePanel::on_checkBoxGizmoWithLocal_stateChanged(int state)
-{
-	AppMainWindow::Inst().m_bGizmoWithLocal = state;
-	CoreLib::Inst()->AppMainWindow_updateMainToolbar();
-}
-
-void DisplayScenePanel::on_checkBoxGizmoWithDepthTest_stateChanged(int state)
-{
-	AppMainWindow::Inst().m_bGizmoWithDepthTest = state;
-}
-
-void DisplayScenePanel::on_checkBoxShowPlane_stateChanged(int state)
-{
-	AppMainWindow::Inst().m_bShowPlane = state;
-}
-
-void DisplayScenePanel::updateValues()
-{
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-
-	ui.btnShowGrid->setChecked(globalSettings.m_showGrid);
-	ui.btnShowAxis->setChecked(globalSettings.m_showAxis);
-	ui.cbRenderType->setCurrentIndex(globalSettings.m_renderStyle);
-	ui.btnShowHUD->setChecked(globalSettings.m_showHUD);
-	ui.btnComputeStats->setChecked(globalSettings.m_computeStatistics);
-	ui.btnUseLighting->setChecked(globalSettings.m_useLighting);
-	ui.btnShowGraphicsMesh->setChecked( globalSettings.m_showGraphicsMesh);
-	ui.btnShowSkinnedOnly->setChecked( globalSettings.m_showSkinnedMeshOnly);
-	ui.checkBoxGizmoWithLocal->setChecked(AppMainWindow::Inst().m_bGizmoWithLocal);
-	ui.checkBoxGizmoWithDepthTest->setChecked(AppMainWindow::Inst().m_bGizmoWithDepthTest);
-}
diff --git a/tools/ArtistTools/source/CoreLib/Window/DisplayScenePanel.h b/tools/ArtistTools/source/CoreLib/Window/DisplayScenePanel.h
deleted file mode 100644
index cd277b6..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/DisplayScenePanel.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef DisplayScenePanel_h__
-#define DisplayScenePanel_h__
-
-#include <QtWidgets/QWidget>
-#include "ui_DisplayScenePanel.h"
-
-#include "corelib_global.h"
-
-class DisplayScenePanel : public QWidget
-{
-	Q_OBJECT
-
-public:
-	DisplayScenePanel(QWidget* parent);
-
-	public:
-		void updateValues();
-
-	public slots:
-	CORELIB_EXPORT void on_btnVisualizeWind_stateChanged(int state);
-	CORELIB_EXPORT void on_btnShowGrid_stateChanged(int state);
-	CORELIB_EXPORT void on_btnShowAxis_stateChanged(int state);
-	CORELIB_EXPORT void on_cbRenderType_currentIndexChanged(int index);
-	CORELIB_EXPORT void on_btnShowWireframe_stateChanged(int state);
-	CORELIB_EXPORT void on_btnShowHUD_stateChanged(int state);
-	CORELIB_EXPORT void on_btnComputeStats_stateChanged(int state);
-	CORELIB_EXPORT void on_btnComputeProfile_stateChanged(int state);
-	CORELIB_EXPORT void on_btnUseLighting_stateChanged(int state);
-	CORELIB_EXPORT void on_btnShowGraphicsMesh_stateChanged(int state);
-	CORELIB_EXPORT void on_btnShowSkinnedOnly_stateChanged(int state);
-	CORELIB_EXPORT void on_btnSkinningDQ_stateChanged(int state);
-	CORELIB_EXPORT void on_checkBoxGizmoWithLocal_stateChanged(int state);
-	CORELIB_EXPORT void on_checkBoxGizmoWithDepthTest_stateChanged(int state);
-	CORELIB_EXPORT void on_checkBoxShowPlane_stateChanged(int state);
-
-
-private:
-	Ui::DisplayScenePanel ui;
-};
-
-#endif // DisplayScene_h__
diff --git a/tools/ArtistTools/source/CoreLib/Window/ExpandablePanel.cpp b/tools/ArtistTools/source/CoreLib/Window/ExpandablePanel.cpp
deleted file mode 100644
index 0fe96d1..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/ExpandablePanel.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-#include <QtWidgets/QLabel>
-#include <QtGui/QImage>
-#include <QtWidgets/QVBoxLayout>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QPainterPath>
-#include "ExpandablePanel.h"
-#include "Nv.h"
-
-static QImage S_TriangleRight;
-static QImage S_TriangleDown;
-
-void InitTriangleResources(int w, int h)
-{
-	S_TriangleRight = QImage(w, h, QImage::Format_ARGB32);
-	S_TriangleDown  = QImage(w, h, QImage::Format_ARGB32);
-
-	S_TriangleRight.fill(QColor(0, 0, 0, 0));
-	S_TriangleDown.fill(QColor(0, 0, 0, 0));
-
-	QPainter painter(&S_TriangleRight);
-	painter.setRenderHints(QPainter::Antialiasing,true);
-
-	QPainterPath path;
-	path.moveTo(0, 0);
-	path.lineTo(w, h>>1);
-	path.lineTo(0, h);
-	path.lineTo(0, 0);
-	painter.setPen(Qt::NoPen);
-	painter.fillPath(path, QBrush(QColor(50, 50, 50)));
-
-	// a painter cannot switch device?
-	QPainter painter2(&S_TriangleDown);
-	painter2.setRenderHint(QPainter::Antialiasing,true);
-	path = QPainterPath();	// trick to clear up a path
-	path.moveTo(0, 0);
-	path.lineTo(w, 0);
-	path.lineTo(w>>1, h);
-	path.lineTo(0, 0);
-	painter2.setPen(Qt::NoPen);
-	painter2.fillPath(path, QBrush(QColor(50, 50, 50)));
-}
-
-class TitleLabelImpl : public TitleLabel
-{
-	enum
-	{
-		IMAGE_H = 10,
-		IMAGE_W = 10,
-		FIXED_H = 20,
-	};
-
-public:
-	TitleLabelImpl(QWidget* parent, bool collapsed)
-		: TitleLabel(parent)
-		, _collapsed(collapsed)
-	{
-		QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-		sizePolicy.setHorizontalStretch(0);
-		sizePolicy.setVerticalStretch(0);
-		sizePolicy.setHeightForWidth(this->sizePolicy().hasHeightForWidth());
-		this->setSizePolicy(sizePolicy);
-		this->setMinimumSize(QSize(0, FIXED_H));
-		this->setMaximumSize(QSize(16777215, FIXED_H));
-		//this->setStyleSheet(QString::fromUtf8("background:rgb(219,219,219);border:1px solid rgb(185,185,185);"));
-		this->setFrameShape(QFrame::NoFrame);
-		this->setFrameShadow(QFrame::Plain);
-		this->setTextFormat(Qt::AutoText);
-		this->setScaledContents(false);
-		this->setAlignment(Qt::AlignCenter);
-
-		if(S_TriangleDown.isNull() || S_TriangleRight.isNull())
-			InitTriangleResources(IMAGE_W, IMAGE_H);
-	}
-
-	void paintEvent(QPaintEvent * e)
-	{
-		QLabel::paintEvent(e);
-
-		QPainter painter(this);
-		painter.setRenderHints(QPainter::Antialiasing,true);
-
-		const int L = 10;
-		const int T = (FIXED_H - IMAGE_H)/2;
-		QRect rc(L, T, IMAGE_W, IMAGE_H);
-
-		// [later] transform the painter should also work;
-		// but i don't get the expected results, so have to use two images
-		if(_collapsed)
-			painter.drawImage(rc, S_TriangleRight);
-		else
-			painter.drawImage(rc, S_TriangleDown);
-		
-	}
-
-	bool Collapsed() {return _collapsed;}
-	void SetCollapsed(bool b) 
-	{
-		_collapsed = b;
-		this->update();
-	}
-	
-protected:
-	virtual void mousePressEvent(QMouseEvent* e)
-	{
-		if(e->buttons() == Qt::LeftButton)
-		{
-			_collapsed = !_collapsed;
-			this->update();
-			emit LPressSignal();
-		}
-	}
-
-private:
-	bool _collapsed;
-};
-
-ExpandablePanel::ExpandablePanel(QWidget* parent, bool collapsed)
-	: QFrame(parent)
-	, _pContent(NV_NULL)
-{
-	//_pContent = new QWidget(this);
-	Init(collapsed);
-}
-
-ExpandablePanel::ExpandablePanel( QWidget* content, QWidget* parent /*= 0*/ )
-	: QFrame(parent)
-	, _pContent(content)
-{
-	Init();
-}
-
-ExpandablePanel::~ExpandablePanel()
-{
-
-}
-
-void ExpandablePanel::SetCollapsed(bool b)
-{
-	if (_pTitle)
-		_pTitle->SetCollapsed(b);
-}
-
-void ExpandablePanel::Init(bool collapsed)
-{
-	setAutoFillBackground(true);
-	setFrameShape(QFrame::StyledPanel);
-	setFrameShadow(QFrame::Sunken);
-	_pMainLayout = new QVBoxLayout(this);
-	_pMainLayout->setSpacing(2);
-	_pMainLayout->setContentsMargins(0, 0, 0, 0);
-	_pMainLayout->setObjectName(QString::fromUtf8("mainLayout"));
-
-	_pTitle = new TitleLabelImpl(this, collapsed);
-	_pTitle->setText("TitleLabel");
-	_pMainLayout->addWidget(_pTitle);
-
-	connect(_pTitle, SIGNAL(LPressSignal()), this, SLOT(TitlePress()));
-	
-	if(_pContent)
-		_pMainLayout->addWidget(_pContent);
-}
-
-void ExpandablePanel::SetTitle( const QString& title )
-{
-	_pTitle->setText(title);
-}
-
-void ExpandablePanel::TitlePress()
-{
-	if(_pTitle->Collapsed())
-	{
-		_pContent->hide();
-	}
-	else	// expanded
-	{
-		_pContent->show();
-	}
-}
-
-void ExpandablePanel::AddContent( QWidget* content )
-{
-	// only support one widget as content right now
-	if (_pContent != NV_NULL) return;
-
-	_pMainLayout->addWidget(content);
-	_pContent = content;
-}
-
diff --git a/tools/ArtistTools/source/CoreLib/Window/ExpandablePanel.h b/tools/ArtistTools/source/CoreLib/Window/ExpandablePanel.h
deleted file mode 100644
index ba3018d..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/ExpandablePanel.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef ExpandablePanel_h__
-#define ExpandablePanel_h__
-
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QLabel>
-
-#include "corelib_global.h"
-
-class TitleLabelImpl;
-class QString;
-class QVBoxLayout;
-
-class TitleLabel : public QLabel
-{
-	Q_OBJECT
-
-public:
-	TitleLabel(QWidget* parent):QLabel(parent){}
-
-signals:
-	void LPressSignal();
-};
-
-class ExpandablePanel : public QFrame
-{
-	Q_OBJECT
-
-public:
-	CORELIB_EXPORT explicit ExpandablePanel(QWidget* parent, bool collapsed = false);
-	explicit ExpandablePanel(QWidget* content, QWidget* parent);
-	virtual ~ExpandablePanel();
-
-	CORELIB_EXPORT void SetTitle(const QString& title);
-	void SetCollapsed(bool b);
-	QWidget* Content() {return _pContent;}
-	CORELIB_EXPORT void AddContent(QWidget* content);
-
-public slots:
-CORELIB_EXPORT void TitlePress();
-
-private:
-	void Init(bool collapsed = false);
-
-private:
-	QVBoxLayout* _pMainLayout;
-	TitleLabelImpl* _pTitle;
-	QWidget* _pContent;
-};
-
-#endif // ExpandablePanel_h__
diff --git a/tools/ArtistTools/source/CoreLib/Window/OutputWindow.cpp b/tools/ArtistTools/source/CoreLib/Window/OutputWindow.cpp
deleted file mode 100644
index 08867e3..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/OutputWindow.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "AppMainWindow.h"
-#include "OutputWindow.h"
-
-#include <QtGUI/QContextMenuEvent>
-
-OutputWindow::OutputWindow(QWidget* parent)
-	:
-	QTextBrowser(parent)
-{
-	ui.setupUi(this);
-}
-
-void OutputWindow::contextMenuEvent(QContextMenuEvent *event)
-{
-	QMenu *menu = createStandardContextMenu();
-	
-	QAction* act = new QAction("&Clear All", this);
-	connect(act, SIGNAL(triggered()), this, SLOT(clear()));
-	menu->addAction(act);
-	menu->exec(event->globalPos());
-	delete menu;
-}
diff --git a/tools/ArtistTools/source/CoreLib/Window/OutputWindow.h b/tools/ArtistTools/source/CoreLib/Window/OutputWindow.h
deleted file mode 100644
index 5d19bb6..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/OutputWindow.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef OutputWindow_h__
-#define OutputWindow_h__
-
-#include <QtWidgets/QTextBrowser>
-#include "ui_OutputWindow.h"
-
-#include "UIGlobal.h"
-
-class CORELIB_EXPORT OutputWindow : public QTextBrowser
-{
-	Q_OBJECT
-
-public:
-	OutputWindow(QWidget* parent);
-
-	void contextMenuEvent(QContextMenuEvent *event);
-
-private:
-	Ui::OutputWindow ui;
-};
-
-#endif // DisplayScene_h__
diff --git a/tools/ArtistTools/source/CoreLib/Window/SlideSpinBox.cpp b/tools/ArtistTools/source/CoreLib/Window/SlideSpinBox.cpp
deleted file mode 100644
index b127f1c..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/SlideSpinBox.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "SlideSpinBox.h"
-
-void SlideSpinBoxSlots::timeout()
-{
-	//qDebug("%s", __FUNCTION__);
-	this->_cb->on_timeout();
-}
-
-void ConfigSpinBoxInt(SlideSpinBoxInt* spinBox, int minv, int maxv, int step)
-{
-	spinBox->blockSignals(true);
-	spinBox->setRange(minv, maxv);
-	spinBox->setSingleStep(step);
-	spinBox->AutoConfigDragRange();
-	spinBox->setKeyboardTracking(false);
-	spinBox->blockSignals(false);
-}
diff --git a/tools/ArtistTools/source/CoreLib/Window/SlideSpinBox.h b/tools/ArtistTools/source/CoreLib/Window/SlideSpinBox.h
deleted file mode 100644
index eeb7626..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/SlideSpinBox.h
+++ /dev/null
@@ -1,284 +0,0 @@
-#ifndef SlideSpinBox_h__
-#define SlideSpinBox_h__
-
-#include <QtWidgets/QStyle>
-#include <QtWidgets/QStyleOptionSpinBox>
-#include <QtWidgets/QAbstractSpinBox>
-#include <QtGui/QMouseEvent>
-#include <QtCore/QTimer>
-#include <QtWidgets/QDoubleSpinBox>
-#include <QtWidgets/QSpinBox>
-
-#include "corelib_global.h"
-
-/*
-	A Lesson: never use a template to sub-class QWidgets!
-	Qt doesn't moc template widget classes;
-	So we have to use a specific 'slots-callback' pair to let the moc system work...
- */
-class SlideSpinBoxCallback
-{
-public:
-	virtual void on_timeout() = 0;
-};
-
-class SlideSpinBoxSlots : public QObject
-{
-	Q_OBJECT
-
-public:
-	SlideSpinBoxSlots(SlideSpinBoxCallback* cb)
-		: _cb (cb)
-	{}
-
-	public slots:
-		CORELIB_EXPORT void timeout();
-
-private:
-	SlideSpinBoxCallback* _cb;
-};
-
-template<typename SpinWidget, typename ValueType>
-class SlideSpinBox : public SpinWidget, public SlideSpinBoxCallback
-{
-
-public:
-	void on_timeout()
-	{
-		//qDebug("%s", __FUNCTION__);
-		EmitDragValueChanged();
-	}
-
-public:
-	typedef ValueType value_type;
-
-	SlideSpinBox(QWidget* parent = 0)
-		: SpinWidget(parent)
-		, _dragRange(DEFAULT_DRAG_RANGE)
-	{
-		setAccelerated(true);
-
-		ResetCustState();
-
-		_pSlots = new SlideSpinBoxSlots(this);
-		
-		_dragTimer.setParent(this);
-		_dragTimer.setInterval(DRAG_TIMER_INTERVAL);
-		_dragTimer.setSingleShot(true);
-		connect(&_dragTimer, SIGNAL(timeout()), _pSlots, SLOT(timeout()));
-	}
-
-	~SlideSpinBox()
-	{
-		delete _pSlots;
-	}
-
-	void SetDragRange(int range)
-	{
-		if(range < MIN_DRAG_RANGE) 
-			range = MIN_DRAG_RANGE;
-		else if(range > MAX_DRAG_RANGE)
-			range = MAX_DRAG_RANGE;
-		
-		_dragRange = range;
-	}
-
-	void AutoConfigDragRange()
-	{
-		ValueType minv = this->minimum();
-		ValueType maxv = this->maximum();
-
-		double vrange = maxv - minv;
-		double step = 1.0;
-
-		if(vrange <= 1.0)
-		{
-			step = 0.01;
-		}
-		else if(vrange <= 10.0)
-		{
-			step = 0.1;
-		}
-
-		double pixelError = 2.0;
-		double dragRange = vrange * pixelError / step;
-
-		SetDragRange((int)dragRange);
-	}
-
-protected:
-	void mouseMoveEvent ( QMouseEvent * event )
-	{
-		if(!_dragBegin)
-		{
-			QAbstractSpinBox::mouseMoveEvent(event);
-			return;
-		}
-
-		if(!_dragging)
-		{
-			_dragging = true;
-			_cursor = this->cursor();
-
-			this->setCursor(Qt::SizeVerCursor);
-		}
-
-		//if(_dragging)
-		//{
-		//	_dragTimer.start();	// always restart, we only need the timeout event;
-		//}
-
-		event->accept();
-		DragValue(event->pos());
-	}
-
-	void mousePressEvent( QMouseEvent * event )
-	{
-		if(event->button() == Qt::LeftButton)
-		{
-			SetupCustState(event);
-		}
-		
-		if(_dragging)
-			blockSignals(true);
-		QAbstractSpinBox::mousePressEvent(event);
-		if(_dragging)
-			blockSignals(false);
-	}
-
-	void mouseReleaseEvent( QMouseEvent * event )
-	{
-		if(_dragging)
-		{
-			setCursor(_cursor);
-			_dragTimer.stop();
-		}
-
-		QAbstractSpinBox::mouseReleaseEvent(event);
-		//if(_dragBegin)
-		//	EmitDragValueChanged();
-
-		ResetCustState();
-	}
-
-	void timerEvent(QTimerEvent *event)
-	{
-		if(_dragging)
-		{
-			// stop timer event to disable acceleration/auto-stepping
-			event->ignore();
-			return;
-		}
-
-		event->accept();
-
-		if(_dragBegin) blockSignals(true);
-		QAbstractSpinBox::timerEvent(event);
-		if(_dragBegin) blockSignals(false);
-	}
-
-private:
-	enum
-	{
-		MIN_DRAG_RANGE = 50,
-		MAX_DRAG_RANGE = 500,
-
-		DEFAULT_DRAG_RANGE = 100,
-
-		DRAG_TIMER_INTERVAL= 30,	// in msec
-	};
-
-	bool SetupCustState(QMouseEvent* event)
-	{
-		QStyleOptionSpinBox opt;
-		this->initStyleOption(&opt);
-		QStyle::SubControl hitControl = this->style()->hitTestComplexControl(QStyle::CC_SpinBox, &opt, event->pos());
-		if(hitControl != QStyle::SC_SpinBoxUp && hitControl != QStyle::SC_SpinBoxDown)
-			return false;
-
-		_pressPosition = event->pos();
-		_dragging	= false;
-		_dragBegin	= true;
-		_pressValue	= this->value();
-		_dragValue  = this->value();
-
-		return true;
-	}
-
-	void ResetCustState()
-	{
-		_dragBegin = false;
-		_dragging = false;
-	}
-	
-	void DragValue(const QPoint& pos)
-	{
-		ValueType valueRange = this->maximum() - this->minimum();
-
-		double dh = (double)(_pressPosition.y() - pos.y());
-		double dv = valueRange * dh / (double)_dragRange;
-		ValueType v = _pressValue + (ValueType)dv;
-
-		//blockSignals(true);
-		setValue(v);
-		//blockSignals(false);
-	}
-
-	void EmitDragValueChanged()
-	{
-		//if(this->value() != _pressValue)	// value are always bound by qt (and decimal settings)
-		if(this->value() != _dragValue)
-		{	
-			_dragValue = this->value();
-			emit valueChanged(this->value());
-		}
-	}
-
-	int		_dragRange;
-
-	QPoint	_pressPosition;
-	ValueType	_pressValue;
-	ValueType	_dragValue;
-
-	bool	_dragging;
-	bool	_dragBegin;
-	QCursor _cursor;
-
-	QTimer _dragTimer;
-	SlideSpinBoxSlots* _pSlots;
-};
-
-typedef SlideSpinBox<QDoubleSpinBox, double> SlideSpinBoxF;
-typedef SlideSpinBox<QSpinBox, int> SlideSpinBoxInt;
-
-template<typename CustSpinBox>
-class ConfigSpinBox
-{
-public:
-	typedef typename CustSpinBox::value_type ValueType;
-
-	ConfigSpinBox(CustSpinBox* spinBox, ValueType minv, ValueType maxv, ValueType step = (ValueType)1)
-	{
-		spinBox->blockSignals(true);
-		spinBox->setRange(minv, maxv);
-		spinBox->setSingleStep(step);
-		spinBox->AutoConfigDragRange();
-		spinBox->setKeyboardTracking(false);
-		SpecificConfig<ValueType>(spinBox);
-		spinBox->blockSignals(false);
-	}
-
-	template<typename T>
-	void SpecificConfig(CustSpinBox* spinBox){}
-
-	template<>
-	void SpecificConfig<double>(CustSpinBox* spinBox)
-	{
-		spinBox->setDecimals(2.0);
-	}
-};
-
-#include "corelib_global.h"
-CORELIB_EXPORT void ConfigSpinBoxInt(SlideSpinBoxInt* spinBox, int minv, int maxv, int step = (int)1);
-
-#endif // SlideSpinBox_h__
diff --git a/tools/ArtistTools/source/CoreLib/Window/SlideSpinBoxInt.h b/tools/ArtistTools/source/CoreLib/Window/SlideSpinBoxInt.h
deleted file mode 100644
index 393adee..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/SlideSpinBoxInt.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef SlideSpinBoxInt_h__
-#define SlideSpinBoxInt_h__
-
-#include <QtWidgets/QStyle>
-#include <QtWidgets/QStyleOptionSpinBox>
-#include <QtWidgets/QAbstractSpinBox>
-#include <QtGui/QMouseEvent>
-#include <QtCore/QTimer>
-#include <QtWidgets/QDoubleSpinBox>
-#include <QtWidgets/QSpinBox>
-#include <SlideSpinBox.h>
-
-// use this header as a trick to make moc work right
-
-#endif // SlideSpinBoxInt_h__
diff --git a/tools/ArtistTools/source/CoreLib/Window/TipListView.cpp b/tools/ArtistTools/source/CoreLib/Window/TipListView.cpp
deleted file mode 100644
index b91fd3e..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/TipListView.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "TipListView.h"
-#include <QtWidgets/QToolTip>
-#include <QtCore/QEvent>
-#include <QtGUI/QEvent.h>
-
-
-TipListView::TipListView(QWidget* parent)
-	:QListWidget(parent)
-{
-}
-
-void TipListView::setTips(QStringList& tips)
-{
-	mTips = tips;
-}
-
-bool TipListView::event(QEvent *evt)
-{
-	if (evt->type() == QEvent::ToolTip)
-	{
-		if (mTips.size() > 0)
-		{
-			QHelpEvent *helpEvent = (QHelpEvent *)(evt);
-			const QPoint& pos = helpEvent->pos();
-			QListWidgetItem* pItem = itemAt(pos);
-			int index = 0, num = count();
-			for (int i = 0; i < num; ++i)
-			{
-				QListWidgetItem* pi = item(i);
-				if (pi == pItem && mTips.size() > i)
-				{
-					QToolTip::showText(helpEvent->globalPos(), mTips[i]);
-					return true;
-				}
-			}
-		}
-		//QToolTip::hideText();
-		//evt->ignore();
-		//return true;
-	}
-	return QListWidget::event(evt);
-}
diff --git a/tools/ArtistTools/source/CoreLib/Window/TipListView.h b/tools/ArtistTools/source/CoreLib/Window/TipListView.h
deleted file mode 100644
index 6913baa..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/TipListView.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef TipListView_h__
-#define TipListView_h__
-
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QListWidget>
-#include <QtCore/QEvent>
-
-#include "corelib_global.h"
-
-class TipListView : public QListWidget
-{
-	Q_OBJECT
-
-public:
-	TipListView(QWidget* parent = 0);
-
-	void setTips(QStringList& tips);
-
-protected:
-	bool event(QEvent *);
-private:
-
-	QStringList mTips;
-
-};
-#endif // TipListView_h__
diff --git a/tools/ArtistTools/source/CoreLib/Window/UIGlobal.h b/tools/ArtistTools/source/CoreLib/Window/UIGlobal.h
deleted file mode 100644
index 3d50132..0000000
--- a/tools/ArtistTools/source/CoreLib/Window/UIGlobal.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013-2015 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-#pragma once
-
-#define USE_MATERIAL_SET	1
-#define USE_CURVE_EDITOR	0
-#define USE_TEXTURE_BRIGHTNESS 0
-
-#define USE_INTERNAL_GRAPHICAL_MATERIAL 0
-
-#include "corelib_global.h"
\ No newline at end of file
diff --git a/tools/ArtistTools/source/CoreLib/corelib_global.h b/tools/ArtistTools/source/CoreLib/corelib_global.h
deleted file mode 100644
index b3c0016..0000000
--- a/tools/ArtistTools/source/CoreLib/corelib_global.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CORELIB_GLOBAL_H
-#define CORELIB_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-#include <Nv/NvBlastCommon.h>
-
-#ifdef CORELIB_LIB
-# define CORELIB_EXPORT Q_DECL_EXPORT
-#else
-# define CORELIB_EXPORT Q_DECL_IMPORT
-#endif
-
-#pragma warning(disable:4018)
-#pragma warning(disable:4099)
-#pragma warning(disable:4101)
-#pragma warning(disable:4267)
-#pragma warning(disable:4273)
-#pragma warning(disable:4996)
-
-#endif // CORELIB_GLOBAL_H
diff --git a/tools/ArtistTools/source/Shaders/BodyShader.hlsl b/tools/ArtistTools/source/Shaders/BodyShader.hlsl
deleted file mode 100644
index 3f9b60f..0000000
--- a/tools/ArtistTools/source/Shaders/BodyShader.hlsl
+++ /dev/null
@@ -1,370 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-//#define USE_GFSDK_SHADOWLIB
-
-///////////////////////////////////////////////////////////////////////////////////
-// Textures
-///////////////////////////////////////////////////////////////////////////////////
-Buffer<float4>			g_BoneIndices : register(t0);
-Buffer<float4>			g_BoneWeights : register(t1);
-
-Texture2D				g_DiffuseTexture : register(t2);
-Texture2D				g_SpecularTexture : register(t3);
-Texture2D				g_NormalTexture : register(t4);
-Texture2D				g_EnvTexture : register(t5);
-
-Texture2D				g_ShadowTexture0 : register(t6);
-Texture2D				g_ShadowTexture1 : register(t7);
-Texture2D				g_ShadowTexture2 : register(t8);
-Texture2D				g_ShadowTexture3 : register(t9);
-
-#include "Light.hlsl"
-#include "BodyShaderCommon.hlsl"
-
-///////////////////////////////////////////////////////////////////////////////////
-// constant buffer
-///////////////////////////////////////////////////////////////////////////////////
-cbuffer cbPerFrame : register(b0)
-{
-	row_major float4x4	g_ViewProjection;
-	row_major float4x4	g_BodyTransformation;
-
-//////////////////////////////////////////////////
-	Light				g_Light[4];
-
-//////////////////////////////////////////////////
-	float3				g_eyePosition;
-	float				g_specularShininess;
-
-	int					g_useDiffuseTextures;
-	int					g_useSpecularTextures;
-	int					g_useNormalTextures;
-	int					g_useTextures;
-
-
-	float4				g_ambientColor;
-	float4				g_diffuseColor;
-	float4				g_specularColor;
-
-	int					g_wireFrame;
-	int					g_useLighting;
-	int					g_wireFrameOver;
-	float				g_unitScale;
-
-	int					g_useDQs;
-	int					g_diffuseChannel;
-	int					g_flatNormal;
-	int 				g_usePinPos;
-
-	row_major float4x4	g_boneMatrices[MAX_BONE_MATRICES];
-	DQ					g_boneDQs[MAX_BONE_MATRICES];
-}
-
-#define FLT_EPSILON 1e-7
-
-SamplerState samLinear : register(s0);
-SamplerState samPointClamp : register(s1);
-
-//////////////////////////////////////////////////////////////////////////////
-// shadow sampling functions
-//////////////////////////////////////////////////////////////////////////////
-float softDepthCmp(float sampledDepth, float calcDepth, float bias, float gain)
-{
-	float delta = gain * (sampledDepth - (calcDepth + bias));
-
-	float s = clamp(1.0 - delta / abs(bias), 0.0f, 1.0f);
-	return s;
-}
-
-float softDepthCmpRHS(float sampledDepth, float calcDepth)
-{
-	float bias = g_unitScale;
-	
-	float delta = sampledDepth - (calcDepth + bias);
-
-	float s = clamp(1.0 - delta / bias, 0.0f, 1.0f);
-	return s;
-}
-
-float softDepthCmpLHS(float sampledDepth, float calcDepth)
-{
-	float bias = g_unitScale;
-	
-	float delta = (calcDepth - bias) - sampledDepth;
-
-	float s = clamp(1.0 - delta / bias, 0.0f, 1.0f);
-	return s;
-}
-
-float ShadowPCF(float2 texcoord, float calcDepth, float bias, float gain, Texture2D shadowTexture)
-{
-	float shadow = 0;
-	float n = 0;
-
-	[unroll]
-	for (int dx = - 3; dx <= 3; dx += 2) {
-		for (int dy = -3; dy <= 3; dy += 2) {
-		    float4 S = shadowTexture.Gather(samPointClamp, texcoord, int2(dx, dy));
-			shadow += softDepthCmp(S.x, calcDepth, bias, gain);
-			shadow += softDepthCmp(S.y, calcDepth, bias, gain);
-			shadow += softDepthCmp(S.z, calcDepth, bias, gain);
-			shadow += softDepthCmp(S.w, calcDepth, bias, gain);
-			n += 4;
-		}
-	}
-	 
-	return shadow / n;
-}
-
-float getShadow(float3 wPos, Light L, Texture2D stex)
-{
-	float2 texcoords = mul(float4(wPos, 1), L.m_lightMatrix).xy;
-	float z = mul(float4(wPos, 1), L.m_viewMatrix).z;
-
-	float bias = L.m_depthBias;
-	float gain = L.m_depthGain;
-	float shadow = ShadowPCF(texcoords, z, bias, gain, stex);
-
-	return shadow;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-inline float getIllumination(Light L, float3 wPos, Texture2D stex)
-{
-	float lit = 1.0f;
-
-	if (L.m_useShadows)
-	{
-		float2 texcoords = mul(float4(wPos, 1), L.m_lightMatrix).xy;
-		float z = mul(float4(wPos, 1), L.m_viewMatrix).z;
-		lit = getShadow(wPos, L, stex);
-	}
-
-	return lit;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-inline float3 computeDiffuseLighting(
-	float3 I,
-	float3 L, // light direction
-	float3 N // surface normal
-	)
-{
-	float diffuse = max(0, dot(N, L));
-
-	return diffuse * I;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-inline float3 computeSpecularLighting(
-	float3 I, // light color
-	float3 L, // light direction
-	float3 N, // surface normal
-	float3 E, // view vector
-	float3 Ms, // specularity
-
-	float shininess)
-{
-	float3 H = normalize(E+N);
-	float NdotH = max(0, dot(H, N));
-	float specular	= pow(NdotH, shininess);
-
-	float3 output = specular * I * Ms;
-
-	return output;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-struct BodyRenderVSIn
-{
-	float3 Position			: POSITION;
-    float3 vertexNormal		: VERTEX_NORMAL;
-	float3 faceNormal		: FACE_NORMAL;
-	float3 Tangent			: TANGENT;
-	float2 texCoord			: TEXCOORD;
-	float  vid				: VERTEX_ID;
-};
-
-struct BodyRenderVSOut
-{
-    float4 Position : SV_Position;
-	float3 Normal   : Normal;
-    float3 Tangent  : TANGENT;
-    float3 wpos		: WPOS;
-	float2 texCoord : TEXCOORD;
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-// vertex shader
-/////////////////////////////////////////////////////////////////////////////////////
-BodyRenderVSOut vs_main(BodyRenderVSIn vertexIn)
-{
-   BodyRenderVSOut vertex;
-
-	float3 pos = vertexIn.Position.xyz;
-
-	float3 normal = g_flatNormal ? normalize(vertexIn.faceNormal) : normalize(vertexIn.vertexNormal);
-	float3 tangent = normalize(vertexIn.Tangent);
-
-	float3 skinnedPos, skinnedNormal, skinnedTangent;
-    
-	float4 boneIndex = g_BoneIndices.Load(vertexIn.vid);
-	float4 boneWeight = g_BoneWeights.Load(vertexIn.vid);
-
-	if (g_useDQs)
-		computeSkinningDQ(boneIndex, boneWeight, g_boneDQs, skinnedPos, skinnedNormal, skinnedTangent, pos, normal, tangent);
-	else
-		computeSkinningLinear(boneIndex, boneWeight, g_boneMatrices, skinnedPos, skinnedNormal, skinnedTangent, pos, normal, tangent);
-	
-	if (!g_usePinPos)
-		pos = skinnedPos;
- 	pos = mul(float4(pos, 1), g_BodyTransformation); 
-	vertex.wpos				= pos;
-
-    vertex.Position			= mul(float4(pos, 1), g_ViewProjection);
-
-    vertex.Normal			= normalize(skinnedNormal);
-	vertex.Tangent			= normalize(skinnedTangent);
-	vertex.texCoord			= vertexIn.texCoord;
-
-	return vertex;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-// pixel shader
-/////////////////////////////////////////////////////////////////////////////////////
-
-float4 ps_main(BodyRenderVSOut vertex) : SV_Target
-{      
-	float4 output = float4(0,0,0,1);
-
-	if (g_wireFrameOver)
-		return output;
-	
-	float3 diffuseColor = g_diffuseColor.xyz;
-	if (g_useDiffuseTextures)
-	{
-		if (g_diffuseChannel == 0)
-			diffuseColor.xyz = g_DiffuseTexture.SampleLevel(samLinear,vertex.texCoord, 0).xyz;
-		else if (g_diffuseChannel == 1)
-			diffuseColor.xyz = g_DiffuseTexture.SampleLevel(samLinear,vertex.texCoord, 0).rrr;
-		else if (g_diffuseChannel == 2)
-			diffuseColor.xyz = g_DiffuseTexture.SampleLevel(samLinear,vertex.texCoord, 0).ggg;
-		else if (g_diffuseChannel == 3)
-			diffuseColor.xyz = g_DiffuseTexture.SampleLevel(samLinear,vertex.texCoord, 0).bbb;
-		else if (g_diffuseChannel == 4)
-			diffuseColor.xyz = g_DiffuseTexture.SampleLevel(samLinear,vertex.texCoord, 0).aaa;
-	}
-
-	float3 specularColor = g_specularColor.xyz;
-	if (g_useSpecularTextures)
-		specularColor.xyz = g_SpecularTexture.SampleLevel(samLinear,vertex.texCoord, 0).xyz;
-
-	if (!g_useLighting)
-		return float4(diffuseColor, 1.0f);
-
-	float3 N = normalize(vertex.Normal.xyz);
-
-	if (g_useNormalTextures)
-	{
-		float3 normalColor = g_NormalTexture.SampleLevel(samLinear,vertex.texCoord, 0).xyz;
-		normalColor = (normalColor - 0.5) * 2.0f;
-
-		float3 T = normalize(vertex.Tangent.xyz);
-		float3 B = normalize(cross(T, N));
-
-		float3 PN = N;
-	
-		PN += normalColor.x * T;
-		PN += normalColor.y * B;
-		PN += normalColor.z * N;
-
-		N = normalize(PN);
-	}
-
-	float3 P = vertex.wpos.xyz;
-	float3 E = normalize(g_eyePosition.xyz - P);
-	float shininess = g_specularShininess;
-
-	// sum all lights
-	Texture2D stex[4] = 
-	{
-		g_ShadowTexture0,
-		g_ShadowTexture1,
-		g_ShadowTexture2,
-		g_ShadowTexture3
-	};
-
-	float3 albedo = diffuseColor.rgb;
-	float3 specularity = specularColor.rgb;
-
-	float3 diffuse = 0;
-	float3 specular = 0;
-	float3 ambient = 0;
-
-	[unroll]
-	for (int i = 0; i < 4; i++)
-	{
-		Light L = g_Light[i];
-
-		if (L.m_enable)
-		{
-			float3 Ldiffuse = 0;
-			float3 Lspecular = 0;
-			float3 Ldir = 0;
-
-			if (L.m_isEnvLight)
-			{
-				Ldir = N;
-
-				bool zup = true;
-				float2 texcoords = GetLightTexCoord(Ldir, zup);
-				float3 Lcolor = (L.m_useEnvMap) ? g_EnvTexture.SampleLevel(samLinear,texcoords.xy,0).rgb : L.m_color;
-				Lcolor *= L.m_intensity;
-				Ldiffuse = Lspecular = Lcolor;
-			}
-			else
-			{
-				float I = getIllumination(L, P, stex[i]);
-				Ldiffuse = Lspecular = I * L.m_intensity * L.m_color;
-				Ldir = 1.0f * L.m_dir;
-			}
-
-			diffuse += computeDiffuseLighting( Ldiffuse, Ldir, N);
-			specular += computeSpecularLighting( Lspecular, Ldir, N, E, specularity, shininess);
-
-			ambient += L.m_ambientColor;
-		}
-	}
-
-	output.rgb = (ambient + diffuse) * albedo + specular;
-
-	return output;
-}
diff --git a/tools/ArtistTools/source/Shaders/BodyShaderCommon.hlsl b/tools/ArtistTools/source/Shaders/BodyShaderCommon.hlsl
deleted file mode 100644
index e113881..0000000
--- a/tools/ArtistTools/source/Shaders/BodyShaderCommon.hlsl
+++ /dev/null
@@ -1,204 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-struct DQ
-{
-	float4 q0;
-	float4 q1;
-};
-
-#define MAX_BONE_MATRICES 512
-#define FLT_EPSILON 1e-7
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-// apply linear blending based skinning
-void computeSkinningLinear(
-	float4 boneIndex,
-	float4 boneWeight,
-	row_major float4x4	boneMatrices[MAX_BONE_MATRICES],
-	out float3 skinnedPosition, 
-	out float3 skinnedNormal, 
-	out float3 skinnedTangent, 
-	float3 restPosition, float3 restNormal, float3 restTangent)
-{
-
-	float weightSum = boneWeight.x + boneWeight.y + boneWeight.z + boneWeight.w ;
-	float invWeightSum = 1.0f / (weightSum + FLT_EPSILON);
-
-	skinnedPosition = float3(0, 0, 0);
-	skinnedNormal = float3(0, 0, 0);
-	skinnedTangent = float3(0, 0, 0);
-
-	[unroll(4)]
-	for (int b = 0; b < 4; b++)
-	{
-		row_major float4x4 bone = boneMatrices[boneIndex[b]];
-		float w = boneWeight[b];
-
-		float3 p = (mul(float4(restPosition.xyz,1), bone)).xyz;
-		skinnedPosition.xyz += w * p;
-		float3 n = (mul(float4(restNormal.xyz,0), bone)).xyz;
-		skinnedNormal.xyz += w * n;
-		float3 t = (mul(float4(restTangent.xyz,0), bone)).xyz;
-		skinnedTangent.xyz += w * t;
-	}
-
-	skinnedPosition.xyz *= invWeightSum;
-	skinnedNormal.xyz *= invWeightSum;
-	skinnedTangent.xyz *= invWeightSum;
-
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-// apply linear blending based skinning
-void computeSkinningLinear(
-	float4 boneIndex,
-	float4 boneWeight,
-	row_major float4x4	boneMatrices[MAX_BONE_MATRICES],
-	out float3 skinnedPosition, 
-	float3 restPosition)
-{
-
-	float weightSum = boneWeight.x + boneWeight.y + boneWeight.z + boneWeight.w ;
-	float invWeightSum = 1.0f / (weightSum + FLT_EPSILON);
-
-	skinnedPosition = float3(0, 0, 0);
-
-	[unroll(4)]
-	for (int b = 0; b < 4; b++)
-	{
-		row_major float4x4 bone = boneMatrices[boneIndex[b]];
-
-		float3 p = boneWeight[b] * invWeightSum * (mul(float4(restPosition.xyz,1), bone)).xyz;
-		skinnedPosition.xyz += p;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-// apply dual quaternion skinning
-void computeSkinningDQ(
-	float4	boneIndex,
-	float4	boneWeight,
-	DQ		boneDQs[MAX_BONE_MATRICES],
-	inout float3 skinnedPosition, 
-	inout float3 skinnedNormal, 
-	inout float3 skinnedTangent, 
-	float3 restPosition, 
-	float3 restNormal, 
-	float3 restTangent)
-{
-	DQ dq;
-	dq.q0 = float4(0,0,0,0);
-	dq.q1 = float4(0,0,0,0);
-
-	[unroll(4)]
-	for (int b = 0; b < 4; b++)
-	{
-		float w = boneWeight[b];
-		DQ boneDQ = boneDQs[boneIndex[b]];
-
-		boneDQ.q0 *= w;
-		boneDQ.q1 *= w;
-
-		// hemispherization
-		float sign = (dot(dq.q0, boneDQ.q0) < -FLT_EPSILON) ? -1.0f: 1.0f;
-
-		dq.q0 += sign * boneDQ.q0;
-		dq.q1 += sign * boneDQ.q1;
-	}
-
-	// normalize
-	float mag = dot(dq.q0, dq.q0);
-	float deLen = 1.0f / sqrt(mag+FLT_EPSILON);
-	dq.q0 *= deLen;
-	dq.q1 *= deLen;
-
-	// transform
-	float3 d0 = dq.q0.xyz;
-	float3 de = dq.q1.xyz;
-	float a0 = dq.q0.w;
-	float ae = dq.q1.w;
-
-	float3 tempPos		= cross(d0, restPosition.xyz) + a0 * restPosition.xyz;
-	float3 tempPos2		= 2.0f * (de * a0 - d0 * ae + cross(d0, de));
-	float3 tempNormal	= cross(d0, restNormal.xyz) + a0 * restNormal.xyz;
-	float3 tempTangent	= cross(d0, restTangent.xyz) + a0 * restTangent.xyz;
-			
-	skinnedPosition.xyz = restPosition.xyz + tempPos2 + cross(2.0f * d0, tempPos);
-	skinnedNormal.xyz	= restNormal.xyz + 2.0 * cross( d0, tempNormal);
-	skinnedTangent.xyz	= restTangent.xyz + 2.0 * cross( d0, tempTangent);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////
-// apply dual quaternion skinning
-void computeSkinningDQ(
-	float4	boneIndex,
-	float4	boneWeight,
-	DQ		boneDQs[MAX_BONE_MATRICES],
-	inout float3 skinnedPosition, 
-	float3 restPosition)
-{
-	DQ dq;
-	dq.q0 = float4(0,0,0,0);
-	dq.q1 = float4(0,0,0,0);
-
-	[unroll(4)]
-	for (int b = 0; b < 4; b++)
-	{
-		float w = boneWeight[b];
-		DQ boneDQ = boneDQs[boneIndex[b]];
-
-		boneDQ.q0 *= w;
-		boneDQ.q1 *= w;
-
-		// hemispherization
-		float sign = (dot(dq.q0, boneDQ.q0) < -FLT_EPSILON) ? -1.0f: 1.0f;
-
-		dq.q0 += sign * boneDQ.q0;
-		dq.q1 += sign * boneDQ.q1;
-	}
-
-	// normalize
-	float mag = dot(dq.q0, dq.q0);
-	float deLen = 1.0f / sqrt(mag+FLT_EPSILON);
-	dq.q0 *= deLen;
-	dq.q1 *= deLen;
-
-	// transform
-	float3 d0 = dq.q0.xyz;
-	float3 de = dq.q1.xyz;
-	float a0 = dq.q0.w;
-	float ae = dq.q1.w;
-
-	float3 tempPos		= cross(d0, restPosition.xyz) + a0 * restPosition.xyz;
-	float3 tempPos2		= 2.0f * (de * a0 - d0 * ae + cross(d0, de));	
-	skinnedPosition.xyz = restPosition.xyz + tempPos2 + cross(2.0f * d0, tempPos);
-}
-
-
-
diff --git a/tools/ArtistTools/source/Shaders/BodyShadow.hlsl b/tools/ArtistTools/source/Shaders/BodyShadow.hlsl
deleted file mode 100644
index 4d7629e..0000000
--- a/tools/ArtistTools/source/Shaders/BodyShadow.hlsl
+++ /dev/null
@@ -1,109 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-Buffer<float4>			g_BoneIndices : register(t0);
-Buffer<float4>			g_BoneWeights : register(t1);
-
-#include "BodyShaderCommon.hlsl"
-
-///////////////////////////////////////////////////////////////////////////////////
-// constant buffer
-///////////////////////////////////////////////////////////////////////////////////
-cbuffer cbPerFrame : register(b0)
-{
-	row_major float4x4	g_ViewProjection;
-	row_major float4x4	g_ViewMatrix;
-	row_major float4x4	g_BodyTransformation;
-
-	int					g_useDQs;
-	int 				g_usePinPos;
-	float				_reserved2;
-	float				_reserved3;
-
-	row_major float4x4	g_boneMatrices[MAX_BONE_MATRICES];
-	DQ					g_boneDQs[MAX_BONE_MATRICES];
-}
-
-struct VSIn
-{
-	float3 Position : POSITION;
-    float3 vertexNormal		: VERTEX_NORMAL;
-	float3 faceNormal		: FACE_NORMAL;
-	float3 Tangent   : TANGENT;
-	float2 texCoord : TEXCOORD;
-	float  vid		: VERTEX_ID;
-};
-
-struct VSOut
-{
-    float4 Position : SV_Position;
-    float Depth : texcoord;
-};
-
-struct PSOut
-{
-	float Z: SV_Target0;
-};
-
-float WorldToDepth(float3 wPos)
-{
-	float z = mul(float4(wPos, 1), g_ViewMatrix).z;
-    return z;
-    	
-}
-
-VSOut vs_main(VSIn vertexIn)
-{
-	VSOut vertex;
-	
-	float4 boneIndex = g_BoneIndices.Load(vertexIn.vid);
-	float4 boneWeight = g_BoneWeights.Load(vertexIn.vid);
-
-	float3 pos = vertexIn.Position.xyz;
-	float3 skinnedPos;
-
-	if (g_useDQs)
-		computeSkinningDQ(boneIndex, boneWeight, g_boneDQs, skinnedPos, pos);
-	else
-   		computeSkinningLinear(boneIndex, boneWeight, g_boneMatrices, skinnedPos, pos);
-
-	if (g_usePinPos)
-		skinnedPos = pos;
-
-	float3 wPos =  mul(float4(skinnedPos, 1), g_BodyTransformation).xyz; 
-    vertex.Position = mul(float4(wPos, 1), g_ViewProjection);
-    vertex.Depth = WorldToDepth(wPos);
-    return vertex;
-}
-
-PSOut ps_main(VSOut vertex)
-{
-	PSOut output;
-	output.Z = vertex.Depth;
-	return output;
-}
diff --git a/tools/ArtistTools/source/Shaders/Light.hlsl b/tools/ArtistTools/source/Shaders/Light.hlsl
deleted file mode 100644
index 85c71f0..0000000
--- a/tools/ArtistTools/source/Shaders/Light.hlsl
+++ /dev/null
@@ -1,69 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-///////////////////////////////////////////////////////////////////////////////////
-struct Light 
-{
-	int				m_enable;
-	float3			m_dir;
-
-	int				m_useShadows;
-	float3			m_color;
-
-	float3			m_ambientColor;
-	int				m_isEnvLight;
-
-	int				m_lhs;
-	int				_reserved1;
-	int				_reserved2;
-	int				_reserved3;
-
-	float			m_depthBias;
-	float			m_depthGain;
-	int				m_useEnvMap;
-	float			m_intensity;
-
-	row_major float4x4	m_viewMatrix;
-	row_major float4x4	m_lightMatrix;
-};
-
-float2 GetLightTexCoord(float3 Ldir, bool zup = true)
-{
-	const float M_PI = 3.1415923;
-
-	float coord0 = zup ? Ldir.x : Ldir.x;
-	float coord1 = zup ? Ldir.y : Ldir.z;
-	float coord2 = zup ? Ldir.z : Ldir.y;
-
-	float u = 0.5f + 0.5f * atan2(coord1, coord0) / M_PI;
-	float v = 0.5f - 0.5f * coord2;
-
-	return float2(u,v);
-}
-
-
diff --git a/tools/ArtistTools/source/Shaders/ScreenQuad.hlsl b/tools/ArtistTools/source/Shaders/ScreenQuad.hlsl
deleted file mode 100644
index e1ab62f..0000000
--- a/tools/ArtistTools/source/Shaders/ScreenQuad.hlsl
+++ /dev/null
@@ -1,66 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-///////////////////////////////////////////////////////////////////////////////////
-// Textures
-///////////////////////////////////////////////////////////////////////////////////
-Texture2D				g_ColorTexture : register(t0);
-
-struct VSOut
-{
-    float4 pos : SV_Position;
-	float2 tex : TEXCOORD;
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-// vertex shader
-/////////////////////////////////////////////////////////////////////////////////////
-VSOut vs_main( uint id : SV_VertexID )
-{
-    VSOut output;
-    output.tex = float2( (id << 1) & 2, id & 2 );
-    output.pos = float4( output.tex * float2( 2.0f, -2.0f ) + float2( -1.0f, 1.0f), 0.0f, 1.0f );
-
-    return output;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-// pixel shader
-/////////////////////////////////////////////////////////////////////////////////////
-//SamplerState samLinear;
-SamplerState samPointClamp;
-
-float4 ps_main(VSOut input) : SV_Target
-{   
-	float4 color;
-
-	color.rgb = g_ColorTexture.Sample(samPointClamp,input.tex).rgb;
-	color.a = 1.0f;
-
-	return color;
-}
diff --git a/tools/ArtistTools/source/Shaders/ScreenQuadColor.hlsl b/tools/ArtistTools/source/Shaders/ScreenQuadColor.hlsl
deleted file mode 100644
index e019b65..0000000
--- a/tools/ArtistTools/source/Shaders/ScreenQuadColor.hlsl
+++ /dev/null
@@ -1,71 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-
-///////////////////////////////////////////////////////////////////////////////////
-// Textures
-///////////////////////////////////////////////////////////////////////////////////
-Texture2D				g_ColorTexture : register(t0);
-
-struct VSOut
-{
-    float4 pos : SV_Position;
-	float2 tex : TEXCOORD;
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-// vertex shader
-/////////////////////////////////////////////////////////////////////////////////////
-VSOut vs_main( uint id : SV_VertexID )
-{
-    VSOut output;
-    output.tex = float2( (id << 1) & 2, id & 2 );
-    output.pos = float4( output.tex * float2( 2.0f, -2.0f ) + float2( -1.0f, 1.0f), 0.0f, 1.0f );
-
-    return output;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-// pixel shader
-/////////////////////////////////////////////////////////////////////////////////////
-//SamplerState samLinear;
-SamplerState samPointClamp;
-
-float4 ps_main(VSOut input) : SV_Target
-{
-	float4 color;
-
-	float3 top = float3(0.49f, 0.569f, 0.700f);
-	float3 btm = float3(0.098f, 0.098f, 0.098f);
-
-	float height = input.tex.y;
-	color.rgb = lerp(top, btm, height);
-
-	color.a = 1.0f;
-
-	return color;
-}
\ No newline at end of file
diff --git a/tools/ArtistTools/source/Shaders/VisualizeShadow.hlsl b/tools/ArtistTools/source/Shaders/VisualizeShadow.hlsl
deleted file mode 100644
index 04bf9f9..0000000
--- a/tools/ArtistTools/source/Shaders/VisualizeShadow.hlsl
+++ /dev/null
@@ -1,81 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed 
-// under the Mutual Non-Disclosure Agreement. 
-// 
-// Notice 
-// ALL NVIDIA DESIGN SPECIFICATIONS AND CODE ("MATERIALS") ARE PROVIDED "AS IS" NVIDIA MAKES 
-// NO REPRESENTATIONS, WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO 
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTIES OF NONINFRINGEMENT, 
-// MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 
-// 
-// 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. No third party distribution is allowed unless 
-// expressly authorized by NVIDIA.  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) 2013 NVIDIA Corporation. All rights reserved.
-//
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////////////
-// constant buffer
-///////////////////////////////////////////////////////////////////////////////////
-cbuffer cbPerFrame : register(b0)
-{
-	float			g_zNear;
-	float			g_zFar;
-	float			g_unitScale;
-	float			g_dummy;
-}
-
-///////////////////////////////////////////////////////////////////////////////////
-// Textures
-///////////////////////////////////////////////////////////////////////////////////
-Texture2D				g_ColorTexture : register(t0);
-
-struct VSOut
-{
-    float4 pos : SV_Position;
-	float2 tex : TEXCOORD;
-};
-
-/////////////////////////////////////////////////////////////////////////////////////
-// vertex shader
-/////////////////////////////////////////////////////////////////////////////////////
-VSOut vs_main( uint id : SV_VertexID )
-{
-    VSOut output;
-    output.tex = float2( (id << 1) & 2, id & 2 );
-    output.pos = float4( output.tex * float2( 2.0f, -2.0f ) + float2( -1.0f, 1.0f), 0.0f, 1.0f );
-
-    return output;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-// pixel shader
-/////////////////////////////////////////////////////////////////////////////////////
-//SamplerState samLinear;
-SamplerState samPointClamp;
-
-float4 ps_main(VSOut input) : SV_Target
-{   
-	float4 color;
-
-	color.rgb = g_ColorTexture.Sample(samPointClamp,input.tex).rgb;
-
-	float depth = color.r;
-	float near	= g_zNear;
-	float far	= g_zFar;
-
-	color.rgb = (depth - near) / (far - near);
-	color.a = 1.0f;
-	return color;
-}
diff --git a/tools/ArtistTools/source/Shaders/color.hlsl b/tools/ArtistTools/source/Shaders/color.hlsl
deleted file mode 100644
index b1fa057..0000000
--- a/tools/ArtistTools/source/Shaders/color.hlsl
+++ /dev/null
@@ -1,67 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Filename: color.vs
-////////////////////////////////////////////////////////////////////////////////
-
-
-/////////////
-// GLOBALS //
-/////////////
-cbuffer MatrixBuffer
-{
-	row_major	matrix worldMatrix;
-	row_major	matrix viewMatrix;
-	row_major	matrix projectionMatrix;
-	float4		g_color;
-
-	int		g_useVertexColor;
-	int		g_dummy2;
-	int		g_dummy3;
-	int		g_dummy4;
-};
-
-
-//////////////
-// TYPEDEFS //
-//////////////
-struct VertexInputType
-{
-    float3 position : POSITION;
-    float4 color : COLOR;
-};
-
-struct PixelInputType
-{
-    float4 position : SV_POSITION;
-    float4 color : COLOR;
-};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Vertex Shader
-////////////////////////////////////////////////////////////////////////////////
-PixelInputType vs_main(VertexInputType input)
-{
-    PixelInputType output;
-    
-	// Calculate the position of the vertex against the world, view, and projection matrices.
-    output.position = mul(float4(input.position,1.0), worldMatrix);
-    output.position = mul(float4(output.position.xyz,1.0f), viewMatrix);
-    output.position = mul(float4(output.position.xyz,1.0f), projectionMatrix);
-    
-	// Store the input color for the pixel shader to use.
-    output.color = input.color;
-
-	if (!g_useVertexColor)
-		output.color = g_color;
-    
-    return output;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Pixel Shader
-////////////////////////////////////////////////////////////////////////////////
-float4 ps_main(PixelInputType input) : SV_TARGET
-{
-    return input.color;
-}