From b0c11962f6012430da3bcaa2727288046b33d648 Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Tue, 24 Oct 2017 15:25:02 -0700 Subject: Changes for 1.1.1 See README.md --- .../authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h') diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h index 35c4b23..a33468d 100644 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h @@ -65,8 +65,11 @@ public: NvBlastBondDesc*& resultBond, BondGenerationConfig cfg) override; virtual int32_t bondsFromPrefractured(uint32_t meshCount, const uint32_t* geometryOffset, const Triangle* geometry, - const bool*& chunkIsSupport, NvBlastBondDesc*& resultBondDescs, + const bool* chunkIsSupport, NvBlastBondDesc*& resultBondDescs, BondGenerationConfig conf = BondGenerationConfig()) override; + + virtual int32_t bondsFromPrefractured(uint32_t meshCount, const uint32_t* convexHullOffset, const CollisionHull** chunkHulls, + const bool* chunkIsSupport, const uint32_t* meshGroups, NvBlastBondDesc*& resultBondDescs) override; private: float processWithMidplanes( TriangleProcessor* trProcessor, @@ -74,8 +77,8 @@ private: const std::vector& hull1p, const std::vector& hull2p, physx::PxVec3& normal, physx::PxVec3& centroid); - int32_t createFullBondListAveraged( uint32_t meshCount, const uint32_t* geometryOffset, const Triangle* geometry, - const bool* supportFlags, NvBlastBondDesc*& resultBondDescs, BondGenerationConfig conf); + int32_t createFullBondListAveraged( uint32_t meshCount, const uint32_t* geometryOffset, const Triangle* geometry, const CollisionHull** chunkHulls, + const bool* supportFlags, const uint32_t* meshGroups, NvBlastBondDesc*& resultBondDescs, BondGenerationConfig conf); int32_t createFullBondListExact( uint32_t meshCount, const uint32_t* geometryOffset, const Triangle* geometry, const bool* supportFlags, NvBlastBondDesc*& resultBondDescs, BondGenerationConfig conf); int32_t createFullBondListExactInternal(uint32_t meshCount, const uint32_t* geometryOffset, const Triangle* geometry, -- cgit v1.2.3