X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=8607e0adfd02d958fdda3b7007e02f1c24a2964c;hp=65c6c2abfc36793fa7a6b19f79d508ab599c4915;hb=b1832d008534acfc7fe0dc8677387ed1016a5b38;hpb=e3aa83b5505dcfbc200e29e5b1701664bb218709

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 65c6c2a..8607e0a 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -5,6 +5,7 @@ import javax.swing.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import java.util.*;
+import static edu.berkeley.qfat.Geom.*;
 
 // FIXME: recenter goal to have centroid coincident with tile
 // FIXME: re-orient goal (how?)
@@ -17,7 +18,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
     boolean control = false;
 
     public void mouseWheelMoved(MouseWheelEvent e) {
-        tz -= e.getWheelRotation() ;
+        tz -= e.getWheelRotation();
     }
 
     public void keyTyped(KeyEvent e)  { }
@@ -73,14 +74,14 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
     private static final float MAG = 1;
 
     Geom.M[] translations;
-    Geom.V[] points;
+    Geom.Vert[] points;
 
     public Main(StlFile stlf) {
 
         for(int i=0; i<stlf.coordArray.length; i+=3) {
-            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.Vert p0 = goal.register(new Geom.Point(stlf.coordArray[i+0].x * MAG, stlf.coordArray[i+0].y * MAG, stlf.coordArray[i+0].z * MAG));
+            Geom.Vert p1 = goal.register(new Geom.Point(stlf.coordArray[i+1].x * MAG, stlf.coordArray[i+1].y * MAG, stlf.coordArray[i+1].z * MAG));
+            Geom.Vert p2 = goal.register(new Geom.Point(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);
         }
@@ -116,20 +117,20 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         };
 
 
-        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)));
+        Geom.Vert ltf = tile.register(new Geom.Point(-(width/2),  (height/2),  (depth/2)));
+        Geom.Vert mtf = tile.register(new Geom.Point( 0.0,        (height/2),  (depth/2)));
+        Geom.Vert rtf = tile.register(new Geom.Point( (width/2),  (height/2),  (depth/2)));
+        Geom.Vert ltn = tile.register(new Geom.Point(-(width/2),  (height/2), -(depth/2)));
+        Geom.Vert mtn = tile.register(new Geom.Point( 0.0,        (height/2), -(depth/2)));
+        Geom.Vert rtn = tile.register(new Geom.Point( (width/2),  (height/2), -(depth/2)));
+        Geom.Vert lbf = tile.register(new Geom.Point(-(width/2), -(height/2),  (depth/2)));
+        Geom.Vert mbf = tile.register(new Geom.Point( 0.0,       -(height/2),  (depth/2)));
+        Geom.Vert rbf = tile.register(new Geom.Point( (width/2), -(height/2),  (depth/2)));
+        Geom.Vert lbn = tile.register(new Geom.Point(-(width/2), -(height/2), -(depth/2)));
+        Geom.Vert mbn = tile.register(new Geom.Point( 0.0,       -(height/2), -(depth/2)));
+        Geom.Vert rbn = tile.register(new Geom.Point( (width/2), -(height/2), -(depth/2)));
         
-        points = new Geom.V[] {
+        points = new Geom.Vert[] {
             ltf,
             mtf,
             rtf,
@@ -207,7 +208,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
             }
         }
 
-        //xGeom.V mid = lbf.getE(mbn).shatter();
+        //xGeom.Vert mid = lbf.getE(mbn).shatter();
 
         // rescale to match volume
         float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0);
@@ -252,7 +253,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         }
     }
 
-    public synchronized void rand(double temperature, Geom.V p) {
+    public synchronized void rand(double temperature, Geom.Vert p) {
         double tile_score = tile.score();
         double goal_score = goal.score();
         
@@ -352,7 +353,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
             //if (v1.z==0 && v1.y==0) continue;
             i++;
             if (i != 1 /*&& i!=4*/) continue;
-            Geom.P p = new Geom.P(0, 0, 0).times(m);
+            Geom.Point p = new Geom.Point(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);
@@ -397,7 +398,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
                 gl.glEnd();
             }
 
-            Geom.P centroid = t.centroid();
+            Geom.Point centroid = t.centroid();
             gl.glBegin(GL.GL_LINES);
             gl.glColor3f(1, 1, 1);
             /*
@@ -406,7 +407,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
             */
 
             if (mesh==goal)
-                for(Geom.V p : new Geom.V[] { t.p1(), t.p2(), t.p3() }) {
+                for(Geom.Vert p : new Geom.Vert[] { t.p1(), t.p2(), t.p3() }) {
                     p.p.glVertex(gl);
                     //p.plus(p.norm().times(p.score()*10)).glVertex(gl);
                     p.partner().p.glVertex(gl);
@@ -448,7 +449,7 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
                 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() }) {
+                    for(Geom.Vert p : new Geom.Vert[] { t.p1(), t.p2(), t.p3() }) {
                         rand(10,p);
                     }
                 goal.rescore();