Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 44 insertions, 22 deletions

diff --git a/tools/common/BlastDataExporter.h b/tools/common/BlastDataExporter.h
index 3e44a7c..8428d6c 100644
--- a/tools/common/BlastDataExporter.h
+++ b/tools/common/BlastDataExporter.h
@@ -1,3 +1,31 @@
+// 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) 2017 NVIDIA Corporation. All rights reserved.
+
+
 #ifndef BLAST_DATA_EXPORTER
 #define BLAST_DATA_EXPORTER
 
@@ -12,7 +40,8 @@ using namespace Nv::Blast;
 
 namespace physx
 {
-	class PxCooking;
+class PxPhysics;
+class PxCooking;
 }
 
 
@@ -22,19 +51,23 @@ struct NvBlastChunkDesc;
 struct NvBlastAsset;
 namespace Nv
 {
-	namespace Blast
-	{
-		class TkAsset;
-		class ExtPxAsset;
-	}
+namespace Blast
+{
+class TkAsset;
+class ExtPxAsset;
+class ExtSerialization;
 }
+}
+
+
 /**
 	Tool for Blast asset creation and exporting
 */
 class BlastDataExporter
 {
 public:
-	BlastDataExporter(TkFramework* framework, physx::PxCooking* cooking, NvBlastLog log) : mFramework(framework), mCooking(cooking), m_log(log) {};
+	BlastDataExporter(TkFramework* framework, physx::PxPhysics* physics, physx::PxCooking* cooking);
+	~BlastDataExporter();
 
 	/**
 		Creates ExtPxAsset
@@ -52,24 +85,13 @@ public:
 	TkAsset*		createTkBlastAsset(const std::vector<NvBlastBondDesc>& bondDescs, const std::vector<NvBlastChunkDesc>& chunkDescs);
 
 	/*
-		Saves Blast LL asset to given path
-	*/
-	bool saveBlastLLAsset(const std::string& outputFilePath, const NvBlastAsset* asset);
-
-	/*
-		Saves Blast Tk asset to given path
-	*/
-	bool saveBlastTkAsset(const std::string& outputFilePath, const TkAsset* asset);
-
-	/*
-		Saves Blast BPXA asset to given path
+	Saves a Blast object to given path
 	*/
-	bool saveBlastExtAsset(const std::string& outputFilePath, const ExtPxAsset* asset);
+	bool			saveBlastObject(const std::string& outputDir, const std::string& objectName, const void* object, uint32_t objectTypeID);
 
 private:
-	TkFramework* mFramework;
-	physx::PxCooking* mCooking;
-	NvBlastLog m_log;
+	TkFramework*		mFramework;
+	ExtSerialization*	mSerialization;
 };