Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 67 insertions, 26 deletions

diff --git a/sdk/extensions/physx/include/NvBlastExtPxAsset.h b/sdk/extensions/physx/include/NvBlastExtPxAsset.h
index a4dbe0e..136f0d2 100644
--- a/sdk/extensions/physx/include/NvBlastExtPxAsset.h
+++ b/sdk/extensions/physx/include/NvBlastExtPxAsset.h
@@ -1,12 +1,30 @@
-/*
-* Copyright (c) 2016-2017, 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) 2016-2017 NVIDIA Corporation. All rights reserved.
+
 
 #ifndef NVBLASTEXTPXASSET_H
 #define NVBLASTEXTPXASSET_H
@@ -114,6 +132,16 @@ public:
 	*/
 	static ExtPxAsset*				create(const ExtPxAssetDesc& desc, TkFramework& framework);
 
+	/**
+	Create a new ExtPxAsset.
+
+	\param[in]	desc			The ExtPxAssetDesc descriptor to be used, @see ExtPxAssetDesc.
+	\param[in]	framework		The TkFramework instance to be used to create TkAsset.
+
+	\return the new ExtPxAsset if successful, NULL otherwise.
+	*/
+	static ExtPxAsset*				create(const TkAssetDesc& desc, ExtPxChunk* pxChunks, ExtPxSubchunk* pxSubchunks, TkFramework& framework);
+
 
 	/*
 		Factory method for deserialization
@@ -123,17 +151,18 @@ public:
 	*/
 	static ExtPxAsset*				create(TkAsset* asset);
 
+	/*
+	Create a new ExtPxAsset.
 
-	/**
-	Deserialize an ExtPxAsset object from the given stream.
+	\param[in]	asset			TkAsset from which ExtPxAsset will be created
+	\param[in]	chunks			Array of physics chunks descriptors
+	\param[in]	chunkCount		Size of chunks descriptors array
 
-	\param[in]	stream			User-defined stream object.
-	\param[in]	framework		The TkFramework instance to be used to deserialize TkAsset.
-	\param[in]	physics			The PxPhysics instance to be to deserialize PxConvexMesh(s).
 
-	\return pointer the deserialized ExtPxAsset object if successful, or NULL if unsuccessful.
+	\return the new ExtPxAsset if successful, NULL otherwise.
+		
 	*/
-	static ExtPxAsset*				deserialize(physx::general_PxIOStream2::PxFileBuf& stream, TkFramework& framework, physx::PxPhysics& physics);
+	static ExtPxAsset*				create(TkAsset* asset, ExtPxAssetDesc::ChunkDesc* chunks, uint32_t chunkCount);
 
 	/**
 	Release this ExtPxAsset.
@@ -141,16 +170,6 @@ public:
 	virtual void					release() = 0;
 
 	/**
-	Write the asset's data to the user-defined PxFileBuf stream. Underlying TkAsset would be also serialized.
-
-	\param[in]	stream			User-defined stream object.
-	\param[in]	cooking			The PxCooking instance to be used to serialize PxConvexMesh(s).
-
-	\return true if serialization was successful, false otherwise.
-	*/
-	virtual bool					serialize(physx::general_PxIOStream2::PxFileBuf& stream, physx::PxCooking& cooking) const = 0;
-	
-	/**
 	Every ExtPxAsset has corresponding TkAsset.
 
 	/return a pointer to TkAsset actor.
@@ -187,6 +206,28 @@ public:
 	virtual const ExtPxSubchunk*	getSubchunks() const = 0;
 
 	/**
+	Get the default NvBlastActorDesc to be used when creating family from this asset. It is called 'default', 
+	because it can be overwritten in ExtPxManager::createFamily(...) function.
+
+	Initially default NvBlastActorDesc contains only uniform health values, and 'nullptr' is set in arrays of health.
+	Call setUniformHealth(false) in order to set health per bond/chunk. You can then access directly values stored in NvBlastActorDesc,
+	change them and they will be serialized/deserialized as withing asset itself.
+
+	NOTE: do not change actual pointers in NvBlastActorDesc: initialBondHealths and initialSupportChunkHealths. You can change actual values
+	in those arrays or if they are 'nullptr' call setUniformHealth(false) before. Or call setUniformHealth(true) to make them 'nullptr'.
+
+	\return	the default NvBlastActorDesc.
+	*/
+	virtual NvBlastActorDesc&		getDefaultActorDesc() = 0;
+
+	virtual const NvBlastActorDesc&	getDefaultActorDesc() const = 0;
+
+	/**
+	Set if uniform health values should be used in NvBlastActorDesc or per bond/chunk ones. @see getDefaultActorDesc.
+	*/
+	virtual void					setUniformHealth(bool enabled) = 0;
+
+	/**
 	Pointer field available to the user.
 	*/
 	void*	userData;