Skip to content

Commit

Permalink
incremental
Browse files Browse the repository at this point in the history
  • Loading branch information
JimmyBoivie authored and JimmyBoivie committed Dec 3, 2015
1 parent 2503a49 commit 689fad6
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 8 deletions.
18 changes: 18 additions & 0 deletions main/HalfEdge.pde
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@ public class HalfEdge {
vertex = v1;
twin.setOrigin(v2);


HalfEdge[] try1 = v1.getEdgesToUpdate(v2);
if (try1 == null) {
twin.setnext(this);
previous = twin;
} else {
twin.setnext(try1[1]);
previous = try1[0];
}

HalfEdge[] try2 = v2.getEdgesToUpdate(v1);
if (try2 == null) {
twin.setprevious(this);
next = twin;
} else {
twin.setprevious(try2[0]);
next = try2[1];
}
// Set Nexts

// Set Prevs
Expand Down
32 changes: 24 additions & 8 deletions main/Vertex.pde
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,34 @@ public class Vertex {
ArrayList<HalfEdge> leaving = getAllLeavingEdges();
HalfEdge[] prevNext = new HalfEdge[2];
if (leaving.size() == 1) {
prevNext[0] = leaving.get(0);
prevNext[1] = prevNext[0].gettwin();
prevNext[1] = leaving.get(0);
prevNext[0] = prevNext[0].gettwin();
return prevNext;
}




Vertex v1 = this;
Vertex v4 = v;
Vertex v2;
Vertex v3;
int[] temp = new int[leaving.size()];
for (int i = 0; i < leaving.size(); i++) {

temp[i] = 0;
}

for (int i = 0; i < leaving.size(); i++) {
v2 = leaving.get(i).getOrigin();
v3 = leaving.get((i+1)%leaving.size()).getOrigin();
if (is2closerCCWof4(v1, v2, v3, v4)) {
temp[i]++;
} else {
temp[(i+1)%leaving.size()]++;
}
}
for (int i = 0; i < leaving.size(); i++) {
if (temp[i] == 0) {
prevNext[1] = leaving.get(i);
prevNext[0] = prevNext[1].getprevious();
}
}
return prevNext;
}

private float[] safeSlope(float dy, float dx) {
Expand Down

0 comments on commit 689fad6

Please sign in to comment.