X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=5ba7404022c20b24bab3ee207ed2604e9774047d;hb=671c9fafbbf48db2c6ea279d182c6bd9d4961796;hp=3b39842b7d85fcd779470652d6977f832a6fa28f;hpb=316044467afed9ea9df7fb373a0ab1ed2f7a901b;p=anneal.git diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 3b39842..5ba7404 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 { - 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 pointset = new PointSet(); @@ -50,15 +50,14 @@ public class Mesh implements Iterable { public int numedges = 0; public float avgedge = 0; - public void unbind() { + public void rebindPoints() { + // unbind all points for(Mesh.T t : this) { t.v1().unbind(); t.v2().unbind(); t.v3().unbind(); } - } - - public void bind() { + // ask edges to re-implement their bindings for(Mesh.T t : this) { t.e1().dobind(); t.e2().dobind(); @@ -66,6 +65,24 @@ public class Mesh implements Iterable { } } + public void unscore() { + HashSet done = new HashSet(); + for(T t : this) + for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) { + if (done.contains(p)) continue; + done.add(p); + p.unscore(); + } + } + public void recomputeAllFundamentalQuadrics() { + HashSet done = new HashSet(); + for(T t : this) + for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) { + if (done.contains(p)) continue; + done.add(p); + p.recomputeFundamentalQuadric(); + } + } public float rescore() { int num = 0; double dist = 0; @@ -75,6 +92,7 @@ public class Mesh implements Iterable { if (done.contains(p)) continue; done.add(p); p.rescore(); + } return (float)(dist/num); } @@ -98,7 +116,6 @@ public class Mesh implements Iterable { return (float)total; } - public class BindingGroup { public HashSet es = new HashSet(); public BindingGroup() { } @@ -126,75 +143,81 @@ public class Mesh implements Iterable { public Point p; E e; // some edge *leaving* this point + /** the nearest vertex in the "score_against" mesh */ + Vert nearest_in_other_mesh; + /** the number of vertices in the other mesh for which this is the nearest_in_other_mesh */ + int quadric_count; + /** the total error quadric (contributions from all vertices in other mesh for which this is nearest) */ + Matrix quadric = Matrix.ZERO; + 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 Matrix errorQuadric() { return quadric; } public Point getPoint() { return p; } + public float score() { return oldscore; } + + private Matrix fundamentalQuadric = null; + public Matrix fundamentalQuadric() { + if (fundamentalQuadric == null) recomputeFundamentalQuadric(); + return fundamentalQuadric; + } + private Vert(Point p) { this.p = p; - //this.e = e; - //if (e==null) throw new Error(); if (pointset.get(p) != null) throw new Error(); pointset.add(this); } - public float score() { return oldscore; } + + public void recomputeFundamentalQuadric() { + unscore(); + Matrix m = Matrix.ZERO; + E e = this.e; + do { + T t = e.t; + m = m.plus(t.norm().fundamentalQuadric(t.centroid())); + e = e.pair.next; + } while(e != this.e); + fundamentalQuadric = m; + rescore(); + } + public void unscore() { - if (watch == null) return; - watch.watch_x -= p.x; - watch.watch_y -= p.y; - watch.watch_z -= p.z; - watch.watch_count--; - if (watch.watch_count==0) { - watch.watch_x = 0; - watch.watch_y = 0; - watch.watch_z = 0; - } - watch = null; + if (nearest_in_other_mesh == null) return; + if (fundamentalQuadric == null) return; + nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.minus(fundamentalQuadric); + nearest_in_other_mesh.quadric_count--; + if (nearest_in_other_mesh.quadric_count==0) + nearest_in_other_mesh.quadric = Matrix.ZERO; + nearest_in_other_mesh = null; } - public Vert partner() { return watch==null ? this : watch; } - public Point watchback() { return watch_count==0 ? partner().p : - new Point(watch_x/watch_count, watch_y/watch_count, watch_z/watch_count); } + public void rescore() { if (score_against == null) return; score -= oldscore; oldscore = 0; - if (watch != null) unscore(); - Vert po = this; - if (watch == null) { - watch = score_against.nearest(po.p); + if (nearest_in_other_mesh != null) unscore(); + if (nearest_in_other_mesh == null) { + nearest_in_other_mesh = score_against.nearest(p); // don't attract to vertices that face the other way - if (watch.e == null || watch.norm().dot(norm()) < 0) { - watch = null; + if (nearest_in_other_mesh.e == null || nearest_in_other_mesh.norm().dot(norm()) < 0) { + nearest_in_other_mesh = null; } else { - watch.watch_x += po.p.x; - watch.watch_y += po.p.y; - watch.watch_z += po.p.z; - watch.watch_count++; + nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric()); + nearest_in_other_mesh.quadric_count++; } } - double s1, s2; - if (watch_count==0) s1 = 0; - else s1 = p.distance(watch_x/watch_count, watch_y/watch_count, watch_z/watch_count); - s2 = watch==null ? 0 : po.p.distance(watch.p); - oldscore = (float)(s1 + s2); + oldscore = quadric_count == 0 ? 0 : (quadric.preAndPostMultiply(p) / quadric_count); score += oldscore; } /** 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(); @@ -203,36 +226,23 @@ public class Mesh implements Iterable { 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); } rescore(); - boolean good = true; - /* - for(T t : this) { - for(E e = this.e; ;) { - if (e.intersects(t)) { good = false; break; } - e = e.pair.next; - if (e == this.e) break; - } - } - */ - /* - if (t==this.t) continue; - if (this.intersects(t)) good = false; - } - */ - return good; + + // should recompute fundamental quadrics of all vertices sharing a face, but we defer... + // FIXME: intersection test needed? + return true; } + public boolean move(Vec v) { Matrix m = new Matrix(v); Vert p = this; boolean good = true; do { good &= p.transform(m); - v = v.times(binding); // bleh wrong p = p.bound_to; } while (p != this); return good; @@ -270,6 +280,16 @@ public class Mesh implements Iterable { return null; } + public Vec norm() { + Vec norm = new Vec(0, 0, 0); + E e = this.e; + do { + if (e.t != null) norm = norm.plus(e.t.norm().times((float)e.prev.angle())); + e = e.pair.next; + } while(e != this.e); + return norm.norm(); + } + public boolean isBoundTo(Vert p) { Vert px = p; do { @@ -278,7 +298,6 @@ public class Mesh implements Iterable { } 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 bind(Vert p, Matrix binding) { @@ -290,15 +309,6 @@ public class Mesh implements Iterable { this.bound_to = temp_bound_to; this.binding = temp_binding.times(temp_binding); // FIXME: may have order wrong here } - public Vec norm() { - Vec norm = new Vec(0, 0, 0); - E e = this.e; - do { - if (e.t != null) norm = norm.plus(e.t.norm().times((float)e.prev.angle())); - e = e.pair.next; - } while(e != this.e); - return norm.norm(); - } } /** [UNIQUE] an edge */ @@ -310,6 +320,7 @@ public class Mesh implements Iterable { 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; } @@ -325,7 +336,6 @@ public class Mesh implements Iterable { } } - boolean shattered = false; public Point shatter() { return shatter(midpoint(), null, null); } public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) { if (shattered) return mid;