diff --git a/src/MeshTools/Clean.h b/src/MeshTools/Clean.h index b3331095d..62bae24fa 100644 --- a/src/MeshTools/Clean.h +++ b/src/MeshTools/Clean.h @@ -38,7 +38,7 @@ template class Clean: public Abs * * See clean() for full documentation. */ - void run(typename Vertex::Type epsilon = TypeTraits::epsilon()) { + void operator()(typename Vertex::Type epsilon = TypeTraits::epsilon()) { if(this->indices.empty()) return; /* Get mesh bounds */ @@ -136,7 +136,7 @@ This is convenience function supplementing direct usage of Clean class, instead of @code MeshBuilder builder; -MeshTools::Clean(builder).run(epsilon); +MeshTools::Clean{builder}(epsilon); @endcode you can just write @code @@ -149,7 +149,7 @@ MeshTools::clean(builder, epsilon); @endcode */ template inline void clean(MeshBuilder& builder, typename Vertex::Type epsilon = TypeTraits::epsilon()) { - Clean(builder).run(epsilon); + Clean{builder}(epsilon); } }} diff --git a/src/MeshTools/Subdivide.h b/src/MeshTools/Subdivide.h index 3d757f7cb..712785653 100644 --- a/src/MeshTools/Subdivide.h +++ b/src/MeshTools/Subdivide.h @@ -38,7 +38,7 @@ template class Subdivide: public AbstractTool< * * See subdivide() for full documentation. */ - void run(Interpolator interpolator) { + void operator()(Interpolator interpolator) { size_t indexCount = this->indices.size(); this->indices.reserve(this->indices.size()*4); @@ -86,7 +86,7 @@ This is convenience function supplementing direct usage of Subdivide class, instead of @code MeshBuilder builder; -MeshTools::Subdivide(builder).run(interpolator); +MeshTools::Subdivide{builder}(interpolator); @endcode you can just write @code @@ -94,7 +94,7 @@ MeshTools::subdivide(builder, interpolator); @endcode */ template inline void subdivide(MeshBuilder& builder, Interpolator interpolator) { - Subdivide(builder).run(interpolator); + Subdivide{builder}(interpolator); } }} diff --git a/src/MeshTools/Tipsify.cpp b/src/MeshTools/Tipsify.cpp index 01f3789b7..d9ed3aacc 100644 --- a/src/MeshTools/Tipsify.cpp +++ b/src/MeshTools/Tipsify.cpp @@ -19,7 +19,7 @@ namespace Magnum { namespace MeshTools { -void Tipsify::run(size_t cacheSize) { +void Tipsify::operator()(size_t cacheSize) { /* Neighboring triangles for each vertex, per-vertex live triangle count */ std::vector liveTriangleCount, neighborPosition, neighbors; buildAdjacency(liveTriangleCount, neighborPosition, neighbors); diff --git a/src/MeshTools/Tipsify.h b/src/MeshTools/Tipsify.h index 38162a66d..589f1c9cf 100644 --- a/src/MeshTools/Tipsify.h +++ b/src/MeshTools/Tipsify.h @@ -41,7 +41,7 @@ class MESHTOOLS_EXPORT Tipsify: public AbstractIndexTool { * * See tipsify() for full documentation. */ - void run(size_t cacheSize); + void operator()(size_t cacheSize); /** * @brief Build vertex-triangle adjacency @@ -69,7 +69,7 @@ This is convenience function supplementing direct usage of Tipsify class, instead of @code MeshBuilder builder; -MeshTools::Tipsify(builder).run(cacheSize); +MeshTools::Tipsify{builder}(cacheSize); @endcode you can just write @code @@ -77,7 +77,7 @@ MeshTools::tipsify(builder, cacheSize); @endcode */ template inline void tipsify(MeshBuilder& builder, size_t cacheSize) { - Tipsify(builder).run(cacheSize); + Tipsify{builder}(cacheSize); } /** @@ -89,7 +89,7 @@ template inline void tipsify(MeshBuilder& builder, size_t See tipsify(MeshBuilder&, size_t) for more information. */ inline void tipsify(std::vector& indices, unsigned int vertexCount, size_t cacheSize) { - Tipsify(indices, vertexCount).run(cacheSize); + Tipsify(indices, vertexCount)(cacheSize); } }}