X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMeshViewer.java;h=29919a49afdc04c9f0e8dba4211a4c3d6a57ac55;hp=38f3ea12d6e68216092d029aee1596b4cb228808;hb=3637de3ab66ba9c7bcd94d3b863bd22c706119e1;hpb=52acf11532731422c971751470738eaad97e5f9a

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 38f3ea1..29919a4 100644
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -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);
@@ -213,10 +213,11 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
     protected HashSet<Mesh.T> safeTriangles = new HashSet<Mesh.T>();
 
-    private synchronized void draw(GL gl, boolean triangles, Iterable<Mesh.T> tris) {
+    private void draw(GL gl, boolean triangles, Iterable<Mesh.T> tris) {
         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();
-
+        }
         }
     }