X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=55052b9e86654b945b222a6b4c7418e635879d8e;hp=94b4e73c68863adee3ca9b128d87333a800fb981;hb=96343836d53ebbd1ada9d7daafdbdb1326fc0349;hpb=162b76f92f5adaf80b312bee2a6bcd5b7ba2eabd diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 94b4e73..55052b9 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -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,7 +65,25 @@ public class Mesh implements Iterable { } } - public float rescore() { + public void unApplyQuadricToNeighborAll() { + 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.unApplyQuadricToNeighbor(); + } + } + 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 applyQuadricToNeighborAll() { int num = 0; double dist = 0; HashSet done = new HashSet(); @@ -74,7 +91,8 @@ public class Mesh implements Iterable { for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) { if (done.contains(p)) continue; done.add(p); - p.rescore(); + p.applyQuadricToNeighbor(); + } return (float)(dist/num); } @@ -125,72 +143,90 @@ 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; if (pointset.get(p) != null) throw new Error(); pointset.add(this); } - public float score() { return oldscore; } - 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; + + public void recomputeFundamentalQuadric() { + unApplyQuadricToNeighbor(); + 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; + applyQuadricToNeighbor(); + } + + public void unApplyQuadricToNeighbor() { + if (nearest_in_other_mesh == null) return; + if (fundamentalQuadric == null) return; + nearest_in_other_mesh.unsc(); + 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.resc(); + 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; + public void unsc() { score -= oldscore; oldscore = 0; + } + public void applyQuadricToNeighbor() { + if (score_against == null) return; - if (watch != null) unscore(); - Vert po = this; - if (watch == null) { - watch = score_against.nearest(po.p); + if (nearest_in_other_mesh != null) unApplyQuadricToNeighbor(); + 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.unsc(); + nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric()); + nearest_in_other_mesh.quadric_count++; + nearest_in_other_mesh.resc(); } } - - 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); + unsc(); + resc(); + } + public void resc() { + oldscore = quadric_count == 0 ? 0 : (quadric.preAndPostMultiply(p) / quadric_count); score += oldscore; } /** does NOT update bound pairs! */ public boolean transform(Matrix m) { - unscore(); + unApplyQuadricToNeighbor(); try { if (pointset.get(this.p)==null) throw new Error(); pointset.remove(this); @@ -202,31 +238,19 @@ public class Mesh implements Iterable { } 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; + applyQuadricToNeighbor(); + + // 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; @@ -264,6 +288,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 { @@ -272,7 +306,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) { @@ -284,15 +317,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 */