checkpoint

darcs-hash:20080629222307-5007d-d50e6a05ea3f038672a173e2d7b6cb9f1e37582f.gz

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 7f806f8..ecee9e5 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -110,6 +110,20 @@ public class Mesh implements Iterable<Mesh.T> {
             error += olderror;
         }
 
+        public Vertex hack(GL gl, Point mouse) {
+            double dist = Double.MAX_VALUE;
+            Vertex cur = null;
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
+                Vertex v = e.getOther(this);
+                double dist2 = v.getPoint().glProject(gl).distance(mouse);
+                if ((cur==null || dist2 < dist) && v.visible) {
+                    dist = dist2;
+                    cur = v;
+                }
+            }
+            return cur;
+        }
+
         public float averageTriangleArea() {
             int count = 0;
             float ret = 0;
@@ -308,6 +322,7 @@ public class Mesh implements Iterable<Mesh.T> {
             return !illegal;
         }
 
+        public E getEdge() { return e; }
         public E getFreeIncident() {
             E ret = getFreeIncident(e, e);
             if (ret != null) return ret;
@@ -362,6 +377,8 @@ public class Mesh implements Iterable<Mesh.T> {
 
         public boolean intersects(T t) { return t.intersects(p1.p, p2.p); }
 
+        public Segment getSegment() { return new Segment(p1.getPoint(), p2.getPoint()); }
+
         public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) {
 
             edu.berkeley.qfat.geom.BindingGroup<E> newBindingGroup =
@@ -554,6 +571,12 @@ public class Mesh implements Iterable<Mesh.T> {
             return Math.acos(v1.norm().dot(v2.norm()));
         }
 
+        public Vertex getOther(Vertex v) {
+            if (this.p1 == v) return p2;
+            if (this.p2 == v) return p1;
+            throw new Error();
+        }
+
         public void makeAdjacent(E e) {
             if (this.next == e) return;
             if (p2 != e.p1) throw new Error("cannot make adjacent -- no shared vertex");

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 6bad5eb..c943565 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -37,6 +37,10 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     boolean shift = false;
     boolean control = false;
 
+    public Point getMouse() {
+        return new Point(mousex, glcanvas.getHeight()-mousey, 0);
+    }
+
     public void mouseWheelMoved(MouseWheelEvent e) {
         tz -= e.getWheelRotation();
     }
@@ -260,6 +264,21 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         }
         //gl.glEnable(GL.GL_DEPTH_TEST);
 
+        gl.glDisable(GL.GL_LIGHTING);
+        gl.glShadeModel(GL.GL_FLAT);
+        if (closest != null) {
+            gl.glColor3f(1,1,1);
+            gl.glBegin(gl.GL_POINTS);
+            closest.getPoint().glVertex(gl);
+            gl.glEnd();
+            Mesh.Vertex v2 = closest.hack(gl, getMouse());
+            gl.glBegin(GL.GL_LINES);        
+            closest.getPoint().glVertex(gl);                                                                                                  
+            if (v2 != null) v2.getPoint().glVertex(gl);
+            gl.glEnd();
+        }
+
+        gl.glFlush();
         gl.glDrawBuffer(GL.GL_BACK);
         gl.glReadBuffer( GL.GL_BACK );
         gl.glPixelStorei( GL.GL_PACK_ALIGNMENT, 1);
@@ -267,17 +286,11 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         gl.glDisable(GL.GL_LIGHTING);
         gl.glShadeModel(GL.GL_FLAT);
 
-        int viewport[] = new int[4];
-        double mvmatrix[] = new double[16];
-        double projmatrix[] = new double[16];
-        double wcoord[] = new double[4];
-        gl.glGetIntegerv(GL.GL_VIEWPORT, viewport, 0);
-        gl.glGetDoublev(GL.GL_MODELVIEW_MATRIX, mvmatrix, 0);
-        gl.glGetDoublev(GL.GL_PROJECTION_MATRIX, projmatrix, 0);
-
         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);
+        double dist = Double.MAX_VALUE;
+        closest = null;
         synchronized(safeTriangles) {
             for(Mesh.T t : safeTriangles)
                 t.glTriangle(gl, null);
@@ -289,14 +302,11 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
                 gl.glEnd();
                 gl.glFlush();
 
-                glu.gluProject(p.x, 
-                               p.y, 
-                               p.z,
-                               mvmatrix, 0, projmatrix, 0, viewport, 0, wcoord, 0);
-                int x = (int)Math.round(wcoord[0]);
-                int y = (int)Math.round(wcoord[1]);
-
+                Point projected = p.glProject(gl);
+                int x = (int)projected.x;
+                int y = (int)projected.y;
                 gl.glReadPixels(x-1, 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;
@@ -305,12 +315,20 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
                     gl.glBegin(gl.GL_POINTS);
                     p.glVertex(gl);
                     gl.glEnd();
+                    y = glcanvas.getHeight()-y;
+                    if (closest==null || (x-mousex)*(x-mousex)+(y-mousey)*(y-mousey) < dist) {
+                        dist = (x-mousex)*(x-mousex)+(y-mousey)*(y-mousey);
+                        closest = v;
+                    }
                 }
             }
         }
         gl.glShadeModel(GL.GL_SMOOTH);
         gl.glEnable(GL.GL_LIGHTING);
         gl.glDrawBuffer(GL.GL_FRONT);
+
+
+
         /*
         IntBuffer selectionBuffer =
         ByteBuffer.allocateDirect(4*10000).order(ByteOrder.nativeOrder()).asIntBuffer();
@@ -327,7 +345,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         }
         */
     }
