X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMeshViewer.java;h=d02470c9f8f9275827cca5e57559a71017daee38;hp=a3b591b1cbc6aab6799e1f971341fce7f9054f82;hb=1cfea6e5d6ca9e75578e97d1fdccf2b306af56c4;hpb=076fc38f95ee874e4bb01e03cb1021f5d137f35e diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java index a3b591b..d02470c 100644 --- a/src/edu/berkeley/qfat/MeshViewer.java +++ b/src/edu/berkeley/qfat/MeshViewer.java @@ -8,39 +8,41 @@ 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 HashSet meshes = new HashSet(); - public synchronized void addMesh(Mesh m) { meshes.add(m); } - public synchronized void removeMesh(Mesh m) { meshes.remove(m); } - - private int mousex; - private int mousey; - private Matrix projection = null; - private Point clickPoint = null; - GLCanvas glcanvas; + private float tz = 0; + private float anglex = 0; + private float angley = 0; - Point clickClosest = null; + 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; - float tz = 0; - float anglex = 0; - float angley = 0; + private HashSet meshes = new HashSet(); - boolean alt = false; - boolean shift = false; - boolean control = false; + public synchronized void addMesh(Mesh m) { meshes.add(m); } + public synchronized void removeMesh(Mesh m) { meshes.remove(m); } 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 = gld.getGL(); + GL gl = glcanvas.getGL();//gld.getGL(); gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); gl.glViewport(0, 0, 500, 300); gl.glEnable(GL.GL_DEPTH_TEST); @@ -70,13 +72,21 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi gl.glEnable(GL.GL_COLOR_MATERIAL); display(gld); + + // hack to get around Mac OS bug + IntBuffer buf = ByteBuffer.allocateDirect(9*4*4).order(ByteOrder.nativeOrder()).asIntBuffer(); + gl.glReadPixels(0,0, 1, 1, gl.GL_RGB, gl.GL_UNSIGNED_BYTE, buf); } public synchronized final void display(GLAutoDrawable drawable) { - GL gl = drawable.getGL(); - 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(); @@ -86,47 +96,56 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi gl.glRotatef(anglex/3, 0, 1, 0); gl.glRotatef(-(angley/3), 1, 0, 0); - for(Mesh mesh : meshes) + gl.glEnable(GL.GL_LIGHTING); + gl.glShadeModel(GL.GL_SMOOTH); + 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 - gl.glDisable(GL.GL_LIGHTING); - gl.glShadeModel(GL.GL_FLAT); if (closest != null) { + gl.glDisable(GL.GL_LIGHTING); + gl.glShadeModel(GL.GL_FLAT); gl.glColor3f(1,1,1); gl.glBegin(gl.GL_POINTS); closest.getPoint().glVertex(gl); gl.glEnd(); } - // update vertex visibilities - // FIXME: only do this when we switch into vertex-finding mode - updateVisibility(gl); + projection = Matrix.getProjectionMatrix(gl); - Matrix projection = Matrix.getProjectionMatrix(gl); - double dist = Double.MAX_VALUE; - if (getMouseClick() != null) return; - closest = null; - for(Mesh mesh : meshes) - if (mesh.option_selectable) - for(Mesh.Vertex v : mesh.vertices()) { - if (!v.visible) continue; - Point p = projection.times(v.getPoint()); - int x = (int)p.x; - int y = (int)p.y; - int mousex = (int)getMouse().x; - int mousey = (int)getMouse().y; - if (closest==null || (x-mousex)*(x-mousex)+(y-mousey)*(y-mousey) < dist) { - dist = (x-mousex)*(x-mousex)+(y-mousey)*(y-mousey); - closest = v; + if (updateVisibilities) { + updateVisibilities = false; + // update vertex visibilities + updateVisibility(gl); + + //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()) { + if (!v.visible) continue; + Point p = projection.times(v.getPoint()); + int x = (int)p.x; + int y = (int)p.y; + int mousex = (int)getMouse().x; + int mousey = (int)getMouse().y; + if (closest==null || (x-mousex)*(x-mousex)+(y-mousey)*(y-mousey) < dist) { + dist = (x-mousex)*(x-mousex)+(y-mousey)*(y-mousey); + closest = v; + } } - } - - projection = Matrix.getProjectionMatrix(gl); + } } protected synchronized void updateVisibility(GL gl) { - Matrix projection = Matrix.getProjectionMatrix(gl); IntBuffer buf = ByteBuffer.allocateDirect(9*4*4).order(ByteOrder.nativeOrder()).asIntBuffer(); gl.glFlush(); gl.glDrawBuffer(GL.GL_BACK); @@ -181,46 +200,34 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi } public void keyTyped(KeyEvent e) { } - public void keyPressed(KeyEvent e) { - switch(e.getKeyCode()) { - case KeyEvent.VK_CONTROL: control = true; break; - case KeyEvent.VK_ALT: alt = true; break; - case KeyEvent.VK_SHIFT: shift = true; break; - } - } - - public void keyReleased(KeyEvent e) { - switch(e.getKeyCode()) { - case KeyEvent.VK_CONTROL: control = false; break; - case KeyEvent.VK_ALT: alt = false; break; - case KeyEvent.VK_SHIFT: shift = false; break; - } - } + public void keyPressed(KeyEvent e) { } + 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(); - clickClosest = closest == null ? null : closest.getPoint(); } public void mouseReleased(MouseEvent e) { clickPoint = null; - clickClosest = null; } public void mouseMoved(MouseEvent e) { mousex = e.getX(); mousey = e.getY(); + if ((e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0) + updateVisibilities = true; } public void mouseDragged(MouseEvent e) { - if (shift) { - if (closest != null && projection != null && clickClosest != null) { + if ((e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0) { + if (closest != null && projection != null) { synchronized(this) { + 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); } } @@ -232,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); @@ -243,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