good 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 a886aa4..c7f9d76 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -199,13 +199,16 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         for(Matrix m : translations) {
             //if (v1.z==0 && v1.y==0) continue;
             i++;
-            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, safeTriangles);
+            */
+            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,7 +216,8 @@ 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;
@@ -247,12 +251,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);