X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=45ddf31e7daa3ef803395907a75cf8c05475cb93;hp=d56e2a0d639a827160e9adbd35611e0d7515c21e;hb=17972ccdcc4b45ccf91a4281d6dedd6f1d79e003;hpb=2a2e64829786ee415fd0c0f16957c55e174b793b

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index d56e2a0..45ddf31 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -11,6 +11,8 @@ import edu.wlu.cs.levy.CG.KDTree;
 import edu.berkeley.qfat.geom.Point;
 import com.infomatiq.jsi.IntProcedure;
 
+// EDGES RUN COUNTER-CLOCKWISE
+
 public class Mesh implements Iterable<Mesh.T> {
 
     public static final float EPSILON = (float)0.0001;
@@ -19,9 +21,9 @@ public class Mesh implements Iterable<Mesh.T> {
     private RTree<T>         triangles = new RTree<T>();
     private PointSet<Vertex> vertices  = new PointSet<Vertex>();
 
-
-    public boolean option_wireframe = false;
+    public boolean option_wireframe    = false;
     public boolean option_errorNormals = false;
+    public boolean option_selectable   = true;
 
     public void render(GL gl, Matrix m) {
         if (option_wireframe) {
@@ -45,6 +47,14 @@ public class Mesh implements Iterable<Mesh.T> {
                          (float)(0.25+(0.05*t.color)),
                          (float)(0.75+(0.05*t.color)),
                          (float)0.3); 
+            /*
+            if (t.red) {
+            gl.glColor4f((float)(0.75+(0.05*t.color)),
+                         (float)(0.25+(0.05*t.color)),
+                         (float)(0.25+(0.05*t.color)),
+                         (float)0.3); 
+            }
+            */
             t.glTriangle(gl, m);
         }
         if (option_errorNormals)
@@ -115,6 +125,93 @@ public class Mesh implements Iterable<Mesh.T> {
     }
 
 
+    public void subdivide() {
+        for (Vertex v : vertices()) v.original = true;
+        HashSet<E> edges = new HashSet<E>();
+        HashSet<E> flip = new HashSet<E>();
+        HashSet<T> tris = new HashSet<T>();
+        int count = 0;
+        for (T t : this) {
+            tris.add(t);
+            edges.add(t.e1());
+            edges.add(t.e2());
+            edges.add(t.e3());
+            count++;
+        }
+        System.out.println("triangles="+count);
+        count = 0;
+        for(E e : edges) {
+            if (e.destroyed || e.shattered) continue;
+            e.shatter().edge = true;
+            for(E ex : (Iterable<E>)e.getBoundPeers()) {
+                Vertex m = nearest(ex.midpoint());
+                m.edge = true;
+                E e3 = ex.p1.getE(m).next;
+                if (e3.p2.original)
+                    flip.add(e3);
+            }
+        }
+
+        int i=0;
+
+        for(E e : flip) {
+            e.flip();
+            System.out.println("flip!");
+            i++;
+        }
+
+        System.out.println("count="+count);
+
+        rebindPoints();
+        HashSet<Vertex> verts = new HashSet<Vertex>();
+        for(Vertex v : vertices()) verts.add(v);
+        for (Vertex v : verts)
+            v.clearWish();
+        for (Vertex v : verts) {
+            if (v.edge) {
+                for(E e = v.e; e!=null; e=e.pair.next==v.e?null:e.pair.next) {
+                    if (e.p2.original) {
+                        v.wish(e.p2);
+                        v.wish(e.p2);
+                        v.wish(e.p2);
+                        v.wish(e.p2);
+                    }
+                }
+                for(E e = v.e; e!=null; e=e.pair.next==v.e?null:e.pair.next) {
+                    for(E e2 = e.p2.e; e2!=null; e2=e2.pair.next==e.p2.e?null:e2.pair.next) {
+                        if (e2.p2.original) {
+                            v.wish(e.p2);
+                        }
+                    }
+                }
+            }
+        }
+        for (Vertex v : verts)
+            v.grantWish();
+        System.out.println("-------------------------------------------------------------------");
+        /*
+        for (Vertex v : verts) {
+            if (v.original) {
+                int n=0;
+                for(E e = v.e; e!=null; e=e.pair.next==v.e?null:e.pair.next) {
+                    n++;
+                    v.wish(e.midpoint());
+                    v.wish(e.midpoint());
+                    v.wish(e.next.pair.t.centroid());
+                }
+                v.avgWish();
+                v.wishes = 3;
+                for(int j=0; j<n-3; j++)
+                    v.wish(v.getPoint());
+            }
+        }
+        for (Vertex v : verts)
+            v.avgWish();
+        for (Vertex v : verts)
+            v.grantWish();
+        */
+    }
+
     // Vertexices //////////////////////////////////////////////////////////////////////////////
 
     /** a vertex in the mesh */
@@ -123,6 +220,38 @@ public class Mesh implements Iterable<Mesh.T> {
         public Point oldp;
         E e;                // some edge *leaving* this point
 
+        public boolean original = false;
+        public boolean edge = false;
+        public boolean face = false;
+
+        private int wishes = 0;
+        private Point wish = Point.ZERO;
+        public void clearWish() { wishes = 0; wish = Point.ZERO; }
+        public void wish(HasPoint hp) {
+            Point p = hp.getPoint();
+            wishes++;
+            wish = new Point(wish.x+p.x, wish.y+p.y, wish.z+p.z);
+        }
+        public void grantWish() {
+            for(Vertex v : (Iterable<Vertex>)getBoundPeers()) {
+                if (v==this) continue;
+                if (v.wishes==0) continue;
+                Point p = this.getBindingMatrix(v).times(v.wish.minus(Point.ZERO).div(v.wishes).plus(Point.ZERO));
+                wish = p.minus(Point.ZERO).times(v.wishes).plus(wish);
+                wishes += v.wishes;
+                v.clearWish();
+            }
+            if (wishes==0) return;
+            Vec d = wish.minus(Point.ZERO).div(wishes).plus(Point.ZERO).minus(getPoint());
+            move(d, false);
+            clearWish();
+        }
+        public void avgWish() {
+            if (wishes==0) return;
+            wish = wish.minus(Point.ZERO).div(wishes).plus(Point.ZERO);
+            wishes = 1;
+        }
+
         private boolean illegal = false;
 
         public boolean visible = false;
@@ -144,6 +273,17 @@ public class Mesh implements Iterable<Mesh.T> {
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) e.t.reinsert();
         }
 
+        // the average of all adjacent points
+        public Point recenter() {
+            int count = 0;
+            Vec vec = Vec.ZERO;
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
+                vec = vec.plus(e.getOther(this).getPoint().minus(Point.ZERO));
+                count++;
+            }
+            return Point.ZERO.plus(vec.div(count));
+        }
+
         public float olderror = 0;
         public void setError(float nerror) {
             error -= olderror;
@@ -203,6 +343,7 @@ public class Mesh implements Iterable<Mesh.T> {
         public HasQuadric nearest() { return error_against==null ? null : error_against.vertices.nearest(p, this); }
         public void computeError() {
             if (error_against==null) return;
+            if (nearest_in_other_mesh == null && nearest()==null) return;
             float nerror =
                 nearest_in_other_mesh != null
                 ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p)
@@ -247,7 +388,7 @@ public class Mesh implements Iterable<Mesh.T> {
             setError(nerror);
         }
 
-        public boolean move(Matrix m, boolean ignoreProblems) {
+        public boolean move(Vec vv, boolean ignoreProblems) {
 
             boolean good = true;
 
@@ -258,21 +399,26 @@ public class Mesh implements Iterable<Mesh.T> {
             // M * t1 = M * t1.getMatrix(t2) * t2
 
             if (bindingGroup!=null && this != bindingGroup.getMaster()) {
-                Matrix v = getBindingMatrix(bindingGroup.getMaster());
-                return ((Vertex)bindingGroup.getMaster()).move(v.inverse().times(m).times(v), ignoreProblems);
+                Matrix m2 = getBindingMatrix(bindingGroup.getMaster());
+                Vec v2 = m2.times(vv.plus(getPoint())).minus(m2.times(getPoint()));
+                return ((Vertex)bindingGroup.getMaster()).move(v2, ignoreProblems);
             }
 
+            Point op = this.p;
+            Point pp = vv.plus(getPoint());
             if (bindingGroup != null) {
-                Matrix m2 = null;
-                for(int i=0; i<20 && !m.equals(m2); i++) {
-                    m2 = m.times(getConstraint());
+                /*
+                for(int i=0; i<20 ; i++) {
+                    Point v2 = getConstraint().times(pp);
+                    pp = pp.midpoint(v2);
                     //System.out.println(m.minus(m2));
                 }
-                if (!m.equals(m2)) return true;
+            */
+                //pp = getConstraint().times(pp);
             }
+            //pp = pp.minus(op).norm().times(vv.mag()).plus(op);
             ok = false;
-            Point op = this.p;
-            Point pt = m.times(this.p);
+            Point pt = pp;
             for(Vertex v : (Iterable<Vertex>)getBoundPeers()) {
                 Point pt2 = v.getBindingMatrix(this).times(pt);
                 /*
@@ -304,7 +450,6 @@ public class Mesh implements Iterable<Mesh.T> {
 
             unApplyQuadricToNeighbor();
 
-
             boolean illegalbefore = illegal;
             illegal = false;
             /*
@@ -387,8 +532,14 @@ public class Mesh implements Iterable<Mesh.T> {
             return getE(v);
         }
         public E getE(Vertex p2) {
-            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
+            if (this.e!=null && this!=this.e.p1 && this!=this.e.p2) throw new RuntimeException();
+            int i=0;
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 if (e.p1 == this && e.p2 == p2) return e;
+                i++;
+                e.sanity();
+                if (e.destroyed) throw new RuntimeException("fark " + i + " " + e.prev + " " + (e.prev.next==e) + " " + e.prev.destroyed);
+            }
             return null;
         }
 
@@ -411,6 +562,13 @@ public class Mesh implements Iterable<Mesh.T> {
     /** [UNIQUE] an edge */
     public final class E extends HasBindingGroup implements Comparable<E> {
 
+        public void sanity() {
+            if (destroyed) return;
+            if (pair!=null && (pair.p1!=p2 || pair.p2!=p1)) throw new RuntimeException();
+            if (next!=null && next.p1!=p2) throw new RuntimeException();
+            if (prev!=null && prev.p2!=p1) throw new RuntimeException();
+        }
+
         public final Vertex p1, p2;
         T t;     // triangle to our "left"
         E prev;  // previous half-edge
@@ -422,6 +580,41 @@ public class Mesh implements Iterable<Mesh.T> {
 
         public Segment getSegment() { return new Segment(p1.getPoint(), p2.getPoint()); }
 
+        public void flip() {
+            // FIXME: coplanarity check needed
+            if (destroyed) return;
+            for (E e : (Iterable<E>)getBoundPeers()) {
+                if (!e.pair.isBoundTo(pair)) throw new RuntimeException("cannot flip!");
+            }
+            Vertex v1 = t.getOtherVertex(this);
+            Vertex v2 = pair.t.getOtherVertex(pair);
+            destroy();
+            pair.destroy();
+            T t1 = newT(v1, v2, p2);
+            T t2 = newT(v2, v1, p1);
+            t1.e1().sanity();
+            t1.e2().sanity();
+            t1.e3().sanity();
+            t2.e1().sanity();
+            t2.e2().sanity();
+            t2.e3().sanity();
+
+            for (E e : (Iterable<E>)getBoundPeers()) {
+                if (e==this) continue;
+                if (e.destroyed) continue;
+                Vertex v1e = e.t.getOtherVertex(e);
+                Vertex v2e = e.pair.t.getOtherVertex(e.pair);
+                e.destroy();
+                e.pair.destroy();
+                if (v1e.getE(v2e)!=null) throw new RuntimeException();
+                newT(v1e, v2e, e.p2).red = true;
+                newT(v2e, v1e, e.p1).red = true;
+                v2e.getE(v1e).bindTo(e.getBindingMatrix(this), v1.getE(v2));
+                v1e.getE(v2e).bindTo(e.pair.getBindingMatrix(this.pair), v2.getE(v1));
+            }
+
+        }
+
         public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) {
 
             edu.berkeley.qfat.geom.BindingGroup<E> newBindingGroup =
@@ -508,8 +701,8 @@ public class Mesh implements Iterable<Mesh.T> {
             }
         }
 
-        public Point shatter() {
-            if (shattered || destroyed) return null;
+        public Vertex shatter() {
+            if (shattered || destroyed) return nearest(midpoint());
             shattered = true;
             E first = null;
             E firste = null;
@@ -550,7 +743,7 @@ public class Mesh implements Iterable<Mesh.T> {
             first.setConstraint(firste.getConstraint());
             firstq.setConstraint(firste.getConstraint());
             */
-            return null;
+            return nearest(midpoint());
         }
 
         public boolean destroyed = false;
@@ -578,9 +771,34 @@ public class Mesh implements Iterable<Mesh.T> {
             pair.prev.next = next;
             next.prev = pair.prev;
             prev.next = pair.next;
-            pair.next = prev;
-            if (p1.e == this) p1.e = prev.next;
-            if (pair.p1.e == pair) pair.p1.e = pair.prev.next;
+            pair.next.prev = prev;
+
+            if (p1.e == this) p1.e = pair.next;
+            if (pair.p1.e == pair) pair.p1.e = next;
+
+            if (p2.e == this) throw new RuntimeException();
+            if (pair.p2.e == pair) throw new RuntimeException();
+
+            /*
+            next = pair;
+            prev = pair;
+            pair.next = this;
+            pair.prev = this;
+            */
+
+            /*
+            pair.prev = null;
+            pair.next = null;
+            next = null;
+            prev = null;
+            */
+
+            /*
+            sanity();
+            next.sanity();
+            prev.sanity();
+            pair.sanity();
+            */
         }
 
         private void sync() {
@@ -622,8 +840,8 @@ public class Mesh implements Iterable<Mesh.T> {
 
         public void makeAdjacent(E e) {
             if (this.next == e) return;
-            if (p2 != e.p1) throw new Error("cannot make adjacent -- no shared vertex");
-            if (t != null || e.t != null) throw new Error("cannot make adjacent -- edges not both free ");
+            if (p2 != e.p1) throw new Error("cannot make adjacent -- no shared vertex: " + this + " " + e);
+            if (t != null || e.t != null) throw new Error("cannot make adjacent -- edges not both free " + t + " " + e.t);
 
             E freeIncident = p2.getFreeIncident(e, this);
 
@@ -660,6 +878,7 @@ public class Mesh implements Iterable<Mesh.T> {
             this.p1 = prev.p2;
             this.p2 = p2;
             this.prev = prev;
+            if (prev.destroyed) throw new RuntimeException();
             if (p2.getE(p1) != null) throw new Error();
             if (p2.e==null) {
                 this.next = this.pair = new E(this, this, prev.next);
@@ -679,6 +898,7 @@ public class Mesh implements Iterable<Mesh.T> {
         public E(E prev, E pair, E next) {
             this.p1 = prev.p2;
             this.p2 = next.p1;
+            if (prev.destroyed) throw new RuntimeException();
             this.prev = prev;
             this.next = next;
             this.pair = pair;
@@ -708,6 +928,9 @@ public class Mesh implements Iterable<Mesh.T> {
     private static float round(float f) {
         return Math.round(f*1000)/1000f;
     }
+    public T newT(HasPoint p1, HasPoint p2, HasPoint p3) {
+        return newT(p1.getPoint(), p2.getPoint(), p3.getPoint(), null, 0);
+    }
     public T newT(Point p1, Point p2, Point p3, Vec norm, int colorclass) {
         if (coalesce) {
 
@@ -748,9 +971,115 @@ public class Mesh implements Iterable<Mesh.T> {
         public final int color;
         public final int colorclass;
 
+        public boolean red = false;
+        public boolean old = false;
+
         public final int serial = max_serial++;
         public boolean occluded;
 
+        public Point shatter() {
+            if (destroyed) return null;
+            E e = e1();
+            
+            HashSet<E> forward = new HashSet<E>();
+            HashSet<E> backward = new HashSet<E>();
+            HashSet<E> both = new HashSet<E>();
+
+            for(E eb : (Iterable<E>)e.getBoundPeers()) {
+                if (eb==e) continue;
+                if (eb.next.isBoundTo(e.next) && eb.prev.isBoundTo(e.prev)) {
+                    forward.add(eb);
+                    both.add(eb);
+                }
+                if (eb.pair.next.pair.isBoundTo(e.prev) && eb.pair.prev.pair.isBoundTo(e.next)) {
+                    backward.add(eb.pair);
+                    both.add(eb.pair);
+                }
+            }
+
+            Vertex v1 = e.t.v1();
+            Vertex v2 = e.t.v2();
+            Vertex v3 = e.t.v3();
+            Point c = e.t.centroid();
+            E e_next = e.next;
+            E e_prev = e.prev;
+            e.t.destroy();
+            newT(v1, v2, c);
+            newT(c,  v2, v3);
+            newT(v3, v1, c);
+
+            // FIXME: forward too
+            for(E ex : backward) {
+                Vertex v1x = ex.t.v1();
+                Vertex v2x = ex.t.v2();
+                Vertex v3x = ex.t.v3();
+                Point cx = ex.t.centroid();
+                E ex_next = ex.next;
+                E ex_prev = ex.prev;
+                ex.t.destroy();
+                newT(v1x, v2x, cx);
+                newT(cx,  v2x, v3x);
+                newT(v3x, v1x, cx);
+
+                // FIXME: i have no idea if this is right
+                e.next.bindTo(e.getBindingMatrix(ex.pair), ex.prev);
+                e.prev.bindTo(e.getBindingMatrix(ex.pair), ex.next);
+                e.next.pair.bindTo(e.getBindingMatrix(ex.pair), ex.prev.pair);
+                e.prev.pair.bindTo(e.getBindingMatrix(ex.pair), ex.next.pair);
+
+                e_next.next.bindTo(e_next.getBindingMatrix(ex_prev.pair), ex_prev.prev.pair);
+                e_next.prev.bindTo(e_next.getBindingMatrix(ex_prev.pair), ex_prev.next.pair);
+
+                e_prev.next.bindTo(e_prev.getBindingMatrix(ex_next.pair), ex_next.prev.pair);
+                e_prev.prev.bindTo(e_prev.getBindingMatrix(ex_next.pair), ex_next.next.pair);
+            }
+
+            /*
+
+            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;
+                if (!e.destroyed) {
+                    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);
+            }
+            */
+            /*
+            first.setConstraint(firste.getConstraint());
+            firstq.setConstraint(firste.getConstraint());
+            */
+            return null;
+        }
+
+
         T(E e1, int colorclass) {
             this.e1 = e1;
             E e2 = e1.next;
@@ -788,11 +1117,30 @@ public class Mesh implements Iterable<Mesh.T> {
         public boolean hasE(E e) { return e1==e || e1.next==e || e1.prev==e; }
         public boolean has(Vertex v) { return v1()==v || v2()==v || v3()==v; }
 
+        public Vertex getOtherVertex(E e) {
+            if (!hasE(e)) throw new RuntimeException();
+            if (!e.has(v1())) return v1();
+            if (!e.has(v2())) return v2();
+            if (!e.has(v3())) return v3();
+            throw new RuntimeException();
+        }
+
         public void removeFromRTree() { triangles.remove(this); }
         public void addToRTree() { triangles.insert(this); }
-        public void destroy() { triangles.remove(this); }
+        public void destroy() {
+            if (e1 != null) {
+                e1.t = null;
+                e1.next.t = null;
+                e1.prev.t = null;
+            }
+            triangles.remove(this);
+            destroyed = true;
+        }
         public void reinsert() { triangles.remove(this); triangles.add(this); }
 
+        private boolean destroyed = false;
+        public boolean destroyed() { return destroyed; }
+
         public boolean shouldBeDrawn() {
 
             if (e1().bindingGroupSize() <= 1) return false;