X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=c50e34ccd2e9629cea45660a136c4122bd680946;hp=1d4967fe1bd76e279e2a0393ae133a7d2ebaef57;hb=f42953f58e189d611803dcb4661bb840d785c30a;hpb=57376a862c00fa1c8731f9989085fcfceeee0370

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 1d4967f..c50e34c 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -14,46 +14,22 @@ 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>();
-    public int size() { return pointset.size(); }
-    public Iterable<Vert> vertices() { return pointset; }
-
-    public Iterable<E> edges() {
-        return
-            new Iterable<E>() {
-            public Iterator<E> iterator() {
-                // HACK
-                HashSet<E> hse = new HashSet<E>();
-                for(T t : Mesh.this) {
-                    hse.add(t.e1());
-                    hse.add(t.e2());
-                    hse.add(t.e3());
-                    hse.add(t.e1().pair);
-                    hse.add(t.e2().pair);
-                    hse.add(t.e3().pair);
-                }
-                return hse.iterator();
-            } };
-    }
-
-    public Iterator<T> iterator() {
-        /*
-        for(Vert v : pointset)
-            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>();
+    private RTree<T> tris = new RTree<T>();
+    private PointSet<Vert> vertices = new PointSet<Vert>();
 
     public Mesh score_against = null;
     public double score = 0;
     public float score() { return (float)score; }
-
     public int numedges = 0;
     public float avgedge = 0;
 
+    public int size() { return vertices.size(); }
+    public Iterable<Vert> vertices() { return vertices; }
+
+    public Iterator<T> iterator() {
+        return tris.iterator();
+    }
+
     public void rebindPoints() {
         // unbind all points
         for(Mesh.T t : this) {
@@ -103,7 +79,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);
     }
@@ -120,10 +96,10 @@ 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(); }
@@ -138,7 +114,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;
 
@@ -154,8 +130,8 @@ 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) {
@@ -279,24 +255,42 @@ public class Mesh implements Iterable<Mesh.T> {
             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?
-            boolean good = true;
+            good = true;
 
             // should recompute fundamental quadrics of all vertices sharing a face, but we defer...
             E e = this.e;
@@ -314,27 +308,51 @@ public class Mesh implements Iterable<Mesh.T> {
                 e = e.pair.next;
             } while(e != this.e);
 
-            if (!ignorecollision)
-            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);
+
+            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 {
@@ -369,7 +387,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);
         }
@@ -401,8 +419,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;
@@ -605,8 +623,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);
@@ -618,7 +636,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;
@@ -724,8 +742,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;
@@ -786,9 +804,10 @@ public class Mesh implements Iterable<Mesh.T> {
         public final int color;
         public final int colorclass;
 
-        public void destroy() {
-            ts.remove(this);
-        }
+        public void removeFromRTree() { tris.remove(this); }
+        public void addToRTree() { tris.insert(this); }
+
+        public void destroy() { tris.remove(this); }
 
         T(E e1, int colorclass) {
             this.e1 = e1;
@@ -813,7 +832,7 @@ public class Mesh implements Iterable<Mesh.T> {
             }
             this.color = color;
             this.colorclass = colorclass;
-            ts.add(this);
+            tris.add(this);
         }
         public E e1() { return e1; }
         public E e2() { return e1.next; }
@@ -829,9 +848,11 @@ public class Mesh implements Iterable<Mesh.T> {
 
         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);