X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2FMain.java;h=8a6cde66dbae8e7874d5c633b13bb15e9472b92b;hb=ac34cfc52e1a697db9c7ff41244f4cd7102f28a0;hp=fc8d2eed78d70375c14a1e2e065d2de001c597de;hpb=895456322db6e2b117fc2188683f91304165b72d;p=anneal.git

diff --git a/src/Main.java b/src/Main.java
index fc8d2ee..8a6cde6 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -121,18 +121,18 @@ public class Main implements GLEventListener {
         //mtf.move(geom.new V(0, (float)-0.05, (float)0.05));
         mtf.move(geom.new V(0, (float)-0.05, (float)0.00));
 
-        /*
 
+        /*
         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(geom.newE(p0, p1), geom.newE(p1, p2), geom.newE(p2, p0), n);
+            Geom.T t  = geom.newT(p0, p1, p2, n);
         }
-
         */
 
+
     }
 
     /**
@@ -221,6 +221,7 @@ public class Main implements GLEventListener {
             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);