Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 184 insertions, 0 deletions

diff --git a/sdk/extensions/serialization/source/NvBlastExtTkSerializerRAW.cpp b/sdk/extensions/serialization/source/NvBlastExtTkSerializerRAW.cpp
new file mode 100644
index 0000000..ed5ce00
--- /dev/null
+++ b/sdk/extensions/serialization/source/NvBlastExtTkSerializerRAW.cpp
@@ -0,0 +1,184 @@
+// 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.
+
+
+#include "NvBlastExtSerializationInternal.h"
+#include "NvBlastTkFramework.h"
+#include "NvBlastTkAsset.h"
+#include "NvBlast.h"
+
+
+namespace Nv
+{
+namespace Blast
+{
+
+// Legacy IDs
+struct ExtTkSerializationLegacyID
+{
+	enum Enum
+	{
+		Framework =	NVBLAST_FOURCC('T', 'K', 'F', 'W'),	//!< TkFramework identifier token, used in serialization
+		Asset =		NVBLAST_FOURCC('A', 'S', 'S', 'T'),	//!< TkAsset identifier token, used in serialization
+		Family =	NVBLAST_FOURCC('A', 'C', 'T', 'F'),	//!< TkFamily identifier token, used in serialization
+	};
+};
+
+
+// Legacy object format versions
+struct ExtTkSerializationLegacyAssetVersion
+{
+	enum Enum
+	{
+		/** Initial version */
+		Initial,
+
+		//	New formats must come before Count.  They should be given descriptive names with more information in comments.
+
+		/** The number of serialized formats. */
+		Count,
+
+		/** The current version.  This should always be Count-1 */
+		Current = Count - 1
+	};
+};
+
+struct ExtTkSerializationLegacyFamilyVersion
+{
+	enum Enum
+	{
+		/** Initial version */
+		Initial,
+
+		//	New formats must come before Count.  They should be given descriptive names with more information in comments.
+
+		/** The number of serialized formats. */
+		Count,
+
+		/** The current version.  This should always be Count-1 */
+		Current = Count - 1
+	};
+};
+
+
+static bool deserializeTkObjectHeader(uint32_t& legacyTypeID, uint32_t& legacyVersion, NvBlastID& objID, uint64_t& userIntData, ExtIStream& stream)
+{
+	// Read framework ID
+	uint32_t fwkID;
+	stream >> fwkID;
+	if (fwkID != ExtTkSerializationLegacyID::Framework)
+	{
+		NVBLAST_LOG_ERROR("deserializeTkObjectHeader: stream does not contain a BlastTk legacy object.");
+		return false;
+	}
+
+	// Read object class ID
+	stream >> legacyTypeID;
+
+	// Read object class version and ensure it's current
+	stream >> legacyVersion;
+
+	// Object ID
+	stream.read(objID.data, sizeof(NvBlastID));
+
+	// Serializable user data
+	uint32_t lsd, msd;
+	stream >> lsd >> msd;
+	userIntData = static_cast<uint64_t>(msd) << 32 | static_cast<uint64_t>(lsd);
+
+	return !stream.fail();
+}
+
+
+TkAsset* deserializeTkAsset(ExtIStream& stream, TkFramework& framework)
+{
+	// Deserializer header
+	uint32_t legacyTypeID;
+	uint32_t legacyVersion;
+	NvBlastID objID;
+	uint64_t userIntData;
+	if (!deserializeTkObjectHeader(legacyTypeID, legacyVersion, objID, userIntData, stream))
+	{
+		return nullptr;
+	}
+
+	if (legacyTypeID != ExtTkSerializationLegacyID::Asset)
+	{
+		NVBLAST_LOG_ERROR("deserializeTkAsset: stream does not contain a BlastTk legacy asset.");
+		return nullptr;
+	}
+
+	if (legacyVersion > ExtTkSerializationLegacyAssetVersion::Current)
+	{
+		NVBLAST_LOG_ERROR("deserializeTkAsset: stream contains a BlastTk legacy asset which is in an unknown version.");
+		return nullptr;
+	}
+
+	// LL asset
+	uint32_t assetSize;
+	stream >> assetSize;
+	NvBlastAsset* llAsset = static_cast<NvBlastAsset*>(NVBLAST_ALLOC_NAMED(assetSize, "deserializeTkAsset"));
+	stream.read(reinterpret_cast<char*>(llAsset), assetSize);
+
+	// Joint descs
+	uint32_t jointDescCount;
+	stream >> jointDescCount;
+	std::vector<TkAssetJointDesc> jointDescs(jointDescCount);
+	for (uint32_t i = 0; i < jointDescs.size(); ++i)
+	{
+		TkAssetJointDesc& jointDesc = jointDescs[i];
+		stream >> jointDesc.nodeIndices[0];
+		stream >> jointDesc.nodeIndices[1];
+		stream >> jointDesc.attachPositions[0].x;
+		stream >> jointDesc.attachPositions[0].y;
+		stream >> jointDesc.attachPositions[0].z;
+		stream >> jointDesc.attachPositions[1].x;
+		stream >> jointDesc.attachPositions[1].y;
+		stream >> jointDesc.attachPositions[1].z;
+	}
+
+	if (stream.fail())
+	{
+		NVBLAST_FREE(llAsset);
+		return nullptr;
+	}
+
+	TkAsset* asset = framework.createAsset(llAsset, jointDescs.data(), (uint32_t)jointDescs.size(), true);
+
+	NvBlastID zeroID;
+	memset(zeroID.data, 0, sizeof(zeroID));
+	if (!memcmp(zeroID.data, objID.data, sizeof(NvBlastID)))
+	{
+		asset->setID(objID);
+	}
+	asset->userIntData = userIntData;
+
+	return asset;
+}
+
+}	// namespace Blast
+}	// namespace Nv