hodapp/prosha
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix another bug in MeshBound

Browse Source
This commit is contained in:
Chris Hodapp 2020-01-16 21:38:57 -05:00
parent 3e0f121240
commit 714e5793e6
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main.rs
View File

@ -220,6 +220,7 @@ struct MeshBound<'a> {
m: &'a Mesh, m: &'a Mesh,
start: HalfEdgeID, start: HalfEdgeID,
cur: HalfEdgeID, cur: HalfEdgeID,
done: bool,
} }
impl<'a> MeshBound<'a> { impl<'a> MeshBound<'a> {
@ -230,6 +231,7 @@ impl<'a> MeshBound<'a> {
m: m, m: m,
start: halfedge_id, start: halfedge_id,
cur: halfedge_id, cur: halfedge_id,
done: false,
}); });
} }
} }
@ -248,22 +250,23 @@ impl<'a> Iterator for MeshBound<'a> {
// Find the one that is a boundary. // Find the one that is a boundary.
// //
// Update 'cur' to this half-edge. // Update 'cur' to this half-edge.
println!("DEBUG: start={} cur={}", self.start, self.cur);
if self.done {
return None;
}
let (v1, v2) = self.m.edge_vertices(self.cur); let (v1, v2) = self.m.edge_vertices(self.cur);
println!("DEBUG: v1={} v2={}", v1, v2);
// TODO: v1 or v2?
for halfedge_id in self.m.vertex_halfedge_iter(v1) { for halfedge_id in self.m.vertex_halfedge_iter(v1) {
println!("DEBUG: try halfedge {}", halfedge_id); let (v3, v4) = self.m.edge_vertices(halfedge_id);
if self.m.is_edge_on_boundary(halfedge_id) { if v3 == v2 || v4 == v2 {
println!("DEBUG: is boundary"); continue
if self.start == halfedge_id { }
println!("DEBUG: back to start"); if self.m.is_edge_on_boundary(halfedge_id) {
// If we are walking the boundary and reach the if self.start == halfedge_id {
// starting edge again, we're done: // If we are walking the boundary and reach the
break; // start edge again, this is the last iteration:
self.done = true;
} }
// Otherwise, yield the next edge:
self.cur = halfedge_id; self.cur = halfedge_id;
return Some(halfedge_id); return Some(halfedge_id);
} }