Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMesh
OpenMesh
Commits
0df4666d
Commit
0df4666d
authored
Mar 26, 2020
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'SmartRangeForEach' into 'master'
add for_each to smart ranges See merge request
!253
parents
470b46d9
290f8f54
Pipeline
#13878
passed with stages
in 180 minutes and 45 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
4 deletions
+34
-4
src/OpenMesh/Core/Mesh/SmartRange.hh
src/OpenMesh/Core/Mesh/SmartRange.hh
+15
-0
src/Unittests/unittests_smart_ranges.cc
src/Unittests/unittests_smart_ranges.cc
+19
-4
No files found.
src/OpenMesh/Core/Mesh/SmartRange.hh
View file @
0df4666d
...
...
@@ -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
);
}
};
...
...
src/Unittests/unittests_smart_ranges.cc
View file @
0df4666d
...
...
@@ -197,7 +197,7 @@ TEST_F(OpenMeshSmartRanges, Sum)
*/
TEST_F
(
OpenMeshSmartRanges
,
PropertyManagerAsFunctor
)
{
auto
myPos
=
OpenMesh
::
makeTemporaryProperty
<
OpenMesh
::
VertexHandle
,
Mesh
::
Point
>
(
mesh_
);
OpenMesh
::
VProp
<
Mesh
::
Point
>
myPos
(
mesh_
);
for
(
auto
vh
:
mesh_
.
vertices
())
myPos
(
vh
)
=
mesh_
.
point
(
vh
);
...
...
@@ -215,7 +215,7 @@ TEST_F(OpenMeshSmartRanges, PropertyManagerAsFunctor)
*/
TEST_F
(
OpenMeshSmartRanges
,
ToVector
)
{
auto
uvs
=
OpenMesh
::
makeTemporaryProperty
<
OpenMesh
::
HalfedgeHandle
,
OpenMesh
::
Vec2d
>
(
mesh_
);
OpenMesh
::
HProp
<
OpenMesh
::
Vec2d
>
uvs
(
mesh_
);
for
(
auto
heh
:
mesh_
.
halfedges
())
uvs
(
heh
)
=
OpenMesh
::
Vec2d
(
heh
.
idx
(),
(
heh
.
idx
()
*
13
)
%
7
);
...
...
@@ -237,7 +237,7 @@ TEST_F(OpenMeshSmartRanges, ToVector)
*/
TEST_F
(
OpenMeshSmartRanges
,
ToArray
)
{
auto
uvs
=
OpenMesh
::
makeTemporaryProperty
<
OpenMesh
::
HalfedgeHandle
,
OpenMesh
::
Vec2d
>
(
mesh_
);
OpenMesh
::
HProp
<
OpenMesh
::
Vec2d
>
uvs
(
mesh_
);
for
(
auto
heh
:
mesh_
.
halfedges
())
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.
// 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
(
size_t
i
=
0
;
i
<
3
;
++
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"
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment