X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMeshViewer.java;h=b1f0e5215e85afd4cce11582cd52657339ba4bea;hb=0f46c2445481610b7d4e7914bd4f3353652caf45;hp=658beb1b23cc680e68324666c0cfcfde86e15970;hpb=f9488635746daea6f8ccbb4680ff7f169dc5b2e5;p=anneal.git

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 658beb1..b1f0e52 100644
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -18,10 +18,10 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     public Mesh.Vert[] points;
 
 
-    public boolean tileon = false;
+    public boolean tileon = true;
     public boolean tilemeshon = false;
-    public boolean goalon = true;
-    public boolean anneal = false;
+    public boolean goalon = false;
+    public boolean anneal = true;
 
     public int breaks = 0;
     boolean alt = false;
@@ -179,9 +179,9 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
         gl.glBegin(GL.GL_TRIANGLES);
         if (tileon)
-        draw(gl, true, tile);
+        draw(gl, true, safeTriangles);
         if (tilemeshon)
-        draw(gl, false, tile);
+        draw(gl, false, safeTriangles);
         gl.glEnd();
 
         //draw(gl, false, tile);
@@ -211,11 +211,13 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         gl.glEnable (GL.GL_LIGHTING);
     }
 
-    private void draw(GL gl, boolean triangles, Mesh mesh) {
+    protected HashSet<Mesh.T> safeTriangles = new HashSet<Mesh.T>();
+
+    private void draw(GL gl, boolean triangles, Iterable<Mesh.T> tris) {
         float red = 0.0f;
         float green = 0.0f;
         float blue = 0.0f;
-        for(Mesh.T t : mesh) {
+        for(Mesh.T t : tris) {
             if (red < 0.15) red = 1.0f;
             if (green < 0.15) green = 1.0f;
             if (blue < 0.15) blue = 1.0f;