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

diff --git a/src/Main.java b/src/Main.java
index 8a6cde6..d8e2658 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -18,7 +18,6 @@ public class Main implements GLEventListener {
 
     public Main(StlFile stlf) {
 
-
         Geom.P ltf = geom.newP(-0.2,  0.1,  0.1);
         Geom.P mtf = geom.newP( 0.0,  0.1,  0.1);
         Geom.P rtf = geom.newP( 0.2,  0.1,  0.1);
@@ -97,16 +96,25 @@ public class Main implements GLEventListener {
 
                     if ((t1.p1().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
                         (t1.p2().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
-                        (t1.p3().plus(v).minus(t2.p2()).mag() < Geom.EPSILON))
-                        t1.bind(t2, 0);
+                        (t1.p3().plus(v).minus(t2.p2()).mag() < Geom.EPSILON)) {
+                        t1.e1().bind(t2.e3());
+                        t1.e2().bind(t2.e2());
+                        t1.e3().bind(t2.e1());
+                    }
                     if ((t1.p2().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
                         (t1.p3().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
-                        (t1.p1().plus(v).minus(t2.p2()).mag() < Geom.EPSILON))
-                        t1.bind(t2, 1);
+                        (t1.p1().plus(v).minus(t2.p2()).mag() < Geom.EPSILON)) {
+                        t1.e2().bind(t2.e3());
+                        t1.e3().bind(t2.e2());
+                        t1.e1().bind(t2.e1());
+                    }
                     if ((t1.p3().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
                         (t1.p1().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
-                        (t1.p2().plus(v).minus(t2.p2()).mag() < Geom.EPSILON))
-                        t1.bind(t2, 2);
+                        (t1.p2().plus(v).minus(t2.p2()).mag() < Geom.EPSILON)) {
+                        t1.e3().bind(t2.e3());
+                        t1.e1().bind(t2.e2());
+                        t1.e2().bind(t2.e1());
+                    }
                 }
             }
         }