From d41654b469fa51870b5952c836c04d9da17f32d3 Mon Sep 17 00:00:00 2001 From: Anton Novoselov Date: Tue, 8 Aug 2017 20:14:22 +0300 Subject: Updated to CL 22627414: * docs updates * authoring fixes * stress solver crash fixes --- ...last_ext_authoring_fracture_tool_8h-source.html | 70 ++++++------- ...ext_authoring_fracture_tool_impl_8h-source.html | 110 ++++++++++----------- .../_nv_blast_ext_authoring_types_8h-source.html | 2 +- ...nv_blast_ext_exporter_fbx_reader_8h-source.html | 2 +- ...s_nv_1_1_blast_1_1_fbx_file_reader-members.html | 2 +- .../class_nv_1_1_blast_1_1_fbx_file_reader.html | 2 +- ...ass_nv_1_1_blast_1_1_fracture_tool-members.html | 2 +- .../class_nv_1_1_blast_1_1_fracture_tool.html | 13 ++- ...v_1_1_blast_1_1_fracture_tool_impl-members.html | 2 +- .../class_nv_1_1_blast_1_1_fracture_tool_impl.html | 13 ++- docs/source_docs/files/functions_0x76.html | 2 +- docs/source_docs/files/functions_func_0x76.html | 4 +- 12 files changed, 119 insertions(+), 105 deletions(-) (limited to 'docs/source_docs') diff --git a/docs/source_docs/files/_nv_blast_ext_authoring_fracture_tool_8h-source.html b/docs/source_docs/files/_nv_blast_ext_authoring_fracture_tool_8h-source.html index 9532728..94af405 100644 --- a/docs/source_docs/files/_nv_blast_ext_authoring_fracture_tool_8h-source.html +++ b/docs/source_docs/files/_nv_blast_ext_authoring_fracture_tool_8h-source.html @@ -155,44 +155,44 @@ 00217 00226 virtual int32_t voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3* cellPoints, bool replaceChunk) = 0; 00227 -00238 virtual int32_t voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3* cellPoints, const physx::PxVec3& scale, bool replaceChunk) = 0; -00239 +00239 virtual int32_t voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3* cellPoints, const physx::PxVec3& scale, const physx::PxQuat& rotation, bool replaceChunk) = 0; 00240 -00251 virtual int32_t slicing(uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase* rnd) = 0; -00252 +00241 +00252 virtual int32_t slicing(uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase* rnd) = 0; 00253 -00257 virtual void finalizeFracturing() = 0; -00258 -00259 virtual uint32_t getChunkCount() const = 0; -00260 -00264 virtual const ChunkInfo& getChunkInfo(int32_t chunkIndex) = 0; -00265 -00273 virtual float getMeshOverlap(const Mesh& meshA, const Mesh& meshB) = 0; -00274 -00281 virtual uint32_t getBaseMesh(int32_t chunkIndex, Triangle*& output) = 0; -00282 -00288 virtual int32_t getChunkIndex(int32_t chunkId) = 0; -00289 -00295 virtual int32_t getChunkId(int32_t chunkIndex) = 0; -00296 -00302 virtual int32_t getChunkDepth(int32_t chunkId) = 0; -00303 -00310 virtual uint32_t getChunksIdAtDepth(uint32_t depth, int32_t*& chunkIds) = 0; -00311 +00254 +00258 virtual void finalizeFracturing() = 0; +00259 +00260 virtual uint32_t getChunkCount() const = 0; +00261 +00265 virtual const ChunkInfo& getChunkInfo(int32_t chunkIndex) = 0; +00266 +00274 virtual float getMeshOverlap(const Mesh& meshA, const Mesh& meshB) = 0; +00275 +00282 virtual uint32_t getBaseMesh(int32_t chunkIndex, Triangle*& output) = 0; +00283 +00289 virtual int32_t getChunkIndex(int32_t chunkId) = 0; +00290 +00296 virtual int32_t getChunkId(int32_t chunkIndex) = 0; +00297 +00303 virtual int32_t getChunkDepth(int32_t chunkId) = 0; +00304 +00311 virtual uint32_t getChunksIdAtDepth(uint32_t depth, int32_t*& chunkIds) = 0; 00312 -00322 virtual uint32_t getBufferedBaseMeshes(Vertex*& vertexBuffer, uint32_t*& indexBuffer, uint32_t*& indexBufferOffsets) = 0; -00323 -00328 virtual void setRemoveIslands(bool isRemoveIslands) = 0; -00329 -00335 virtual int32_t islandDetectionAndRemoving(int32_t chunkId) = 0; -00336 -00341 virtual bool isMeshContainOpenEdges(const Mesh* input) = 0; -00342 }; -00343 -00344 } // namespace Blast -00345 } // namespace Nv -00346 -00347 #endif // ifndef NVBLASTAUTHORINGFRACTURETOOL_H +00313 +00323 virtual uint32_t getBufferedBaseMeshes(Vertex*& vertexBuffer, uint32_t*& indexBuffer, uint32_t*& indexBufferOffsets) = 0; +00324 +00329 virtual void setRemoveIslands(bool isRemoveIslands) = 0; +00330 +00336 virtual int32_t islandDetectionAndRemoving(int32_t chunkId) = 0; +00337 +00342 virtual bool isMeshContainOpenEdges(const Mesh* input) = 0; +00343 }; +00344 +00345 } // namespace Blast +00346 } // namespace Nv +00347 +00348 #endif // ifndef NVBLASTAUTHORINGFRACTURETOOL_H
diff --git a/docs/source_docs/files/_nv_blast_ext_authoring_fracture_tool_impl_8h-source.html b/docs/source_docs/files/_nv_blast_ext_authoring_fracture_tool_impl_8h-source.html index de780d1..1b37fd4 100644 --- a/docs/source_docs/files/_nv_blast_ext_authoring_fracture_tool_impl_8h-source.html +++ b/docs/source_docs/files/_nv_blast_ext_authoring_fracture_tool_impl_8h-source.html @@ -128,66 +128,66 @@ 00172 00181 int32_t voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3* cellPoints, bool replaceChunk) override; 00182 -00193 int32_t voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3* cellPoints, const physx::PxVec3& scale, bool replaceChunk) override; -00194 +00194 int32_t voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3* cellPoints, const physx::PxVec3& scale, const physx::PxQuat& rotation, bool replaceChunk) override; 00195 -00206 int32_t slicing(uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase* rnd) override; -00207 +00196 +00207 int32_t slicing(uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase* rnd) override; 00208 -00212 void finalizeFracturing() override; -00213 -00214 uint32_t getChunkCount() const override; -00215 -00219 const ChunkInfo& getChunkInfo(int32_t chunkIndex) override; -00220 -00228 float getMeshOverlap(const Mesh& meshA, const Mesh& meshB) override; -00229 -00237 uint32_t getBaseMesh(int32_t chunkIndex, Triangle*& output) override; -00238 -00244 int32_t getChunkIndex(int32_t chunkId) override; -00245 -00251 int32_t getChunkId(int32_t chunkIndex) override; -00252 -00258 int32_t getChunkDepth(int32_t chunkId) override; -00259 -00267 uint32_t getChunksIdAtDepth(uint32_t depth, int32_t*& chunkIds) override; -00268 +00209 +00213 void finalizeFracturing() override; +00214 +00215 uint32_t getChunkCount() const override; +00216 +00220 const ChunkInfo& getChunkInfo(int32_t chunkIndex) override; +00221 +00229 float getMeshOverlap(const Mesh& meshA, const Mesh& meshB) override; +00230 +00238 uint32_t getBaseMesh(int32_t chunkIndex, Triangle*& output) override; +00239 +00245 int32_t getChunkIndex(int32_t chunkId) override; +00246 +00252 int32_t getChunkId(int32_t chunkIndex) override; +00253 +00259 int32_t getChunkDepth(int32_t chunkId) override; +00260 +00268 uint32_t getChunksIdAtDepth(uint32_t depth, int32_t*& chunkIds) override; 00269 -00280 uint32_t getBufferedBaseMeshes(Vertex*& vertexBuffer, uint32_t*& indexBuffer, uint32_t*& indexBufferOffsets) override; -00281 -00286 void setRemoveIslands(bool isRemoveIslands) override; -00287 -00293 int32_t islandDetectionAndRemoving(int32_t chunkId) override; -00294 -00299 bool isMeshContainOpenEdges(const Mesh* input) override; -00300 -00301 private: -00302 void eraseChunk(int32_t chunkId); -00303 bool isAncestorForChunk(int32_t ancestorId, int32_t chunkId); -00304 void deleteAllChildsOfChunk(int32_t chunkId); -00305 int32_t slicingNoisy(uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase* rnd); -00306 -00307 protected: -00311 float mScaleFactor; -00312 physx::PxVec3 mOffset; -00313 -00314 /* Chunk mesh wrappers */ -00315 std::vector<Triangulator*> mChunkPostprocessors; -00316 +00270 +00281 uint32_t getBufferedBaseMeshes(Vertex*& vertexBuffer, uint32_t*& indexBuffer, uint32_t*& indexBufferOffsets) override; +00282 +00287 void setRemoveIslands(bool isRemoveIslands) override; +00288 +00294 int32_t islandDetectionAndRemoving(int32_t chunkId) override; +00295 +00300 bool isMeshContainOpenEdges(const Mesh* input) override; +00301 +00302 private: +00303 void eraseChunk(int32_t chunkId); +00304 bool isAncestorForChunk(int32_t ancestorId, int32_t chunkId); +00305 void deleteAllChildsOfChunk(int32_t chunkId); +00306 int32_t slicingNoisy(uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase* rnd); +00307 +00308 protected: +00312 float mScaleFactor; +00313 physx::PxVec3 mOffset; +00314 +00315 /* Chunk mesh wrappers */ +00316 std::vector<Triangulator*> mChunkPostprocessors; 00317 -00318 -00319 int32_t mPlaneIndexerOffset; -00320 int32_t mChunkIdCounter; -00321 std::vector<ChunkInfo> mChunkData; -00322 -00323 bool mRemoveIslands; -00324 }; -00325 -00326 } // namespace Blast -00327 } // namespace Nv -00328 +00318 +00319 +00320 int32_t mPlaneIndexerOffset; +00321 int32_t mChunkIdCounter; +00322 std::vector<ChunkInfo> mChunkData; +00323 +00324 bool mRemoveIslands; +00325 }; +00326 +00327 } // namespace Blast +00328 } // namespace Nv 00329 -00330 #endif // ifndef NVBLASTAUTHORINGFRACTURETOOLIMPL_H +00330 +00331 #endif // ifndef NVBLASTAUTHORINGFRACTURETOOLIMPL_H
diff --git a/docs/source_docs/files/_nv_blast_ext_authoring_types_8h-source.html b/docs/source_docs/files/_nv_blast_ext_authoring_types_8h-source.html index cfb944f..626417a 100644 --- a/docs/source_docs/files/_nv_blast_ext_authoring_types_8h-source.html +++ b/docs/source_docs/files/_nv_blast_ext_authoring_types_8h-source.html @@ -113,7 +113,7 @@ 00085 Vertex a, b, c; 00086 int32_t userData; 00087 int32_t materialId; -00088 int32_t smoothingGroup; // NOT SUPPORTED ATM. +00088 int32_t smoothingGroup; 00089 physx::PxVec3 getNormal() 00090 { 00091 return ((b.p - a.p).cross(c.p - a.p)); diff --git a/docs/source_docs/files/_nv_blast_ext_exporter_fbx_reader_8h-source.html b/docs/source_docs/files/_nv_blast_ext_exporter_fbx_reader_8h-source.html index 484aeb5..ba9982c 100644 --- a/docs/source_docs/files/_nv_blast_ext_exporter_fbx_reader_8h-source.html +++ b/docs/source_docs/files/_nv_blast_ext_exporter_fbx_reader_8h-source.html @@ -117,7 +117,7 @@ 00098 00102 int32_t* getMaterialIds() override; 00103 -00107 int32_t* getSmoothingGroups() override { return nullptr; }; +00107 int32_t* getSmoothingGroups() override; 00108 00112 char* getMaterialName(int32_t id) override; 00113 diff --git a/docs/source_docs/files/class_nv_1_1_blast_1_1_fbx_file_reader-members.html b/docs/source_docs/files/class_nv_1_1_blast_1_1_fbx_file_reader-members.html index 2a976df..5f2bae6 100644 --- a/docs/source_docs/files/class_nv_1_1_blast_1_1_fbx_file_reader-members.html +++ b/docs/source_docs/files/class_nv_1_1_blast_1_1_fbx_file_reader-members.html @@ -51,7 +51,7 @@ getMaterialName(int32_t id) overrideNv::Blast::FbxFileReader [virtual] getNormalsArray() overrideNv::Blast::FbxFileReader [virtual] getPositionArray() overrideNv::Blast::FbxFileReader [virtual] - getSmoothingGroups() overrideNv::Blast::FbxFileReader [inline, virtual] + getSmoothingGroups() overrideNv::Blast::FbxFileReader [virtual] getUvArray() overrideNv::Blast::FbxFileReader [virtual] getVerticesCount() const overrideNv::Blast::FbxFileReader [inline, virtual] isCollisionLoaded() overrideNv::Blast::FbxFileReader [virtual] diff --git a/docs/source_docs/files/class_nv_1_1_blast_1_1_fbx_file_reader.html b/docs/source_docs/files/class_nv_1_1_blast_1_1_fbx_file_reader.html index d3573ad..fbc20ce 100644 --- a/docs/source_docs/files/class_nv_1_1_blast_1_1_fbx_file_reader.html +++ b/docs/source_docs/files/class_nv_1_1_blast_1_1_fbx_file_reader.html @@ -373,7 +373,7 @@ Get loaded vertex positions (  )  - [inline, override, virtual] + [override, virtual]
diff --git a/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool-members.html b/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool-members.html index c5ce142..cd75468 100644 --- a/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool-members.html +++ b/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool-members.html @@ -60,7 +60,7 @@ setSourceMesh(const Mesh *mesh)=0Nv::Blast::FractureTool [pure virtual] slicing(uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase *rnd)=0Nv::Blast::FractureTool [pure virtual] voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, bool replaceChunk)=0Nv::Blast::FractureTool [pure virtual] - voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, const physx::PxVec3 &scale, bool replaceChunk)=0Nv::Blast::FractureTool [pure virtual] + voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, const physx::PxVec3 &scale, const physx::PxQuat &rotation, bool replaceChunk)=0Nv::Blast::FractureTool [pure virtual] ~FractureTool()Nv::Blast::FractureTool [inline, virtual] diff --git a/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool.html b/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool.html index 46875fb..f126ac6 100644 --- a/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool.html +++ b/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool.html @@ -95,7 +95,7 @@ Inheritance diagram for Nv::Blast::FractureTool: virtual int32_t slicing (uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase *rnd)=0 -virtual int32_t voronoiFracturing (uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, const physx::PxVec3 &scale, bool replaceChunk)=0 +virtual int32_t voronoiFracturing (uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, const physx::PxVec3 &scale, const physx::PxQuat &rotation, bool replaceChunk)=0 virtual int32_t voronoiFracturing (uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, bool replaceChunk)=0 @@ -678,7 +678,7 @@ Fractures specified chunk with slicing method.
Parameters:

