X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=cca8e47e68b560570acd359519caf5a2ae69452b;hb=5b8228730c1dcfb86ec27c9e7ac224428785d165;hp=1a1b9a30924c6047afa2cf8b34e11ad9d02f4b90;hpb=161d356850a765c2f6b83b42275095b777d7b2aa;p=anneal.git

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 1a1b9a3..cca8e47 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -17,8 +17,8 @@ public class Mesh implements Iterable<Mesh.T> {
     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>();
+    public  HashSet<E>           es = new HashSet<E>();
+    public  ArrayList<T>         ts = new ArrayList<T>();
 
     public Iterator<T> iterator() { return ts.iterator(); }
 
@@ -28,15 +28,17 @@ public class Mesh implements Iterable<Mesh.T> {
     public double score = 0;
     public float score() { return (float)score; }
 
-    public void unbind() {
+    public int numedges = 0;
+    public float avgedge = 0;
 
+    public void unbind() {
         for(Mesh.T t : this) {
-            t.p1().unbind();
-            t.p2().unbind();
-            t.p3().unbind();
+            t.v1().unbind();
+            t.v2().unbind();
+            t.v3().unbind();
         }
-
     }
+
     public void bind() {
         for(Mesh.T t : this) {
             t.e1().dobind();
@@ -44,25 +46,23 @@ public class Mesh implements Iterable<Mesh.T> {
             t.e3().dobind();
         }
     }
-    public int numedges = 0;
-    public float avgedge = 0;
 
     public float rescore() {
         int num = 0;
         double dist = 0;
         HashSet<Vert> done = new HashSet<Vert>();
         for(T t : ts)
-            for(Vert p : new Vert[] { t.p1(), t.p2(), t.p3() }) {
+            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(Vert p : new Vert[] { t.p1(), t.p2(), t.p3() })
+            for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() })
                 p.kdremove();
         kd = new KDTree(3);
         for(T t : ts)
-            for(Vert p : new Vert[] { t.p1(), t.p2(), t.p3() })
+            for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() })
                 p.kdinsert();
         return (float)(dist/num);
     }
@@ -111,14 +111,6 @@ public class Mesh implements Iterable<Mesh.T> {
                      (float)(max_z + min_z)/2);
     }
 
