checkpoint i think it works!
[anneal.git] / src / edu / berkeley / qfat / Mesh.java
index d395d7f..64724a6 100644 (file)
@@ -6,6 +6,7 @@ import javax.swing.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import edu.berkeley.qfat.geom.*;
+import edu.berkeley.qfat.geom.HasBindingGroup;
 import edu.wlu.cs.levy.CG.KDTree;
 import edu.berkeley.qfat.geom.Point;
 import com.infomatiq.jsi.IntProcedure;
@@ -44,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) {
@@ -75,11 +77,9 @@ public class Mesh implements Iterable<Mesh.T> {
 
     /** a vertex in the mesh */
     public final class Vertex extends HasQuadric implements Visitor {
-        public Point p, oldp;
+        public Point p, oldp, goodp;
         E e;                // some edge *leaving* this point
 
-        Matrix binding = Matrix.ONE;
-        Vertex bound_to = this;
         private boolean illegal = false;
 
         public Point getPoint() { return p; }
@@ -87,6 +87,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
         private Vertex(Point p) {
             this.p = p;
+            this.goodp = p;
             if (vertices.get(p) != null) throw new Error();
             vertices.add(this);
         }
@@ -141,28 +142,39 @@ public class Mesh implements Iterable<Mesh.T> {
                 ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p)
                 : nearest().fundamentalQuadric().preAndPostMultiply(p);
             if (quadric_count != 0)
-                nerror = (/*nerror +*/ quadric.preAndPostMultiply(p))/(quadric_count/*+1*/);
-                /*
+                nerror = (nerror + quadric.preAndPostMultiply(p))/(quadric_count+1);
+
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 double ang = Math.abs(e.dihedralAngle());
                 if (ang > Math.PI) throw new Error();
                 float minangle = (float)(Math.PI * 0.8);
                 if (ang > minangle) nerror += (ang - minangle);
+                /*
                 if (e.t.aspect() < 0.2) {
-                    nerror += (0.2-e.t.aspect()) * 300;
+                    nerror += (0.2-e.t.aspect()) * 10;
                 }
-            }
                 */
+            }
+
             setError(nerror);
         }
 
         public boolean move(Matrix m, boolean ignoreProblems) {
             boolean good = true;
-            for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to)
-                good &= p.transform(m.times(p.p), ignoreProblems);
-            for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to)
-                if (good || ignoreProblems)  p.reComputeErrorAround();
-                else                         p.transform(p.oldp, true);
+
+            //     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 v : (Iterable<Vertex>)getBoundPeers())
+                if (good || ignoreProblems)  v.reComputeErrorAround();
+                else                         v.transform(v.oldp, true);
+
             return good;
         }
 
@@ -257,24 +269,7 @@ public class Mesh implements Iterable<Mesh.T> {
             return norm.norm();
         }
 
-        public boolean isBoundTo(Vertex p) {
-            for(Vertex px = p; px!=null; px=(px.bound_to==p?null:px.bound_to))
-                if (px==this)
-                    return true;
-            return false;
-        }
-
-        public void unbind() { bound_to = this; binding = Matrix.ONE; }
-        public void bind(Vertex p) { bind(p, Matrix.ONE); }
-        public void bind(Vertex p, Matrix binding) {
-            if (isBoundTo(p)) return;
-            Vertex temp_bound_to = p.bound_to;
-            Matrix temp_binding = p.binding;
-            p.bound_to = this.bound_to;
-            p.binding = binding.times(this.binding); // FIXME: may have order wrong here
-            this.bound_to = temp_bound_to;
-            this.binding = temp_binding.times(temp_binding); // FIXME: may have order wrong here
-        }
+        public void bindTo(Vertex p) { bindTo(Matrix.ONE, p); }
     }
 
     public class BindingGroup {
@@ -293,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);
@@ -302,23 +297,18 @@ public class Mesh implements Iterable<Mesh.T> {
                     e.prev.prev.bindEdge(eother.next.next);
                 }
             }
-
+            */
         }
         public void dobind(E e) {
             for(E ebound : set) {
-                e.p1.bind(ebound.p2);
-                e.p2.bind(ebound.p1);
-            }
-        }
-        public void shatter(BindingGroup bg1, BindingGroup bg2) {
-            for(E e : set) {
-                e.shatter(e.midpoint(), bg1, bg2);
+                e.p1.bindTo(Matrix.ONE, ebound.p2);
+                e.p2.bindTo(Matrix.ONE, ebound.p1);
             }
         }
     }
 
     /** [UNIQUE] an edge */