- +

@@ -706,6 +706,12 @@ Fractures specified chunk with slicing method.
Parameters:const physx::PxVec3 & 
+ + + + + + @@ -728,12 +734,13 @@ Fractures specified chunk with voronoi method. Cells can be scaled along x,y,z a +
scale,
const physx::PxQuat &  rotation,
[in] cellPoints Array of voronoi sites
[in] cellPoints Array of voronoi sites
[in] scale Voronoi cells scaling factor
[in] rotation Voronoi cells rotation. Has no effect without cells scale factor
[in] replaceChunk if 'true', newly generated chunks will replace source chunk, if 'false', newly generated chunks will be at next depth level, source chunk will be parent for them. Case replaceChunk == true && chunkId == 0 considered as wrong input parameters
Returns:
If 0, fracturing is successful.
-

Implemented in Nv::Blast::FractureToolImpl.

+

Implemented in Nv::Blast::FractureToolImpl.

diff --git a/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool_impl-members.html b/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool_impl-members.html index 09dea62..c86867b 100644 --- a/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool_impl-members.html +++ b/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool_impl-members.html @@ -68,7 +68,7 @@ setSourceMesh(const Mesh *mesh) overrideNv::Blast::FractureToolImpl [virtual] slicing(uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase *rnd) overrideNv::Blast::FractureToolImpl [virtual] voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, bool replaceChunk) overrideNv::Blast::FractureToolImpl [virtual] - voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, const physx::PxVec3 &scale, bool replaceChunk) overrideNv::Blast::FractureToolImpl [virtual] + voronoiFracturing(uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, const physx::PxVec3 &scale, const physx::PxQuat &rotation, bool replaceChunk) overrideNv::Blast::FractureToolImpl [virtual] ~FractureTool()Nv::Blast::FractureTool [inline, virtual] ~FractureToolImpl()Nv::Blast::FractureToolImpl [inline] diff --git a/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool_impl.html b/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool_impl.html index 69b32ef..21e1dec 100644 --- a/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool_impl.html +++ b/docs/source_docs/files/class_nv_1_1_blast_1_1_fracture_tool_impl.html @@ -97,7 +97,7 @@ Inheritance diagram for Nv::Blast::FractureToolImpl: int32_t slicing (uint32_t chunkId, SlicingConfiguration conf, bool replaceChunk, RandomGeneratorBase *rnd) override -int32_t voronoiFracturing (uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, const physx::PxVec3 &scale, bool replaceChunk) override +int32_t voronoiFracturing (uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, const physx::PxVec3 &scale, const physx::PxQuat &rotation, bool replaceChunk) override int32_t voronoiFracturing (uint32_t chunkId, uint32_t cellCount, const physx::PxVec3 *cellPoints, bool replaceChunk) override @@ -717,7 +717,7 @@ Fractures specified chunk with slicing method.

