From b269dd5785a396c5512b30db6cca41d1be6fd21a Mon Sep 17 00:00:00 2001 From: JimmyBoivie Date: Mon, 7 Dec 2015 20:17:57 -0500 Subject: [PATCH] uhh: --- main/DrawHalfEdge.pde | 8 ++++---- main/Face.pde | 14 +++++++------- main/HalfEdge.pde | 12 ++++++------ main/Point.pde | 2 +- main/PointList.pde | 4 ++-- main/main.pde | 10 +++++----- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/main/DrawHalfEdge.pde b/main/DrawHalfEdge.pde index 67c80c2..78a4b16 100644 --- a/main/DrawHalfEdge.pde +++ b/main/DrawHalfEdge.pde @@ -1,7 +1,7 @@ public class DrawHalfEdge { public void drawline(Point v1, Point v2) { - ////System.out.println(v1 + " " + v2); + //////System.out.println(v1 + " " + v2); line(v1.getX(), v1.getY(), v2.getX(), v2.getY()); } public void drawpoint(Point v) { @@ -18,17 +18,17 @@ public class DrawHalfEdge { public void drawConnectedGraph(Point p) { ArrayList edges = p.getLeaving(); drawpoint(p); - ////System.out.println(p); + //////System.out.println(p); if(edges != null) { for(HalfEdge edge: edges) { - ////System.out.println(edge); + //////System.out.println(edge); drawConnection(edge); } } } public void drawConnection(HalfEdge edge) { - ////System.out.println("drawing connection"); + //////System.out.println("drawing connection"); Point v2 = edge.getOrigin(); Point v1 = edge.gettwin().getOrigin(); drawline(v1, v2); diff --git a/main/Face.pde b/main/Face.pde index 0f9b745..6307390 100644 --- a/main/Face.pde +++ b/main/Face.pde @@ -17,7 +17,7 @@ public class Face { p = new Point(i, j); if (inSpecificFace(p, pl)) { point(i,j); - System.out.println(p); + //System.out.println(p); } } } @@ -26,7 +26,7 @@ public class Face { public boolean inSpecificFace(Point a, PointList pl) { if ((outerComponent == null) || (CompGeo.inside(outerComponent, a, pl.getFar()))) { - System.out.println(a); + //System.out.println(a); int num = innerComponents.size(); for (int i = 0; i < num; i++) { if (inAnInner(innerComponents.get(i), a, pl)) { @@ -45,16 +45,16 @@ public class Face { } public void printFace() { - System.out.println("Outer Face:"); + //System.out.println("Outer Face:"); if (outerComponent != null) { outerComponent.printRNext(); } - System.out.println(); - System.out.println("Inner Components:"); + //System.out.println(); + //System.out.println("Inner Components:"); int num = innerComponents.size(); for (int i = 0; i < num; i++) { - System.out.println("COMPONENT[" + i + "]"); + //System.out.println("COMPONENT[" + i + "]"); innerComponents.get(i).printRNext(); } - System.out.println(); + //System.out.println(); } } diff --git a/main/HalfEdge.pde b/main/HalfEdge.pde index 3a4a1d2..6278e9b 100644 --- a/main/HalfEdge.pde +++ b/main/HalfEdge.pde @@ -252,13 +252,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) { @@ -371,10 +371,10 @@ public class HalfEdge { } public void printRNext() { - System.out.println(" " + origin); + //System.out.println(" " + origin); HalfEdge temp = next; while (temp != this) { - System.out.println(" " + temp.getOrigin()); + //System.out.println(" " + temp.getOrigin()); temp = temp.getnext(); } } diff --git a/main/Point.pde b/main/Point.pde index 2d10ac5..ad6f895 100644 --- a/main/Point.pde +++ b/main/Point.pde @@ -56,7 +56,7 @@ public class Point { public void deleteEdges() { while(ref != null) { - //System.out.println("REMOVING EDGE " + ref.getOrigin() + " " + ref.gettwin().getOrigin()); + ////System.out.println("REMOVING EDGE " + ref.getOrigin() + " " + ref.gettwin().getOrigin()); ref.Remove(); } diff --git a/main/PointList.pde b/main/PointList.pde index 3d9e22a..1f19a6c 100644 --- a/main/PointList.pde +++ b/main/PointList.pde @@ -52,8 +52,8 @@ public class PointList { } public HalfEdge getHalfEdge(Point p, Point q) { - System.out.println(p); - System.out.println(q); + //System.out.println(p); + //System.out.println(q); int num = points.size(); int id = -1; for (int i = 0; i < num; i++) { diff --git a/main/main.pde b/main/main.pde index 3017104..d5001e8 100644 --- a/main/main.pde +++ b/main/main.pde @@ -68,13 +68,13 @@ public void setup() { //h1.printFace(); //float f = CompGeo.signedArea(h1.gettwin()); //float f2 = CompGeo.signedArea(h1); - ////System.out.println("Signed Area: " + f); - ////System.out.println("Signed Area: " + f2); + //////System.out.println("Signed Area: " + f); + //////System.out.println("Signed Area: " + f2); //h1.gettwin().printFace(); //h1.printFace(); //if (CompGeo.inside(h1.gettwin(), p6, p7)) { - // //System.out.println("INSIDE"); - //} else { //System.out.println("OUTSIDE"); } + // ////System.out.println("INSIDE"); + //} else { ////System.out.println("OUTSIDE"); } //HalfEdge h5 = new HalfEdge(p5, p2); //h5.gettwin().printFace(); //h5.printFace(); @@ -149,7 +149,7 @@ public void colorFace(float x, float y) { if((p.getY() - 10 < y) && (p.getY() + 10 > y)) { HalfEdge h = list.getHalfEdge(colorEdgePoint, p); if(h != null) { - System.out.println("h is not null"); + //System.out.println("h is not null"); Face f = new Face(h, list); f.printFace(); if(colorFaceColor == 0) {