Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 36 insertions, 33 deletions

diff --git a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.cpp b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.cpp
index 244f121..b2533a6 100644
--- a/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.cpp
+++ b/tools/ArtistTools/source/BlastPlugin/SampleBase/ui/EditionToolController.cpp
@@ -1,12 +1,30 @@
-/*
-* Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
-*
-* NVIDIA CORPORATION and its licensors retain all intellectual property
-* and proprietary rights in and to this software, related documentation
-* and any modifications thereto.  Any use, reproduction, disclosure or
-* distribution of this software and related documentation without an express
-* license agreement from NVIDIA CORPORATION is strictly prohibited.
-*/
+// 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"
@@ -76,7 +94,7 @@ LRESULT EditionToolController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
 
 			PxRaycastHit hit; hit.shape = NULL;
 			PxRaycastBuffer hit1;
-			getPhysXController().getPhysXScene().raycast(eyePos, pickDir, PX_MAX_F32, hit1, PxHitFlag::ePOSITION | PxHitFlag::eNORMAL);
+			getPhysXController().getEditPhysXScene().raycast(eyePos, pickDir, PX_MAX_F32, hit1, PxHitFlag::ePOSITION | PxHitFlag::eNORMAL);
 			hit = hit1.block;
 
 			PxRigidActor* actor = NULL;
@@ -109,19 +127,8 @@ void EditionToolController::fracture(PxActor* actor)
 		return;
 	}
 
-	ExtPxActor* extActor = NULL;
 	PxRigidDynamic* rigidDynamic = actor->is<PxRigidDynamic>();
-	if (NULL != rigidDynamic)
-	{
-		extActor = blastController.getExtPxManager().getActorFromPhysXActor(*rigidDynamic);
-	}
-	if (NULL == extActor)
-	{
-		return;
-	}
-
-	uint32_t chunkCount = extActor->getChunkCount();
-	if (chunkCount <= 0)
+	if (NULL == rigidDynamic)
 	{
 		return;
 	}
@@ -131,7 +138,7 @@ void EditionToolController::fracture(PxActor* actor)
 	for (; it != families.end(); it++)
 	{
 		BlastFamilyPtr f = *it;
-		if (f->find(extActor))
+		if (f->find(*actor))
 		{
 			pBlastFamily = f;
 			break;
@@ -142,17 +149,13 @@ void EditionToolController::fracture(PxActor* actor)
 		return;
 	}
 
-	const uint32_t* chunkIndices = extActor->getChunkIndices();
+	const uint32_t chunkIndex = pBlastFamily->getChunkIndexByPxActor(*actor);
 
 	const BlastAsset& blastAsset = pBlastFamily->getBlastAsset();
-	const BlastAsset* pBlastAsset = &blastAsset;
-
-	SceneController& sceneController = getManager()->getSceneController();
-	AssetList::ModelAsset desc;
-	sceneController.GetAssetDesc(pBlastAsset, desc);
+	BlastAsset* pBlastAsset = (BlastAsset*)&blastAsset;
 
-	std::string assetname = desc.id;
-	GlobalSettings& globalSettings = GlobalSettings::Inst();
-	getManager()->fractureAsset(globalSettings.m_projectFileDir, assetname, pBlastAsset, chunkIndices[0]);
-	getManager()->addModelAsset(globalSettings.m_projectFileDir, assetname, desc.isSkinned, desc.transform, false);
+	VoronoiFractureExecutor executor;
+	executor.setSourceAsset(pBlastAsset);
+	executor.setTargetChunk(chunkIndex);
+	executor.execute();
 }
\ No newline at end of file