Parameters:

- +

@@ -745,6 +745,12 @@ Fractures specified chunk with slicing method.
Parameters:const physx::PxVec3 & 
+ + + + + + @@ -767,12 +773,13 @@ Fractures specified chunk with voronoi method. Cells can be scaled along x,y,z a +
scale,
const physx::PxQuat &  rotation,
[in] cellPoints Array of voronoi sites
[in] cellPoints Array of voronoi sites
[in] scale Voronoi cells scaling factor
[in] rotation Voronoi cells rotation. Has no effect without cells scale factor
[in] replaceChunk if 'true', newly generated chunks will replace source chunk, if 'false', newly generated chunks will be at next depth level, source chunk will be parent for them. Case replaceChunk == true && chunkId == 0 considered as wrong input parameters
Returns:
If 0, fracturing is successful.
-

Implements Nv::Blast::FractureTool.

+

Implements Nv::Blast::FractureTool.

diff --git a/docs/source_docs/files/functions_0x76.html b/docs/source_docs/files/functions_0x76.html index 3a830fa..3d4b330 100644 --- a/docs/source_docs/files/functions_0x76.html +++ b/docs/source_docs/files/functions_0x76.html @@ -105,7 +105,7 @@ Here is a list of all class members with links to the classes they belong to: : NvBlastChunk , NvBlastChunkDesc

  • voronoiFracturing() -: Nv::Blast::FractureToolImpl +: Nv::Blast::FractureToolImpl , Nv::Blast::FractureTool , Nv::Blast::FractureToolImpl
  • VoronoiSitesGeneratorImpl() diff --git a/docs/source_docs/files/functions_func_0x76.html b/docs/source_docs/files/functions_func_0x76.html index bfcf027..4214091 100644 --- a/docs/source_docs/files/functions_func_0x76.html +++ b/docs/source_docs/files/functions_func_0x76.html @@ -91,8 +91,8 @@
  • voronoiFracturing() : Nv::Blast::FractureToolImpl , Nv::Blast::FractureTool -, Nv::Blast::FractureToolImpl -, Nv::Blast::FractureTool +, Nv::Blast::FractureToolImpl +, Nv::Blast::FractureTool
  • VoronoiSitesGeneratorImpl() : Nv::Blast::VoronoiSitesGeneratorImpl -- cgit v1.2.3