X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2FMain.java;h=8b97bf36e1117672acc76bf32ae83a4001a22b20;hp=04083293bdef7ae75faea9946b6b294832b3a195;hb=4b43602a6590a8c44a42e6d68cc1c33a4429eb4e;hpb=3b3dd514ddc6861b08fc3deffaa018f32b7c9c78

diff --git a/src/Main.java b/src/Main.java
index 0408329..8b97bf3 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -77,56 +77,56 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
     public Main(StlFile stlf) {
 
         for(int i=0; i<stlf.coordArray.length; i+=3) {
-            Geom.V p0 = goal.new P(stlf.coordArray[i+0].x * MAG, stlf.coordArray[i+0].y * MAG, stlf.coordArray[i+0].z * MAG).register();
-            Geom.V p1 = goal.new P(stlf.coordArray[i+1].x * MAG, stlf.coordArray[i+1].y * MAG, stlf.coordArray[i+1].z * MAG).register();
-            Geom.V p2 = goal.new P(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.V p0 = goal.register(new Geom.P(stlf.coordArray[i+0].x * MAG, stlf.coordArray[i+0].y * MAG, stlf.coordArray[i+0].z * MAG));
+            Geom.V p1 = goal.register(new Geom.P(stlf.coordArray[i+1].x * MAG, stlf.coordArray[i+1].y * MAG, stlf.coordArray[i+1].z * MAG));
+            Geom.V p2 = goal.register(new Geom.P(stlf.coordArray[i+2].x * MAG, stlf.coordArray[i+2].y * MAG, stlf.coordArray[i+2].z * MAG));
+            Geom.Vec n  = new Geom.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)));
+        goal.transform(new Geom.M(new Geom.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 goal_width  = goal.diagonal().dot(new Geom.Vec(1, 0, 0));
+        float goal_height = goal.diagonal().dot(new Geom.Vec(0, 1, 0));
+        float goal_depth  = goal.diagonal().dot(new Geom.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)),
+            new Geom.M(new Geom.Vec(-(width/2),  height,    0)),
+            new Geom.M(new Geom.Vec( (width/2),  height,    0)),
+            new Geom.M(new Geom.Vec(-(width/2), -height,    0)),
+            new Geom.M(new Geom.Vec( (width/2), -height,    0)),
+            new Geom.M(new Geom.Vec(-(width/2),       0,  depth)),
+            new Geom.M(new Geom.Vec( (width/2),       0,  depth)),
+            new Geom.M(new Geom.Vec(-(width/2),       0, -depth)),
+            new Geom.M(new Geom.Vec( (width/2),       0, -depth)),
+
+            new Geom.M(new Geom.Vec( width,           0,    0)),
+            new Geom.M(new Geom.Vec(-width,           0,    0)),
             /*
-            tile.new M(tile.new Vec(     0,           0,    depth)),
-            tile.new M(tile.new Vec(     0,           0,   -depth)),
+            new Geom.M(new Geom.Vec(     0,           0,    depth)),
+            new Geom.M(new Geom.Vec(     0,           0,   -depth)),
             */
         };
 
 
