X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=8a697dc1ec39f6c9d47d4b7bb6d8b57395c01fa1;hp=74ccd4bc8e828b45631881ed5ce5d54ba1043158;hb=982c27e513b15799973ab26d5dc143aa4606800a;hpb=1229f4eaa0337691b51ecd3e0baebddc2644f2c3 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 74ccd4b..8a697dc 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -116,25 +116,7 @@ public class Mesh implements Iterable { return (float)total; } - public class BindingGroup { - public HashSet es = new HashSet(); - public BindingGroup() { } - public BindingGroup(E e) { - es.add(e); - } - public void add(E e) { - if (e.bg != null) { merge(e.bg); return; } - es.add(e); - e.bg = this; - } - public void merge(BindingGroup bg) { - for(E e : bg.es) { - e.bg = null; - add(e); - } - } - } - + public void rebuildPointSet() { pointset.rebuild(); } public Vec diagonal() { return pointset.diagonal(); } public Point centroid() { return pointset.centroid(); } public Vert nearest(Point p) { return pointset.nearest(p); } @@ -153,6 +135,7 @@ public class Mesh implements Iterable { Vert bound_to = this; Matrix binding = new Matrix(); float oldscore = 0; + boolean quadricStale = false; public Matrix errorQuadric() { return quadric; } public Point getPoint() { return p; } @@ -171,6 +154,8 @@ public class Mesh implements Iterable { } public void recomputeFundamentalQuadric() { + if (!quadricStale && fundamentalQuadric != null) return; + quadricStale = false; unApplyQuadricToNeighbor(); Matrix m = Matrix.ZERO; E e = this.e; @@ -198,19 +183,22 @@ public class Mesh implements Iterable { public void applyQuadricToNeighbor() { if (score_against == null) return; + Vert new_nearest = score_against.nearest(p); + if (nearest_in_other_mesh != null && new_nearest == nearest_in_other_mesh) return; + 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 (nearest_in_other_mesh.e == null || nearest_in_other_mesh.norm().dot(norm()) < 0) { - nearest_in_other_mesh = null; - } else { - nearest_in_other_mesh.unComputeError(); - nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric()); - nearest_in_other_mesh.quadric_count++; - nearest_in_other_mesh.computeError(); - } + if (nearest_in_other_mesh != null) throw new Error(); + + nearest_in_other_mesh = new_nearest; + + // don't attract to vertices that face the other way + if (nearest_in_other_mesh.e == null || nearest_in_other_mesh.norm().dot(norm()) < 0) { + nearest_in_other_mesh = null; + } else { + nearest_in_other_mesh.unComputeError(); + nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric()); + nearest_in_other_mesh.quadric_count++; + nearest_in_other_mesh.computeError(); } reComputeError(); } @@ -245,6 +233,13 @@ public class Mesh implements Iterable { applyQuadricToNeighbor(); // should recompute fundamental quadrics of all vertices sharing a face, but we defer... + E e = this.e; + do { + e.p2.quadricStale = true; + e = e.pair.next; + } while(e != this.e); + + // FIXME: intersection test needed? return true; } @@ -323,6 +318,56 @@ public class Mesh implements Iterable { } } + public class BindingGroup { + private HashSet left = new HashSet(); + private HashSet right = new HashSet(); + public BindingGroup() { } + public BindingGroup(E e) { + left.add(e); + } + public void add(E e, boolean swap) { + if (e.bg != null) { + if (e.bg == this) return; + for(E ex : (!swap ? e.bg.left : e.bg.right)) { + ex.bg = this; + left.add(ex); + } + for(E ex : (!swap ? e.bg.right : e.bg.left)) { + ex.bg = this; + right.add(ex); + } + } else { + (!swap ? left : right).add(e); + e.bg = this; + } + } + public void dobind(E e) { + // assumes e is part of the "left" set + Vert v1 = null; + Vert v2 = null; + if (left.contains(e)) { v1 = e.p1; v2 = e.p2; } + if (right.contains(e)) { v1 = e.p2; v2 = e.p1; } + for(E ex : left) { + if (ex==e) continue; + v1.bind(ex.p1); + v2.bind(ex.p2); + } + for(E ex : right) { + if (ex==e) continue; + v1.bind(ex.p2); + v2.bind(ex.p1); + } + } + public void shatter(BindingGroup bg1, BindingGroup bg2) { + for(E e : left) { + e.shatter(e.midpoint(), bg1, bg2); + } + for(E e : right) { + e.shatter(e.midpoint(), bg2, bg1); /* swap correct? */ + } + } + } + /** [UNIQUE] an edge */ public final class E implements Comparable { @@ -336,17 +381,10 @@ public class Mesh implements Iterable { public int compareTo(E e) { return e.length() > length() ? 1 : -1; } - public void bind(E e) { bind(e, new Matrix()); } - public void bind(E e, Matrix m) { e.bg.add(this); } - - public void dobind() { - if (bg==null) return; - for(E ex : bg.es) { - if (ex==this) continue; - p1.bind(ex.p1); - p2.bind(ex.p2); - } + public void bindEdge(E e) { + bg.add(e.pair, false); } + public void dobind() { if (bg != null) bg.dobind(this); } public Point shatter() { return shatter(midpoint(), null, null); } public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) { @@ -359,14 +397,14 @@ public class Mesh implements Iterable { if (bg1==null) bg1 = new BindingGroup(); if (bg2==null) bg2 = new BindingGroup(); - for(E e : bg.es) e.shatter(e.midpoint(), bg1, bg2); + bg.shatter(bg1, bg2); pair.shatter(); destroy(); newT(r.p, p1.p, mid, null); newT(r.p, mid, p2.p, null); - bg1.add(p1.getE(mid)); - bg2.add(p2.getE(mid).pair); + bg1.add(p1.getE(mid), false); + bg2.add(p2.getE(mid).pair, false); return mid; }