From: adam Date: Wed, 5 Dec 2007 07:38:01 +0000 (-0800) Subject: checkpoint X-Git-Url: http://git.megacz.com/?p=anneal.git;a=commitdiff_plain;h=6fc720977d26dc1f154a3c0802c3beabd347d673 checkpoint darcs-hash:20071205073801-5007d-56cf8d92672b8d02605bb9f39620c82b08a9203d.gz --- diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index 74f7098..bb15b3b 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -8,76 +8,17 @@ import java.util.*; import edu.berkeley.qfat.geom.*; import edu.berkeley.qfat.geom.Point; -// FIXME: recenter goal to have centroid coincident with tile // FIXME: re-orient goal (how?) -// fish case: ensure that spinal axis of fish is the x-axis of the tile -public class Main implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener { - - boolean alt = false; - boolean shift = false; - boolean control = false; - - 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) { } - public void mouseReleased(MouseEvent e) { } - - 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; - } else { - anglex -= mousex - e.getX(); - angley += mousey - e.getY(); - } - mousex = e.getX(); - mousey = e.getY(); - } - - private Mesh tile = new Mesh(); - private Mesh goal = new Mesh(); +public class Main extends MeshViewer { + public static final Random random = new Random(); + /** magnification factor */ private static final float MAG = 1; - Matrix[] translations; - Mesh.Vert[] points; - - public Main(StlFile stlf) { + public Main(StlFile stlf, Frame f) { + super(f); for(int i=0; i 400) return; - //double min = (tile.avgedge/tile.numedges)*(1+(4/(double)verts)); - //if (verts>0 && tile.es.peek().length() < min) return; + if (verts > 200) return; PriorityQueue es = new PriorityQueue(); for(Mesh.E e : tile.edges()) es.add(e); for(int i=0; i<10; i++) { @@ -259,209 +197,39 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener double goal_score = goal.score(); p.rescore(); - /* - //if (p.watch==null) return; - float r1 = Math.abs(random.nextFloat()); - r1 = r1 - (float)Math.floor(r1); - r1 = r1 * (float)0.01; - r1 = r1 - (float)0.005; - public Vert partner() { return quadric==null ? this : quadric; } - public Point quadric() { return quadric_count==0 ? partner().p : - new Point(quadric_x/quadric_count, quadric_y/quadric_count, quadric_z/quadric_count); } - - Vec v = p.nearest_vert_in_other_mesh().minus(p.p).norm().times(r1); - */ - //v = p.norm().times(v.dot(p.norm())); - Vec v = new Vec((random.nextFloat() - (float)0.5) / 1000, (random.nextFloat() - (float)0.5) / 1000, (random.nextFloat() - (float)0.5) / 1000); - /* - Matrix inv = p.errorQuadric(); - Vec v = new Vec(inv.d, inv.h, inv.l).norm().times(1/(float)1000); - */ - boolean aspect = false;//(Math.abs(random.nextInt()) % 100) <= 2; - Matrix old_tile_aspect = null;//goal.aspect; - boolean good = true; - if (aspect) { - /* - v = v.times(10); - tile.aspect = new Matrix(tile.aspect.a / (v.x+1), tile.aspect.f / (v.y+1), tile.aspect.k / (v.z+1)); - tile.invaspect = new Matrix(1/tile.aspect.a, 1/tile.aspect.f, 1/tile.aspect.k); - goal.rescore(); - tile.rescore(); - */ - } else { - good = p.move(v); - } + //Matrix inv = p.errorQuadric(); + //Vec v = new Vec(inv.d, inv.h, inv.l).norm().times(1/(float)1000); + + boolean good = p.move(v); double new_tile_score = tile.score(); double new_goal_score = goal.score(); double tile_delta = new_tile_score - tile_score; double goal_delta = 0;//new_goal_score - goal_score; double delta = tile_delta + goal_delta; - double swapProbability = Math.exp((-1 * delta) / temperature); + //double swapProbability = Math.exp((-1 * delta) / temperature); //boolean doSwap = Math.random() < swapProbability; boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0); - //boolean doSwap = true; - //System.out.println(doSwap); + if (doSwap) { tile_score = new_tile_score; goal_score = new_goal_score; - System.out.println("score: " + tile_score + " / " + goal_score); - if (aspect) System.out.println("aspect " + v); + //System.out.println("score: " + tile_score + " / " + goal_score); } else { - if (aspect) { - //tile.aspect = old_tile_aspect; - //tile.invaspect = new Matrix(1/tile.aspect.a, 1/tile.aspect.f, 1/tile.aspect.k); - goal.rescore(); - tile.rescore(); - } else { - p.move(v.times(-1)); - } + p.move(v.times(-1)); } } - /** - * 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); - display(gld); - } - - 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 display(GLAutoDrawable drawable) { - GL gl = drawable.getGL(); - GLU glu = new GLU(); - gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); - gl.glPointSize(5.0f); - gl.glLoadIdentity(); - glu.gluPerspective(50-tz, ((float)drawable.getWidth())/drawable.getHeight(), 0.5, 10); - glu.gluLookAt(0, 0, -1, 0, 0, 0, 0, 1, 0); - gl.glTranslatef(tx/(float)20, ty/(float)20, 0); - gl.glRotatef(anglex/3, 0, 1, 0); - gl.glRotatef(angley/3, 1, 0, 0); - - gl.glBegin(GL.GL_TRIANGLES); - draw(gl, true, tile); - gl.glEnd(); - - gl.glBegin(GL.GL_TRIANGLES); - gl.glColor4f((float)0.5, (float)0.5, (float)0.5, (float)0.8); - //draw(gl, false, goal); - gl.glEnd(); - - - int i = 0; - //gl.glDisable(GL.GL_DEPTH_TEST); - gl.glColor4f(1,1,1,1); - for(Matrix m : translations) { - //if (v1.z==0 && v1.y==0) continue; - i++; - if (i != 1 /*&& i!=4*/) continue; - Point p = new Point(0, 0, 0).times(m); - Vec v = new Vec(p.x, p.y, p.z); - v = v.times((float)1.04); - gl.glTranslatef(v.x, v.y, v.z); - draw(gl, false, tile); - gl.glTranslatef(-v.x, -v.y, -v.z); - } - //gl.glEnable(GL.GL_DEPTH_TEST); - } - - private synchronized void draw(GL gl, boolean triangles, Mesh mesh) { - float red = 0.0f; - float green = 0.0f; - float blue = 0.0f; - for(Mesh.T t : mesh) { - if (red < 0.15) red = 1.0f; - if (green < 0.15) green = 1.0f; - if (blue < 0.15) blue = 1.0f; - red -= .09f; - green -= .12f; - blue -= .15f; - - if (triangles) switch(t.color) { - case 0: gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3); break; - case 1: gl.glColor4f((float)0.25, (float)0.75, (float)0.25, (float)0.3); break; - case 2: gl.glColor4f((float)0.75, (float)0.25, (float)0.25, (float)0.3); break; - case 3: gl.glColor4f((float)0.50, (float)0.50, (float)0.50, (float)0.3); break; - } - //gl.glBegin(GL.GL_LINES); - - if (triangles) { - gl.glBegin(GL.GL_TRIANGLES); - t.glVertices(gl); - gl.glEnd(); - } else { - gl.glBegin(GL.GL_LINES); - t.e1().p1.p.glVertex(gl); - t.e1().p2.p.glVertex(gl); - t.e2().p1.p.glVertex(gl); - t.e2().p2.p.glVertex(gl); - t.e3().p1.p.glVertex(gl); - t.e3().p2.p.glVertex(gl); - gl.glEnd(); - } - - Point centroid = t.centroid(); - gl.glBegin(GL.GL_LINES); - gl.glColor3f(1, 1, 1); - /* - centroid.glVertex(gl); - centroid.plus(t.norm().times(t.diameter())).glVertex(gl); - */ - - if (mesh==goal) - for(Mesh.Vert p : new Mesh.Vert[] { t.v1(), t.v2(), t.v3() }) { - p.p.glVertex(gl); - //p.plus(p.norm().times(p.score()*10)).glVertex(gl); - //p.partner().p.glVertex(gl); - //tile.nearest(p).centroid().glVertex(gl); - } - - gl.glEnd(); - } - } - - public static void main(String[] s) throws Exception { - StlFile stlf = new StlFile(); - stlf.load("simplefish.stl"); - Main main = new Main(stlf); - Frame f = new Frame(); - GLCapabilities glcaps = new GLCapabilities(); - GLCanvas glcanvas = new GLCanvas(); - glcanvas.addGLEventListener(main); - f.add(glcanvas, BorderLayout.CENTER); - f.pack(); - f.show(); - f.setSize(900, 900); - f.doLayout(); - - glcanvas.addMouseListener(main); - glcanvas.addMouseMotionListener(main); - glcanvas.addMouseWheelListener(main); - glcanvas.addKeyListener(main); - - main.anneal(glcanvas); - } public static int verts = 0; - public void anneal(GLCanvas glcanvas) throws Exception { + public void anneal() throws Exception { int verts = 0; while(true) { //Thread.sleep(10); for(int i=0; i<1; i++) { - glcanvas.repaint(); + repaint(); //tile.ts.get(Math.abs(random.nextInt()) % tile.ts.size()).e1().p1 for(Mesh.T t : tile) for(Mesh.Vert p : new Mesh.Vert[] { t.v1(), t.v2(), t.v3() }) { @@ -479,4 +247,11 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener } + public static void main(String[] s) throws Exception { + StlFile stlf = new StlFile(); + stlf.load("simplefish.stl"); + Frame f = new Frame(); + Main main = new Main(stlf, f); + main.anneal(); + } } \ No newline at end of file diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java new file mode 100644 index 0000000..3192c83 --- /dev/null +++ b/src/edu/berkeley/qfat/MeshViewer.java @@ -0,0 +1,204 @@ +package edu.berkeley.qfat; +import java.awt.*; +import java.awt.event.*; +import javax.swing.*; +import javax.media.opengl.*; +import javax.media.opengl.glu.*; +import java.util.*; +import edu.berkeley.qfat.geom.*; +import edu.berkeley.qfat.geom.Point; + +public class MeshViewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener { + + public Mesh tile = new Mesh(); + public Mesh goal = new Mesh(); + public Matrix[] translations; + public Mesh.Vert[] points; + + + boolean alt = false; + boolean shift = false; + boolean control = false; + + 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) { } + public void mouseReleased(MouseEvent e) { } + + 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; + } 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); + display(gld); + } + + 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 display(GLAutoDrawable drawable) { + GL gl = drawable.getGL(); + GLU glu = new GLU(); + gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); + gl.glPointSize(5.0f); + gl.glLoadIdentity(); + glu.gluPerspective(50-tz, ((float)drawable.getWidth())/drawable.getHeight(), 0.5, 10); + glu.gluLookAt(0, 0, -1, 0, 0, 0, 0, 1, 0); + gl.glTranslatef(tx/(float)20, ty/(float)20, 0); + gl.glRotatef(anglex/3, 0, 1, 0); + gl.glRotatef(angley/3, 1, 0, 0); + + gl.glBegin(GL.GL_TRIANGLES); + draw(gl, true, tile); + gl.glEnd(); + + gl.glBegin(GL.GL_TRIANGLES); + gl.glColor4f((float)0.5, (float)0.5, (float)0.5, (float)0.8); + //draw(gl, false, goal); + gl.glEnd(); + + + int i = 0; + //gl.glDisable(GL.GL_DEPTH_TEST); + gl.glColor4f(1,1,1,1); + for(Matrix m : translations) { + //if (v1.z==0 && v1.y==0) continue; + i++; + if (i != 1 /*&& i!=4*/) continue; + Point p = new Point(0, 0, 0).times(m); + Vec v = new Vec(p.x, p.y, p.z); + v = v.times((float)1.04); + gl.glTranslatef(v.x, v.y, v.z); + draw(gl, false, tile); + gl.glTranslatef(-v.x, -v.y, -v.z); + } + //gl.glEnable(GL.GL_DEPTH_TEST); + } + + private synchronized void draw(GL gl, boolean triangles, Mesh mesh) { + float red = 0.0f; + float green = 0.0f; + float blue = 0.0f; + for(Mesh.T t : mesh) { + if (red < 0.15) red = 1.0f; + if (green < 0.15) green = 1.0f; + if (blue < 0.15) blue = 1.0f; + red -= .09f; + green -= .12f; + blue -= .15f; + + if (triangles) switch(t.color) { + case 0: gl.glColor4f((float)0.25, (float)0.25, (float)0.75, (float)0.3); break; + case 1: gl.glColor4f((float)0.25, (float)0.75, (float)0.25, (float)0.3); break; + case 2: gl.glColor4f((float)0.75, (float)0.25, (float)0.25, (float)0.3); break; + case 3: gl.glColor4f((float)0.50, (float)0.50, (float)0.50, (float)0.3); break; + } + //gl.glBegin(GL.GL_LINES); + + if (triangles) { + gl.glBegin(GL.GL_TRIANGLES); + t.glVertices(gl); + gl.glEnd(); + } else { + gl.glBegin(GL.GL_LINES); + t.e1().p1.p.glVertex(gl); + t.e1().p2.p.glVertex(gl); + t.e2().p1.p.glVertex(gl); + t.e2().p2.p.glVertex(gl); + t.e3().p1.p.glVertex(gl); + t.e3().p2.p.glVertex(gl); + gl.glEnd(); + } + + Point centroid = t.centroid(); + gl.glBegin(GL.GL_LINES); + gl.glColor3f(1, 1, 1); + /* + centroid.glVertex(gl); + centroid.plus(t.norm().times(t.diameter())).glVertex(gl); + */ + + if (mesh==goal) + for(Mesh.Vert p : new Mesh.Vert[] { t.v1(), t.v2(), t.v3() }) { + p.p.glVertex(gl); + //p.plus(p.norm().times(p.score()*10)).glVertex(gl); + //p.partner().p.glVertex(gl); + //tile.nearest(p).centroid().glVertex(gl); + } + + gl.glEnd(); + + } + } + + private GLCanvas glcanvas; + public MeshViewer(Frame f) { + GLCapabilities glcaps = new GLCapabilities(); + glcanvas = new GLCanvas(); + glcanvas.addGLEventListener(this); + f.add(glcanvas, BorderLayout.CENTER); + f.pack(); + f.show(); + f.setSize(900, 900); + f.doLayout(); + glcanvas.addMouseListener(this); + glcanvas.addMouseMotionListener(this); + glcanvas.addMouseWheelListener(this); + glcanvas.addKeyListener(this); + } + public void repaint() { + glcanvas.repaint(); + } +} \ No newline at end of file