From 02cd6386b16b2caeee72a04649704a466682b275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 5 Jan 2025 13:39:03 +0100 Subject: [PATCH] MeshTools: use generateIndices() instead of std::iota() in concatenate(). There's still the other TODO for index generation, but I don't feel like doing that now. --- src/Magnum/MeshTools/Concatenate.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/MeshTools/Concatenate.cpp b/src/Magnum/MeshTools/Concatenate.cpp index a88c65b45..f181e7377 100644 --- a/src/Magnum/MeshTools/Concatenate.cpp +++ b/src/Magnum/MeshTools/Concatenate.cpp @@ -26,10 +26,10 @@ #include "Concatenate.h" -#include #include #include +#include "Magnum/MeshTools/GenerateIndices.h" #include "Magnum/MeshTools/Implementation/remapAttributeData.h" namespace Magnum { namespace MeshTools { @@ -116,7 +116,7 @@ Trade::MeshData concatenate(Containers::Array&& indexData, const UnsignedI /* Otherwise, if we need an index buffer (meaning at least one of the meshes is indexed), generate a trivial index buffer */ } else if(!indices.isEmpty()) { - std::iota(indices + indexOffset, indices + indexOffset + mesh.vertexCount(), UnsignedInt(vertexOffset)); + MeshTools::generateTrivialIndicesInto(indices.sliceSize(indexOffset, mesh.vertexCount()), vertexOffset); indexOffset += mesh.vertexCount(); }