X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMeshViewer.java;h=f24e2ad9c89033f858d9f58594adeec9208e4578;hp=f869aac17efdfecd5891fa77cadd77d96a0afb68;hb=2b09dab499516873839b9bdbc972c980829e9bac;hpb=8eb1f25c21956fea2fdd1fffc3d1f1ace5a2047b

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index f869aac..f24e2ad 100644
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -12,16 +12,16 @@ 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.Vert[] points;
+    public Mesh.Vertex[] points;
 
 
     public boolean tileon = true;
     public boolean tilemeshon = false;
     public boolean goalon = false;
-    public boolean anneal = true;
+    public boolean anneal = false;
 
     public int breaks = 0;
     boolean alt = false;
@@ -54,7 +54,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             Vec normal = t.norm();
             pw.println("facet normal " + normal.x + " " + normal.y + " " + normal.z);
             pw.println("  outer loop");
-            for(Mesh.Vert v : new Mesh.Vert[] { t.v1(), t.v2(), t.v3() }) {
+            for(Mesh.Vertex v : new Mesh.Vertex[] { t.v1(), t.v2(), t.v3() }) {
                 pw.println("    vertex " + v.p.x + " " + v.p.y + " " + v.p.z);
             }
             pw.println("  endloop");
@@ -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);
@@ -199,23 +199,26 @@ 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);
         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) {
+        synchronized(safeTriangles) {
+        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;
@@ -223,7 +226,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             green -= .12f;
             blue -= .15f;
 
-            if (triangles) switch(t.colorclass) {
+            if (triangles) switch(t.color/*class*/) {
                 case 0: gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3); break;
                 case 1: gl.glColor4f((float)0.25, (float)0.75, (float)0.25, (float)0.3); break;
                 case 2: gl.glColor4f((float)0.75, (float)0.25, (float)0.25, (float)0.3); break;
@@ -232,7 +235,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
                 case 5: gl.glColor4f((float)0.25, (float)0.75, (float)0.75, (float)0.3); break;
                 case 6: gl.glColor4f((float)0.75, (float)0.25, (float)0.75, (float)0.3); break;
             }
-            gl.glColor4f((float)0.75, (float)0.25, (float)0.25, (float)0.3);
+            //gl.glColor4f((float)0.75, (float)0.25, (float)0.25, (float)0.3);
             //gl.glBegin(GL.GL_LINES);
 
             if (triangles) {
@@ -264,7 +267,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             */
             /*
             if (mesh==goal)
-                for(Mesh.Vert p : new Mesh.Vert[] { t.v1(), t.v2(), t.v3() }) {
+                for(Mesh.Vertex p : new Mesh.Vertex[] { t.v1(), t.v2(), t.v3() }) {
                 gl.glDisable(GL.GL_LIGHTING);
                 gl.glBegin(GL.GL_LINES);
                 gl.glColor3f(1, 1, 1);
@@ -277,7 +280,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
                 }
             */
             gl.glEnd();
-
+        }
         }
     }