diff options
Diffstat (limited to 'include/assimp/mesh.h')
| -rw-r--r-- | include/assimp/mesh.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/assimp/mesh.h b/include/assimp/mesh.h index da81cc24c..609f62e10 100644 --- a/include/assimp/mesh.h +++ b/include/assimp/mesh.h @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #pragma GCC system_header #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1900 #pragma warning(disable : 4351) #endif // _MSC_VER @@ -660,7 +660,7 @@ struct aiMesh { /** * @brief Vertex positions. - * + * * This array is always present in a mesh. The array is * mNumVertices in size. */ @@ -668,7 +668,7 @@ struct aiMesh { /** * @brief Vertex normals. - * + * * The array contains normalized vectors, nullptr if not present. * The array is mNumVertices in size. Normals are undefined for * point and line primitives. A mesh consisting of points and @@ -692,7 +692,7 @@ struct aiMesh { /** * @brief Vertex tangents. - * + * * The tangent of a vertex points in the direction of the positive * X texture axis. The array contains normalized vectors, nullptr if * not present. The array is mNumVertices in size. A mesh consisting @@ -708,7 +708,7 @@ struct aiMesh { /** * @brief Vertex bitangents. - * + * * The bitangent of a vertex points in the direction of the positive * Y texture axis. The array contains normalized vectors, nullptr if not * present. The array is mNumVertices in size. @@ -719,7 +719,7 @@ struct aiMesh { /** * @brief Vertex color sets. - * + * * A mesh may contain 0 to #AI_MAX_NUMBER_OF_COLOR_SETS vertex * colors per vertex. nullptr if not present. Each array is * mNumVertices in size if present. @@ -728,7 +728,7 @@ struct aiMesh { /** * @brief Vertex texture coordinates, also known as UV channels. - * + * * A mesh may contain 0 to AI_MAX_NUMBER_OF_TEXTURECOORDS channels per * vertex. Used and unused (nullptr) channels may go in any order. * The array is mNumVertices in size. @@ -737,7 +737,7 @@ struct aiMesh { /** * @brief Specifies the number of components for a given UV channel. - * + * * Up to three channels are supported (UVW, for accessing volume * or cube maps). If the value is 2 for a given channel n, the * component p.z of mTextureCoords[n][p] is set to 0.0f. @@ -748,7 +748,7 @@ struct aiMesh { /** * @brief The faces the mesh is constructed from. - * + * * Each face refers to a number of vertices by their indices. * This array is always present in a mesh, its size is given * in mNumFaces. If the #AI_SCENE_FLAGS_NON_VERBOSE_FORMAT @@ -763,7 +763,7 @@ struct aiMesh { /** * @brief The bones of this mesh. - * + * * A bone consists of a name by which it can be found in the * frame hierarchy and a set of vertex weights. */ @@ -771,7 +771,7 @@ struct aiMesh { /** * @brief The material used by this mesh. - * + * * A mesh uses only a single material. If an imported model uses * multiple materials, the import splits up the mesh. Use this value * as index into the scene's material list. @@ -918,7 +918,7 @@ struct aiMesh { } //! @brief Check whether the mesh contains tangent and bitangent vectors. - //! + //! //! It is not possible that it contains tangents and no bitangents //! (or the other way round). The existence of one of them //! implies that the second is there, too. @@ -934,7 +934,7 @@ struct aiMesh { if (index >= AI_MAX_NUMBER_OF_COLOR_SETS) { return false; } - return mColors[index] != nullptr && mNumVertices > 0; + return mColors[index] != nullptr && mNumVertices > 0; } //! @brief Check whether the mesh contains a texture coordinate set |