}
}
- public void unscoreAll() {
+ public void unApplyQuadricToNeighborAll() {
HashSet<Vert> done = new HashSet<Vert>();
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();
+ p.unApplyQuadricToNeighbor();
}
}
public void recomputeAllFundamentalQuadrics() {
p.recomputeFundamentalQuadric();
}
}
- public float rescoreAll() {
+ public float applyQuadricToNeighborAll() {
int num = 0;
double dist = 0;
HashSet<Vert> done = new HashSet<Vert>();
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);
return (float)total;
}
- public class BindingGroup {
- public HashSet<E> es = new HashSet<E>();
- 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); }
Vert bound_to = this;
Matrix binding = new Matrix();
float oldscore = 0;
+ boolean quadricStale = false;
public Matrix errorQuadric() { return quadric; }
public Point getPoint() { return p; }
}
public void recomputeFundamentalQuadric() {
- unscore();
+ if (!quadricStale && fundamentalQuadric != null) return;
+ quadricStale = false;
+ unApplyQuadricToNeighbor();
Matrix m = Matrix.ZERO;
E e = this.e;
do {
e = e.pair.next;
} while(e != this.e);
fundamentalQuadric = m;
- rescore();
+ applyQuadricToNeighbor();
}
- public void unscore() {
+ public void unApplyQuadricToNeighbor() {
if (nearest_in_other_mesh == null) return;
if (fundamentalQuadric == null) return;
+ nearest_in_other_mesh.unComputeError();
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.computeError();
nearest_in_other_mesh = null;
}
- public void unsc() {
- score -= oldscore;
- oldscore = 0;
- }
- public void rescore() {
+ public void applyQuadricToNeighbor() {
if (score_against == null) return;
- unsc();
+ 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) unscore();
- if (nearest_in_other_mesh == null) {
- nearest_in_other_mesh = score_against.nearest(p);
+ if (nearest_in_other_mesh != null) unApplyQuadricToNeighbor();
+ if (nearest_in_other_mesh != null) throw new Error();
- // 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.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric());
- nearest_in_other_mesh.quadric_count++;
- }
+ 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();
+ }
- resc();
+ public void reComputeError() {
+ unComputeError();
+ computeError();
}
- public void resc() {
+ public void unComputeError() {
+ score -= oldscore;
+ oldscore = 0;
+ }
+ public void computeError() {
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);
} catch (Exception e) {
throw new RuntimeException(e);
}
- rescore();
+ 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;
}
}
}
+ public class BindingGroup {
+ private HashSet<E> left = new HashSet<E>();
+ private HashSet<E> right = new HashSet<E>();
+ 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<E> {
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) {
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;
}
projects / anneal.git / blobdiff