X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FMain.java;h=f598ac1ba84835c2a19e58af6e0b15022bc6652f;hb=2a27d25e38de18ff97d4c15e79f542d2f40ce25a;hp=3acb5e0800a3915cb471a73a0a06bef6cadfd2a7;hpb=a18e40f15c9b054cdd16c3a5416a36a10033b632;p=anneal.git

diff --git a/src/Main.java b/src/Main.java
index 3acb5e0..f598ac1 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -8,12 +8,16 @@ public class Main implements GLEventListener {
 
     private Geom geom = new Geom();
 
+    /** magnification factor */
+    private static final float MAG = 1;
+
     public Main(StlFile stlf) {
         for(int i=0; i<stlf.coordArray.length; i+=3) {
-            Geom.P p0 = geom.newP(stlf.coordArray[i+0].x, stlf.coordArray[i+0].y, stlf.coordArray[i+0].z);
-            Geom.P p1 = geom.newP(stlf.coordArray[i+1].x, stlf.coordArray[i+1].y, stlf.coordArray[i+1].z);
-            Geom.P p2 = geom.newP(stlf.coordArray[i+2].x, stlf.coordArray[i+2].y, stlf.coordArray[i+2].z);
-            Geom.T t  = geom.newT(geom.newE(p0, p1), geom.newE(p1, p2), geom.newE(p2, p0));
+            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);
         }
     }
 
@@ -52,6 +56,18 @@ public class Main implements GLEventListener {
             gl.glBegin(GL.GL_TRIANGLES);
             t.glVertices(gl);
             gl.glEnd();
+
+            Geom.P centroid = t.centroid();
+            gl.glBegin(GL.GL_LINES);
+            /*
+            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);
+            gl.glEnd();
+            
+
         }
     }