X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=60aa9aba531a63fa35d43e29595939006140fe89;hp=d5e0db2f0612205585a3f7131628f5e20fa61eff;hb=2b09dab499516873839b9bdbc972c980829e9bac;hpb=468b086402bb0ccae7ce4dda8b009d61bfc37a71

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index d5e0db2..60aa9ab 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -45,6 +45,7 @@ public class Mesh implements Iterable<Mesh.T> {
             t.e2().dobind();
             t.e3().dobind();
         }
+        System.out.println("rebound!");
     }
 
     public void transform(Matrix m) {
@@ -161,12 +162,18 @@ public class Mesh implements Iterable<Mesh.T> {
         public boolean move(Matrix m, boolean ignoreProblems) {
             boolean good = true;
 
-            for(Vertex p : (Iterable<Vertex>)getBoundPeers())
-                good &= p.transform(m.times(p.p), ignoreProblems);
+            //     t1' = M * t1
+            //     t2' = t2.getMatrix(t1) * t1'
+            //     t2' = t2.getMatrix(t1) * M * t1
+            //     t1 =     t1.getMatrix(t2) * t2
+            // M * t1 = M * t1.getMatrix(t2) * t2
+            for(Vertex v : (Iterable<Vertex>)getBoundPeers())
+                good &= v.transform(v.getBindingMatrix(this).times(m).times(this.p),
+                                    ignoreProblems);
 
-            for(Vertex p : (Iterable<Vertex>)getBoundPeers())
-                if (good || ignoreProblems)  p.reComputeErrorAround();
-                else                         p.transform(p.oldp, true);
+            for(Vertex v : (Iterable<Vertex>)getBoundPeers())
+                if (good || ignoreProblems)  v.reComputeErrorAround();
+                else                         v.transform(v.oldp, true);
 
             return good;
         }
@@ -281,7 +288,7 @@ public class Mesh implements Iterable<Mesh.T> {
             e.bind_to    = bind_others;
             for (E epeer  : e_bind_peers.set) add(epeer);
             for (E eother : e_bind_to.set)    bind_others.add(eother);
-
+            /*
             for(E eother : bind_others.set) {
                 if (e.next.bind_to.set.contains(eother.prev)) {
                     e.next.next.bindEdge(eother.prev.prev);
@@ -290,7 +297,7 @@ public class Mesh implements Iterable<Mesh.T> {
                     e.prev.prev.bindEdge(eother.next.next);
                 }
             }
-
+            */
         }
         public void dobind(E e) {
             for(E ebound : set) {
@@ -320,13 +327,16 @@ public class Mesh implements Iterable<Mesh.T> {
         public boolean intersects(T t) { return t.intersects(p1.p, p2.p); }
 
         public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) {
-            edu.berkeley.qfat.geom.BindingGroup<E> newBindingGroup = (edu.berkeley.qfat.geom.BindingGroup<E>)newBindingGroup_;
+            edu.berkeley.qfat.geom.BindingGroup<E> newBindingGroup =
+                (edu.berkeley.qfat.geom.BindingGroup<E>)newBindingGroup_;
             if (newBindingGroup==null) return;
             if (this==newBindingGroup.getMaster()) return;
+            /*
             for(E eother : (Iterable<E>)newBindingGroup) {
                 this.next.bindTo(newBindingGroup.getMatrix(eother), eother.next);
                 this.prev.bindTo(newBindingGroup.getMatrix(eother), eother.prev);
             }
+            */
         }
 
         public float stretchRatio() {
@@ -344,8 +354,41 @@ public class Mesh implements Iterable<Mesh.T> {
         public int compareTo(E e) {
             return e.comparator() > comparator() ? 1 : -1;
         }
-        public void bindEdge(E e) { bind_to.add(e); }
-        public void dobind() { bind_to.dobind(this); }
+        public void bindEdge(E e, Matrix m) {
+            //bind_to.add(e);
+
+            //assumes edges are identical length at binding time
+            e = e.pair;
+            Vec reflectionPlaneNormal = e.p2.p.minus(e.p1.p).norm();
+            float a = reflectionPlaneNormal.x;
+            float b = reflectionPlaneNormal.y;
+            float c = reflectionPlaneNormal.z;
+            Matrix reflectionMatrix =
+                new Matrix( 1-2*a*a,  -2*a*b,  -2*a*c, 0,
+                            -2*a*b,  1-2*b*b,  -2*b*c, 0,
+                            -2*a*c,   -2*b*c, 1-2*c*c, 0,
+                            0,       0,       0,       1);
+            /*
+            m = m.times(Matrix.translate(e.midpoint().minus(Point.ORIGIN))
+                        .times(reflectionMatrix)
+                        .times(Matrix.translate(Point.ORIGIN.minus(e.midpoint()))));
+            */
+            System.out.println(reflectionPlaneNormal);
+            System.out.println("  " + p1.p + " " + m.times(e.p1.p));
+            System.out.println("  " + p2.p + " " + m.times(e.p2.p));
+            if (m.times(e.p1.p).minus(p1.p).mag() > EPSILON) throw new Error();
+            if (m.times(e.p2.p).minus(p2.p).mag() > EPSILON) throw new Error();
+            this.bindTo(m, e);
+        }
+        
+        public void dobind() {
+            //bind_to.dobind(this);
+            for(E e : (Iterable<E>)getBoundPeers()) {
+                if (e==this) continue;
+                p1.bindTo(getBindingMatrix(e), e.p1);
+                p2.bindTo(getBindingMatrix(e), e.p2);
+            }
+        }
 
         public Point shatter() { return shatter(true); }
         public Point shatter(boolean triangles) { return shatter(midpoint(), null, null, triangles); }
@@ -599,12 +642,14 @@ public class Mesh implements Iterable<Mesh.T> {
         public void reinsert() { triangles.remove(this); triangles.add(this); }
 
         public boolean shouldBeDrawn() {
+            /*
             if (e1().bind_to==null) return false;
             if (e2().bind_to==null) return false;
             if (e3().bind_to==null) return false;
             if (e1().bind_to.set.size() == 0) return false;
             if (e2().bind_to.set.size() == 0) return false;
             if (e3().bind_to.set.size() == 0) return false;
+            */
             return true;
         }