X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=a93535799bb82953a400c69e76cd0e97d48d0c20;hp=747599c59e3ff26c47a82543d461665574ba3909;hb=4d3990172ccd3eae8c771780a7a0c3bc0d897f36;hpb=2f48eabf8a07e99905e1eae0b64b5a2abecb01fe

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 747599c..a935357 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -14,9 +14,10 @@ public class Mesh implements Iterable<Mesh.T> {
     public static final float EPSILON = (float)0.0001;
     public static final Random random = new Random();
 
-    private PointSet<Vert> pointset = new PointSet<Vert>();
+    private PointSet<Vert> vertices = new PointSet<Vert>();
 
-    public Iterable<Vert> vertices() { return pointset; }
+    public int size() { return vertices.size(); }
+    public Iterable<Vert> vertices() { return vertices; }
 
     public Iterable<E> edges() {
         return
@@ -37,12 +38,18 @@ public class Mesh implements Iterable<Mesh.T> {
     }
 
     public Iterator<T> iterator() {
-        for(Vert v : pointset)
+        /*
+        for(Vert v : vertices)
             if (v.e != null && v.e.t != null)
                 return new FaceIterator(v);
         return new FaceIterator();
+        */
+        return ts.iterator();
     }
 
+    public HashSet<T> ts = new HashSet<T>();
+    public RTree<T> tris = new RTree<T>();
+
     public Mesh score_against = null;
     public double score = 0;
     public float score() { return (float)score; }
@@ -99,7 +106,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
     public void transform(Matrix m) {
         ArrayList<Vert> set = new ArrayList<Vert>();
-        for (Vert v : pointset)
+        for (Vert v : vertices)
             set.add(v);
         for(Vert v : set) v.transform(m);
     }
@@ -116,12 +123,13 @@ public class Mesh implements Iterable<Mesh.T> {
         return (float)total;
     }
 
-    public void rebuildPointSet() { pointset.rebuild(); }
-    public Vec diagonal() { return pointset.diagonal(); }
-    public Point centroid() { return pointset.centroid(); }
-    public Vert nearest(Point p) { return pointset.nearest(p); }
+    public void rebuild() { /*vertices.rebuild();*/ }
+    public Vec diagonal() { return vertices.diagonal(); }
+    public Point centroid() { return vertices.centroid(); }
+    public Vert nearest(Point p) { return vertices.nearest(p); }
 
     public final class Vert extends HasPoint {
+        public String toString() { return p.toString(); }
         public Point p;
         E e;                // some edge *leaving* this point
 
@@ -133,7 +141,7 @@ public class Mesh implements Iterable<Mesh.T> {
         Matrix quadric = Matrix.ZERO;
 
         Vert bound_to = this;
-        Matrix binding = new Matrix();
+        Matrix binding = Matrix.ONE;
         float oldscore = 0;
         boolean quadricStale = false;
 
@@ -149,22 +157,29 @@ public class Mesh implements Iterable<Mesh.T> {
 
         private Vert(Point p) {
             this.p = p;
-            if (pointset.get(p) != null) throw new Error();
-            pointset.add(this);
+            if (vertices.get(p) != null) throw new Error();
+            vertices.add(this);
+        }
+
+        private void glNormal(GL gl) {
+            Vec norm = norm();
+            gl.glNormal3f(norm.x, norm.y, norm.z);
         }
 
         public void recomputeFundamentalQuadric() {
-            if (!quadricStale && fundamentalQuadric != null) return;
+            //if (!quadricStale && fundamentalQuadric != null) return;
             quadricStale = false;
             unApplyQuadricToNeighbor();
             Matrix m = Matrix.ZERO;
             E e = this.e;
+            int count = 0;
             do {
                 T t = e.t;
                 m = m.plus(t.norm().fundamentalQuadric(t.centroid()));
+                count++;
                 e = e.pair.next;
             } while(e != this.e);
-            fundamentalQuadric = m;
+            fundamentalQuadric = m.times(1/(float)count);
             applyQuadricToNeighbor();
         }
 
@@ -203,6 +218,15 @@ public class Mesh implements Iterable<Mesh.T> {
             reComputeError();
         }
 
+        public void reComputeErrorAround() {
+            reComputeError();
+            if (nearest_in_other_mesh != null) nearest_in_other_mesh.reComputeError();
+            E e = this.e;
+            do {
+                e.p2.reComputeError();
+                e = e.pair.next;
+            } while (e != this.e);
+        }
         public void reComputeError() {
             unComputeError();
             computeError();
@@ -212,48 +236,150 @@ public class Mesh implements Iterable<Mesh.T> {
             oldscore = 0;
         }
         public void computeError() {
-            oldscore = quadric_count == 0 ? 0 : (quadric.preAndPostMultiply(p) / quadric_count);
+            if (quadric_count == 0) {
+                if (!tilemesh) {
+                }
+                else if (nearest_in_other_mesh == null) {
+                    if (score_against != null) {
+                        Vert ne = score_against.nearest(p);
+                        oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
+                    } else {
+                        oldscore = 0;
+                    }
+                } else {
+                    oldscore = nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
+                }
+            } else {
+                oldscore = (quadric.preAndPostMultiply(p) * 100) / quadric_count;
+            }
+
+            oldscore = oldscore;
+
+            int numaspects = 0;
+            float aspects = 0;
+            E e = this.e;
+            do {
+                //double ang = Math.abs(e.crossAngle());
+                double ang = Math.abs(e.crossAngle());
+                if (ang > Math.PI) throw new Error();
+                /*
+                if (e.t != null) {
+                    numaspects++;
+                    aspects += e.t.aspect()*e.t.aspect();
+                }
+                */
+
+                float minangle = (float)(Math.PI * 0.8);
+                if (ang > minangle)
+                    oldscore += (ang - minangle);
+
+                e = e.pair.next;
+            } while (e != this.e);
+            if (numaspects > 0) oldscore += (aspects / numaspects);
+
+            //System.out.println(oldscore);
+            //oldscore = oldscore*oldscore;
             score += oldscore;
         }
 
+        private void removeTrianglesFromRTree() {
+            E e = this.e;
+            do {
+                if (e.t != null) e.t.removeFromRTree();
+                e = e.pair.next;
+            } while(e != this.e);
+        }
+        private void addTrianglesToRTree() {
+            E e = this.e;
+            do {
+                if (e.t != null) e.t.addToRTree();
+                e = e.pair.next;
+            } while(e != this.e);
+        }
+
         /** does NOT update bound pairs! */
         public boolean transform(Matrix m) {
             unApplyQuadricToNeighbor();
+            Point oldp = this.p;
             try {
-                if (pointset.get(this.p)==null) throw new Error();
-                pointset.remove(this);
+                if (vertices.get(this.p)==null) throw new Error();
+                vertices.remove(this);
+                removeTrianglesFromRTree();
                 float newx = m.a*p.x + m.b*p.y + m.c*p.z + m.d;
                 float newy = m.e*p.x + m.f*p.y + m.g*p.z + m.h;
                 float newz = m.i*p.x + m.j*p.y + m.k*p.z + m.l;
                 this.p = new Point(newx, newy, newz);
-                pointset.add(this);
+                addTrianglesToRTree();
+                vertices.add(this);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
             applyQuadricToNeighbor();
 
+            // FIXME: intersection test needed?
+            good = true;
+
             // should recompute fundamental quadrics of all vertices sharing a face, but we defer...
             E e = this.e;
             do {
+                /*
+                if (Math.abs(e.crossAngle()) > (Math.PI * 0.9) ||
+                    Math.abs(e.next.crossAngle()) > (Math.PI * 0.9)) {
+                    good = false;
+                }
+                if (e.t.aspect() < 0.1) {
+                    good = false;
+                }
+                */
                 e.p2.quadricStale = true;
                 e = e.pair.next;
             } while(e != this.e);
 
-            // FIXME: intersection test needed?
-            boolean good = true;
-            for(T t : Mesh.this) {
-                if (!good) break;
-                e = this.e;
-                do {
-                    if (!t.has(e.p1) && !t.has(e.p2) && e.t != null && e.intersects(t)) { good = false; break; }
-                    e = e.pair.next;
-                } while(e != this.e);
+
+            if (!ignorecollision && good) {
+
+                tris.range(new Segment(oldp, this.p),
+                            new Visitor<T>() {
+                                public void visit(T t) {
+                                    if (!good) return;
+                                    E e = Vert.this.e;
+                                    do {
+                                        if (!t.has(e.p1) && !t.has(e.p2) && e.intersects(t)) { good = false; }
+                                        if (e.t != null) {
+                                            if (!e.t.has(t.e1().p1) && !e.t.has(t.e1().p2) && t.e1().intersects(e.t)) { good = false; }
+                                            if (!e.t.has(t.e2().p1) && !e.t.has(t.e2().p2) && t.e2().intersects(e.t)) { good = false; }
+                                            if (!e.t.has(t.e3().p1) && !e.t.has(t.e3().p2) && t.e3().intersects(e.t)) { good = false; }
+                                        }
+                                        e = e.pair.next;
+                                    } while(e != Vert.this.e);
+                                }
+                            });
+
+                /*
+                for(T t : Mesh.this) {
+                    if (!good) break;
+                    e = this.e;
+                    do {
+                        if (!t.has(e.p1) && !t.has(e.p2) && e.intersects(t)) { good = false; break; }
+                        if (e.t != null) {
+                            if (!e.t.has(t.e1().p1) && !e.t.has(t.e1().p2) && t.e1().intersects(e.t)) { good = false; break; }
+                            if (!e.t.has(t.e2().p1) && !e.t.has(t.e2().p2) && t.e2().intersects(e.t)) { good = false; break; }
+                            if (!e.t.has(t.e3().p1) && !e.t.has(t.e3().p2) && t.e3().intersects(e.t)) { good = false; break; }
+                        }
+                        e = e.pair.next;
+                    } while(e != this.e);
+                }
+                */
             }
+
+
+            reComputeErrorAround();
             return good;
         }
+        private boolean good;
 
         public boolean move(Vec v) {
-            Matrix m = new Matrix(v);
+            Matrix m = Matrix.translate(v);
             Vert p = this;
             boolean good = true;
             do {
@@ -267,7 +393,14 @@ public class Mesh implements Iterable<Mesh.T> {
             E ret = getFreeIncident(e, e);
             if (ret != null) return ret;
             ret = getFreeIncident(e.pair.next, e.pair.next);
-            if (ret == null) throw new Error("unable to find free incident to " + this);
+            if (ret == null) {
+                E ex = e;
+                do {
+                    System.out.println(ex + " " + ex.t);
+                    ex = ex.pair.next;
+                } while (ex != e);
+                throw new Error("unable to find free incident to " + this);
+            }
             return ret;
         }
 
@@ -281,7 +414,7 @@ public class Mesh implements Iterable<Mesh.T> {
         }
 
         public E getE(Point p2) {
-            Vert v = pointset.get(p2);
+            Vert v = vertices.get(p2);
             if (v==null) return null;
             return getE(v);
         }
@@ -313,8 +446,8 @@ public class Mesh implements Iterable<Mesh.T> {
             } while(px != p);
             return false;
         }
-        public void unbind() { bound_to = this; binding = new Matrix(); }
-        public void bind(Vert p) { bind(p, new Matrix()); }
+        public void unbind() { bound_to = this; binding = Matrix.ONE; }
+        public void bind(Vert p) { bind(p, Matrix.ONE); }
         public void bind(Vert p, Matrix binding) {
             if (isBoundTo(p)) return;
             Vert temp_bound_to = p.bound_to;
@@ -335,19 +468,21 @@ public class Mesh implements Iterable<Mesh.T> {
         public BindingGroup(E e) { this(); set.add(e); }
         public void add(E e) {
             if (set.contains(e)) return;
-            for (E epeer : e.bind_peers.set) {
-                epeer.bind_peers = this;
-                epeer.bind_to    = bind_others;
-                set.add(epeer);
-            }
-            for (E eother : e.bind_to.set) {
-                bind_others.add(eother);
-            }
+            set.add(e);
+            BindingGroup e_bind_peers = e.bind_peers;
+            BindingGroup e_bind_to    = e.bind_to;
+            e.bind_peers = this;
+            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);
                 }
+                if (e.prev.bind_to.set.contains(eother.next)) {
+                    e.prev.prev.bindEdge(eother.next.next);
+                }
             }
 
         }
@@ -376,28 +511,49 @@ public class Mesh implements Iterable<Mesh.T> {
         public BindingGroup bind_to     = bind_peers.other();
         boolean shattered = false;
 
-        public int compareTo(E e) { return e.length() > length() ? 1 : -1; }
+        public float comparator() {
+            Vert nearest = score_against.nearest(midpoint());
+            //if (t==null) return length();
+            /*
+            double ang = Math.abs(crossAngle());
+            float minangle = (float)(Math.PI * 0.9);
+            if (ang > minangle)
+                return 300;
+            */
+            /*
+            if ((length() * length()) / t.area() > 10)
+                return (float)(length()*Math.sqrt(t.area()));
+            return length()*t.area();
+            */
+            return (float)Math.max(length(), midpoint().distance(nearest.p));
+            //return length();
+        }
+        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) return mid;
+            if (shattered || destroyed) return mid;
             shattered = true;
 
             Vert r = next.p2;
             E next = this.next;
             E prev = this.prev;
 
+            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);
-            bind_to.shatter(bg2.other(), bg1.other());
+            old_bind_to.shatter(bg2.other(), bg1.other());
             pair.shatter();
             destroy();
 
-            newT(r.p, p1.p, mid, null);
-            newT(r.p, mid, p2.p, null);
+            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;
@@ -408,18 +564,27 @@ public class Mesh implements Iterable<Mesh.T> {
             if (destroyed) return;
             destroyed = true;
             pair.destroyed = true;
+
+            if (t != null) t.destroy();
+            t = null;
+
+            if (pair.t != null) pair.t.destroy();
+            pair.t = null;
+
             if (next.t != null) next.t.destroy();
             if (prev.t != null) prev.t.destroy();
             next.t = null;
             prev.t = null;
+
+            if (pair.next.t != null) pair.next.t.destroy();
+            if (pair.prev.t != null) pair.next.t.destroy();
             pair.next.t = null;
             pair.prev.t = null;
-            /*
+
             this.bind_to = null;
             pair.bind_to = null;
             this.bind_peers = null;
             pair.bind_peers = null;
-            */
             pair.prev.next = next;
             next.prev = pair.prev;
             prev.next = pair.next;
@@ -448,7 +613,13 @@ public class Mesh implements Iterable<Mesh.T> {
         }
         private boolean added = false;
 
-        public T makeT() { return t==null ? (t = new T(this)) : t; }
+        public T makeT(int colorclass) { return t==null ? (t = new T(this, colorclass)) : t; }
+
+        public double crossAngle() {
+            Vec v1 = t.norm().times(-1);
+            Vec v2 = pair.t.norm().times(-1);
+            return Math.acos(v1.norm().dot(v2.norm()));
+        }
 
         /** angle between this half-edge and the next */
         public double angle() {
@@ -479,8 +650,8 @@ public class Mesh implements Iterable<Mesh.T> {
 
         /** creates an isolated edge out in the middle of space */
         public E(Point p1, Point p2) {
-            if (pointset.get(p1) != null) throw new Error();
-            if (pointset.get(p2) != null) throw new Error();
+            if (vertices.get(p1) != null) throw new Error();
+            if (vertices.get(p2) != null) throw new Error();
             this.p1 = new Vert(p1);
             this.p2 = new Vert(p2);
             this.prev = this.next = this.pair = new E(this, this, this);
@@ -492,7 +663,7 @@ public class Mesh implements Iterable<Mesh.T> {
         /** adds a new half-edge from prev.p2 to p2 */
         public E(E prev, Point p) {
             Vert p2;
-            p2 = pointset.get(p);
+            p2 = vertices.get(p);
             if (p2 == null) p2 = new Vert(p);
             this.p1 = prev.p2;
             this.p2 = p2;
@@ -598,8 +769,8 @@ public class Mesh implements Iterable<Mesh.T> {
     }
 
     public E makeE(Point p1, Point p2) {
-        Vert v1 = pointset.get(p1);
-        Vert v2 = pointset.get(p2);
+        Vert v1 = vertices.get(p1);
+        Vert v2 = vertices.get(p2);
         if (v1 != null && v2 != null) {
             E e = v1.getE(v2);
             if (e != null) return e;
@@ -610,7 +781,7 @@ public class Mesh implements Iterable<Mesh.T> {
         if (v2 != null) return new E(v2.getFreeIncident(), p1).pair;
         return new E(p1, p2);
     }
-    public T newT(Point p1, Point p2, Point p3, Vec norm) {
+    public T newT(Point p1, Point p2, Point p3, Vec norm, int colorclass) {
         if (norm != null) {
             Vec norm2 = p3.minus(p1).cross(p2.minus(p1));
             float dot = norm.dot(norm2);
@@ -625,7 +796,7 @@ public class Mesh implements Iterable<Mesh.T> {
             e23.makeAdjacent(e31);
             e31.makeAdjacent(e12);
         }
-        T ret = e12.makeT();
+        T ret = e12.makeT(colorclass);
         if (e12.t == null) throw new Error();
         if (e23.t == null) throw new Error();
         if (e31.t == null) throw new Error();
@@ -658,11 +829,17 @@ public class Mesh implements Iterable<Mesh.T> {
     public final class T extends Triangle {
         public final E e1;
         public final int color;
+        public final int colorclass;
+
+        public void removeFromRTree() { tris.remove(this); }
+        public void addToRTree() { tris.insert(this); }
 
         public void destroy() {
+            tris.remove(this);
+            ts.remove(this);
         }
 
-        T(E e1) {
+        T(E e1, int colorclass) {
             this.e1 = e1;
             E e2 = e1.next;
             E e3 = e2.next;
@@ -684,6 +861,9 @@ public class Mesh implements Iterable<Mesh.T> {
                 break;
             }
             this.color = color;
+            this.colorclass = colorclass;
+            ts.add(this);
+            tris.add(this);
         }
         public E e1() { return e1; }
         public E e2() { return e1.next; }
@@ -696,6 +876,19 @@ public class Mesh implements Iterable<Mesh.T> {
         public Point p3() { return e1.next.p2.p; }
         public boolean hasE(E e) { return e1==e || e1.next==e || e1.prev==e; }
         public boolean has(Vert v) { return v1()==v || v2()==v || v3()==v; }
-    }
 
+        public void glVertices(GL gl) {
+
+            if (e1().bind_to.set.size() == 0) return;
+            if (e2().bind_to.set.size() == 0) return;
+            if (e3().bind_to.set.size() == 0) return;
+
+            norm().glNormal(gl);
+            p1().glVertex(gl);
+            p2().glVertex(gl);
+            p3().glVertex(gl);
+        }
+    }
+    public boolean tilemesh = false;
+    public boolean ignorecollision = false;
 }