Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 33 insertions, 15 deletions

diff --git a/sdk/extensions/physx/source/physics/NvBlastExtPxManagerImpl.h b/sdk/extensions/physx/source/physics/NvBlastExtPxManagerImpl.h
index 1f5e510..9c74bdb 100644
--- a/sdk/extensions/physx/source/physics/NvBlastExtPxManagerImpl.h
+++ b/sdk/extensions/physx/source/physics/NvBlastExtPxManagerImpl.h
@@ -1,19 +1,37 @@
-/*
-* 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 NVBLASTEXTPXMANAGERIMPL_H
 #define NVBLASTEXTPXMANAGERIMPL_H
 
 #include "NvBlastExtPxManager.h"
-#include "NvBlastExtArray.h"
-#include "NvBlastExtHashMap.h"
+#include "NvBlastArray.h"
+#include "NvBlastHashMap.h"
 #include "NvBlastExtPxListener.h"
 #include "NvBlastExtPxFamily.h"
 
@@ -188,10 +206,10 @@ private:
 	TkFramework&											m_framework;
 	ExtPxCreateJointFunction								m_createJointFn;
 	bool													m_usePxUserData;
-	ExtInlineArray<ExtPxListener*, 8>::type					m_listeners;
-	ExtHashMap<const PxRigidDynamic*, ExtPxActor*>::type	m_physXActorsMap;
-	ExtHashMap<TkFamily*, ExtPxFamily*>::type				m_tkFamiliesMap;
-	ExtHashMap<TkActor*, ExtArray<TkJoint*>::type >::type	m_incompleteJointMultiMap;
+	InlineArray<ExtPxListener*, 8>::type					m_listeners;
+	HashMap<const PxRigidDynamic*, ExtPxActor*>::type		m_physXActorsMap;
+	HashMap<TkFamily*, ExtPxFamily*>::type					m_tkFamiliesMap;
+	HashMap<TkActor*, Array<TkJoint*>::type >::type			m_incompleteJointMultiMap;
 	uint32_t												m_actorCountLimit;
 };