checkpoint

[anneal.git] / src / edu / berkeley / qfat / Mesh.java

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 523f6e1..f7ecb4d 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -16,11 +16,32 @@ public class Mesh implements Iterable<Mesh.T> {
     public static float EPSILON = (float)0.0001;
     public static Random random = new Random();
 
-    private HashMap<Point,Vert>  ps = new HashMap<Point,Vert>();
-    public  HashSet<E>           es = new HashSet<E>();
-    public  ArrayList<T>         ts = new ArrayList<T>();
+    private HashMap<Point,Vert>  verts = new HashMap<Point,Vert>();
+
+    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() { return ts.iterator(); }
+    public Iterator<T> iterator() {
+        for(Vert v : verts.values())
+            if (v.e != null && v.e.t != null)
+                return new FaceIterator(v);
+        return new FaceIterator();
+    }
 
     public Point origin() { return new Point(0, 0, 0); }
 
@@ -51,17 +72,17 @@ public class Mesh implements Iterable<Mesh.T> {
         int num = 0;
         double dist = 0;
         HashSet<Vert> done = new HashSet<Vert>();
-        for(T t : ts)
+        for(T t : this)
             for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) {
                 if (done.contains(p)) continue;
                 done.add(p);
                 p.rescore();
             }
-        for(T t : ts)
+        for(T t : this)
             for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() })
                 p.kdremove();
         kd = new KDTree(3);
-        for(T t : ts)
+        for(T t : this)
             for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() })
                 p.kdinsert();
         return (float)(dist/num);
@@ -69,7 +90,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
     public void transform(Matrix m) {
         ArrayList<Vert> set = new ArrayList<Vert>();
-        set.addAll(ps.values());
+        set.addAll(verts.values());
         for(Vert v : set) v.transform(m);
     }
 
@@ -80,7 +101,7 @@ public class Mesh implements Iterable<Mesh.T> {
         float max_x = Float.MIN_VALUE;
         float max_y = Float.MIN_VALUE;
         float max_z = Float.MIN_VALUE;
-        for(Point p : ps.keySet()) {
+        for(Point p : verts.keySet()) {
             if (p.x < min_x) min_x = p.x;
             if (p.y < min_y) min_y = p.y;
             if (p.z < min_z) min_z = p.z;
@@ -98,7 +119,7 @@ public class Mesh implements Iterable<Mesh.T> {
         float max_x = Float.MIN_VALUE;
         float max_y = Float.MIN_VALUE;
         float max_z = Float.MIN_VALUE;
-        for(Point p : ps.keySet()) {
+        for(Point p : verts.keySet()) {
             if (p.x < min_x) min_x = p.x;
             if (p.y < min_y) min_y = p.y;
             if (p.z < min_z) min_z = p.z;
@@ -113,7 +134,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
     public float volume() {
         double total = 0;
-        for(T t : ts) {
+        for(T t : this) {
             double area = t.area();
             Vec origin_to_centroid = new Vec(new Point(0, 0, 0), t.centroid());
             boolean facingAway = t.norm().dot(origin_to_centroid) > 0;
@@ -148,13 +169,13 @@ public class Mesh implements Iterable<Mesh.T> {
         }
     }
 
-    public Vert register(Point p) { Vert v = ps.get(p); return v==null ? new Vert(p) : v; }
+    public Vert register(Point p) { Vert v = verts.get(p); return v==null ? new Vert(p) : v; }
     public final class Vert {
         public Point p;
         private Vert(Point p) {
             this.p = p;
-            if (ps.get(p) != null) throw new Error();
-            ps.put(this.p, this);
+            if (verts.get(p) != null) throw new Error();
+            verts.put(this.p, this);
         }
         public void kdremove() {
             if (!inserted) return;
@@ -220,21 +241,21 @@ public class Mesh implements Iterable<Mesh.T> {
             // FIXME: screws up hashmap
             unscore();
             try {
-                if (ps.get(this.p)==null) throw new Error();
-                ps.remove(this.p);
+                if (verts.get(this.p)==null) throw new Error();
+                verts.remove(this.p);
                 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);
                 // FIXME: what if we move onto exactly where another point is?
-                ps.put(this.p,(Vert)this);
+                verts.put(this.p,(Vert)this);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
             rescore();
             boolean good = true;
             /*
-            for(T t : ts) {
+            for(T t : this) {
                 for(E e = this.e; ;) {
                     if (e.intersects(t)) { good = false; break; }
                     e = e.pair.next;
@@ -467,8 +488,6 @@ public class Mesh implements Iterable<Mesh.T> {
             pair.destroyed = true;
             if (next.t != null) next.t.destroy();
             if (prev.t != null) prev.t.destroy();
-            if (pair.next.t != null) ts.remove(pair.next.t);
-            if (pair.prev.t != null) ts.remove(pair.prev.t);
             next.t = null;
             prev.t = null;
             pair.next.t = null;
@@ -481,8 +500,6 @@ public class Mesh implements Iterable<Mesh.T> {
             pair.next = prev;
             if (p1.e == this) p1.e = prev.next;
             if (pair.p1.e == pair) pair.p1.e = pair.prev.next;
-            es.remove(this);
-            es.remove(pair);
             avgedge -= this.length();
             avgedge -= pair.length();
             numedges--;
@@ -496,7 +513,6 @@ public class Mesh implements Iterable<Mesh.T> {
             if (this.next.p1 != p2) throw new Error();
             if (this.prev.p2 != p1) throw new Error();
             if (this.p1.e == null) this.p1.e = this;
-            es.add(this);
             if (!added) {
                 added = true;
                 numedges++;
@@ -581,7 +597,7 @@ public class Mesh implements Iterable<Mesh.T> {
         if (norm != null) {
             Vec norm2 = p3.p.minus(p1.p).cross(p2.p.minus(p1.p));
             float dot = norm.dot(norm2);
-            //if (Math.abs(dot) < EPointSILON) throw new Error("dot products within epsilon of each other: "+norm+" "+norm2);
+            //if (Math.abs(dot) < EPointSILON) throw new Error("dot products within evertsilon of each other: "+norm+" "+norm2);
             if (dot < 0) { Vert p = p1; p1=p2; p2 = p; }
         }
         E e12 = p1.makeE(p2);
@@ -599,9 +615,11 @@ public class Mesh implements Iterable<Mesh.T> {
         return ret;
     }
 
+
     public class FaceIterator implements Iterator<T> {
         private HashSet<T> visited = new HashSet<T>();
         private LinkedList<T> next = new LinkedList<T>();
+        public FaceIterator() { }
         public FaceIterator(Vert v) { next.addFirst(v.e.t); }
         public boolean hasNext() { return next.peek()!=null; }
         public void remove() { throw new Error(); }
@@ -625,7 +643,6 @@ public class Mesh implements Iterable<Mesh.T> {
         public final int color;
 
         public void destroy() {
-            ts.remove(this);
         }
 
         T(E e1) {
@@ -651,8 +668,6 @@ public class Mesh implements Iterable<Mesh.T> {
             }
             this.color = color;
 
-            // FIXME unnecssary?
-            ts.add(this);
             v1().kdinsert();
             v2().kdinsert();
             v3().kdinsert();