From 80332478b6fe13c3437177c64cbcd2193357f161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 7 Dec 2013 23:10:26 +0100 Subject: [PATCH] MeshTools: be more explicit in what needs to be done on mesh afterwards. --- src/MeshTools/CompressIndices.h | 6 +++--- src/MeshTools/Interleave.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/MeshTools/CompressIndices.h b/src/MeshTools/CompressIndices.h index 43ef9ae2e..fc4968d13 100644 --- a/src/MeshTools/CompressIndices.h +++ b/src/MeshTools/CompressIndices.h @@ -65,9 +65,9 @@ std::tuple> MAGNUM_MESHTOO @param indices Index array The same as @ref compressIndices(const std::vector&), but this -function writes the output to given buffer, updates index count and specifies -index buffer with proper index range in the mesh, so you don't have to call -@ref Mesh::setIndexCount() and @ref Mesh::setIndexBuffer() on your own. +function writes the output to given buffer and calls @ref Mesh::setIndexCount() +and @ref Mesh::setIndexBuffer(), thus you don't need to do anything else for +mesh index configuration. @see @ref MeshTools::interleave() */ diff --git a/src/MeshTools/Interleave.h b/src/MeshTools/Interleave.h index dc663456a..e9b33feed 100644 --- a/src/MeshTools/Interleave.h +++ b/src/MeshTools/Interleave.h @@ -190,8 +190,8 @@ The same as @ref interleave(const T&, const U&...), but this function writes the output to given array buffer and updates vertex count in the mesh accordingly, so you don't have to call @ref Mesh::setVertexCount() on your own. -@attention Setting primitive type and binding the attributes to shader is left - to user - see @ref Mesh-configuration "Mesh documentation". +@attention You still must call @ref Mesh::setPrimitive() and + @ref Mesh::addVertexBuffer() on the mesh afterwards. For only one attribute array this function is convenient equivalent to the following, without any performance loss: