Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'SmartRangeForEach' into 'master'

Browse Source 
add for_each to smart ranges

See merge request OpenMesh/OpenMesh!253
This commit is contained in:
Jan Möbius
2020-03-26 18:58:04 +01:00
parent 470b46d96c 290f8f5414
commit 0df4666d1a
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/OpenMesh/Core/Mesh/SmartRange.hh
View File

@@ -371,6 +371,21 @@ struct SmartRangeT
} }
/** @brief Apply a functor to each element.
*
* Calls functor \p f with each element as parameter
*
* @param f Functor that is called for each element.
*/
template <typename Functor>
auto for_each(Functor&& f) -> void
{
auto range = static_cast<const RangeT*>(this);
for (const auto& e : *range)
f(e);
}
}; };

23
src/Unittests/unittests_smart_ranges.cc
View File

@@ -197,7 +197,7 @@ TEST_F(OpenMeshSmartRanges, Sum)
*/ */
TEST_F(OpenMeshSmartRanges, PropertyManagerAsFunctor) TEST_F(OpenMeshSmartRanges, PropertyManagerAsFunctor)
{ {
auto myPos = OpenMesh::makeTemporaryProperty<OpenMesh::VertexHandle, Mesh::Point>(mesh_); OpenMesh::VProp<Mesh::Point> myPos(mesh_);
for (auto vh : mesh_.vertices()) for (auto vh : mesh_.vertices())
myPos(vh) = mesh_.point(vh); myPos(vh) = mesh_.point(vh);
@@ -215,7 +215,7 @@ TEST_F(OpenMeshSmartRanges, PropertyManagerAsFunctor)
*/ */
TEST_F(OpenMeshSmartRanges, ToVector) TEST_F(OpenMeshSmartRanges, ToVector)
{ {
auto uvs = OpenMesh::makeTemporaryProperty<OpenMesh::HalfedgeHandle, OpenMesh::Vec2d>(mesh_); OpenMesh::HProp<OpenMesh::Vec2d> uvs(mesh_);
for (auto heh : mesh_.halfedges()) for (auto heh : mesh_.halfedges())
uvs(heh) = OpenMesh::Vec2d(heh.idx(), (heh.idx() * 13)%7); uvs(heh) = OpenMesh::Vec2d(heh.idx(), (heh.idx() * 13)%7);
@@ -237,7 +237,7 @@ TEST_F(OpenMeshSmartRanges, ToVector)
*/ */
TEST_F(OpenMeshSmartRanges, ToArray) TEST_F(OpenMeshSmartRanges, ToArray)
{ {
auto uvs = OpenMesh::makeTemporaryProperty<OpenMesh::HalfedgeHandle, OpenMesh::Vec2d>(mesh_); OpenMesh::HProp<OpenMesh::Vec2d> uvs(mesh_);
for (auto heh : mesh_.halfedges()) for (auto heh : mesh_.halfedges())
uvs(heh) = OpenMesh::Vec2d(heh.idx(), (heh.idx() * 13)%7); uvs(heh) = OpenMesh::Vec2d(heh.idx(), (heh.idx() * 13)%7);
@@ -256,7 +256,7 @@ TEST_F(OpenMeshSmartRanges, BoundingBox)
{ {
// The custom vecs OpenMesh are tested with here do not implement a min or max function. // The custom vecs OpenMesh are tested with here do not implement a min or max function.
// Thus we convert here. // Thus we convert here.
auto myPos = OpenMesh::makeTemporaryProperty<OpenMesh::VertexHandle, OpenMesh::Vec3f>(mesh_); OpenMesh::VProp<OpenMesh::Vec3f> myPos(mesh_);
for (auto vh : mesh_.vertices()) for (auto vh : mesh_.vertices())
for (size_t i = 0; i < 3; ++i) for (size_t i = 0; i < 3; ++i)
myPos(vh)[i] = mesh_.point(vh)[i]; myPos(vh)[i] = mesh_.point(vh)[i];
@@ -281,5 +281,20 @@ TEST_F(OpenMeshSmartRanges, BoundingBox)
} }
/* Test for each
*/
TEST_F(OpenMeshSmartRanges, ForEach)
{
std::vector<int> vec;
auto f = [&vec](OpenMesh::VertexHandle vh) { vec.push_back(vh.idx()); };
mesh_.vertices().for_each(f);
ASSERT_EQ(vec.size(), mesh_.n_vertices()) << "vec has wrong size";
for (size_t i = 0; i < vec.size(); ++i)
EXPECT_EQ(vec[i], i) << "wrong index in vector";
}
} }