X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=94b4e73c68863adee3ca9b128d87333a800fb981;hb=162b76f92f5adaf80b312bee2a6bcd5b7ba2eabd;hp=84cb0916ef729a7318fc0bf4e79d3b433414a47e;hpb=b424ccb86139efcf43779ebb3267bc1709347dd8;p=anneal.git

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 84cb091..94b4e73 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -11,8 +11,8 @@ import edu.berkeley.qfat.geom.Point;
 
 public class Mesh implements Iterable<Mesh.T> {
 
-    public static float EPSILON = (float)0.0001;
-    public static Random random = new Random();
+    public static final float EPSILON = (float)0.0001;
+    public static final Random random = new Random();
 
     private PointSet<Vert> pointset = new PointSet<Vert>();
 
@@ -98,7 +98,6 @@ public class Mesh implements Iterable<Mesh.T> {
         return (float)total;
     }
 
-
     public class BindingGroup {
         public HashSet<E> es = new HashSet<E>();
         public BindingGroup() { }
@@ -124,6 +123,18 @@ public class Mesh implements Iterable<Mesh.T> {
 
     public final class Vert extends HasPoint {
         public Point p;
+        E e;                // some edge *leaving* this point
+
+        Vert bound_to = this;
+        int watch_count;
+        float watch_x;
+        float watch_y;
+        float watch_z;
+        Vert watch;
+        Matrix binding = new Matrix();
+        float oldscore = 0;
+        boolean inserted = false;
+
         public Point getPoint() { return p; }
         private Vert(Point p) {
             this.p = p;
@@ -179,8 +190,6 @@ public class Mesh implements Iterable<Mesh.T> {
 
         /** does NOT update bound pairs! */
         public boolean transform(Matrix m) {
-            // FIXME: screws up kdtree 
-            // FIXME: screws up hashmap
             unscore();
             try {
                 if (pointset.get(this.p)==null) throw new Error();
@@ -189,7 +198,6 @@ public class Mesh implements Iterable<Mesh.T> {
                 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?
                 pointset.add(this);
             } catch (Exception e) {
                 throw new RuntimeException(e);
@@ -285,17 +293,6 @@ public class Mesh implements Iterable<Mesh.T> {
             } while(e != this.e);
             return norm.norm();
         }
-
-        Vert bound_to = this;
-        int watch_count;
-        float watch_x;
-        float watch_y;
-        float watch_z;
-        Vert watch;
-        E e;                // some edge *leaving* this point
-        Matrix binding = new Matrix();
-        float oldscore = 0;
-        boolean inserted = false;
     }
 
     /** [UNIQUE] an edge */
@@ -307,6 +304,7 @@ public class Mesh implements Iterable<Mesh.T> {
         E next;  // next half-edge
         E pair;  // partner half-edge
         public BindingGroup bg = new BindingGroup(this);
+        boolean shattered = false;
 
         public int compareTo(E e) { return e.length() > length() ? 1 : -1; }
 
@@ -322,7 +320,6 @@ public class Mesh implements Iterable<Mesh.T> {
             }
         }
 
-        boolean shattered = false;
         public Point shatter() { return shatter(midpoint(), null, null); }
         public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) {
             if (shattered) return mid;
@@ -415,16 +412,22 @@ public class Mesh implements Iterable<Mesh.T> {
         }
 
         /** creates an isolated edge out in the middle of space */
-        public E(Vert p1, Vert p2) {
-            if (p1==p2) throw new Error("attempt to create edge with single vertex: " + p1);
-            this.p1 = p1;
-            this.p2 = p2;
+        public E(Point p1, Point p2) {
+            if (pointset.get(p1) != null) throw new Error();
+            if (pointset.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);
+            this.p1.e = this;
+            this.p2.e = this.pair;
             sync();
         }
 
         /** adds a new half-edge from prev.p2 to p2 */
-        public E(E prev, Vert p2) {
+        public E(E prev, Point p) {
+            Vert p2;
+            p2 = pointset.get(p);
+            if (p2 == null) p2 = new Vert(p);
             this.p1 = prev.p2;
             this.p2 = p2;
             this.prev = prev;
@@ -439,6 +442,7 @@ public class Mesh implements Iterable<Mesh.T> {
                 this.prev.next = this;
                 this.pair = new E(q, this, z);
             }
+            if (p2.e==null) p2.e = this.pair;
             sync();
         }
 
@@ -527,10 +531,6 @@ public class Mesh implements Iterable<Mesh.T> {
         }
     }
 
-    private Vert register(Point p) {
-        Vert v = pointset.get(p);
-        return v==null ? new Vert(p) : v;
-    }
     public E makeE(Point p1, Point p2) {
         Vert v1 = pointset.get(p1);
         Vert v2 = pointset.get(p2);
@@ -540,9 +540,9 @@ public class Mesh implements Iterable<Mesh.T> {
             e = v2.getE(v1);
             if (e != null) return e;
         }
-        if (v1 != null) return new E(v1.getFreeIncident(), register(p2));
-        if (v2 != null) return new E(v2.getFreeIncident(), register(p1)).pair;
-        return new E(register(p1), register(p2));
+        if (v1 != null) return new E(v1.getFreeIncident(), p2);
+        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) {
         if (norm != null) {