-        Geom.V ltf = tile.new P(-(width/2),  (height/2),  (depth/2)).register();
-        Geom.V mtf = tile.new P( 0.0,        (height/2),  (depth/2)).register();
-        Geom.V rtf = tile.new P( (width/2),  (height/2),  (depth/2)).register();
-        Geom.V ltn = tile.new P(-(width/2),  (height/2), -(depth/2)).register();
-        Geom.V mtn = tile.new P( 0.0,        (height/2), -(depth/2)).register();
-        Geom.V rtn = tile.new P( (width/2),  (height/2), -(depth/2)).register();
-        Geom.V lbf = tile.new P(-(width/2), -(height/2),  (depth/2)).register();
-        Geom.V mbf = tile.new P( 0.0,       -(height/2),  (depth/2)).register();
-        Geom.V rbf = tile.new P( (width/2), -(height/2),  (depth/2)).register();
-        Geom.V lbn = tile.new P(-(width/2), -(height/2), -(depth/2)).register();
-        Geom.V mbn = tile.new P( 0.0,       -(height/2), -(depth/2)).register();
-        Geom.V rbn = tile.new P( (width/2), -(height/2), -(depth/2)).register();
+        Geom.V ltf = tile.register(new Geom.P(-(width/2),  (height/2),  (depth/2)));
+        Geom.V mtf = tile.register(new Geom.P( 0.0,        (height/2),  (depth/2)));
+        Geom.V rtf = tile.register(new Geom.P( (width/2),  (height/2),  (depth/2)));
+        Geom.V ltn = tile.register(new Geom.P(-(width/2),  (height/2), -(depth/2)));
+        Geom.V mtn = tile.register(new Geom.P( 0.0,        (height/2), -(depth/2)));
+        Geom.V rtn = tile.register(new Geom.P( (width/2),  (height/2), -(depth/2)));
+        Geom.V lbf = tile.register(new Geom.P(-(width/2), -(height/2),  (depth/2)));
+        Geom.V mbf = tile.register(new Geom.P( 0.0,       -(height/2),  (depth/2)));
+        Geom.V rbf = tile.register(new Geom.P( (width/2), -(height/2),  (depth/2)));
+        Geom.V lbn = tile.register(new Geom.P(-(width/2), -(height/2), -(depth/2)));
+        Geom.V mbn = tile.register(new Geom.P( 0.0,       -(height/2), -(depth/2)));
+        Geom.V rbn = tile.register(new Geom.P( (width/2), -(height/2), -(depth/2)));
         
         points = new Geom.V[] {
             ltf,
@@ -210,10 +210,10 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
 
         // rescale to match volume
         float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0);
-        goal.transform(goal.new M(factor));
+        goal.transform(new Geom.M(factor));
 
         // translate to match centroid
-        goal.transform(goal.new M(tile.centroid().minus(goal.centroid())));
+        goal.transform(new Geom.M(tile.centroid().minus(goal.centroid())));
 
         //tx.e2.shatter();
         //tx.e3.shatter();
@@ -221,10 +221,10 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
 
         tile.bind();
 
-        //mid.move(tile.new Vec((float)0,0,(float)-0.05));
-        //ltn.move(tile.new Vec((float)0,0,(float)-0.05));
+        //mid.move(new Geom.Vec((float)0,0,(float)-0.05));
+        //ltn.move(new Geom.Vec((float)0,0,(float)-0.05));
 
-        //mtf.move(tile.new Vec(0, (float)-0.05, (float)0.05));
+        //mtf.move(new Geom.Vec(0, (float)-0.05, (float)0.05));
 
 
         System.out.println("tile volume: " + tile.volume());
@@ -271,8 +271,8 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         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);
+            tile.aspect = new Geom.M(tile.aspect.a / (v.x+1), tile.aspect.f / (v.y+1), tile.aspect.k / (v.z+1));
+            tile.invaspect = new Geom.M(1/tile.aspect.a, 1/tile.aspect.f, 1/tile.aspect.k);
             goal.rescore();
             tile.rescore();
             */
@@ -295,7 +295,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         } 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);
+                //tile.invaspect = new Geom.M(1/tile.aspect.a, 1/tile.aspect.f, 1/tile.aspect.k);
                 goal.rescore();
                 tile.rescore();
             } else {
@@ -351,8 +351,8 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
             //if (v1.z==0 && v1.y==0) continue;
             i++;
             if (i != 1 /*&& i!=4*/) continue;
-            Geom.V p = tile.new P(0, 0, 0).times(m).register();
-            Geom.Vec v = tile.new Vec(p.p.x, p.p.y, p.p.z);
+            Geom.P p = new Geom.P(0, 0, 0).times(m);
+            Geom.Vec v = new Geom.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);
@@ -396,7 +396,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
                 gl.glEnd();
             }
 
-            Geom.V centroid = t.centroid().register();
+            Geom.P centroid = t.centroid();
             gl.glBegin(GL.GL_LINES);
             gl.glColor3f(1, 1, 1);
             /*