checkpoint

[anneal.git] / src / Main.java

diff --git a/src/Main.java b/src/Main.java
index bc01a06..0408329 100644 (file)
--- a/src/Main.java
+++ b/src/Main.java
@@ -77,9 +77,9 @@ 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.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.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.T t  = goal.newT(p0, p1, p2, n);
         }
@@ -115,18 +115,18 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         };
 
 
-        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();
+        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();
         
         points = new Geom.V[] {
             ltf,
@@ -351,7 +351,7 @@ 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.newP(0, 0, 0).times(m).register();
+            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);
             v = v.times((float)1.04);
             gl.glTranslatef(v.x, v.y, v.z);