From c389ca2d86ed528e4d54941378a4752ca74026e8 Mon Sep 17 00:00:00 2001 From: bgaldrikian Date: Thu, 8 Oct 2020 22:01:09 -0700 Subject: * Updated license file * Updated copyright dates * Removed ArtistTool * Pulled request #15 "Fix Blast bond generation" * Pulled request #16 "Fix invalid pointer access in authoring tools" --- .../authoring/include/NvBlastExtAuthoring.h | 2 +- .../include/NvBlastExtAuthoringBondGenerator.h | 2 +- .../authoring/include/NvBlastExtAuthoringCutout.h | 2 +- .../include/NvBlastExtAuthoringFractureTool.h | 2 +- .../include/NvBlastExtAuthoringMeshCleaner.h | 2 +- .../authoring/source/NvBlastExtApexSharedParts.cpp | 29 ++++++++++++++++++---- .../authoring/source/NvBlastExtApexSharedParts.h | 2 +- .../authoring/source/NvBlastExtAuthoring.cpp | 2 +- .../NvBlastExtAuthoringBondGeneratorImpl.cpp | 2 +- .../source/NvBlastExtAuthoringBondGeneratorImpl.h | 2 +- .../source/NvBlastExtAuthoringBooleanTool.cpp | 2 +- .../source/NvBlastExtAuthoringBooleanTool.h | 2 +- .../NvBlastExtAuthoringCollisionBuilderImpl.cpp | 2 +- .../NvBlastExtAuthoringCollisionBuilderImpl.h | 2 +- .../source/NvBlastExtAuthoringCutoutImpl.cpp | 2 +- .../source/NvBlastExtAuthoringCutoutImpl.h | 2 +- .../source/NvBlastExtAuthoringFractureToolImpl.cpp | 2 +- .../source/NvBlastExtAuthoringFractureToolImpl.h | 2 +- .../source/NvBlastExtAuthoringMeshCleanerImpl.cpp | 8 ++++-- .../source/NvBlastExtAuthoringMeshCleanerImpl.h | 2 +- .../source/NvBlastExtAuthoringMeshNoiser.cpp | 2 +- .../source/NvBlastExtAuthoringMeshNoiser.h | 2 +- .../NvBlastExtAuthoringPatternGeneratorImpl.cpp | 2 +- .../NvBlastExtAuthoringPatternGeneratorImpl.h | 2 +- .../source/NvBlastExtAuthoringPerlinNoise.h | 2 +- .../source/NvBlastExtAuthoringTriangulator.cpp | 2 +- .../source/NvBlastExtAuthoringTriangulator.h | 2 +- .../authoring/source/NvBlastExtAuthoringVSA.h | 2 +- .../source/NvBlastExtTriangleProcessor.cpp | 8 +++--- .../authoring/source/NvBlastExtTriangleProcessor.h | 2 +- 30 files changed, 61 insertions(+), 38 deletions(-) (limited to 'sdk/extensions/authoring') diff --git a/sdk/extensions/authoring/include/NvBlastExtAuthoring.h b/sdk/extensions/authoring/include/NvBlastExtAuthoring.h index 829e13f..fb963b2 100755 --- a/sdk/extensions/authoring/include/NvBlastExtAuthoring.h +++ b/sdk/extensions/authoring/include/NvBlastExtAuthoring.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTAUTHORING_H diff --git a/sdk/extensions/authoring/include/NvBlastExtAuthoringBondGenerator.h b/sdk/extensions/authoring/include/NvBlastExtAuthoringBondGenerator.h index 6345e6d..5ef4987 100755 --- a/sdk/extensions/authoring/include/NvBlastExtAuthoringBondGenerator.h +++ b/sdk/extensions/authoring/include/NvBlastExtAuthoringBondGenerator.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGBONDGENERATOR_H diff --git a/sdk/extensions/authoring/include/NvBlastExtAuthoringCutout.h b/sdk/extensions/authoring/include/NvBlastExtAuthoringCutout.h index 10ffdd0..375132f 100755 --- a/sdk/extensions/authoring/include/NvBlastExtAuthoringCutout.h +++ b/sdk/extensions/authoring/include/NvBlastExtAuthoringCutout.h @@ -11,7 +11,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTAUTHORINGCUTOUT_H #define NVBLASTAUTHORINGCUTOUT_H diff --git a/sdk/extensions/authoring/include/NvBlastExtAuthoringFractureTool.h b/sdk/extensions/authoring/include/NvBlastExtAuthoringFractureTool.h index 0798f95..b273936 100755 --- a/sdk/extensions/authoring/include/NvBlastExtAuthoringFractureTool.h +++ b/sdk/extensions/authoring/include/NvBlastExtAuthoringFractureTool.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTAUTHORINGFRACTURETOOL_H diff --git a/sdk/extensions/authoring/include/NvBlastExtAuthoringMeshCleaner.h b/sdk/extensions/authoring/include/NvBlastExtAuthoringMeshCleaner.h index 6a9ab56..ece3c85 100755 --- a/sdk/extensions/authoring/include/NvBlastExtAuthoringMeshCleaner.h +++ b/sdk/extensions/authoring/include/NvBlastExtAuthoringMeshCleaner.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGMESHCLEANER_H diff --git a/sdk/extensions/authoring/source/NvBlastExtApexSharedParts.cpp b/sdk/extensions/authoring/source/NvBlastExtApexSharedParts.cpp index 847df77..807310d 100755 --- a/sdk/extensions/authoring/source/NvBlastExtApexSharedParts.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtApexSharedParts.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #include "NvBlastExtApexSharedParts.h" @@ -821,11 +821,23 @@ Status Collide(const Vec3V& initialDir, const ConvexV& convexA, const Mat34V& bT return Status(BAllEq(bCon, bTrue) == 1 ? STATUS_CONTACT : STATUS_DEGENERATE); } -static void _calcSeparation(const ConvexV& convexA, const physx::PxTransform& aToWorldIn, const Mat34V& bToA, ConvexV& convexB, Output& out, Separation& sep) +static void _calcSeparation(const ConvexV& convexA, const physx::PxTransform& aToWorldIn, const Mat34V& bToA, ConvexV& convexB, const Vec3V& centroidAToB, Output& out, Separation& sep) { Mat33V aToB = M34Trnsps33(bToA); Vec3V normalA = out.getNormal(); + FloatV vEpsilon = FLoad(1e-6f); + if (BAllEqFFFF(FIsGrtr(out.mDistSq, vEpsilon))) + { + if (BAllEqTTTT(FIsGrtr(V3Dot(centroidAToB, centroidAToB), vEpsilon))) + { + normalA = V3Normalize(centroidAToB); + } + else + { + normalA = V3UnitX(); + } + } convexA.calcExtent(normalA, sep.min0, sep.max0); Vec3V normalB = M33MulV3(aToB, normalA); @@ -972,9 +984,16 @@ bool importerHullsInProximityApexFree(uint32_t hull0Count, const PxVec3* hull0, convexB.mNumAovVertices = numAov1; convexB.mAovVertices = verts1; + const physx::PxVec3 hullACenter = hull0Bounds.getCenter(); + const physx::PxVec3 hullBCenter = hull1Bounds.getCenter(); + const Vec3V centroidA = V3LoadU(&hullACenter.x); + const Vec3V centroidB = M34MulV3(bToA, V3LoadU(&hullBCenter.x)); + // Take the origin of B in As space as the inital direction as it is 'the difference in transform origins B-A in A's space' // Should be a good first guess - const Vec3V initialDir = bToA.col3; + // Use centroid information + const Vec3V initialDir = V3Sub(centroidB, centroidA); + Output output; Status status = Collide(initialDir, convexA, bToA, convexB, output); @@ -999,7 +1018,7 @@ bool importerHullsInProximityApexFree(uint32_t hull0Count, const PxVec3* hull0, { if (separation) { - _calcSeparation(convexA, localToWorldRT0In, bToA, convexB, output, *separation); + _calcSeparation(convexA, localToWorldRT0In, bToA, convexB, initialDir, output, *separation); } return true; } @@ -1008,7 +1027,7 @@ bool importerHullsInProximityApexFree(uint32_t hull0Count, const PxVec3* hull0, { if (separation) { - _calcSeparation(convexA, localToWorldRT0In, bToA, convexB, output, *separation); + _calcSeparation(convexA, localToWorldRT0In, bToA, convexB, initialDir, output, *separation); } PxF32 val; FStore(output.mDistSq, &val); diff --git a/sdk/extensions/authoring/source/NvBlastExtApexSharedParts.h b/sdk/extensions/authoring/source/NvBlastExtApexSharedParts.h index f60b6fb..bb37565 100755 --- a/sdk/extensions/authoring/source/NvBlastExtApexSharedParts.h +++ b/sdk/extensions/authoring/source/NvBlastExtApexSharedParts.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAPEXSHAREDPARTS_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoring.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoring.cpp index b26eee3..6db06e3 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoring.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoring.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #include "NvBlastExtAuthoring.h" #include "NvBlastTypes.h" diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.cpp index 1fc61c2..626904c 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2020 NVIDIA Corporation. All rights reserved. // This warning arises when using some stl containers with older versions of VC diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h index fd81c2c..1fa42cd 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGBONDGENERATORIMPL_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringBooleanTool.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringBooleanTool.cpp index 89a3498..e8d25af 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringBooleanTool.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringBooleanTool.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #include "NvBlastGlobals.h" diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringBooleanTool.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringBooleanTool.h index 71f346a..4ed1afd 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringBooleanTool.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringBooleanTool.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGBOOLEANTOOL_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringCollisionBuilderImpl.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringCollisionBuilderImpl.cpp index 506227e..9b3b60d 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringCollisionBuilderImpl.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringCollisionBuilderImpl.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #include #include "NvBlastExtAuthoringCollisionBuilderImpl.h" diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringCollisionBuilderImpl.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringCollisionBuilderImpl.h index 8d136e4..79e32dd 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringCollisionBuilderImpl.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringCollisionBuilderImpl.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGCOLLISIONBUILDERIIMPL_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp index cef97f7..a1fc150 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #include "NvBlastGlobals.h" diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.h index ea3c1ff..f6b1e8d 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTAUTHORINGFCUTOUTIMPL_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringFractureToolImpl.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringFractureToolImpl.cpp index a5cd4c1..1bec026 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringFractureToolImpl.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringFractureToolImpl.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #include "NvBlastExtAuthoringFractureToolImpl.h" #include "NvBlastExtAuthoringMeshImpl.h" diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringFractureToolImpl.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringFractureToolImpl.h index 153e43c..61c55b8 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringFractureToolImpl.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringFractureToolImpl.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTAUTHORINGFRACTURETOOLIMPL_H #define NVBLASTAUTHORINGFRACTURETOOLIMPL_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshCleanerImpl.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshCleanerImpl.cpp index f5bc66c..d3ecc57 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshCleanerImpl.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshCleanerImpl.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #include #include @@ -1558,7 +1558,11 @@ Mesh* MeshCleanerImpl::cleanMesh(const Mesh* mesh) } } - trque.push(best); + if (!trs.empty()) + { + trque.push(best); + } + while (!trque.empty()) { int32_t trid = trque.front(); diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshCleanerImpl.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshCleanerImpl.h index aec863e..90ed72c 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshCleanerImpl.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshCleanerImpl.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGMESHCLEANERIMPL_H #define NVBLASTEXTAUTHORINGMESHCLEANERIMPL_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshNoiser.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshNoiser.cpp index 5810b9a..dde21bb 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshNoiser.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshNoiser.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2020 NVIDIA Corporation. All rights reserved. // This warning arises when using some stl containers with older versions of VC diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshNoiser.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshNoiser.h index 4fced5a..b70c453 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshNoiser.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshNoiser.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGMESHNOISER_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringPatternGeneratorImpl.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringPatternGeneratorImpl.cpp index 000767a..1b0462c 100644 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringPatternGeneratorImpl.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringPatternGeneratorImpl.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #include "NvBlastGlobals.h" #include "NvBlastAssert.h" diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringPatternGeneratorImpl.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringPatternGeneratorImpl.h index 98e3842..e211d83 100644 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringPatternGeneratorImpl.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringPatternGeneratorImpl.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGPATTERNGENERATORIMPL_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringPerlinNoise.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringPerlinNoise.h index a47c40e..58e1173 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringPerlinNoise.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringPerlinNoise.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGPERLINNOISE_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringTriangulator.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringTriangulator.cpp index af04d4a..9e84a89 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringTriangulator.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringTriangulator.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. // This warning arises when using some stl containers with older versions of VC diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringTriangulator.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringTriangulator.h index 1e9fad8..71edd21 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringTriangulator.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringTriangulator.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGTRIANGULATOR_H diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringVSA.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringVSA.h index 5d97f88..fc2fce1 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringVSA.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringVSA.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTAUTHORINGVSA_H diff --git a/sdk/extensions/authoring/source/NvBlastExtTriangleProcessor.cpp b/sdk/extensions/authoring/source/NvBlastExtTriangleProcessor.cpp index ffb838b..cee74fe 100755 --- a/sdk/extensions/authoring/source/NvBlastExtTriangleProcessor.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtTriangleProcessor.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #include "NvBlastExtTriangleProcessor.h" @@ -193,7 +193,7 @@ void TriangleProcessor::sortToCCW(std::vector& points, PxVec3& normal) int lastUnique = 0; for (uint32_t i = 1; i < points.size(); ++i) { - PxVec3 df = points[i] - points[lastUnique]; + PxVec3 df = (points[i] - points[lastUnique]).abs(); if (df.x > V_COMP_EPS || df.y > V_COMP_EPS || df.z > V_COMP_EPS) { points[++lastUnique] = points[i]; @@ -216,7 +216,7 @@ void TriangleProcessor::buildConvexHull(std::vector& points, std::vector int lastUnique = 0; for (uint32_t i = 1; i < points.size(); ++i) { - PxVec3 df = points[i] - points[lastUnique]; + PxVec3 df = (points[i] - points[lastUnique]).abs(); if (df.x > V_COMP_EPS || df.y > V_COMP_EPS || df.z > V_COMP_EPS) { points[++lastUnique] = points[i]; @@ -237,7 +237,7 @@ void TriangleProcessor::buildConvexHull(std::vector& points, std::vector { PxVec2 pnt = getProjectedPointWithWinding(points[i], projectionDirection); PxVec2 vec = pnt - getProjectedPointWithWinding(convexHull.back(), projectionDirection); - if (vec.x < V_COMP_EPS && vec.y < V_COMP_EPS) + if (PxAbs(vec.x) < V_COMP_EPS && PxAbs(vec.y) < V_COMP_EPS) { continue; } diff --git a/sdk/extensions/authoring/source/NvBlastExtTriangleProcessor.h b/sdk/extensions/authoring/source/NvBlastExtTriangleProcessor.h index cf60469..17f55de 100755 --- a/sdk/extensions/authoring/source/NvBlastExtTriangleProcessor.h +++ b/sdk/extensions/authoring/source/NvBlastExtTriangleProcessor.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2016-2018 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2016-2020 NVIDIA Corporation. All rights reserved. #ifndef NVBLASTEXTTRIANGLEPROCESSOR_H -- cgit v1.2.3