Blast 1.1.3. See docs/release_notes.txt.v1.1.3_rc1

1 files changed, 163 insertions, 163 deletions

diff --git a/sdk/toolkit/source/NvBlastTkAssetImpl.h b/sdk/toolkit/source/NvBlastTkAssetImpl.h
index 8c7b597..3ae9cfc 100644..100755
--- a/sdk/toolkit/source/NvBlastTkAssetImpl.h
+++ b/sdk/toolkit/source/NvBlastTkAssetImpl.h
@@ -1,163 +1,163 @@
-// 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-2018 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef NVBLASTTKASSETIMPL_H
-#define NVBLASTTKASSETIMPL_H
-
-
-#include "NvBlastTkCommon.h"
-#include "NvBlastTkJoint.h"
-#include "NvBlastTkAsset.h"
-#include "NvBlastTkTypeImpl.h"
-#include "NvBlastArray.h"
-
-
-// Forward declarations
-struct NvBlastAsset;
-
-
-namespace Nv
-{
-namespace Blast
-{
-
-/**
-Implementation of TkAsset
-*/
-NVBLASTTK_IMPL_DECLARE(Asset)
-{
-public:
-	TkAssetImpl();
-	TkAssetImpl(const NvBlastID& id);
-	~TkAssetImpl();
-
-	NVBLASTTK_IMPL_DEFINE_IDENTIFIABLE('A', 'S', 'S', 'T');
-
-	// Public methods
-
-	/**
-	Factory create method.  This method creates a low-level asset and stores a reference to it.
-
-	\param[in]	desc	Asset descriptor set by the user.
-
-	\return a pointer to a new TkAssetImpl object if successful, NULL otherwise.
-	*/
-	static TkAssetImpl*					create(const TkAssetDesc& desc);
-	
-	/**
-	Static method to create an asset from an existing low-level asset.
-
-	\param[in]	assetLL			A valid low-level asset passed in by the user.
-	\param[in]	jointDescs		Optional joint descriptors to add to the new asset.
-	\param[in]	jointDescCount	The number of joint descriptors in the jointDescs array.  If non-zero, jointDescs cannot be NULL.
-	\param[in]	ownsAsset		Whether or not to let this TkAssetImpl object release the low-level NvBlastAsset memory upon its own release.
-
-	\return a pointer to a new TkAssetImpl object if successful, NULL otherwise.
-	*/
-	static TkAssetImpl*					create(const NvBlastAsset* assetLL, Nv::Blast::TkAssetJointDesc* jointDescs = nullptr, uint32_t jointDescCount = 0, bool ownsAsset = false);
-
-	/**
-	\return a pointer to the underlying low-level NvBlastAsset associated with this asset.
-	*/
-	const NvBlastAsset*					getAssetLLInternal() const;
-
-	/**
-	\return the number of internal joint descriptors stored with this asset.
-	*/
-	uint32_t							getJointDescCountInternal() const;
-
-	/**
-	\return the array of internal joint descriptors stored with this asset, with size given by getJointDescCountInternal().
-	*/
-	const TkAssetJointDesc*				getJointDescsInternal() const;
-
-	// Begin TkAsset
-	virtual const NvBlastAsset*			getAssetLL() const override;
-
-	virtual uint32_t					getChunkCount() const override;
-
-	virtual uint32_t					getLeafChunkCount() const override;
-
-	virtual uint32_t					getBondCount() const override;
-
-	virtual const NvBlastChunk*			getChunks() const override;
-
-	virtual const NvBlastBond*			getBonds() const override;
-
-	virtual const NvBlastSupportGraph	getGraph() const override;
-
-	virtual uint32_t					getDataSize() const override;
-
-	virtual uint32_t					getJointDescCount() const override;
-
-	virtual const TkAssetJointDesc*		getJointDescs() const override;
-	// End TkAsset
-
-private:
-	/**
-	Utility to add a joint descriptor between the indexed chunks.  The two chunks
-	must be support chunks, and there must exist a bond between them.  The joint's
-	attachment positions will be the bond centroid.
-
-	\param[in]	chunkIndex0	The first chunk index.
-	\param[in]	chunkIndex1	The second chunk index.
-
-	\return true iff successful.
-	*/
-	bool								addJointDesc(uint32_t chunkIndex0, uint32_t chunkIndex1);
-
-	NvBlastAsset*					m_assetLL;		//!< The underlying low-level asset.
-	Array<TkAssetJointDesc>::type	m_jointDescs;	//!< The array of internal joint descriptors.
-	bool							m_ownsAsset;	//!< Whether or not this asset should release its low-level asset upon its own release.
-};
-
-
-//////// TkAssetImpl inline methods ////////
-
-NV_INLINE const NvBlastAsset* TkAssetImpl::getAssetLLInternal() const
-{
-	return m_assetLL;
-}
-
-
-NV_INLINE uint32_t TkAssetImpl::getJointDescCountInternal() const
-{
-	return m_jointDescs.size();
-}
-
-
-NV_INLINE const TkAssetJointDesc* TkAssetImpl::getJointDescsInternal() const
-{
-	return m_jointDescs.begin();
-}
-
-} // namespace Blast
-} // namespace Nv
-
-
-#endif // ifndef NVBLASTTKASSETIMPL_H
+// 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-2018 NVIDIA Corporation. All rights reserved.