-    public T newT(Vert p12, Vert p23, Vert p31, Vec norm) {
-        Vec norm2 = p31.p.minus(p12.p).cross(p23.p.minus(p12.p));
-        float dot = norm.dot(norm2);
-        //if (Math.abs(dot) < EPointSILON) throw new Error("dot products within epsilon of each other: "+norm+" "+norm2);
-        if (dot < 0) { Vert p = p12; p12=p23; p23 = p; }
-        return newT(p12, p23, p31);
-    }
-
     public float volume() {
         double total = 0;
         for(T t : ts) {
@@ -137,22 +129,6 @@ public class Mesh implements Iterable<Mesh.T> {
         return (Vert)results[0];
     }
 
-    public T newT(Vert p1, Vert p2, Vert p3) {
-        E e12 = p1.makeE(p2);
-        E e23 = p2.makeE(p3);
-        E e31 = p3.makeE(p1);
-        while(e12.next != e23 || e23.next != e31 || e31.next != e12) {
-            e12.makeAdjacent(e23);
-            e23.makeAdjacent(e31);
-            e31.makeAdjacent(e12);
-        }
-        T ret = e12.makeT();
-        if (e12.t == null) throw new Error();
-        if (e23.t == null) throw new Error();
-        if (e31.t == null) throw new Error();
-        return ret;
-    }
-
     public class BindingGroup {
         public HashSet<E> es = new HashSet<E>();
         public BindingGroup() { }
@@ -238,7 +214,6 @@ public class Mesh implements Iterable<Mesh.T> {
             score += oldscore;
         }
 
-
         /** does NOT update bound pairs! */
         public boolean transform(Matrix m) {
             // FIXME: screws up kdtree 
@@ -368,9 +343,9 @@ public class Mesh implements Iterable<Mesh.T> {
     public final class E implements Comparable<E> {
 
         public boolean intersects(T t) {
-            double A0=t.p1().p.x, A1=t.p1().p.y, A2=t.p1().p.z;
-            double B0=t.p2().p.x, B1=t.p2().p.y, B2=t.p2().p.z;
-            double C0=t.p3().p.x, C1=t.p3().p.y, C2=t.p3().p.z;
+            double A0=t.v1().p.x, A1=t.v1().p.y, A2=t.v1().p.z;
+            double B0=t.v2().p.x, B1=t.v2().p.y, B2=t.v2().p.z;
+            double C0=t.v3().p.x, C1=t.v3().p.y, C2=t.v3().p.z;
             double j0=p1.p.x, j1=p1.p.y, j2=p1.p.z;
             double k0=p2.p.x, k1=p2.p.y, k2=p2.p.z;
             double J0, J1, J2;
@@ -478,8 +453,8 @@ public class Mesh implements Iterable<Mesh.T> {
             pair.shatter();
             destroy();
 
-            newT(r, p1, mid);
-            newT(r, mid, p2);
+            newT(r, p1, mid, null);
+            newT(r, mid, p2, null);
             bg1.add(p1.getE(mid));
             bg2.add(mid.getE(p2));
             return mid;
@@ -602,8 +577,30 @@ public class Mesh implements Iterable<Mesh.T> {
         public String toString() { return p1+"->"+p2; }
     }
 
+    public T newT(Vert p1, Vert p2, Vert p3, Vec norm) {
+        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 (dot < 0) { Vert p = p1; p1=p2; p2 = p; }
+        }
+        E e12 = p1.makeE(p2);
+        E e23 = p2.makeE(p3);
+        E e31 = p3.makeE(p1);
+        while(e12.next != e23 || e23.next != e31 || e31.next != e12) {
+            e12.makeAdjacent(e23);
+            e23.makeAdjacent(e31);
+            e31.makeAdjacent(e12);
+        }
+        T ret = e12.makeT();
+        if (e12.t == null) throw new Error();
+        if (e23.t == null) throw new Error();
+        if (e31.t == null) throw new Error();
+        return ret;
+    }
+
     /** [UNIQUE] a triangle (face) */
-    public final class T {
+    public final class T extends Triangle {
         public final E e1;
         public final int color;
 
@@ -611,15 +608,6 @@ public class Mesh implements Iterable<Mesh.T> {
             ts.remove(this);
         }
 
-        public Vert nearest(Point p) {
-            float d1 = p1().p.distance(p);
-            float d2 = p2().p.distance(p);
-            float d3 = p3().p.distance(p);
-            if (d1 < d2 && d1 < d3) return p1();
-            if (d2 < d3) return p2();
-            return p3();
-        }
-
         T(E e1) {
             this.e1 = e1;
             E e2 = e1.next;
@@ -645,42 +633,23 @@ public class Mesh implements Iterable<Mesh.T> {
 
             // FIXME unnecssary
             ts.add(this);
-            p1().kdinsert();
-            p2().kdinsert();
-            p3().kdinsert();
+            v1().kdinsert();
+            v2().kdinsert();
+            v3().kdinsert();
 
             this.color = color;
         }
-        public Vert p1() { return e1.p1; }
-        public Vert p2() { return e1.p2; }
-        public Vert p3() { return e1.next.p2; }
         public E e1() { return e1; }
         public E e2() { return e1.next; }
         public E e3() { return e1.prev; }
-        public Vec norm() { return p2().p.minus(p1().p).cross(p3().p.minus(p1().p)).norm(); }
+        public Vert v1() { return e1.p1; }
+        public Vert v2() { return e1.p2; }
+        public Vert v3() { return e1.next.p2; }
+        public Point p1() { return e1.p1.p; }
+        public Point p2() { return e1.p2.p; }
+        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 p1()==v || p2()==v || p3()==v; }
-
-        public float area() {
-            return (float)Math.abs(0.5 * e1().length() * new Vec(p1().p, p2().p).norm().dot(new Vec(p2().p, p3().p)));
-        }
-
-        public void glVertices(GL gl) {
-            p1().p.glVertex(gl);
-            p2().p.glVertex(gl);
-            p3().p.glVertex(gl);
-        }
-
-        public Point centroid() { return new Point((p1().p.x+p2().p.x+p3().p.x)/3,
-                                          (p1().p.y+p2().p.y+p3().p.y)/3, 
-                                          (p1().p.z+p2().p.z+p3().p.z)/3); }
-        public float diameter() {
-            // FIXME: what is this supposed to be?
-            return Math.max(Math.max(e1().length(), e2().length()), e3().length()) / 2;
-        }
-
-
+        public boolean has(Vert v) { return v1()==v || v2()==v || v3()==v; }
     }
-    
 
 }