X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMeshViewer.java;h=eaafed6fa4a9a70a0735c5e0fff06dcbe2aa8d1a;hp=b4d958add87d0905d5d8260851bce8fc7b437e8a;hb=1fe8adfcaa676865b5858e5d9de094392a22e26b;hpb=0e80eb500d944f8ad1f3a9e2d296d9a4cbcd7e25 diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java index b4d958a..eaafed6 100644 --- a/src/edu/berkeley/qfat/MeshViewer.java +++ b/src/edu/berkeley/qfat/MeshViewer.java @@ -11,13 +11,7 @@ import java.util.*; import edu.berkeley.qfat.geom.*; import edu.berkeley.qfat.geom.Point; -public class MeshViewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener { - - public boolean force = false; - public Mesh tile = new Mesh(false); - public Mesh goal = new Mesh(false); - public Matrix[] transforms; - public Mesh.Vertex[] points; +public class MeshViewer extends Viewer { public int whichNeighbor = 1; @@ -32,171 +26,22 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi public boolean neighborsWireOne = false; public boolean errorNormals = false; + public boolean force = false; + public Matrix[] transforms; + public Mesh.Vertex[] points; public int breaks = 0; - boolean alt = false; - 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(); - } - - 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; - case KeyEvent.VK_SPACE: breaks++; force = true; break; - case KeyEvent.VK_UP: temp = temp * 2; break; - case KeyEvent.VK_ENTER: temp = 10; break; - case KeyEvent.VK_LEFT: whichNeighbor--; break; - case KeyEvent.VK_RIGHT: whichNeighbor++; break; - case KeyEvent.VK_D: dump(); break; - case KeyEvent.VK_E: errorNormals = !errorNormals; break; - case KeyEvent.VK_A: hillclimb = false; anneal = !anneal; break; - case KeyEvent.VK_H: anneal = true; hillclimb = !hillclimb; break; - case KeyEvent.VK_N: neighbors = !neighbors; break; - case KeyEvent.VK_T: tileon = !tileon; break; - case KeyEvent.VK_G: goalon = !goalon; break; - case KeyEvent.VK_M: tilemeshon = !tilemeshon; break; - } - } - public synchronized void dump() { - try { - PrintWriter pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream("dump.stl"))); - pw.println("solid dump"); - for(Mesh.T t : tile) { - Vec normal = t.norm(); - pw.println("facet normal " + normal.x + " " + normal.y + " " + normal.z); - pw.println(" outer loop"); - for(Mesh.Vertex v : new Mesh.Vertex[] { t.v1(), t.v2(), t.v3() }) { - pw.println(" vertex " + v.p.x + " " + v.p.y + " " + v.p.z); - } - pw.println(" endloop"); - pw.println("endfacet"); - } - pw.println("endsolid dump"); - pw.flush(); - pw.close(); - } catch (Exception e) { throw new RuntimeException(e); } - } - 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 mouseClicked(MouseEvent e) { } - public void mouseEntered(MouseEvent e) { } - public void mouseExited(MouseEvent e) { } - public void mousePressed(MouseEvent e) { - clickPoint = getMouse(); - clickClosest = closest == null ? null : closest.getPoint(); - } - public void mouseReleased(MouseEvent e) { - clickPoint = null; - clickClosest = null; - } - - Point clickPoint = null; - Point clickClosest = null; - - int mousex; - int mousey; - public void mouseMoved(MouseEvent e) { - mousex = e.getX(); - mousey = e.getY(); - } - - float tx = 0; - float ty = 0; - float tz = 0; - float anglex = 0; - float angley = 0; - public void mouseDragged(MouseEvent e) { - if (shift) { - /* - tx += (mousex - e.getX())/(float)20; - ty += (mousey - e.getY())/(float)20; - */ - if (closest != null && lastGL != null && projection != null && clickClosest != null) { - synchronized(safeTriangles) { - 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); - } - } - } else { - anglex -= mousex - e.getX(); - angley += mousey - e.getY(); - } - mousex = e.getX(); - mousey = e.getY(); - } - - /** - * Take care of initialization here. - */ - public void init(GLAutoDrawable gld) { - GL gl = gld.getGL(); - gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - gl.glViewport(0, 0, 500, 300); - gl.glEnable(GL.GL_DEPTH_TEST); - gl.glClearDepth(1.0); - gl.glDepthFunc(GL.GL_LEQUAL); - gl.glMatrixMode(GL.GL_PROJECTION); - gl.glLoadIdentity(); - gl.glMatrixMode(GL.GL_MODELVIEW); - - float mat_specular[] = { 0.5f, 0.5f, 0.5f, 0.5f }; - float mat_shininess[] = { 50.0f }; - gl.glShadeModel(GL.GL_SMOOTH); - //gl.glMaterialfv(GL.GL_FRONT, GL.GL_DIFFUSE, mat_specular, 0); - //gl.glMaterialfv(GL.GL_FRONT, GL.GL_SPECULAR, mat_specular, 0); - //gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT, new float[] { 0.3f, 0.3f, 0.3f, 0.3f }, 0); - //gl.glMaterialfv(GL.GL_FRONT, GL.GL_SHININESS, mat_shininess, 0); - gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, new float[] { 1.0f, 4.0f, -10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT1, GL.GL_POSITION, new float[] { -10.0f, 10.0f, 10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT2, GL.GL_POSITION, new float[] { 10.0f, -10.0f, 10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT3, GL.GL_POSITION, new float[] { 10.0f, 10.0f, -10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT4, GL.GL_POSITION, new float[] { -10.0f, 10.0f, -10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT5, GL.GL_POSITION, new float[] { 10.0f, -10.0f, -10.0f, 0.0f }, 0); - gl.glEnable(GL.GL_LIGHTING); - gl.glEnable(GL.GL_LIGHT0); - /* - gl.glEnable(GL.GL_LIGHT1); - gl.glEnable(GL.GL_LIGHT2); - gl.glEnable(GL.GL_LIGHT3); - gl.glEnable(GL.GL_LIGHT4); - gl.glEnable(GL.GL_LIGHT5); - */ - gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE); - gl.glEnable(GL.GL_COLOR_MATERIAL); - - display(gld); - } - - private GL lastGL = null; public int temps; public int accepts; public int vertss; - public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { } - public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { } - public void display(GLAutoDrawable drawable) { + protected HashSet safeTriangles = new HashSet(); + + public MeshViewer(JFrame f) { super(f); } - if (transforms==null) return; + public void _display(GLAutoDrawable drawable, GL gl) { + if (transforms==null) return; glcanvas.setSize(f.getWidth(), f.getHeight() - 100); Graphics2D g = (Graphics2D)f.getGraphics(); g.setColor(Color.black); @@ -210,8 +55,6 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi g.fillRect(140, 45+top, accepts, 10); g.fillRect(140, 65+top, vertss, 10); - GL gl = drawable.getGL(); - lastGL = gl; GLU glu = new GLU(); gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); gl.glPointSize(5.0f); @@ -316,8 +159,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); double dist = Double.MAX_VALUE; if (clickPoint==null) closest = null; - projection = Matrix.getProjectionMatrix(gl); - synchronized(safeTriangles) { + synchronized(this) { for(Mesh.T t : safeTriangles) t.glTriangle(gl, null); for(Mesh.Vertex v : tile.vertices()) { @@ -354,90 +196,15 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi 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(); - gl.glSelectBuffer(selectionBuffer.capacity(), selectionBuffer); - gl.glInitNames(); - gl.glRenderMode(GL.GL_SELECT); - draw(gl, true, safeTriangles); - int hits = gl.glRenderMode(GL.GL_RENDER); - synchronized(safeTriangles) { - for(Mesh.T t : safeTriangles) { - t.occluded = true; - } - processHits(hits, selectionBuffer); - } - */ - } - Mesh.Vertex closest = null; - Matrix projection = 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. - public void processHits(int hits, IntBuffer buffer) { - /* - System.out.println("---------------------------------"); - System.out.println(" HITS: " + hits); - */ - int offset = 0; - int names; - float z1, z2; - for (int i = 0; i < hits; i++) { - /* - System.out.println("- - - - - - - - - - - -"); - System.out.println(" hit: " + (i + 1)); - */ - names = buffer.get(offset); - offset++; - z1 = (float) buffer.get(offset) / 0x7fffffff; - offset++; - z2 = (float) buffer.get(offset) / 0x7fffffff; - offset++; - /* - System.out.println(" number of names: " + names); - System.out.println(" z1: " + z1); - System.out.println(" z2: " + z2); - System.out.println(" names: "); - */ - - for (int j = 0; j < names; j++) { - int who = buffer.get(offset); - for(Mesh.T t : safeTriangles) { - if (t.serial==who) { - t.occluded = false; - } - } - /* - System.out.print(" " + who); - if (j == (names - 1)) { - System.out.println("<-"); - } else { - System.out.println(); - } - */ - offset++; - } - /* - System.out.println("- - - - - - - - - - - -"); - */ - } - /* - System.out.println("--------------------------------- "); - */ } - protected HashSet safeTriangles = new HashSet(); private void draw(GL gl, boolean triangles, Iterable tris) { draw(gl, triangles, tris, Matrix.ONE); } private void draw(GL gl, boolean triangles, Iterable tris, Matrix m) { float red = 0.0f; float green = 0.0f; float blue = 0.0f; - synchronized(safeTriangles) { + synchronized(this) { for(Mesh.T t : tris) { if (red < 0.15) red = 1.0f; if (green < 0.15) green = 1.0f; @@ -512,27 +279,43 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi } } - - //private JTextArea ocanvas = new JTextArea(); - private JFrame f; - private GLCanvas glcanvas; - public MeshViewer(JFrame f) { - this.f = f; - - GLCapabilities glcaps = new GLCapabilities(); - glcanvas = new GLCanvas(); - glcanvas.addGLEventListener(this); - f.add(glcanvas, BorderLayout.CENTER); - - glcanvas.addMouseListener(this); - glcanvas.addMouseMotionListener(this); - glcanvas.addMouseWheelListener(this); - glcanvas.addKeyListener(this); - } - public void repaint() { - glcanvas.repaint(); + public synchronized void dump() { + try { + PrintWriter pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream("dump.stl"))); + pw.println("solid dump"); + for(Mesh.T t : tile) { + Vec normal = t.norm(); + pw.println("facet normal " + normal.x + " " + normal.y + " " + normal.z); + pw.println(" outer loop"); + for(Mesh.Vertex v : new Mesh.Vertex[] { t.v1(), t.v2(), t.v3() }) { + pw.println(" vertex " + v.p.x + " " + v.p.y + " " + v.p.z); + } + pw.println(" endloop"); + pw.println("endfacet"); + } + pw.println("endsolid dump"); + pw.flush(); + pw.close(); + } catch (Exception e) { throw new RuntimeException(e); } } - + public void keyPressed(KeyEvent e) { + super.keyPressed(e); + switch(e.getKeyCode()) { + case KeyEvent.VK_SPACE: breaks++; force = true; break; + case KeyEvent.VK_UP: temp = temp * 2; break; + case KeyEvent.VK_ENTER: temp = 10; break; + case KeyEvent.VK_LEFT: whichNeighbor--; break; + case KeyEvent.VK_RIGHT: whichNeighbor++; break; + case KeyEvent.VK_D: dump(); break; + case KeyEvent.VK_E: errorNormals = !errorNormals; break; + case KeyEvent.VK_A: hillclimb = false; anneal = !anneal; break; + case KeyEvent.VK_H: anneal = true; hillclimb = !hillclimb; break; + case KeyEvent.VK_N: neighbors = !neighbors; break; + case KeyEvent.VK_T: tileon = !tileon; break; + case KeyEvent.VK_G: goalon = !goalon; break; + case KeyEvent.VK_M: tilemeshon = !tilemeshon; break; + } + } } \ No newline at end of file