Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 34 insertions, 14 deletions

diff --git a/sdk/toolkit/source/NvBlastTkActorImpl.h b/sdk/toolkit/source/NvBlastTkActorImpl.h
index 4d65660..33fde68 100644
--- a/sdk/toolkit/source/NvBlastTkActorImpl.h
+++ b/sdk/toolkit/source/NvBlastTkActorImpl.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 NVBLASTTKACTORIMPL_H
 #define NVBLASTTKACTORIMPL_H
@@ -98,6 +116,8 @@ public:
 	virtual uint32_t			getJointCount() const override;
 
 	virtual uint32_t			getJoints(TkJoint** joints, uint32_t jointsSize) const override;
+
+	virtual bool				isBoundToWorld() const override;
 	// End TkActor
 
 	// Begin TkObject
@@ -215,7 +235,7 @@ private:
 			const void*					m_material;			//!< for Buffered type
 			const NvBlastProgramParams*	m_programParams;	//!< for Plain type
 		};
-		TkArray<char>::type	m_damageDescs;
+		Array<char>::type	m_damageDescs;
 		uint32_t			m_damageDescCount;
 	};
 
@@ -247,7 +267,7 @@ private:
 	TkGroupImpl*							m_group;			//!< The TkGroupImpl (if any) to which this actor belongs
 	uint32_t								m_groupJobIndex;	//!< The index of this actor's job within its group's job list
 	physx::PxFlags<TkActorFlag::Enum, char>	m_flags;			//!< Status flags for this actor
-	TkArray<DamageData>::type				m_damageBuffer;		//!< Buffered damage input
+	Array<DamageData>::type					m_damageBuffer;		//!< Buffered damage input
 	uint32_t								m_jointCount;		//!< The number of joints referenced in m_jointList
 	DList									m_jointList;		//!< A doubly-linked list of joint references
 
@@ -276,7 +296,7 @@ NV_INLINE TkFamilyImpl& TkActorImpl::getFamilyImpl() const
 NV_INLINE uint32_t TkActorImpl::getIndexInternal() const
 {
 	NVBLAST_ASSERT(isActive());
-	return NvBlastActorGetIndex(m_actorLL, TkFrameworkImpl::get()->log);
+	return NvBlastActorGetIndex(m_actorLL, logLL);
 }
 
 
@@ -343,7 +363,7 @@ NV_INLINE void TkActorImpl::DamageData::generateFracture(NvBlastFractureBuffers*
 {
 	if (getType() == Plain)
 	{
-		NvBlastActorGenerateFracture(commandBuffers, actorLL, m_program, m_programParams, TkFrameworkImpl::get()->log, timers);
+		NvBlastActorGenerateFracture(commandBuffers, actorLL, m_program, m_programParams, logLL, timers);
 	}
 	else
 	{
@@ -352,7 +372,7 @@ NV_INLINE void TkActorImpl::DamageData::generateFracture(NvBlastFractureBuffers*
 			m_damageDescCount,
 			m_material,
 		};
-		NvBlastActorGenerateFracture(commandBuffers, actorLL, m_program, &programParams, TkFrameworkImpl::get()->log, timers);
+		NvBlastActorGenerateFracture(commandBuffers, actorLL, m_program, &programParams, logLL, timers);
 	}
 }