diff options
| author | bgaldrikian <[email protected]> | 2018-10-25 00:12:07 -0700 |
|---|---|---|
| committer | bgaldrikian <[email protected]> | 2018-10-25 00:12:07 -0700 |
| commit | a3f92a1c7a1cc1553bd9581845ef2542d55ee58f (patch) | |
| tree | 65d7b052c81faca989db10cf2681f4209fe6dc76 /sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h | |
| parent | Merge pull request #14 from neithy/master (diff) | |
| download | blast-a3f92a1c7a1cc1553bd9581845ef2542d55ee58f.tar.xz blast-a3f92a1c7a1cc1553bd9581845ef2542d55ee58f.zip | |
Fix for crash bug during ESS authoringv1.1.4_releasev1.1.4_rc2
Doc updates for AuthoringTool and ApexImporter
Updated release notes
Diffstat (limited to 'sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h')
| -rwxr-xr-x | sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h index bef3668..222d22b 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringBondGeneratorImpl.h @@ -75,8 +75,9 @@ public: private:
- float processWithMidplanes(TriangleProcessor* trProcessor, const Triangle* mA, uint32_t mavc, const Triangle* mB, uint32_t mbvc,
- const std::vector<physx::PxVec3>& hull1p, const std::vector<physx::PxVec3>& hull2p, physx::PxVec3& normal, physx::PxVec3& centroid, float maxSeparation);
+ float processWithMidplanes(TriangleProcessor* trProcessor, const Triangle* mA, uint32_t mavc, const Triangle* mB, uint32_t mbvc, const CollisionHull* hull1, const CollisionHull* hull2,
+ const std::vector<physx::PxVec3>& hull1p, const std::vector<physx::PxVec3>& hull2p,
+ physx::PxVec3& normal, physx::PxVec3& centroid, float maxSeparation);
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, std::set<std::pair<uint32_t, uint32_t> >* pairNotToTest = nullptr);
|