X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMeshViewer.java;h=e8f45867b6838a18d20f299a9b15adc505076e9f;hp=9bed900f87f4215ec7a582d775ec5be08ffe73d1;hb=4c6451ef747ae7ffc2aa8955e55254673ac49d16;hpb=e0e7d9b473eacc2407c2d70ed0ec42b109a1faf3

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 9bed900..e8f4586 100644
--- 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;
 
@@ -21,7 +21,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     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;
@@ -151,6 +151,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
     public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { }
     public void display(GLAutoDrawable drawable) {
+
         if (translations==null) return;
 
         glcanvas.setSize(f.getWidth(), f.getHeight() - 100);
@@ -198,14 +199,18 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         gl.glColor4f(1,1,1,1);
         for(Matrix m : translations) {
             //if (v1.z==0 && v1.y==0) continue;
+            //if (i>0) continue;
             i++;
-            //if (i != 7 && i!=4) 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, m);
+            /*
             gl.glTranslatef(-v.x, -v.y, -v.z);
+            */
         }
         //gl.glEnable(GL.GL_DEPTH_TEST);
         gl.glEnable (GL.GL_LIGHTING);
@@ -213,10 +218,12 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
     protected HashSet<Mesh.T> safeTriangles = new HashSet<Mesh.T>();
 
-    private void draw(GL gl, boolean triangles, Iterable<Mesh.T> tris) {
+    private void draw(GL gl, boolean triangles, Iterable<Mesh.T> tris) { draw(gl, triangles, tris, Matrix.ONE); }
+    private void draw(GL gl, boolean triangles, Iterable<Mesh.T> tris, Matrix m) {
         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;
@@ -225,7 +232,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;
@@ -234,7 +241,12 @@ 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);
+            /*
+            if (t.e1().pair.t==null) gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3);
+            else if (t.e2().pair.t==null) gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3);
+            else if (t.e3().pair.t==null) gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3);
+            else  gl.glColor4f((float)0.75, (float)0.25, (float)0.25, (float)0.3);
+            */
             //gl.glBegin(GL.GL_LINES);
 
             if (triangles) {
@@ -246,12 +258,12 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
                 gl.glDisable(GL.GL_LIGHTING);
                 gl.glBegin(GL.GL_LINES);
                 gl.glColor3f(1, 1, 1);
-                t.e1().p1.p.glVertex(gl);
-                t.e1().p2.p.glVertex(gl);
-                t.e2().p1.p.glVertex(gl);
-                t.e2().p2.p.glVertex(gl);
-                t.e3().p1.p.glVertex(gl);
-                t.e3().p2.p.glVertex(gl);
+                m.times(t.e1().p1.p).glVertex(gl);
+                m.times(t.e1().p2.p).glVertex(gl);
+                m.times(t.e2().p1.p).glVertex(gl);
+                m.times(t.e2().p2.p).glVertex(gl);
+                m.times(t.e3().p1.p).glVertex(gl);
+                m.times(t.e3().p2.p).glVertex(gl);
                 gl.glEnd();
                 gl.glEnable(GL.GL_LIGHTING);
 
@@ -279,7 +291,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
                 }
             */
             gl.glEnd();
-
+        }
         }
     }