From: adam Date: Mon, 30 Jun 2008 03:55:04 +0000 (-0700) Subject: checkpoint X-Git-Url: http://git.megacz.com/?p=anneal.git;a=commitdiff_plain;h=076fc38f95ee874e4bb01e03cb1021f5d137f35e;hp=0c83217e7d2c100185cca08f5fcd310f2a5347a1 checkpoint darcs-hash:20080630035504-5007d-8a7b6d397d023297bfd2162c545aaacc3508179b.gz --- diff --git a/src/edu/berkeley/qfat/InteractiveMeshViewer.java b/src/edu/berkeley/qfat/InteractiveMeshViewer.java index 1a72d7e..ed23803 100644 --- a/src/edu/berkeley/qfat/InteractiveMeshViewer.java +++ b/src/edu/berkeley/qfat/InteractiveMeshViewer.java @@ -13,7 +13,26 @@ import edu.berkeley.qfat.geom.Point; public class InteractiveMeshViewer extends MeshViewer { - public InteractiveMeshViewer(JFrame f) { super(f); } + public Mesh tile; + public Mesh goal; + public InteractiveMeshViewer(JFrame f) { + super(f); + setTile(new Mesh(false)); + setGoal(new Mesh(false)); + } + + public void setTile(Mesh tile) { + removeMesh(this.tile); + this.tile = tile; + addMesh(this.tile); + } + public void setGoal(Mesh goal) { + removeMesh(this.goal); + this.goal = goal; + goal.option_selectable = false; + goal.option_wireframe = true; + addMesh(this.goal); + } public synchronized void dump() { try { @@ -35,6 +54,26 @@ public class InteractiveMeshViewer extends MeshViewer { } catch (Exception e) { throw new RuntimeException(e); } } + public int whichNeighbor = 1; + public double temp; + public boolean tileon = true; + public boolean tilemeshon = false; + public boolean goalon = true; + public boolean anneal = false; + public boolean hillclimb = false; + public boolean neighbors = false; + public boolean neighborsWire = false; + public boolean neighborsWireOne = false; + public boolean errorNormals = false; + + public boolean force = false; + public Mesh.Vertex[] points; + public int breaks = 0; + + public int temps; + public int accepts; + public int vertss; + public void keyPressed(KeyEvent e) { super.keyPressed(e); switch(e.getKeyCode()) { diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index 3ce1d88..5dbba74 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -52,6 +52,7 @@ import edu.berkeley.qfat.geom.Polygon; public class Main extends InteractiveMeshViewer { + public Matrix[] transforms; public static int verts = 1; @@ -108,7 +109,7 @@ public class Main extends InteractiveMeshViewer { StlFile stlf = new StlFile(); InputStream res = this.getClass().getClassLoader().getResourceAsStream(file); stlf.readBinaryFile(file, res); - goal = new Mesh(false); + setGoal(new Mesh(false)); for(int i=0; i { private RTree triangles = new RTree(); private PointSet vertices = new PointSet(); - - public boolean option_wireframe = false; + public boolean option_wireframe = false; public boolean option_errorNormals = false; + public boolean option_selectable = true; public void render(GL gl, Matrix m) { if (option_wireframe) { diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java index 3751ddf..a3b591b 100644 --- a/src/edu/berkeley/qfat/MeshViewer.java +++ b/src/edu/berkeley/qfat/MeshViewer.java @@ -11,35 +11,70 @@ import java.util.*; import edu.berkeley.qfat.geom.*; import edu.berkeley.qfat.geom.Point; -public class MeshViewer extends Viewer { +public class MeshViewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener { - public int whichNeighbor = 1; - public double temp; - public boolean tileon = true; - public boolean tilemeshon = false; - public boolean goalon = true; - public boolean anneal = false; - public boolean hillclimb = false; - public boolean neighbors = false; - public boolean neighborsWire = false; - public boolean neighborsWireOne = false; - public boolean errorNormals = false; + Mesh.Vertex closest = null; - public boolean force = false; - public Matrix[] transforms; - public Mesh.Vertex[] points; - public int breaks = 0; + private HashSet meshes = new HashSet(); + public synchronized void addMesh(Mesh m) { meshes.add(m); } + public synchronized void removeMesh(Mesh m) { meshes.remove(m); } - public int temps; - public int accepts; - public int vertss; + private int mousex; + private int mousey; + private Matrix projection = null; + private Point clickPoint = null; - public MeshViewer(JFrame f) { super(f); } + GLCanvas glcanvas; - public void _display(GLAutoDrawable drawable, GL gl) { + Point clickClosest = null; - if (transforms==null) return; - glcanvas.setSize(f.getWidth(), f.getHeight() - 100); + float tz = 0; + float anglex = 0; + float angley = 0; + + boolean alt = false; + boolean shift = false; + boolean control = false; + + public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { } + public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { } + + public synchronized 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.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE); + gl.glEnable(GL.GL_COLOR_MATERIAL); + + display(gld); + } + + public synchronized final void display(GLAutoDrawable drawable) { + GL gl = drawable.getGL(); + glcanvas.setSize(glcanvas.getParent().getWidth(), glcanvas.getParent().getHeight() - 100); GLU glu = new GLU(); gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); @@ -51,10 +86,10 @@ public class MeshViewer extends Viewer { gl.glRotatef(anglex/3, 0, 1, 0); gl.glRotatef(-(angley/3), 1, 0, 0); - tile.render(gl, Matrix.ONE); - goal.render(gl, Matrix.ONE); + for(Mesh mesh : meshes) + mesh.render(gl, Matrix.ONE); - // highlight the point closest to the mouse + // 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) { @@ -66,25 +101,149 @@ public class MeshViewer extends Viewer { // update vertex visibilities // FIXME: only do this when we switch into vertex-finding mode - updateVisibility(gl, tile); + updateVisibility(gl); Matrix projection = Matrix.getProjectionMatrix(gl); double dist = Double.MAX_VALUE; if (getMouseClick() != null) return; closest = null; - for(Mesh.Vertex v : tile.vertices()) { - if (!v.visible) continue; - Point p = projection.times(v.getPoint()); - int x = (int)p.x; - int y = (int)p.y; - //y = glcanvas.getHeight()-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; + 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); + 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 mesh : meshes) mesh.render(gl, Matrix.ONE); + for(Mesh mesh : meshes) + if (mesh.option_selectable) + 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 */ + public Point getMouse() { + 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(); + } + + 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 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; + } + + public void mouseMoved(MouseEvent e) { + mousex = e.getX(); + mousey = e.getY(); + } + + public void mouseDragged(MouseEvent e) { + if (shift) { + 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()); + closest.move(delta, false); + } } + } else { + anglex -= mousex - e.getX(); + angley += mousey - e.getY(); } + mousex = e.getX(); + mousey = e.getY(); + } + + public MeshViewer(JFrame f) { + 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(); } } \ No newline at end of file diff --git a/src/edu/berkeley/qfat/Viewer.java b/src/edu/berkeley/qfat/Viewer.java deleted file mode 100644 index 1464020..0000000 --- a/src/edu/berkeley/qfat/Viewer.java +++ /dev/null @@ -1,201 +0,0 @@ -package edu.berkeley.qfat; -import java.io.*; -import java.nio.*; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; -import com.sun.opengl.util.*; -import java.util.*; -import edu.berkeley.qfat.geom.*; -import edu.berkeley.qfat.geom.Point; - -public abstract class Viewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener { - - Mesh.Vertex closest = 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; - - private Point clickPoint = null; - Point clickClosest = null; - - float tz = 0; - float anglex = 0; - float angley = 0; - - boolean alt = false; - boolean shift = false; - boolean control = false; - - public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { } - public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { } - - 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.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE); - gl.glEnable(GL.GL_COLOR_MATERIAL); - - display(gld); - } - - public abstract void _display(GLAutoDrawable drawable, GL gl); - public final void display(GLAutoDrawable drawable) { - GL gl = drawable.getGL(); - _display(drawable, 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 */ - public Point getMouse() { - 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(); - } - - 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 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; - } - - public void mouseMoved(MouseEvent e) { - mousex = e.getX(); - mousey = e.getY(); - } - - public void mouseDragged(MouseEvent e) { - if (shift) { - 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()); - closest.move(delta, false); - } - } - } else { - anglex -= mousex - e.getX(); - angley += mousey - e.getY(); - } - mousex = e.getX(); - mousey = e.getY(); - } - - public Viewer(JFrame f) { - this.f = f; - 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(); - } -} \ No newline at end of file