-    public final class E implements Comparable<E> {
+    public final class E extends HasBindingGroup implements Comparable<E> {
 
         public final Vertex p1, p2;
         T t;     // triangle to our "left"
@@ -331,6 +321,23 @@ 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_;
+            if (newBindingGroup==null) return;
+            if (this==newBindingGroup.getMaster()) return;
+            for(E eother : (Iterable<E>)newBindingGroup) {
+                if (next==null || prev==null) continue;
+                if (eother.next==null || eother.prev==null) continue;
+                if (next.isBoundTo(eother.pair.prev.pair) && !prev.isBoundTo(eother.pair.next.pair))
+                    prev.bindTo(next.getBindingMatrix(eother.pair.prev.pair), eother.pair.next.pair);
+                if (!next.isBoundTo(eother.pair.prev.pair) && prev.isBoundTo(eother.pair.next.pair))
+                    next.bindTo(prev.getBindingMatrix(eother.pair.next.pair), eother.pair.prev.pair);
+            }
+
+        }
+
         public float stretchRatio() {
             Vertex nearest = error_against.nearest(midpoint());
             float nearest_distance = midpoint().distance(nearest.p);
@@ -340,40 +347,92 @@ public class Mesh implements Iterable<Mesh.T> {
             return nearest_distance/other_distance;
         }
         public float comparator() {
-            
-
             return length();
             //return t==null?0:(1/t.aspect());
         }
         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 Point shatter() { return shatter(midpoint(), null, null); }
-        public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) {
-            if (shattered || destroyed) return mid;
-            shattered = true;
-
-            Vertex r = next.p2;
-            E next = this.next;
-            E prev = this.prev;
+        public void bindEdge(E e, Matrix m) {
+            _bindEdge(e, m);
+            pair._bindEdge(e.pair, m);
+        }
+        public void _bindEdge(E e, Matrix m) {
+            //bind_to.add(e);
 
-            int old_colorclass = t==null ? 0 : t.colorclass;
-            if (bg1==null) bg1 = new BindingGroup();
-            if (bg2==null) bg2 = new BindingGroup();
-            BindingGroup old_bind_to = bind_to;
-            bind_peers.shatter(bg1, bg2);
-            old_bind_to.shatter(bg2.other(), bg1.other());
-            pair.shatter();
-            destroy();
+            e = e.pair;
+            /*
+            //assumes edges are identical length at binding time
+            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);
+            }
+        }
 
-            newT(r.p, p1.p, mid, null, old_colorclass);
-            newT(r.p, mid, p2.p, null, old_colorclass);
-            bg1.add(p1.getE(mid));
-            bg2.add(p2.getE(mid).pair);
-            return mid;
+        public Point shatter() {
+            if (shattered || destroyed) return null;
+            shattered = true;
+            E first = null;
+            E firste = null;
+            E firstx = null;
+            E firstq = null;
+            for(E e : (Iterable<E>)getBoundPeers()) {
+                E enext = e.next;
+                E eprev = e.prev;
+                E pnext = e.pair.next;
+                E pprev = e.pair.prev;
+                Point mid = e.midpoint();
+                Vertex r = e.next.p2;
+                Vertex l = e.pair.next.p2;
+                e.destroy();
+                e.pair.destroy();
+                newT(r.p, e.p1.p, mid,    null, 0);
+                newT(r.p, mid,    e.p2.p, null, 0);
+                newT(l.p, mid,    e.p1.p, null, 0);
+                newT(l.p, e.p2.p, mid,    null, 0);
+                /*
+                */
+            }
+            for(E e : (Iterable<E>)getBoundPeers()) {
+                Point mid = e.midpoint();
+                if (first==null) {
+                    first = e.p1.getE(mid);
+                    firste = e;
+                    firstx = e.pair;
+                    firstq = e.p2.getE(mid).pair;
+                    continue;
+                }
+                e.p1.getE(mid).          bindTo(e.getBindingMatrix(firste), first);
+                e.p1.getE(mid).pair.     bindTo(e.getBindingMatrix(firste), first.pair);
+                e.p2.getE(mid).pair.     bindTo(e.getBindingMatrix(firste), firstq);
+                e.p2.getE(mid).pair.pair.bindTo(e.getBindingMatrix(firste), firstq.pair);
+                //e.p1.getE(mid).pair.prev.bindTo(e.pair.getBindingMatrix(firstx), first.pair.prev);
+            }
+            return null;
         }
 
         public boolean destroyed = false;
@@ -592,9 +651,9 @@ public class Mesh implements Iterable<Mesh.T> {
         public void reinsert() { triangles.remove(this); triangles.add(this); }
 
         public boolean shouldBeDrawn() {
-            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;
+            if (e1().bindingGroupSize() <= 1) return false;
+            if (e2().bindingGroupSize() <= 1) return false;
+            if (e3().bindingGroupSize() <= 1) return false;
             return true;
         }
 
@@ -602,10 +661,9 @@ public class Mesh implements Iterable<Mesh.T> {
         public void glVertices(GL gl) {
             if (!shouldBeDrawn()) return;
             norm().glNormal(gl);
-            Point p1 = v1().oldp;
-            Point p2 = v2().oldp;
-            Point p3 = v3().oldp;
-            if (p1==null || p2==null || p3==null) return;
+            Point p1 = v1().goodp;
+            Point p2 = v2().goodp;
+            Point p3 = v3().goodp;
             p1.glVertex(gl);
             p2.glVertex(gl);
             p3.glVertex(gl);