From 1e887d827e65a084a0ad0ba933c61a8330aeee07 Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Mon, 28 Aug 2017 13:55:34 -0700 Subject: Candidate 1.1 release. * SampleAssetViewer now unconditionally loads the commandline-defined asset. * Better error handling in AuthoringTool (stderr and user error handler). * More consistent commandline switches in AuthoringTool and ApexImporter (--ll, --tx, --px flags). * NvBlastExtAuthoring ** Mesh cleaner, tries to remove self intersections and open edges in the interior of a mesh. ** Ability to set interior material to existing (external) material, or a new material id. ** Material ID remapping API. ** Rotation of voronoi cells used for fracturing. * Fixed smoothing groups in FBX exporter code. * Impulse passing from parent to child chunks fixed. * Reading unskinned fbx meshes correctly. * Collision hull generation from fbx meshes fixed. * Win32/64 PerfTest crash fix. --- .../authoring/source/NvBlastExtAuthoringMeshImpl.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'sdk/extensions/authoring/source/NvBlastExtAuthoringMeshImpl.h') diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshImpl.h b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshImpl.h index ee36f9c..5b7b245 100644 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshImpl.h +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringMeshImpl.h @@ -138,12 +138,17 @@ public: /** Set per-facet material id. */ - void setMaterialId(int32_t* materialIds) override; + void setMaterialId(const int32_t* materialIds) override; + + /** + Replaces an material id on faces with a new one + */ + void replaceMaterialId(int32_t oldMaterialId, int32_t newMaterialId) override; /** Set per-facet smoothing group. */ - void setSmoothingGroup(int32_t* smoothingGroup) override; + void setSmoothingGroup(const int32_t* smoothingGroups) override; private: std::vector mVertices; @@ -173,14 +178,14 @@ void setCuttingBox(const physx::PxVec3& point, const physx::PxVec3& normal, Mesh \param[in] size Cutting box size \param[in] id Cutting box ID */ -Mesh* getCuttingBox(const physx::PxVec3& point, const physx::PxVec3& normal, float size, int32_t id); +Mesh* getCuttingBox(const physx::PxVec3& point, const physx::PxVec3& normal, float size, int32_t id, int32_t interiorMaterialId); /** Create box at some particular position. \param[in] point Cutting face center \param[in] size Cutting box size */ -Mesh* getBigBox(const physx::PxVec3& point, float size); +Mesh* getBigBox(const physx::PxVec3& point, float size, int32_t interiorMaterialId); /** Create slicing box with noisy cutting surface. @@ -195,7 +200,7 @@ Mesh* getBigBox(const physx::PxVec3& point, float size); \param[in] octaves Noise octaves \param[in] seed Random generator seed, used for noise generation. */ -Mesh* getNoisyCuttingBoxPair(const physx::PxVec3& point, const physx::PxVec3& normal, float size, float jaggedPlaneSize, uint32_t resolution, int32_t id, float amplitude, float frequency, int32_t octaves, int32_t seed); +Mesh* getNoisyCuttingBoxPair(const physx::PxVec3& point, const physx::PxVec3& normal, float size, float jaggedPlaneSize, uint32_t resolution, int32_t id, float amplitude, float frequency, int32_t octaves, int32_t seed, int32_t interiorMaterialId); /** -- cgit v1.2.3