Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Philip Trettner
polymesh
Commits
69d91918
Commit
69d91918
authored
Aug 03, 2018
by
Philip Trettner
Browse files
fixed format
parent
d7177b1a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/polymesh/impl/impl_low_level_api_mutable.hh
View file @
69d91918
...
...
@@ -640,7 +640,8 @@ inline void low_level_api_mutable::halfedge_attach(halfedge_index h, vertex_inde
connect_prev_next
(
h1
,
h_next
);
}
inline
void
low_level_api_mutable
::
halfedge_merge
(
halfedge_index
h
)
const
{
inline
void
low_level_api_mutable
::
halfedge_merge
(
halfedge_index
h
)
const
{
auto
v_center
=
from_vertex_of
(
h
);
assert
(
m
.
handle_of
(
v_center
).
adjacent_vertices
().
size
()
==
2
&&
"vertex_from must have valence 2"
);
...
...
@@ -660,7 +661,7 @@ inline void low_level_api_mutable::halfedge_merge(halfedge_index h) const{
auto
f_a
=
face_of
(
h
);
auto
f_b
=
face_of
(
h_opp
);
//auto v_to = to_vertex_of(h);
//
auto v_to = to_vertex_of(h);
auto
v_from
=
from_vertex_of
(
h_prev
);
// Set from vertex
...
...
@@ -672,17 +673,15 @@ inline void low_level_api_mutable::halfedge_merge(halfedge_index h) const{
connect_prev_next
(
h_opp
,
h_prev_opp_next
);
// fix vertex
if
(
outgoing_halfedge_of
(
v_from
)
==
h_prev
)
{
if
(
outgoing_halfedge_of
(
v_from
)
==
h_prev
)
outgoing_halfedge_of
(
v_from
)
=
h
;
}
// fix adjacent faces
if
(
f_a
.
is_valid
()
&&
halfedge_of
(
f_a
)
==
h_prev
)
{
if
(
f_a
.
is_valid
()
&&
halfedge_of
(
f_a
)
==
h_prev
)
halfedge_of
(
f_a
)
=
h
;
}
if
(
f_b
.
is_valid
()
&&
halfedge_of
(
f_b
)
==
h_prev_opp
)
{
if
(
f_b
.
is_valid
()
&&
halfedge_of
(
f_b
)
==
h_prev_opp
)
halfedge_of
(
f_b
)
=
h_opp
;
}
// remove
set_removed
(
edge_of
(
h_prev
));
...
...
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