checkpoint

[anneal.git] / src / edu / berkeley / qfat / MeshViewer.java

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 9bed900..29919a4 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -12,8 +12,8 @@ import edu.berkeley.qfat.geom.Point;
 
 public class MeshViewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener  {
 
-    public Mesh tile = new Mesh();
-    public Mesh goal = new Mesh();
+    public Mesh tile = new Mesh(false);
+    public Mesh goal = new Mesh(false);
     public Matrix[] translations;
     public Mesh.Vertex[] points;
 
@@ -199,12 +199,12 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         for(Matrix m : translations) {
             //if (v1.z==0 && v1.y==0) continue;
             i++;
-            //if (i != 7 && i!=4) continue;
+            if (i!=2&&i!=5) continue;
             Point p = new Point(0, 0, 0).times(m);
             Vec v = new Vec(p.x, p.y, p.z);
             v = v.times((float)1.04);
             gl.glTranslatef(v.x, v.y, v.z);
-            //draw(gl, false, tile);
+            //draw(gl, false, safeTriangles);
             gl.glTranslatef(-v.x, -v.y, -v.z);
         }
         //gl.glEnable(GL.GL_DEPTH_TEST);
@@ -217,6 +217,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         float red = 0.0f;
         float green = 0.0f;
         float blue = 0.0f;
+        synchronized(safeTriangles) {
         for(Mesh.T t : tris) {
             if (red < 0.15) red = 1.0f;
             if (green < 0.15) green = 1.0f;
@@ -279,7 +280,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
                 }
             */
             gl.glEnd();
-
+        }
         }
     }