X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMeshViewer.java;h=c5c6a3b9cd088fc6249f7df8e672527331da3d67;hp=9e984807ab650b7e9fbb802f03fe2957ea0b37e0;hb=5e1dfbf83814f05b602d6463fca86470531fe4fe;hpb=5f15a6155bf7fbf2d62b3ab9fd992a54af10a95a

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 9e98480..c5c6a3b 100644
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -14,15 +14,17 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
     public Mesh tile = new Mesh(false);
     public Mesh goal = new Mesh(false);
-    public Matrix[] translations;
+    public Matrix[] transforms;
     public Mesh.Vertex[] points;
 
-
+    public double temp;
     public boolean tileon = true;
     public boolean tilemeshon = false;
-    public boolean goalon = false;
+    public boolean goalon = true;
     public boolean anneal = false;
     public boolean neighbors = false;
+    public boolean neighborsWire = false;
+    public boolean neighborsWireOne = false;
 
     public int breaks = 0;
     boolean alt = false;
@@ -40,6 +42,8 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             case KeyEvent.VK_ALT: alt = true; break;
             case KeyEvent.VK_SHIFT: shift = true; break;
             case KeyEvent.VK_SPACE: breaks++; break;
+            case KeyEvent.VK_UP: temp = temp * 2; break;
+            case KeyEvent.VK_ENTER: temp = 10; break;
             case KeyEvent.VK_D: dump(); break;
             case KeyEvent.VK_A: anneal = !anneal; break;
             case KeyEvent.VK_N: neighbors = !neighbors; break;
@@ -152,16 +156,17 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     public    int vertss;
     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) {
+    public synchronized void display(GLAutoDrawable drawable) {
+
+        if (transforms==null) return;
 
-        if (translations==null) return;
 
         glcanvas.setSize(f.getWidth(), f.getHeight() - 100);
         Graphics2D g = (Graphics2D)f.getGraphics();
         g.setColor(Color.black);
         g.fillRect(0, f.getHeight()-100, f.getWidth(), f.getHeight());
         g.setColor(Color.red);
-        int top = f.getHeight()-100;
+        int top = f.getHeight()-70;
         g.drawString("temperature: "+temps, 10, 30+top);
         g.drawString("acceptance: "+accepts, 10, 50+top);
         g.drawString("vertices: "+vertss, 10, 70+top);
@@ -191,16 +196,17 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         gl.glBegin(GL.GL_TRIANGLES);
         gl.glColor4f((float)0.5, (float)0.5, (float)0.5, (float)0.8);
         if (goalon)
-        draw(gl, false, goal);
+            draw(gl, false, goal);
         gl.glEnd();
 
 
         int i = 0;
         //gl.glDisable(GL.GL_DEPTH_TEST);
         gl.glColor4f(1,1,1,1);
-        for(Matrix m : translations) {
+        for(Matrix m : transforms) {
             //if (v1.z==0 && v1.y==0) continue;
             i++;
+            if (neighborsWireOne && i>1) continue;
             //if (i>4) continue;
             /*
             Point p = new Point(0, 0, 0).times(m);
@@ -208,13 +214,15 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             v = v.times((float)1.04);
             gl.glTranslatef(v.x, v.y, v.z);
             */
-            if (neighbors) draw(gl, false, safeTriangles, m);
+            if (neighbors) draw(gl, true, safeTriangles, m);
+            else if (neighborsWire || neighborsWireOne) draw(gl, false, safeTriangles, m);
             /*
             gl.glTranslatef(-v.x, -v.y, -v.z);
             */
         }
         //gl.glEnable(GL.GL_DEPTH_TEST);
         gl.glEnable (GL.GL_LIGHTING);
+
     }
 
     protected HashSet<Mesh.T> safeTriangles = new HashSet<Mesh.T>();
@@ -252,22 +260,26 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
             if (triangles) {
                 gl.glBegin(GL.GL_TRIANGLES);
-                t.glVertices(gl);
+                if (t.shouldBeDrawn()) {
+                    m.times(t.norm()).glNormal(gl);
+                    m.times(t.v1().goodp).glVertex(gl);
+                    m.times(t.v2().goodp).glVertex(gl);
+                    m.times(t.v3().goodp).glVertex(gl);
+                    //t.glVertices(gl, m);
+                }
                 gl.glEnd();
             } else {
-
                 gl.glDisable(GL.GL_LIGHTING);
                 gl.glBegin(GL.GL_LINES);
                 gl.glColor3f(1, 1, 1);
-                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);
+                m.times(t.e1().p1.goodp).glVertex(gl);
+                m.times(t.e1().p2.goodp).glVertex(gl);
+                m.times(t.e2().p1.goodp).glVertex(gl);
+                m.times(t.e2().p2.goodp).glVertex(gl);
+                m.times(t.e3().p1.goodp).glVertex(gl);
+                m.times(t.e3().p2.goodp).glVertex(gl);
                 gl.glEnd();
                 gl.glEnable(GL.GL_LIGHTING);
-
             }
 
             Point centroid = t.centroid();
@@ -298,14 +310,15 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
 
     //private JTextArea ocanvas = new JTextArea();
-    private Frame f;
+    private JFrame f;
     private GLCanvas glcanvas;
-    public MeshViewer(Frame f) {
+    public MeshViewer(JFrame f) {
         this.f = f;
        GLCapabilities glcaps = new GLCapabilities();
         glcanvas = new GLCanvas();
         glcanvas.addGLEventListener(this);
         f.add(glcanvas, BorderLayout.CENTER);
+
         glcanvas.addMouseListener(this);
         glcanvas.addMouseMotionListener(this);
         glcanvas.addMouseWheelListener(this);
@@ -314,4 +327,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     public void repaint() {
         glcanvas.repaint();
     }
+
+
+
 }
\ No newline at end of file