X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=b25d1b73dcb5847c4498c69510058bf78f1d8690;hp=374f01299432928f43c83ee029d9f54854457816;hb=43e3ce680ac8b6d621bb59c0eed326d87e728a61;hpb=1cb56f053dc0a26302e777b2f82aa043ee780950 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 374f012..b25d1b7 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(); @@ -66,6 +66,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 fundamental() { + 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 +93,7 @@ public class Mesh implements Iterable { if (done.contains(p)) continue; done.add(p); p.rescore(); + } return (float)(dist/num); } @@ -126,15 +145,26 @@ public class Mesh implements Iterable { 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; + + /** 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; + Matrix binding = new Matrix(); float oldscore = 0; boolean inserted = false; + public Matrix errorQuadric() { return quadric; } + + private Matrix fundamentalQuadric = null; + public Matrix fundamentalQuadric() { + if (fundamentalQuadric == null) recomputeFundamentalQuadric(); + return fundamentalQuadric; + } + public Point getPoint() { return p; } private Vert(Point p) { this.p = p; @@ -142,49 +172,58 @@ public class Mesh implements Iterable { 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); + if (quadric_count==0) s1 = 0; + else s1 = p.distance(quadric_x/quadric_count, quadric_y/quadric_count, quadric_z/quadric_count); + s2 = quadric==null ? 0 : po.p.distance(quadric.p); oldscore = (float)(s1 + s2); + */ + oldscore = quadric_count == 0 ? 0 : (quadric.preAndPostMultiply(p) / quadric_count); + score += oldscore; } @@ -198,12 +237,22 @@ 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); } + fundamentalQuadric = fundamentalQuadric(); rescore(); + + // recompute fundamental quadrics of all vertices sharing a face + /* + E e = this.e; + do { + e.p2.recomputeFundamentalQuadric(); + e = e.pair.next; + } while(e != this.e); + */ + boolean good = true; /* for(T t : this) { @@ -305,6 +354,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; } @@ -320,7 +370,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;