1.1.6 Release.1.1.6

1 files changed, 35 insertions, 35 deletions

diff --git a/PxShared/include/foundation/PxTransform.h b/PxShared/include/foundation/PxTransform.h
index ddba031..f639903 100644
--- a/PxShared/include/foundation/PxTransform.h
+++ b/PxShared/include/foundation/PxTransform.h
@@ -1,29 +1,29 @@
-// 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.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//  * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//  * Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//  * Neither the name of NVIDIA CORPORATION nor the names of its
+//    contributors may be used to endorse or promote products derived
+//    from this software without specific prior written permission.
 //
-// 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.
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-// 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) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved.
 // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
 // Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
 
@@ -66,7 +66,7 @@ class PxTransform
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE explicit PxTransform(const PxQuat& orientation) : q(orientation), p(0)
 	{
-		PX_ASSERT(orientation.isSane());
+		PX_SHARED_ASSERT(orientation.isSane());
 	}
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform(float x, float y, float z, PxQuat aQ = PxQuat(PxIdentity))
@@ -76,7 +76,7 @@ class PxTransform
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform(const PxVec3& p0, const PxQuat& q0) : q(q0), p(p0)
 	{
-		PX_ASSERT(q0.isSane());
+		PX_SHARED_ASSERT(q0.isSane());
 	}
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE explicit PxTransform(const PxMat44& m); // defined in PxMat44.h
@@ -91,7 +91,7 @@ class PxTransform
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform operator*(const PxTransform& x) const
 	{
-		PX_ASSERT(x.isSane());
+		PX_SHARED_ASSERT(x.isSane());
 		return transform(x);
 	}
 
@@ -104,39 +104,39 @@ class PxTransform
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform getInverse() const
 	{
-		PX_ASSERT(isFinite());
+		PX_SHARED_ASSERT(isFinite());
 		return PxTransform(q.rotateInv(-p), q.getConjugate());
 	}
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 transform(const PxVec3& input) const
 	{
-		PX_ASSERT(isFinite());
+		PX_SHARED_ASSERT(isFinite());
 		return q.rotate(input) + p;
 	}
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 transformInv(const PxVec3& input) const
 	{
-		PX_ASSERT(isFinite());
+		PX_SHARED_ASSERT(isFinite());
 		return q.rotateInv(input - p);
 	}
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 rotate(const PxVec3& input) const
 	{
-		PX_ASSERT(isFinite());
+		PX_SHARED_ASSERT(isFinite());
 		return q.rotate(input);
 	}
 
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxVec3 rotateInv(const PxVec3& input) const
 	{
-		PX_ASSERT(isFinite());
+		PX_SHARED_ASSERT(isFinite());
 		return q.rotateInv(input);
 	}
 
 	//! Transform transform to parent (returns compound transform: first src, then *this)
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform transform(const PxTransform& src) const
 	{
-		PX_ASSERT(src.isSane());
-		PX_ASSERT(isSane());
+		PX_SHARED_ASSERT(src.isSane());
+		PX_SHARED_ASSERT(isSane());
 		// src = [srct, srcr] -> [r*srct + t, r*srcr]
 		return PxTransform(q.rotate(src.p) + p, q * src.q);
 	}
@@ -171,8 +171,8 @@ class PxTransform
 	//! Transform transform from parent (returns compound transform: first src, then this->inverse)
 	PX_CUDA_CALLABLE PX_FORCE_INLINE PxTransform transformInv(const PxTransform& src) const
 	{
-		PX_ASSERT(src.isSane());
-		PX_ASSERT(isFinite());
+		PX_SHARED_ASSERT(src.isSane());
+		PX_SHARED_ASSERT(isFinite());
 		// src = [srct, srcr] -> [r^-1*(srct-t), r^-1*srcr]
 		PxQuat qinv = q.getConjugate();
 		return PxTransform(qinv.rotate(src.p - p), qinv * src.q);