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

diff --git a/src/edu/berkeley/qfat/Viewer.java b/src/edu/berkeley/qfat/Viewer.java
index b39f2a6..1464020 100644
--- a/src/edu/berkeley/qfat/Viewer.java
+++ b/src/edu/berkeley/qfat/Viewer.java
@@ -14,20 +14,20 @@ 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 int mousex;
+    private int mousey;
+    private Matrix projection = null;
+
     JFrame f;
     GLCanvas glcanvas;
-    Point clickPoint = null;
+
+    private Point clickPoint = null;
     Point clickClosest = null;
 
-    int mousex;
-    int mousey;
-    float tx = 0;
-    float ty = 0;
     float tz = 0;
     float anglex = 0;
     float angley = 0;
@@ -73,10 +73,49 @@ 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.glFlush();
+        gl.glDrawBuffer(GL.GL_BACK);
+        gl.glReadBuffer( GL.GL_BACK );
+        gl.glPixelStorei( GL.GL_PACK_ALIGNMENT, 1);
+        gl.glFlush();
+        gl.glDisable(GL.GL_LIGHTING);
+        gl.glShadeModel(GL.GL_FLAT);
+        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 */
@@ -84,6 +123,11 @@ public abstract class Viewer implements GLEventListener, MouseListener, MouseMot
         return new Point(mousex, glcanvas.getHeight()-mousey, 0);
     }
 
+    /** return the position where the mouse button was pressed, or null if it is not currently pressed */
+    public Point getMouseClick() {
+        return clickPoint;
+    }
+
     public void mouseWheelMoved(MouseWheelEvent e) {
         tz -= e.getWheelRotation();
     }
@@ -125,17 +169,11 @@ public abstract class Viewer implements GLEventListener, MouseListener, MouseMot
 
     public void mouseDragged(MouseEvent e) {
         if (shift) {
-            /*
-            tx += (mousex - e.getX())/(float)20;
-            ty += (mousey - e.getY())/(float)20;
-            */
             if (closest != null && projection != null && clickClosest != null) {
                 synchronized(this) {
                     Vec d1 = projection.inverse().times(getMouse()).minus(projection.inverse().times(clickPoint));
                     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(delta, false);
                 }
             }
         } else {