-
+    Mesh.Vertex closest = null;
 
     // I copied this method without changes from the mentioned base class.
     // It extracts the data in the selection buffer and writes it on the console.
@@ -409,7 +427,8 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
                 case 6: gl.glColor4f((float)0.75, (float)0.25, (float)0.75, (float)0.3); break;
             }
             
-            if (t.v1().visible && t.v2().visible && t.v3().visible) continue;
+            gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3); 
+            //if (t.v1().visible && t.v2().visible && t.v3().visible) continue;
 
             /*
             if (t.e1().pair.t==null) gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3);

diff --git a/src/edu/berkeley/qfat/geom/Point.java b/src/edu/berkeley/qfat/geom/Point.java
index 61fa603..2de47a6 100644 (file)
--- a/src/edu/berkeley/qfat/geom/Point.java
+++ b/src/edu/berkeley/qfat/geom/Point.java
@@ -1,5 +1,6 @@
 package edu.berkeley.qfat.geom;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 
 /** point in 3-space; immutable */
 public final class Point implements HasBoundingBox {
@@ -27,5 +28,19 @@ public final class Point implements HasBoundingBox {
     public float getMinY() { return y; }
     public float getMaxZ() { return z; }
     public float getMinZ() { return z; }
+
+    public Point glProject(GL gl) {
+        Point p = this;
+        int viewport[] = new int[4];
+        double mvmatrix[] = new double[16];
+        double projmatrix[] = new double[16];
+        double wcoord[] = new double[4];
+        gl.glGetIntegerv(GL.GL_VIEWPORT, viewport, 0);
+        gl.glGetDoublev(GL.GL_MODELVIEW_MATRIX, mvmatrix, 0);
+        gl.glGetDoublev(GL.GL_PROJECTION_MATRIX, projmatrix, 0);
+        GLU glu = new GLU();
+        glu.gluProject(p.x, p.y, p.z, mvmatrix, 0, projmatrix, 0, viewport, 0, wcoord, 0);
+        return new Point(wcoord[0], wcoord[1], 0);
+    }
 }
 

diff --git a/src/edu/berkeley/qfat/geom/Segment.java b/src/edu/berkeley/qfat/geom/Segment.java
index 576bb75..7e6ebd6 100644 (file)
--- a/src/edu/berkeley/qfat/geom/Segment.java
+++ b/src/edu/berkeley/qfat/geom/Segment.java
@@ -25,4 +25,6 @@ public class Segment implements HasBoundingBox {
     public float getMaxZ() { return Math.max(p1.z, p2.z); }
     public float getMinZ() { return Math.min(p1.z, p2.z); }
 
+    public Segment glProject(GL gl) { return new Segment(p1.glProject(gl), p2.glProject(gl)); }
+
 }