X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FViewer.java;h=627b4572cf3a346828ee9f3409140abfcb005b68;hp=b39f2a671716e2e472fac3c168167424a8c685cb;hb=5360ba25cbb730399bf1153292e97cf070a7bec2;hpb=1fe8adfcaa676865b5858e5d9de094392a22e26b

diff --git a/src/edu/berkeley/qfat/Viewer.java b/src/edu/berkeley/qfat/Viewer.java
index b39f2a6..627b457 100644
--- a/src/edu/berkeley/qfat/Viewer.java
+++ b/src/edu/berkeley/qfat/Viewer.java
@@ -14,11 +14,12 @@ import edu.berkeley.qfat.geom.Point;
 public abstract class Viewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener  {
 
     Mesh.Vertex closest = null;
-    Matrix projection = null;
 
     public Mesh tile = new Mesh(false);
     public Mesh goal = new Mesh(false);
 
+    private Matrix projection = null;
+
     JFrame f;
     GLCanvas glcanvas;
     Point clickPoint = null;
@@ -73,12 +74,45 @@ public abstract class Viewer implements GLEventListener, MouseListener, MouseMot
     }
 
     public abstract void _display(GLAutoDrawable drawable, GL gl);
-    public void display(GLAutoDrawable drawable) {
+    public final void display(GLAutoDrawable drawable) {
         GL gl = drawable.getGL();
         _display(drawable, gl);
-        this.projection = Matrix.getProjectionMatrix(gl);
+        projection = Matrix.getProjectionMatrix(gl);
+    }
+
+    protected synchronized void updateVisibility(GL gl, Mesh mesh) {
+        Matrix projection = Matrix.getProjectionMatrix(gl);
+        IntBuffer buf = ByteBuffer.allocateDirect(9*4*4).order(ByteOrder.nativeOrder()).asIntBuffer();
+        gl.glColor3f(0,0,0);
+        gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+        for(Mesh.T t : mesh) t.glTriangle(gl, null);
+        for(Mesh.Vertex v : mesh.vertices()) {
+            Point p = v.getPoint();
+            gl.glColor3f(1,1,1);
+            gl.glBegin(gl.GL_POINTS);
+            p.glVertex(gl);
+            gl.glEnd();
+            gl.glFlush();
+            
+            Point projected = projection.times(p);
+            gl.glReadPixels((int)projected.x-1, (int)projected.y-1, 3, 3, gl.GL_RGB, gl.GL_UNSIGNED_BYTE, buf);
+            
+            boolean vis = false;
+            for(int j=0; j<9*4; j++) vis |= buf.get(j)!=0;
+            v.visible = vis;
+            if (vis) {
+                gl.glColor3f(0,0,0);
+                gl.glBegin(gl.GL_POINTS);
+                p.glVertex(gl);
+                gl.glEnd();
+            }
+        }
+        gl.glShadeModel(GL.GL_SMOOTH);
+        gl.glEnable(GL.GL_LIGHTING);
+        gl.glDrawBuffer(GL.GL_FRONT);
     }
 
+
     /** return the position of the mouse as a point in window-space */
     public Point getMouse() {
         return new Point(mousex, glcanvas.getHeight()-mousey, 0);
@@ -135,7 +169,7 @@ public abstract class Viewer implements GLEventListener, MouseListener, MouseMot
                     Vec delta = d1.plus(clickClosest).minus(closest.getPoint());
                     //System.out.println(delta + " " + closest.getPoint());
                     System.out.println(getMouse().minus(clickPoint));
-                    closest.move(Matrix.translate(delta), true);
+                    closest.move(Matrix.translate(delta), false);
                 }
             }
         } else {