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 c5c6a3b..cc05e86 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -12,19 +12,24 @@ import edu.berkeley.qfat.geom.Point;
 
 public class MeshViewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener  {
 
+    public boolean force = false;
     public Mesh tile = new Mesh(false);
     public Mesh goal = new Mesh(false);
     public Matrix[] transforms;
     public Mesh.Vertex[] points;
 
+    public int whichNeighbor = 1;
+
     public double temp;
     public boolean tileon = true;
     public boolean tilemeshon = false;
     public boolean goalon = true;
     public boolean anneal = false;
+    public boolean hillclimb = false;
     public boolean neighbors = false;
     public boolean neighborsWire = false;
     public boolean neighborsWireOne = false;
+    public boolean errorNormals = false;
 
     public int breaks = 0;
     boolean alt = false;
@@ -41,11 +46,15 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             case KeyEvent.VK_CONTROL: control = true; break;
             case KeyEvent.VK_ALT: alt = true; break;
             case KeyEvent.VK_SHIFT: shift = true; break;
-            case KeyEvent.VK_SPACE: breaks++; break;
+            case KeyEvent.VK_SPACE: breaks++; force = true; break;
             case KeyEvent.VK_UP: temp = temp * 2; break;
             case KeyEvent.VK_ENTER: temp = 10; break;
+            case KeyEvent.VK_LEFT: whichNeighbor--; break;
+            case KeyEvent.VK_RIGHT: whichNeighbor++; break;
             case KeyEvent.VK_D: dump(); break;
-            case KeyEvent.VK_A: anneal = !anneal; break;
+            case KeyEvent.VK_E: errorNormals = !errorNormals; break;
+            case KeyEvent.VK_A: hillclimb = false; anneal = !anneal; break;
+            case KeyEvent.VK_H: anneal = true; hillclimb = !hillclimb; break;
             case KeyEvent.VK_N: neighbors = !neighbors; break;
             case KeyEvent.VK_T: tileon = !tileon; break;
             case KeyEvent.VK_G: goalon = !goalon; break;
@@ -156,7 +165,7 @@ 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 synchronized void display(GLAutoDrawable drawable) {
+    public void display(GLAutoDrawable drawable) {
 
         if (transforms==null) return;
 
@@ -180,9 +189,29 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         gl.glPointSize(5.0f);
         gl.glLoadIdentity();
         glu.gluPerspective(50, ((float)drawable.getWidth())/drawable.getHeight(), 0.5, 10);
-        glu.gluLookAt(0, 0, (tz/10)-1, 0, 0, 0, 0, 1, 0);
+        glu.gluLookAt(0, 0, -((tz/10)-1), 0, 0, 0, 0, 1, 0);
         gl.glRotatef(anglex/3, 0, 1, 0);
-        gl.glRotatef(angley/3, 1, 0, 0);
+        gl.glRotatef(-(angley/3), 1, 0, 0);
+
+
+        gl.glDisable(GL.GL_LIGHTING);
+        gl.glColor4f(1, 0, 0, 1);
+        gl.glBegin(GL.GL_LINES);
+        gl.glVertex3f(0,0,0);
+        gl.glVertex3f(.3f,0,0);
+        gl.glEnd();
+        gl.glColor4f(0, 1, 0, 1);
+        gl.glBegin(GL.GL_LINES);
+        gl.glVertex3f(0,0,0);
+        gl.glVertex3f(0,.3f,0);
+        gl.glEnd();
+        gl.glColor4f(0, 0, 1, 1);
+        gl.glBegin(GL.GL_LINES);
+        gl.glVertex3f(0,0,0);
+        gl.glVertex3f(0,0,.3f);
+        gl.glEnd();
+        gl.glEnable(GL.GL_LIGHTING);
+
 
         gl.glBegin(GL.GL_TRIANGLES);
         if (tileon)
@@ -204,9 +233,17 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         //gl.glDisable(GL.GL_DEPTH_TEST);
         gl.glColor4f(1,1,1,1);
         for(Matrix m : transforms) {
+            /*
+              gl.glColor4f(0, 1, 1, 1);
+              gl.glBegin(GL.GL_LINES);
+              new Point(0,0,0).glVertex(gl);
+              new Point(0,0,0).plus(m.getTranslationalComponent()).glVertex(gl);
+              gl.glEnd();
+              gl.glEnable(GL.GL_LIGHTING);
+            */
             //if (v1.z==0 && v1.y==0) continue;
             i++;
-            if (neighborsWireOne && i>1) continue;
+            if (neighborsWireOne && i!=whichNeighbor) continue;
             //if (i>4) continue;
             /*
             Point p = new Point(0, 0, 0).times(m);
@@ -285,25 +322,23 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             Point centroid = t.centroid();
             gl.glBegin(GL.GL_LINES);
             gl.glColor3f(1, 1, 1);
-            /*
-            centroid.glVertex(gl);
-            centroid.plus(t.norm().times(t.diameter())).glVertex(gl);
-            */
-            /*
-            if (mesh==goal)
+
+            if (triangles && errorNormals)
                 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);
-                p.p.glVertex(gl);
-                //p.p.plus(p.norm().times(p.score())).glVertex(gl);
-                if (p.nearest_in_other_mesh != null) p.nearest_in_other_mesh.p.glVertex(gl);
-                    //tile.nearest(p).centroid().glVertex(gl);
-                gl.glEnd();
-                gl.glEnable(GL.GL_LIGHTING);
+                    if (p.ok) {
+                        //gl.glDisable(GL.GL_LIGHTING);
+                        gl.glBegin(GL.GL_LINES);
+                        gl.glColor3f(1, 1, 1);
+                        p.p.glVertex(gl);
+                        p.p.plus(p.norm().times((float)p.error()*10)).glVertex(gl);
+                        //if (p.nearest_in_other_mesh != null) p.nearest_in_other_mesh.p.glVertex(gl);
+                        //tile.nearest(p).centroid().glVertex(gl);
+                        gl.glEnd();
+                        //gl.glEnable(GL.GL_LIGHTING);
+                    }
                 }
-            */
             gl.glEnd();
+            
         }
         }
     }
@@ -314,7 +349,8 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     private GLCanvas glcanvas;
     public MeshViewer(JFrame f) {
         this.f = f;
-       GLCapabilities glcaps = new GLCapabilities();
+
+        GLCapabilities glcaps = new GLCapabilities();
         glcanvas = new GLCanvas();
         glcanvas.addGLEventListener(this);
         f.add(glcanvas, BorderLayout.CENTER);