Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 63 insertions, 19 deletions

diff --git a/sdk/extensions/physx/source/physics/NvBlastExtPxManagerImpl.cpp b/sdk/extensions/physx/source/physics/NvBlastExtPxManagerImpl.cpp
index 42266ee..bb2c64d 100644
--- a/sdk/extensions/physx/source/physics/NvBlastExtPxManagerImpl.cpp
+++ b/sdk/extensions/physx/source/physics/NvBlastExtPxManagerImpl.cpp
@@ -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.
+
 
 #include "NvBlastExtPxManagerImpl.h"
 #include "NvBlastExtPxAssetImpl.h"
@@ -32,26 +50,30 @@ namespace Blast
 
 ExtPxManager* ExtPxManager::create(PxPhysics& physics, TkFramework& framework, ExtPxCreateJointFunction createFn, bool useUserData)
 {
-	return NVBLASTEXT_NEW(ExtPxManagerImpl)(physics, framework, createFn, useUserData);
+	return NVBLAST_NEW(ExtPxManagerImpl)(physics, framework, createFn, useUserData);
 }
 
 void ExtPxManagerImpl::release()
 {
-	NVBLASTEXT_DELETE(this, ExtPxManagerImpl);
+	NVBLAST_DELETE(this, ExtPxManagerImpl);
 }
 
 ExtPxFamily* ExtPxManagerImpl::createFamily(const ExtPxFamilyDesc& desc)
 {
-	NVBLASTEXT_CHECK_ERROR(desc.pxAsset != nullptr, "Family creation: pxAsset is nullptr.", return nullptr);
+	NVBLAST_CHECK_ERROR(desc.pxAsset != nullptr, "Family creation: pxAsset is nullptr.", return nullptr);
 
-	// create tk family
+	// prepare TkActorDesc (take NvBlastActorDesc from ExtPxFamilyDesc if it's not null, otherwise take from PxAsset)
 	TkActorDesc tkActorDesc;
-	(&tkActorDesc)->NvBlastActorDesc::operator=(desc.actorDesc);
+	const NvBlastActorDesc& actorDesc = desc.actorDesc ? *desc.actorDesc : desc.pxAsset->getDefaultActorDesc();
+	(&tkActorDesc)->NvBlastActorDesc::operator=(actorDesc);
 	tkActorDesc.asset = &desc.pxAsset->getTkAsset();
+
+	// create tk actor
 	TkActor* actor = m_framework.createActor(tkActorDesc);
-	NVBLASTEXT_CHECK_ERROR(actor != nullptr, "Family creation: tk actor creation failed.", return nullptr);
+	NVBLAST_CHECK_ERROR(actor != nullptr, "Family creation: tk actor creation failed.", return nullptr);
 
-	ExtPxFamilyImpl* family = NVBLASTEXT_NEW(ExtPxFamilyImpl)(*this, actor->getFamily(), *desc.pxAsset);
+	// create px family
+	ExtPxFamilyImpl* family = NVBLAST_NEW(ExtPxFamilyImpl)(*this, actor->getFamily(), *desc.pxAsset);
 
 	if (desc.group)
 	{
@@ -68,7 +90,17 @@ bool ExtPxManagerImpl::createJoint(TkJoint& joint)
 		const TkJointData data = joint.getData();
 		ExtPxActorImpl* pxActor0 = data.actors[0] != nullptr ? reinterpret_cast<ExtPxActorImpl*>(data.actors[0]->userData) : nullptr;
 		ExtPxActorImpl* pxActor1 = data.actors[1] != nullptr ? reinterpret_cast<ExtPxActorImpl*>(data.actors[1]->userData) : nullptr;
-		NVBLAST_ASSERT(pxActor0 || pxActor1);
+		if (!pxActor0 && !pxActor1)
+		{
+			for (int i = 0; i < 2; ++i)
+			{
+				if (data.actors[i] != nullptr)
+				{
+					m_incompleteJointMultiMap[data.actors[i]].pushBack(&joint);
+				}
+			}
+			return false;
+		}
 		PxTransform lf0(data.attachPositions[0]);
 		PxTransform lf1(data.attachPositions[1]);
 		PxJoint* pxJoint = m_createJointFn(pxActor0,  lf0, pxActor1, lf1, m_physics, joint);
@@ -83,9 +115,9 @@ bool ExtPxManagerImpl::createJoint(TkJoint& joint)
 
 void ExtPxManagerImpl::updateJoint(TkJoint& joint)
 {
+	const TkJointData& data = joint.getData();
 	if (joint.userData)
 	{
-		const TkJointData& data = joint.getData();
 		ExtPxActorImpl* pxActors[2];
 		for (int i = 0; i < 2; ++i)
 		{
@@ -94,7 +126,7 @@ void ExtPxManagerImpl::updateJoint(TkJoint& joint)
 				pxActors[i] = reinterpret_cast<ExtPxActorImpl*>(data.actors[i]->userData);
 				if (pxActors[i] == nullptr)
 				{
-					ExtArray<TkJoint*>::type& joints = m_incompleteJointMultiMap[data.actors[i]];
+					Array<TkJoint*>::type& joints = m_incompleteJointMultiMap[data.actors[i]];
 					NVBLAST_ASSERT(joints.find(&joint) == joints.end());
 					joints.pushBack(&joint);
 					return;	// Wait until the TkActor is received to create this joint
@@ -109,6 +141,18 @@ void ExtPxManagerImpl::updateJoint(TkJoint& joint)
 		PxJoint* pxJoint = reinterpret_cast<PxJoint*>(joint.userData);
 		pxJoint->setActors(pxActors[0] ? &pxActors[0]->getPhysXActor() : nullptr, pxActors[1] ? &pxActors[1]->getPhysXActor() : nullptr);
 	}
+	else
+	{
+		ExtPxActorImpl* pxActor0 = data.actors[0] != nullptr ? reinterpret_cast<ExtPxActorImpl*>(data.actors[0]->userData) : nullptr;
+		ExtPxActorImpl* pxActor1 = data.actors[1] != nullptr ? reinterpret_cast<ExtPxActorImpl*>(data.actors[1]->userData) : nullptr;
+		PxTransform lf0(data.attachPositions[0]);
+		PxTransform lf1(data.attachPositions[1]);
+		PxJoint* pxJoint = m_createJointFn(pxActor0, lf0, pxActor1, lf1, m_physics, joint);
+		if (pxJoint)
+		{
+			joint.userData = pxJoint;
+		}
+	}
 }
 
 void ExtPxManagerImpl::destroyJoint(TkJoint& joint)