X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMeshViewer.java;h=d02470c9f8f9275827cca5e57559a71017daee38;hp=c344bcafdf1ec86532af0b37a6da9d03f5960911;hb=1cfea6e5d6ca9e75578e97d1fdccf2b306af56c4;hpb=85c64e9b1601906bea50c0e1f30f1d0471b80867

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index c344bca..d02470c 100644
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -8,32 +8,39 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import com.sun.opengl.util.*;
 import java.util.*;
+import edu.berkeley.qfat.bind.*;
 import edu.berkeley.qfat.geom.*;
 import edu.berkeley.qfat.geom.Point;
 
-public class MeshViewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener {
+public class MeshViewer extends JPanel implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener {
 
-    Mesh.Vertex closest = null;
+    Main main;
 
-    private int      mousex;
-    private int      mousey;
-    private Matrix   projection = null;
-    private Point    clickPoint = null;
-    private GLCanvas glcanvas;
-    private boolean  updateVisibilities = false;
+
+    private float tz = 0;
+    private float anglex = 0;
+    private float angley = 0;
+
+    private Mesh.Vertex closest = null;
+    private Point       closestOriginallyAt = null;
+    private int         mousex;
+    private int         mousey;
+    private Matrix      projection = null;
+    private Point       clickPoint = null;
+    private GLCanvas    glcanvas;
+    private boolean     updateVisibilities = false;
+    private boolean     mouseInside = false;
 
     private HashSet<Mesh> meshes = new HashSet<Mesh>();
 
     public synchronized void addMesh(Mesh m) { meshes.add(m); }
     public synchronized void removeMesh(Mesh m) { meshes.remove(m); }
 
-    float tz = 0;
-    float anglex = 0;
-    float angley = 0;
-
     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
     public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { }
 
+    public void addKeyListener(KeyListener kl) { glcanvas.addKeyListener(kl); }
+
     public synchronized void init(GLAutoDrawable gld) {
         GL gl = glcanvas.getGL();//gld.getGL();
         gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
@@ -72,10 +79,14 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     }
 
     public synchronized final void display(GLAutoDrawable drawable) {
-        glcanvas.setSize(glcanvas.getParent().getWidth(), glcanvas.getParent().getHeight() - 100);
+        glcanvas.setSize(glcanvas.getParent().getWidth(), glcanvas.getParent().getHeight());
 
         GL gl = glcanvas.getGL();//drawable.getGL();
         GLU glu = new GLU();
+
+        if (!mouseInside) gl.glClearColor(0.1f, 0.1f, 0.1f, 1.0f);
+        else gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+
         gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
         gl.glPointSize(5.0f);
         gl.glLoadIdentity();
@@ -87,8 +98,14 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
         gl.glEnable(GL.GL_LIGHTING);
         gl.glShadeModel(GL.GL_SMOOTH);
-        for(Mesh mesh : meshes)
+        for(Mesh mesh : meshes) {
             mesh.render(gl, Matrix.ONE);
+            if (main != null && main.whichNeighbor>0 && main.transforms!=null && !mesh.option_wireframe) {
+                mesh.option_wireframe = true;
+                mesh.render(gl, main.transforms[main.whichNeighbor-1]);
+                mesh.option_wireframe = false;
+            }
+        }
 
         // highlight the point closest to the mouse; we do this here to avoid flicker
         if (closest != null) {
@@ -110,6 +127,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             //Matrix projection = Matrix.getProjectionMatrix(gl);
             double dist = Double.MAX_VALUE;
             closest = null;
+            closestOriginallyAt = null;
             for(Mesh mesh : meshes)
                 if (mesh.option_selectable)
                     for(Mesh.Vertex v : mesh.vertices()) {
@@ -186,8 +204,8 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     public void keyReleased(KeyEvent e) { }
 
     public void mouseClicked(MouseEvent e) { }
-    public void mouseEntered(MouseEvent e) { }
-    public void mouseExited(MouseEvent e) { }
+    public void mouseEntered(MouseEvent e) { mouseInside = true; }
+    public void mouseExited(MouseEvent e) { mouseInside = false; }
     public void mousePressed(MouseEvent e) {
         clickPoint = getMouse();
     }
@@ -207,9 +225,9 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         if ((e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0) {
             if (closest != null && projection != null) {
                 synchronized(this) {
-                    Point clickClosest = closest == null ? null : closest.getPoint();
+                    if (closestOriginallyAt==null) closestOriginallyAt = closest.getPoint();
                     Vec d1 = projection.inverse().times(getMouse()).minus(projection.inverse().times(clickPoint));
-                    Vec delta = d1.plus(clickClosest).minus(closest.getPoint());
+                    Vec delta = d1.plus(closestOriginallyAt).minus(closest.getPoint());
                     closest.move(delta, false);
                 }
             }
@@ -221,10 +239,11 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         mousey = e.getY();
     }
 
-    public MeshViewer(JFrame f) {
+    public MeshViewer() {
         glcanvas = new GLCanvas();
         glcanvas.addGLEventListener(this);
-        f.add(glcanvas, BorderLayout.CENTER);
+        setLayout(new BorderLayout());
+        this.add(glcanvas, BorderLayout.CENTER);
         glcanvas.addMouseListener(this);
         glcanvas.addMouseMotionListener(this);
         glcanvas.addMouseWheelListener(this);
@@ -232,7 +251,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     }
 
     public void repaint() {
-        glcanvas.repaint();
+        if (glcanvas != null) glcanvas.repaint();
     }
 
 }
\ No newline at end of file