Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 35 insertions, 19 deletions

diff --git a/sdk/extensions/physx/source/sync/NvBlastExtSync.cpp b/sdk/extensions/physx/source/sync/NvBlastExtSync.cpp
index 5f018d9..a74f3e7 100644
--- a/sdk/extensions/physx/source/sync/NvBlastExtSync.cpp
+++ b/sdk/extensions/physx/source/sync/NvBlastExtSync.cpp
@@ -1,18 +1,34 @@
-/*
-* 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.
 
 
 #include "NvBlastExtSync.h"
 #include "NvBlastAssert.h"
 #include "NvBlast.h"
-#include "NvBlastExtDefs.h"
 #include "NvBlastExtPxManager.h"
 #include "NvBlastExtPxFamily.h"
 #include "NvBlastExtPxActor.h"
@@ -39,7 +55,7 @@ public:
 
 	ExtSyncImpl();
 	
-	~ExtSyncImpl();
+	virtual				~ExtSyncImpl();
 
 
 	//////// TkEventListener interface ////////
@@ -74,7 +90,7 @@ private:
 
 void ExtSyncEvent::release()
 {
-	NVBLASTEXT_DELETE(this, ExtSyncEvent);
+	NVBLAST_DELETE(this, ExtSyncEvent);
 }
 
 
@@ -84,12 +100,12 @@ void ExtSyncEvent::release()
 
 ExtSync* ExtSync::create()
 {
-	return NVBLASTEXT_NEW(ExtSyncImpl) ();
+	return NVBLAST_NEW(ExtSyncImpl) ();
 }
 
 void ExtSyncImpl::release()
 {
-	NVBLASTEXT_DELETE(this, ExtSyncImpl);
+	NVBLAST_DELETE(this, ExtSyncImpl);
 }
 
 ExtSyncImpl::ExtSyncImpl()
@@ -109,7 +125,7 @@ void ExtSyncImpl::receive(const TkEvent* events, uint32_t eventCount)
 		if (tkEvent.type == TkEvent::FractureCommand)
 		{
 			const TkFractureCommands* fracEvent = tkEvent.getPayload<TkFractureCommands>();
-			ExtSyncEventFracture* e = NVBLASTEXT_NEW(ExtSyncEventFracture) ();
+			ExtSyncEventFracture* e = NVBLAST_NEW(ExtSyncEventFracture) ();
 			e->timestamp = duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count();
 			e->familyID = fracEvent->tkActorData.family->getID();
 			e->bondFractures.resize(fracEvent->buffers.bondFractureCount);
@@ -123,11 +139,11 @@ void ExtSyncImpl::receive(const TkEvent* events, uint32_t eventCount)
 
 void ExtSyncImpl::syncFamily(const TkFamily& family)
 {
-	ExtSyncEventFamilySync* e = NVBLASTEXT_NEW(ExtSyncEventFamilySync) ();
+	ExtSyncEventFamilySync* e = NVBLAST_NEW(ExtSyncEventFamilySync) ();
 	e->timestamp = duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count();
 	e->familyID = family.getID();
 	const NvBlastFamily* familyLL = family.getFamilyLL();
-	const uint32_t size = NvBlastFamilyGetSize(familyLL, NvBlastTkFrameworkGet()->getLogFn());
+	const uint32_t size = NvBlastFamilyGetSize(familyLL, logLL);
 	e->family = std::vector<char>((char*)familyLL, (char*)familyLL + size);
 	m_syncEvents.push_back(e);
 }
@@ -138,7 +154,7 @@ void ExtSyncImpl::syncFamily(const ExtPxFamily& family)
 
 	syncFamily(tkFamily);
 
-	ExtSyncEventPhysicsSync* e = NVBLASTEXT_NEW(ExtSyncEventPhysicsSync) ();
+	ExtSyncEventPhysicsSync* e = NVBLAST_NEW(ExtSyncEventPhysicsSync) ();
 	e->timestamp = duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count();
 	e->familyID = tkFamily.getID();
 	std::vector<ExtPxActor*> actors(family.getActorCount());
@@ -170,7 +186,7 @@ void ExtSyncImpl::releaseSyncBuffer()
 {
 	for (uint32_t i = 0; i < m_syncEvents.size(); ++i)
 	{
-		NVBLASTEXT_DELETE(m_syncEvents[i], ExtSyncEvent);
+		NVBLAST_DELETE(m_syncEvents[i], ExtSyncEvent);
 	}
 	m_syncEvents.clear();
 }