+

+

+#ifndef NVBLASTTKASSETIMPL_H

+#define NVBLASTTKASSETIMPL_H

+

+

+#include "NvBlastTkCommon.h"

+#include "NvBlastTkJoint.h"

+#include "NvBlastTkAsset.h"

+#include "NvBlastTkTypeImpl.h"

+#include "NvBlastArray.h"

+

+

+// Forward declarations

+struct NvBlastAsset;

+

+

+namespace Nv

+{

+namespace Blast

+{

+

+/**

+Implementation of TkAsset

+*/

+NVBLASTTK_IMPL_DECLARE(Asset)

+{

+public:

+	TkAssetImpl();

+	TkAssetImpl(const NvBlastID& id);

+	~TkAssetImpl();

+

+	NVBLASTTK_IMPL_DEFINE_IDENTIFIABLE('A', 'S', 'S', 'T');

+

+	// Public methods

+

+	/**

+	Factory create method.  This method creates a low-level asset and stores a reference to it.

+

+	\param[in]	desc	Asset descriptor set by the user.

+

+	\return a pointer to a new TkAssetImpl object if successful, NULL otherwise.

+	*/

+	static TkAssetImpl*					create(const TkAssetDesc& desc);

+	

+	/**

+	Static method to create an asset from an existing low-level asset.

+

+	\param[in]	assetLL			A valid low-level asset passed in by the user.

+	\param[in]	jointDescs		Optional joint descriptors to add to the new asset.

+	\param[in]	jointDescCount	The number of joint descriptors in the jointDescs array.  If non-zero, jointDescs cannot be NULL.

+	\param[in]	ownsAsset		Whether or not to let this TkAssetImpl object release the low-level NvBlastAsset memory upon its own release.

+

+	\return a pointer to a new TkAssetImpl object if successful, NULL otherwise.

+	*/

+	static TkAssetImpl*					create(const NvBlastAsset* assetLL, Nv::Blast::TkAssetJointDesc* jointDescs = nullptr, uint32_t jointDescCount = 0, bool ownsAsset = false);

+

+	/**

+	\return a pointer to the underlying low-level NvBlastAsset associated with this asset.

+	*/

+	const NvBlastAsset*					getAssetLLInternal() const;

+

+	/**

+	\return the number of internal joint descriptors stored with this asset.

+	*/

+	uint32_t							getJointDescCountInternal() const;

+

+	/**

+	\return the array of internal joint descriptors stored with this asset, with size given by getJointDescCountInternal().

+	*/

+	const TkAssetJointDesc*				getJointDescsInternal() const;

+

+	// Begin TkAsset

+	virtual const NvBlastAsset*			getAssetLL() const override;

+

+	virtual uint32_t					getChunkCount() const override;

+

+	virtual uint32_t					getLeafChunkCount() const override;

+

+	virtual uint32_t					getBondCount() const override;

+

+	virtual const NvBlastChunk*			getChunks() const override;

+

+	virtual const NvBlastBond*			getBonds() const override;

+

+	virtual const NvBlastSupportGraph	getGraph() const override;

+

+	virtual uint32_t					getDataSize() const override;

+

+	virtual uint32_t					getJointDescCount() const override;

+

+	virtual const TkAssetJointDesc*		getJointDescs() const override;

+	// End TkAsset

+

+private:

+	/**

+	Utility to add a joint descriptor between the indexed chunks.  The two chunks

+	must be support chunks, and there must exist a bond between them.  The joint's

+	attachment positions will be the bond centroid.

+

+	\param[in]	chunkIndex0	The first chunk index.

+	\param[in]	chunkIndex1	The second chunk index.

+

+	\return true iff successful.

+	*/

+	bool								addJointDesc(uint32_t chunkIndex0, uint32_t chunkIndex1);

+

+	NvBlastAsset*					m_assetLL;		//!< The underlying low-level asset.

+	Array<TkAssetJointDesc>::type	m_jointDescs;	//!< The array of internal joint descriptors.

+	bool							m_ownsAsset;	//!< Whether or not this asset should release its low-level asset upon its own release.

+};

+

+

+//////// TkAssetImpl inline methods ////////

+

+NV_INLINE const NvBlastAsset* TkAssetImpl::getAssetLLInternal() const

+{

+	return m_assetLL;

+}

+

+

+NV_INLINE uint32_t TkAssetImpl::getJointDescCountInternal() const

+{

+	return m_jointDescs.size();

+}

+

+

+NV_INLINE const TkAssetJointDesc* TkAssetImpl::getJointDescsInternal() const

+{

+	return m_jointDescs.begin();

+}

+

+} // namespace Blast

+} // namespace Nv

+

+

+#endif // ifndef NVBLASTTKASSETIMPL_H