From 7ec1037258d9a02a28af56d2fbe808bc698c3109 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Tue, 15 Dec 2015 14:50:39 -0500 Subject: [PATCH] fix --- main/HalfEdge.pde | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/main/HalfEdge.pde b/main/HalfEdge.pde index 68800cc..3607426 100644 --- a/main/HalfEdge.pde +++ b/main/HalfEdge.pde @@ -252,8 +252,8 @@ public class HalfEdge { } public HalfEdge findHalfEdgeSelected(float x, float y, float distance, Point farAway) { - if (this.isSelected(x,y,distance, farAway)) { return this; } - if (counted != false) { + if (this.isSelected(x,y,distance, farAway) == true) { return this; } + if (counted == false) { counted = true; HalfEdge temp = twin.findHalfEdgeSelected(x,y,distance,farAway); if (temp != null) { return temp; } @@ -276,15 +276,17 @@ public class HalfEdge { float ndy = dx; float notScaled = sqrt(ndx*ndx + ndy*ndy); float scale = notScaled/distance; - ndx = ndx/scale; - ndy = ndy/scale; + if (scale > 1) { + ndx = ndx/scale; + ndy = ndy/scale; + } Point p2 = new Point(midx + ndx, midy + ndy); Point p4 = new Point(midx - ndx, midy - ndy); HalfEdge h1 = new HalfEdge(p1, p2); HalfEdge h2 = new HalfEdge(p2, p3); HalfEdge h3 = new HalfEdge(p3, p4); HalfEdge h4 = new HalfEdge(p4, p1); - return CompGeo.inside(h1, new Point(x, y), farAway); + return CompGeo.inside(h1, new Point(x, y), farAway); } public ArrayList getAllLeaving() { @@ -294,13 +296,13 @@ public class HalfEdge { } public void printFace() { HalfEdge temp = next; - //////System.out.println("PrintFaceBegin"); - //////System.out.println(origin + " " + twin.getOrigin()); + //System.out.println("PrintFaceBegin"); + //System.out.println(origin + " " + twin.getOrigin()); while (temp != this) { - //////System.out.println(temp.getOrigin() + " " + temp.gettwin().getOrigin()); + //System.out.println(temp.getOrigin() + " " + temp.gettwin().getOrigin()); temp = temp.getnext(); } - //////System.out.println(); + //System.out.println(); } private boolean isReachable(HalfEdge h) {