mirror of https://github.com/mosra/magnum.git
Browse Source
One less executable to build, and we need to test more variants. The
original measured thing ("when to remove duplicates") is no longer really
relevant.
Interestingly enough the fuzzy variant isn't that much slower.
pull/449/head
Vladimír Vondruš
6 years ago
4 changed files with 80 additions and 146 deletions
@ -1,134 +0,0 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense, |
||||
and/or sell copies of the Software, and to permit persons to whom the |
||||
Software is furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included |
||||
in all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
#include <Corrade/Containers/GrowableArray.h> |
||||
#include <Corrade/TestSuite/Tester.h> |
||||
#include <Corrade/Utility/Algorithms.h> |
||||
|
||||
#include "Magnum/Math/Vector4.h" |
||||
#include "Magnum/MeshTools/Duplicate.h" |
||||
#include "Magnum/MeshTools/RemoveDuplicates.h" |
||||
#include "Magnum/MeshTools/Subdivide.h" |
||||
#include "Magnum/Primitives/Icosphere.h" |
||||
#include "Magnum/Trade/MeshData.h" |
||||
|
||||
namespace Magnum { namespace MeshTools { namespace Test { namespace { |
||||
|
||||
struct SubdivideRemoveDuplicatesBenchmark: TestSuite::Tester { |
||||
explicit SubdivideRemoveDuplicatesBenchmark(); |
||||
|
||||
void subdivide(); |
||||
void subdivideAndRemoveDuplicatesAfter(); |
||||
void subdivideAndRemoveDuplicatesAfterInPlace(); |
||||
void subdivideAndRemoveDuplicatesInBetween(); |
||||
}; |
||||
|
||||
SubdivideRemoveDuplicatesBenchmark::SubdivideRemoveDuplicatesBenchmark() { |
||||
addBenchmarks({&SubdivideRemoveDuplicatesBenchmark::subdivide, |
||||
&SubdivideRemoveDuplicatesBenchmark::subdivideAndRemoveDuplicatesAfter, |
||||
&SubdivideRemoveDuplicatesBenchmark::subdivideAndRemoveDuplicatesAfterInPlace, |
||||
&SubdivideRemoveDuplicatesBenchmark::subdivideAndRemoveDuplicatesInBetween}, 4); |
||||
} |
||||
|
||||
namespace { |
||||
static Vector3 interpolator(const Vector3& a, const Vector3& b) { |
||||
return (a+b).normalized(); |
||||
} |
||||
} |
||||
|
||||
void SubdivideRemoveDuplicatesBenchmark::subdivide() { |
||||
Trade::MeshData icosphere = Primitives::icosphereSolid(0); |
||||
|
||||
CORRADE_BENCHMARK(3) { |
||||
Containers::Array<UnsignedInt> indices; |
||||
arrayResize(indices, Containers::NoInit, icosphere.indexCount()); |
||||
Utility::copy(icosphere.indices<UnsignedInt>(), indices); |
||||
|
||||
Containers::Array<Vector3> positions; |
||||
arrayResize(positions, Containers::NoInit, icosphere.vertexCount()); |
||||
Utility::copy(icosphere.attribute<Vector3>(Trade::MeshAttribute::Position), positions); |
||||
|
||||
/* Subdivide 5 times */ |
||||
for(std::size_t i = 0; i != 5; ++i) |
||||
MeshTools::subdivide(indices, positions, interpolator); |
||||
} |
||||
} |
||||
|
||||
void SubdivideRemoveDuplicatesBenchmark::subdivideAndRemoveDuplicatesAfter() { |
||||
Trade::MeshData icosphere = Primitives::icosphereSolid(0); |
||||
|
||||
CORRADE_BENCHMARK(3) { |
||||
Containers::Array<UnsignedInt> indices; |
||||
arrayResize(indices, Containers::NoInit, icosphere.indexCount()); |
||||
Utility::copy(icosphere.indices<UnsignedInt>(), indices); |
||||
|
||||
Containers::Array<Vector3> positions; |
||||
arrayResize(positions, Containers::NoInit, icosphere.vertexCount()); |
||||
Utility::copy(icosphere.attribute<Vector3>(Trade::MeshAttribute::Position), positions); |
||||
|
||||
/* Subdivide 5 times */ |
||||
for(std::size_t i = 0; i != 5; ++i) |
||||
MeshTools::subdivide(indices, positions, interpolator); |
||||
|
||||
/* Remove duplicates after */ |
||||
arrayResize(positions, MeshTools::removeDuplicatesFuzzyIndexedInPlace( |
||||
stridedArrayView(indices), |
||||
Containers::arrayCast<2, Float>(stridedArrayView(positions)))); |
||||
} |
||||
} |
||||
|
||||
void SubdivideRemoveDuplicatesBenchmark::subdivideAndRemoveDuplicatesAfterInPlace() { |
||||
CORRADE_BENCHMARK(3) { |
||||
/* Because that's what this thing does */ |
||||
Trade::MeshData icosphere = Primitives::icosphereSolid(5); |
||||
} |
||||
} |
||||
|
||||
void SubdivideRemoveDuplicatesBenchmark::subdivideAndRemoveDuplicatesInBetween() { |
||||
Trade::MeshData icosphere = Primitives::icosphereSolid(0); |
||||
|
||||
CORRADE_BENCHMARK(3) { |
||||
Containers::Array<UnsignedInt> indices; |
||||
arrayResize(indices, Containers::NoInit, icosphere.indexCount()); |
||||
Utility::copy(icosphere.indices<UnsignedInt>(), indices); |
||||
|
||||
Containers::Array<Vector3> positions; |
||||
arrayResize(positions, Containers::NoInit, icosphere.vertexCount()); |
||||
Utility::copy(icosphere.attribute<Vector3>(Trade::MeshAttribute::Position), positions); |
||||
|
||||
/* Subdivide 5 times and remove duplicates during the operation */ |
||||
for(std::size_t i = 0; i != 5; ++i) { |
||||
MeshTools::subdivide(indices, positions, interpolator); |
||||
arrayResize(positions, MeshTools::removeDuplicatesFuzzyIndexedInPlace( |
||||
stridedArrayView(indices), |
||||
Containers::arrayCast<2, Float>(stridedArrayView(positions)))); |
||||
} |
||||
} |
||||
} |
||||
|
||||
}}}} |
||||
|
||||
CORRADE_TEST_MAIN(Magnum::MeshTools::Test::SubdivideRemoveDuplicatesBenchmark) |
||||
|
||||
Loading…
Reference in new issue