Browse Source

MeshTools: fix a variable shadowing warning.

pull/491/head
Vladimír Vondruš 5 years ago
parent
commit
515bfce970
  1. 16
      src/Magnum/MeshTools/RemoveDuplicates.cpp

16
src/Magnum/MeshTools/RemoveDuplicates.cpp

@ -483,7 +483,7 @@ Trade::MeshData removeDuplicatesFuzzy(const Trade::MeshData& data, const Float f
/* For each attribute decide if it needs to be fuzzy-deduplicated or not, /* For each attribute decide if it needs to be fuzzy-deduplicated or not,
calculate the epsilon size and call the appropriate API */ calculate the epsilon size and call the appropriate API */
const Containers::StridedArrayView2D<UnsignedInt> perAttributeIndices = combinedIndices.transposed<0, 1>(); Containers::StridedArrayView2D<UnsignedInt> perAttributeIndices = combinedIndices.transposed<0, 1>();
for(UnsignedInt i = 0; i != owned.attributeCount(); ++i) { for(UnsignedInt i = 0; i != owned.attributeCount(); ++i) {
const VertexFormat format = owned.attributeFormat(i); const VertexFormat format = owned.attributeFormat(i);
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format), CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format),
@ -579,20 +579,18 @@ Trade::MeshData removeDuplicatesFuzzy(const Trade::MeshData& data, const Float f
indexType = owned.indexType(); indexType = owned.indexType();
} }
combinedIndices = combinedIndices.prefix(vertexCount);
Trade::MeshData layout = interleavedLayout(owned, vertexCount); Trade::MeshData layout = interleavedLayout(owned, vertexCount);
Trade::MeshIndexData indices{indexType, indexData}; Trade::MeshIndexData indices{indexType, indexData};
Trade::MeshData out{layout.primitive(), Trade::MeshData out{layout.primitive(),
std::move(indexData), indices, std::move(indexData), indices,
layout.releaseVertexData(), layout.releaseAttributeData(), vertexCount}; layout.releaseVertexData(), layout.releaseAttributeData(), vertexCount};
{ /* Trim the views to only the unique combinations, duplicate the attributes
/* Duplicate the attributes according to the combined index buffer */ according to the combined index buffer */
const Containers::StridedArrayView2D<UnsignedInt> perAttributeIndices = combinedIndices.transposed<0, 1>(); combinedIndices = combinedIndices.prefix(vertexCount);
for(UnsignedInt i = 0; i != owned.attributeCount(); ++i) perAttributeIndices = combinedIndices.transposed<0, 1>();
duplicateInto(perAttributeIndices[i].prefix(vertexCount), owned.attribute(i), out.mutableAttribute(i)); for(UnsignedInt i = 0; i != owned.attributeCount(); ++i)
} duplicateInto(perAttributeIndices[i].prefix(vertexCount), owned.attribute(i), out.mutableAttribute(i));
return out; return out;
} }

Loading…
Cancel
Save