Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: solvespace/solvespace
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d8f5a8da32b4
Choose a base ref
...
head repository: solvespace/solvespace
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e74185b63940
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 14, 2020

  1. Fix #696. Account for multiple coincident edges when looking for nake… 

    …d edges.
    @phkahler
    phkahler committed Sep 14, 2020
    Copy the full SHA
    e74185b View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 src/mesh.cpp
10 changes: 8 additions & 2 deletions src/mesh.cpp
View file
Original file line number Diff line number Diff line change
@@ -971,9 +971,15 @@ void SKdNode::MakeCertainEdgesInto(SEdgeList *sel, EdgeKind how, bool coplanarIs

switch(how) {
case EdgeKind::NAKED_OR_SELF_INTER:
// there should be one anti-parllel edge
if(info.count != 1) {
sel->AddEdge(a, b, auxA);
if(leaky) *leaky = true;
// but there may be multiple parallel coincident edges
SKdNode::EdgeOnInfo parallelInfo = {};
FindEdgeOn(b, a, -cnt, coplanarIsInter, &parallelInfo);
if (info.count != parallelInfo.count) {
sel->AddEdge(a, b, auxA);
if(leaky) *leaky = true;
}
}
if(info.intersectsMesh) {
sel->AddEdge(a, b, auxA);