diff options
Diffstat (limited to 'include/assimp/SceneCombiner.h')
| -rw-r--r-- | include/assimp/SceneCombiner.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/include/assimp/SceneCombiner.h b/include/assimp/SceneCombiner.h index 790a18c2d..cb3b83829 100644 --- a/include/assimp/SceneCombiner.h +++ b/include/assimp/SceneCombiner.h @@ -2,8 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team - +Copyright (c) 2006-2025, assimp team All rights reserved. @@ -190,12 +189,11 @@ struct SceneHelper { * and loaders (ie. LWS). */ class ASSIMP_API SceneCombiner { +public: // class cannot be instanced SceneCombiner() = delete; - ~SceneCombiner() = delete; -public: // ------------------------------------------------------------------- /** Merges two or more scenes. * @@ -275,8 +273,8 @@ public: /** Builds a list of uniquely named bones in a mesh list * * @param asBones Receives the output list - * @param it First mesh to be processed - * @param end Last mesh to be processed + * @param it First mesh to be processed + * @param end Last mesh to be processed */ static void BuildUniqueBoneList(std::list<BoneWithHash> &asBones, std::vector<aiMesh *>::const_iterator it, @@ -285,9 +283,9 @@ public: // ------------------------------------------------------------------- /** Add a name prefix to all nodes in a scene. * - * @param Current node. This function is called recursively. + * @param node Current node. This function is called recursively. * @param prefix Prefix to be added to all nodes - * @param len STring length + * @param len String length */ static void AddNodePrefixes(aiNode *node, const char *prefix, unsigned int len); @@ -295,7 +293,7 @@ public: // ------------------------------------------------------------------- /** Add an offset to all mesh indices in a node graph * - * @param Current node. This function is called recursively. + * @param node Current node. This function is called recursively. * @param offset Offset to be added to all mesh indices */ static void OffsetNodeMeshIndices(aiNode *node, unsigned int offset); @@ -310,7 +308,7 @@ public: * the master graph), a scene is attached to the root of the master * graph (as an additional child node) * @duplicates List of duplicates. If elem[n] == n the scene is not - * a duplicate. Otherwise elem[n] links scene n to its first occurrence. + * a duplicate. Otherwise, elem[n] links scene n to its first occurrence. */ static void AttachToGraph(aiScene *master, std::vector<NodeAttachmentInfo> &srcList); @@ -321,8 +319,9 @@ public: // ------------------------------------------------------------------- /** Get a deep copy of a scene * - * @param dest Receives a pointer to the destination scene - * @param src Source scene - remains unmodified. + * @param dest Receives a pointer to the destination scene + * @param source Source scene - remains unmodified. + * @param allocate true for allocation a new scene */ static void CopyScene(aiScene **dest, const aiScene *source, bool allocate = true); |