X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2FMain.java;h=5fae70a2f37fb90032805ce1cfb287f80efacd3d;hb=84765ab1ebd4913c7ff3e4a27d86cab22648ecfe;hp=a5365f095bdb5f3c5b7b4c2517e248741a84fbce;hpb=212e1516923584fac360e0084d38291cc99bef74;p=anneal.git

diff --git a/src/Main.java b/src/Main.java
index a5365f0..5fae70a 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -5,7 +5,9 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import java.util.*;
 
-// FEATURE: check google's 3D warehouse for sample shapes
+// 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 {
     
@@ -63,30 +65,70 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         mousey = e.getY();
     }
 
-    private Geom geom = new Geom();
+    private Geom tile = new Geom();
+    private Geom goal = new Geom();
 
     /** magnification factor */
     private static final float MAG = 1;
 
-    Geom.V[] translations;
-    Geom.P[] points;
+    Geom.M[] translations;
+    Geom.V[] points;
 
     public Main(StlFile stlf) {
 
-        Geom.P ltf = geom.newP(-0.2,  0.1,  0.1);
-        Geom.P mtf = geom.newP( 0.0,  0.1,  0.1);
-        Geom.P rtf = geom.newP( 0.2,  0.1,  0.1);
-        Geom.P ltn = geom.newP(-0.2,  0.1, -0.1);
-        Geom.P mtn = geom.newP( 0.0,  0.1, -0.1);
-        Geom.P rtn = geom.newP( 0.2,  0.1, -0.1);
-        Geom.P lbf = geom.newP(-0.2, -0.1,  0.1);
-        Geom.P mbf = geom.newP( 0.0, -0.1,  0.1);
-        Geom.P rbf = geom.newP( 0.2, -0.1,  0.1);
-        Geom.P lbn = geom.newP(-0.2, -0.1, -0.1);
-        Geom.P mbn = geom.newP( 0.0, -0.1, -0.1);
-        Geom.P rbn = geom.newP( 0.2, -0.1, -0.1);
+        for(int i=0; i<stlf.coordArray.length; i+=3) {
+            Geom.V p0 = goal.newP(stlf.coordArray[i+0].x * MAG, stlf.coordArray[i+0].y * MAG, stlf.coordArray[i+0].z * MAG).register();
+            Geom.V p1 = goal.newP(stlf.coordArray[i+1].x * MAG, stlf.coordArray[i+1].y * MAG, stlf.coordArray[i+1].z * MAG).register();
+            Geom.V p2 = goal.newP(stlf.coordArray[i+2].x * MAG, stlf.coordArray[i+2].y * MAG, stlf.coordArray[i+2].z * MAG).register();
+            Geom.Vec n  = goal.new Vec(stlf.normArray[i/3].x * MAG, stlf.normArray[i/3].y  * MAG, stlf.normArray[i/3].z * MAG);
+            Geom.T t  = goal.newT(p0, p1, p2, n);
+        }
+
+        // rotate to align major axis -- this probably needs to be done by a human.
+        goal.transform(goal.new M(goal.new Vec(0, 0, 1), (float)(Math.PI/2)));
+
+
+        float goal_width  = goal.diagonal().dot(goal.new Vec(1, 0, 0));
+        float goal_height = goal.diagonal().dot(goal.new Vec(0, 1, 0));
+        float goal_depth  = goal.diagonal().dot(goal.new Vec(0, 0, 1));
+
+        float width  = (float)0.6;
+        float height = (float)0.08;
+        float depth  = (float)0.3;
+        translations = new Geom.M[] {
+
+            tile.new M(tile.new Vec(-(width/2),  height,    0)),
+            tile.new M(tile.new Vec( (width/2),  height,    0)),
+            tile.new M(tile.new Vec(-(width/2), -height,    0)),
+            tile.new M(tile.new Vec( (width/2), -height,    0)),
+            tile.new M(tile.new Vec(-(width/2),       0,  depth)),
+            tile.new M(tile.new Vec( (width/2),       0,  depth)),
+            tile.new M(tile.new Vec(-(width/2),       0, -depth)),
+            tile.new M(tile.new Vec( (width/2),       0, -depth)),
+
+            tile.new M(tile.new Vec( width,           0,    0)),
+            tile.new M(tile.new Vec(-width,           0,    0)),
+            /*
+            tile.new M(tile.new Vec(     0,           0,    depth)),
+            tile.new M(tile.new Vec(     0,           0,   -depth)),
+            */
+        };
+
+
+        Geom.V ltf = tile.newP(-(width/2),  (height/2),  (depth/2)).register();
+        Geom.V mtf = tile.newP( 0.0,        (height/2),  (depth/2)).register();
+        Geom.V rtf = tile.newP( (width/2),  (height/2),  (depth/2)).register();
+        Geom.V ltn = tile.newP(-(width/2),  (height/2), -(depth/2)).register();
+        Geom.V mtn = tile.newP( 0.0,        (height/2), -(depth/2)).register();
+        Geom.V rtn = tile.newP( (width/2),  (height/2), -(depth/2)).register();
+        Geom.V lbf = tile.newP(-(width/2), -(height/2),  (depth/2)).register();
+        Geom.V mbf = tile.newP( 0.0,       -(height/2),  (depth/2)).register();
+        Geom.V rbf = tile.newP( (width/2), -(height/2),  (depth/2)).register();
+        Geom.V lbn = tile.newP(-(width/2), -(height/2), -(depth/2)).register();
+        Geom.V mbn = tile.newP( 0.0,       -(height/2), -(depth/2)).register();
+        Geom.V rbn = tile.newP( (width/2), -(height/2), -(depth/2)).register();
         
-        points = new Geom.P[] {
+        points = new Geom.V[] {
             ltf,
             mtf,
             rtf,
@@ -101,71 +143,61 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
             rbn
         };
 
-        translations = new Geom.V[] {
-            geom.new V(-0.2,  0.2,    0),
-            geom.new V( 0.2,  0.2,    0),
-            geom.new V(-0.2, -0.2,    0),
-            geom.new V( 0.2, -0.2,    0),
-            geom.new V( 0.4,    0,    0),
-            geom.new V(-0.4,    0,    0),
-            geom.new V(   0,    0,  0.2),
-            geom.new V(   0,    0, -0.2),
-        };
 
         // top
-        geom.newT(ltf, mtf, mtn);
-        geom.newT(mtn, ltn, ltf);
-        geom.newT(mtf, rtf, rtn);
-        geom.newT(rtn, mtn, mtf);
+        tile.newT(ltf, mtf, mtn);
+        tile.newT(mtn, ltn, ltf);
+        tile.newT(mtf, rtf, rtn);
+        tile.newT(rtn, mtn, mtf);
 
         // bottom (swap normals)
-        geom.newT(mbf, lbf, mbn);
-        geom.newT(lbn, mbn, lbf);
-        geom.newT(rbf, mbf, rbn);
-        geom.newT(mbn, rbn, mbf);
+        tile.newT(mbf, lbf, mbn);
+        tile.newT(lbn, mbn, lbf);
+        tile.newT(rbf, mbf, rbn);
+        tile.newT(mbn, rbn, mbf);
         
         // left
-        geom.newT(ltf, ltn, lbn);
-        geom.newT(lbn, lbf, ltf);
+        tile.newT(ltf, ltn, lbn);
+        tile.newT(lbn, lbf, ltf);
 
         // right (swap normals)
-        geom.newT(rtn, rtf, rbn);
-        geom.newT(rbf, rbn, rtf);
+        tile.newT(rtn, rtf, rbn);
+        tile.newT(rbf, rbn, rtf);
 
         // front
-        geom.newT(ltn, mtn, mbn);
-        geom.newT(ltn, mbn, lbn);
-        geom.newT(mtn, rtn, rbn);
-        geom.newT(mtn, rbn, mbn);
+        tile.newT(ltn, mtn, mbn);
+        tile.newT(ltn, mbn, lbn);
+        tile.newT(mtn, rtn, rbn);
+        tile.newT(mtn, rbn, mbn);
 
         // back
-        geom.newT(mtf, ltf, mbf);
-        geom.newT(mbf, ltf, lbf);
-        geom.newT(rtf, mtf, rbf);
-        geom.newT(rbf, mtf, mbf);
-
-        for(Geom.V v : translations) {
-            for(Geom.T t1 : geom) {
-                for(Geom.T t2 : geom) {
+        tile.newT(mtf, ltf, mbf);
+        tile.newT(mbf, ltf, lbf);
+        tile.newT(rtf, mtf, rbf);
+        tile.newT(rbf, mtf, mbf);
+
+        for(Geom.M m : translations) {
+            for(Geom.T t1 : tile) {
+                for(Geom.T t2 : tile) {
                     if (t1==t2) continue;
 
-                    if ((t1.p1().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
-                        (t1.p2().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
-                        (t1.p3().plus(v).minus(t2.p2()).mag() < Geom.EPSILON)) {
+                    if ((t1.p1().times(m).minus(t2.p1()).mag() < Geom.EPSILON) &&
+                        (t1.p2().times(m).minus(t2.p3()).mag() < Geom.EPSILON) &&
+                        (t1.p3().times(m).minus(t2.p2()).mag() < Geom.EPSILON)) {
                         t1.e1().bind(t2.e3().pair);
                         t1.e2().bind(t2.e2().pair);
                         t1.e3().bind(t2.e1().pair);
                     }
-                    if ((t1.p2().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
-                        (t1.p3().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
-                        (t1.p1().plus(v).minus(t2.p2()).mag() < Geom.EPSILON)) {
+                    if ((t1.p2().times(m).minus(t2.p1()).mag() < Geom.EPSILON) &&
+                        (t1.p3().times(m).minus(t2.p3()).mag() < Geom.EPSILON) &&
+                        (t1.p1().times(m).minus(t2.p2()).mag() < Geom.EPSILON)) {
                         t1.e2().bind(t2.e3().pair);
                         t1.e3().bind(t2.e2().pair);
                         t1.e1().bind(t2.e1().pair);
                     }
-                    if ((t1.p3().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
-                        (t1.p1().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
-                        (t1.p2().plus(v).minus(t2.p2()).mag() < Geom.EPSILON)) {
+                    if ((t1.p3().times(m).minus(t2.p1()).mag() < Geom.EPSILON) &&
+                        (t1.p1().times(m).minus(t2.p3()).mag() < Geom.EPSILON) &&
+                        (t1.p2().times(m).minus(t2.p2()).mag() < Geom.EPSILON)) {
                         t1.e3().bind(t2.e3().pair);
                         t1.e1().bind(t2.e2().pair);
                         t1.e2().bind(t2.e1().pair);
@@ -174,58 +206,100 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
             }
         }
 
-        Geom.P mid = ltn.getE(mbn).shatter();
+        //xGeom.V mid = lbf.getE(mbn).shatter();
+
+        // rescale to match volume
+        float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0);
+        goal.transform(goal.new M(factor));
+
+        // translate to match centroid
+        goal.transform(goal.new M(tile.centroid().minus(goal.centroid())));
 
         //tx.e2.shatter();
         //tx.e3.shatter();
 
 
-        geom.bind();
+        tile.bind();
 
-        mid.move(geom.new V((float)0,0,(float)-0.05));
-        //ltn.move(geom.new V((float)0,0,(float)-0.05));
-
-        //mtf.move(geom.new V(0, (float)-0.05, (float)0.05));
-        /*
-        for(int i=0; i<100; i++) {
-            rand();
-        }
-        */
+        //mid.move(tile.new Vec((float)0,0,(float)-0.05));
+        //ltn.move(tile.new Vec((float)0,0,(float)-0.05));
 
+        //mtf.move(tile.new Vec(0, (float)-0.05, (float)0.05));
 
-        /*
-        for(int i=0; i<stlf.coordArray.length; i+=3) {
-            Geom.P p0 = geom.newP(stlf.coordArray[i+0].x * MAG, stlf.coordArray[i+0].y * MAG, stlf.coordArray[i+0].z * MAG);
-            Geom.P p1 = geom.newP(stlf.coordArray[i+1].x * MAG, stlf.coordArray[i+1].y * MAG, stlf.coordArray[i+1].z * MAG);
-            Geom.P p2 = geom.newP(stlf.coordArray[i+2].x * MAG, stlf.coordArray[i+2].y * MAG, stlf.coordArray[i+2].z * MAG);
-            Geom.V n  = geom.new V(stlf.normArray[i/3].x * MAG, stlf.normArray[i/3].y  * MAG, stlf.normArray[i/3].z * MAG);
-            Geom.T t  = geom.newT(p0, p1, p2, n);
-        }
-        */
 
+        System.out.println("tile volume: " + tile.volume());
+        System.out.println("goal volume: " + goal.volume());
 
+        tile.score_against = goal;
+        goal.score_against = tile;
     }
         Random random = new Random();
 
     public synchronized void breakit() {
-        int i = Math.abs(random.nextInt()) % geom.es.size();
-        Geom.E e = geom.es.poll();
-        System.out.println("shatter " + e);
-        e.shatter();
-        geom.unbind();
-        geom.bind();
-    }
-    public synchronized void rand() {
+        if (verts > 300) return;
+        //double min = (tile.avgedge/tile.numedges)*(1+(4/(double)verts));
+        //if (verts>0 && tile.es.peek().length() < min) return;
+        PriorityQueue<Geom.E> es = new PriorityQueue<Geom.E>();
+        for(Geom.E e : tile.es) es.add(e);
         for(int i=0; i<10; i++) {
-            Geom.P p = geom.ts.get(Math.abs(random.nextInt()) % geom.ts.size()).e1().p1;
-            float r1 = Math.abs(random.nextFloat());
-            r1 = r1 - (float)Math.floor(r1);
-            r1 = r1 * (float)0.01;
-            r1 = r1 - (float)0.005;
-            switch(Math.abs(random.nextInt()) % 3) {
-                case 0: p.move(geom.new V((float)0,  (float)r1, (float)0)); break;
-                case 1: p.move(geom.new V((float)r1, (float)0,  (float)0)); break;
-                case 2: p.move(geom.new V((float)0,  (float)0, (float)r1)); break;
+            Geom.E e = es.poll();
+            verts++;
+            System.out.println("shatter " + e);
+            e.shatter();
+            tile.unbind();
+            tile.bind();
+        }
+    }
+
+    public synchronized void rand(double temperature, Geom.V p) {
+        double tile_score = tile.score();
+        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;
+        Geom.Vec v = p.watchback().minus(p).norm().times(r1);
+
+        //v = p.norm().times(v.dot(p.norm()));
+
+        boolean aspect = false;//(Math.abs(random.nextInt()) % 100) <= 2;
+        Geom.M old_tile_aspect = null;//goal.aspect;
+        boolean good = true;
+        if (aspect) {
+            /*
+            v = v.times(10);
+            tile.aspect = tile.new M(tile.aspect.a / (v.x+1), tile.aspect.f / (v.y+1), tile.aspect.k / (v.z+1));
+            tile.invaspect = tile.new M(1/tile.aspect.a, 1/tile.aspect.f, 1/tile.aspect.k);
+            goal.rescore();
+            tile.rescore();
+            */
+        } else {
+            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 = new_goal_score - goal_score;
+        double delta = tile_delta + goal_delta;
+        double swapProbability = Math.exp((-1 * delta) / temperature);
+        //boolean doSwap = Math.random() < swapProbability;
+        boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
+        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);
+        } else {
+            if (aspect) {
+                //tile.aspect = old_tile_aspect;
+                //tile.invaspect = tile.new M(1/tile.aspect.a, 1/tile.aspect.f, 1/tile.aspect.k);
+                goal.rescore();
+                tile.rescore();
+            } else {
+                p.move(v.times(-1));
             }
         }
     }
@@ -237,12 +311,12 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         GL gl = gld.getGL();
         gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
         gl.glViewport(0, 0, 500, 300);
-        gl.glMatrixMode(GL.GL_PROJECTION);
         gl.glEnable(GL.GL_DEPTH_TEST);
         gl.glClearDepth(1.0);
         gl.glDepthFunc(GL.GL_LEQUAL);
+        gl.glMatrixMode(GL.GL_PROJECTION);
         gl.glLoadIdentity();
-        //glu.gluOrtho2D(0.0, 500.0, 0.0, 300.0);
+        gl.glMatrixMode(GL.GL_MODELVIEW);
         display(gld);
     }
 
@@ -261,39 +335,52 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         gl.glRotatef(angley/3, 1, 0, 0);
 
         gl.glBegin(GL.GL_TRIANGLES);
-        draw(gl, true);
+        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();
 
-        for(Geom.V v1 : translations) {
-            if (v1.z==0 && v1.y==0) continue;
-            Geom.V v = v1.times((float)1.1);
+
+        int i = 0;
+        //gl.glDisable(GL.GL_DEPTH_TEST);
+        gl.glColor4f(1,1,1,1);
+        for(Geom.M m : translations) {
+            //if (v1.z==0 && v1.y==0) continue;
+            i++;
+            if (i != 1 /*&& i!=4*/) continue;
+            Geom.V p = tile.newP(0, 0, 0).times(m).register();
+            Geom.Vec v = tile.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);
+            draw(gl, false, tile);
             gl.glTranslatef(-v.x, -v.y, -v.z);
-            break;
         }
-
+        //gl.glEnable(GL.GL_DEPTH_TEST);
     }
 
-    private synchronized void draw(GL gl, boolean triangles) {
+    private synchronized void draw(GL gl, boolean triangles, Geom mesh) {
         float red = 0.0f;
         float green = 0.0f;
         float blue = 0.0f;
-        for(Geom.T t : geom) {
+        for(Geom.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;
-            gl.glColor3f(red, green, blue);
-            switch(t.color) {
-                case 0: gl.glColor3f((float)0.25, (float)0.25, (float)0.75); break;
-                case 1: gl.glColor3f((float)0.25, (float)0.75, (float)0.25); break;
-                case 2: gl.glColor3f((float)0.75, (float)0.25, (float)0.25); break;
-                case 3: gl.glColor3f((float)0.50, (float)0.50, (float)0.50); break;
+
+            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);
@@ -309,21 +396,22 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
                 gl.glEnd();
             }
 
-            Geom.P centroid = t.centroid();
+            Geom.V centroid = t.centroid().register();
             gl.glBegin(GL.GL_LINES);
             gl.glColor3f(1, 1, 1);
             /*
             centroid.glVertex(gl);
             centroid.plus(t.norm().times(t.diameter())).glVertex(gl);
             */
-            /*
-            t.p1().glVertex(gl);
-            t.p1().plus(t.p1().norm().times(t.diameter())).glVertex(gl);
-            t.p2().glVertex(gl);
-            t.p2().plus(t.p2().norm().times(t.diameter())).glVertex(gl);
-            t.p3().glVertex(gl);
-            t.p3().plus(t.p3().norm().times(t.diameter())).glVertex(gl);
-            */
+
+            if (mesh==goal)
+                for(Geom.V p : new Geom.V[] { t.p1(), t.p2(), t.p3() }) {
+                    p.glVertex(gl);
+                    //p.plus(p.norm().times(p.score()*10)).glVertex(gl);
+                    p.partner().glVertex(gl);
+                    //tile.nearest(p).centroid().glVertex(gl);
+                }
+
             gl.glEnd();
 
         }
@@ -331,7 +419,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
 
     public static void main(String[] s) throws Exception {
         StlFile stlf = new StlFile();
-        stlf.load("teapot.stl");
+        stlf.load("simplefish.stl");
         Main main = new Main(stlf);
         Frame f = new Frame();
         GLCapabilities glcaps = new GLCapabilities();
@@ -348,12 +436,24 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         glcanvas.addMouseWheelListener(main);
         glcanvas.addKeyListener(main);
 
-        int i = 0;
+        main.anneal(glcanvas);
+    }
+    public static int verts = 0;
+    public void anneal(GLCanvas glcanvas) throws Exception {
+        int verts = 0;
         while(true) {
-            Thread.sleep(10);
-            glcanvas.repaint();
-            main.rand();
-            if (i++>10) { main.breakit(); i = 0; }
+            //Thread.sleep(10);
+            for(int i=0; i<1; i++) {
+                glcanvas.repaint();
+                //tile.ts.get(Math.abs(random.nextInt()) % tile.ts.size()).e1().p1
+                for(Geom.T t : tile)
+                    for(Geom.V p : new Geom.V[] { t.p1(), t.p2(), t.p3() }) {
+                        rand(10,p);
+                    }
+                goal.rescore();
+                tile.rescore();
+            }
+            breakit();
        }
 
     }