diff --git a/src/Magnum/MeshTools/CompressIndices.cpp b/src/Magnum/MeshTools/CompressIndices.cpp index 10fc50ccb..919d64bfb 100644 --- a/src/Magnum/MeshTools/CompressIndices.cpp +++ b/src/Magnum/MeshTools/CompressIndices.cpp @@ -30,7 +30,6 @@ #include #include "Magnum/Math/Functions.h" -#include "Magnum/Buffer.h" namespace Magnum { namespace MeshTools { @@ -76,18 +75,4 @@ std::tuple, Mesh::IndexType, UnsignedInt, UnsignedInt> c return std::make_tuple(std::move(typeData.first), typeData.second, *minmax.first, *minmax.second); } -#ifdef MAGNUM_BUILD_DEPRECATED -void compressIndices(Mesh& mesh, Buffer& buffer, BufferUsage usage, const std::vector& indices) { - Containers::Array data; - Mesh::IndexType type; - UnsignedInt start, end; - std::tie(data, type, start, end) = compressIndices(indices); - - buffer.setData(data, usage); - - mesh.setCount(indices.size()) - .setIndexBuffer(buffer, 0, type, start, end); -} -#endif - }} diff --git a/src/Magnum/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h index 3a2565afb..c066c88bb 100644 --- a/src/Magnum/MeshTools/CompressIndices.h +++ b/src/Magnum/MeshTools/CompressIndices.h @@ -66,24 +66,6 @@ mesh.setCount(indices.size()) */ std::tuple, Mesh::IndexType, UnsignedInt, UnsignedInt> MAGNUM_MESHTOOLS_EXPORT compressIndices(const std::vector& indices); -#ifdef MAGNUM_BUILD_DEPRECATED -/** -@brief Compress vertex indices and write them to index buffer -@param mesh Output mesh -@param buffer Index buffer -@param usage Index buffer usage -@param indices Index array - -The same as @ref compressIndices(const std::vector&), but this -function writes the output to given buffer and calls @ref Mesh::setCount() and -@ref Mesh::setIndexBuffer(), thus you don't need to do anything else for mesh -index configuration. -@deprecated Use general-purpose @ref compressIndices(const std::vector&) - instead. -*/ -void MAGNUM_MESHTOOLS_EXPORT compressIndices(Mesh& mesh, Buffer& buffer, BufferUsage usage, const std::vector& indices); -#endif - }} #endif