X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=0e594614a70001e35662711562e07c97e1acb188;hp=f4f08379e416237ada40723150c1d6a9ab89e384;hb=9e6eb545b0735cf21d6804bc68bb16c58fc0da61;hpb=3685f1880f7505a26574d02102aafcef11b0686e diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index f4f0837..0e59461 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -116,25 +116,6 @@ 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(); } @@ -337,6 +318,71 @@ public class Mesh implements Iterable { } } + public class BindingGroup { + private HashSet left = new HashSet(); + private HashSet right = new HashSet(); + public BindingGroup() { } + public BindingGroup(E e) { add(null, e, false); } + public void add(E ethis, E e, boolean swap) { + if (ethis==null) { } + else if (right.contains(ethis)) swap = !swap; + else if (!left.contains(ethis)) throw new Error(); + + if (e.bg != null) { + if (e.bg == this) { + if ((!swap ? right : left).contains(e)) throw new Error("double bind!"); + 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; + } + for(E ex : (!swap ? right : left)) { + if (e.prev.isBoundTo(ex.prev)) { + System.out.println("hit!"); + } + } + } + public boolean isBoundTo(E e1, E e2) { + if (left.contains(e1) && right.contains(e2)) return true; + if (left.contains(e2) && right.contains(e1)) return true; + return false; + } + public void dobind(E e) { + 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, false); + } + for(E e : right) { + e.shatter(e.midpoint(), bg1, bg2, true); // swap correct? + } + } + } + /** [UNIQUE] an edge */ public final class E implements Comparable { @@ -348,22 +394,15 @@ public class Mesh implements Iterable { public BindingGroup bg = new BindingGroup(this); boolean shattered = false; - public int compareTo(E e) { return e.length() > length() ? 1 : -1; } + public boolean isBoundTo(E e) { return bg.isBoundTo(this, e); } - 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 int compareTo(E e) { return e.length() > length() ? 1 : -1; } + public void bindEdge(E e) { bg.add(this, e, true); } + 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) { + public Point shatter() { return shatter(midpoint(), null, null, false); } + public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean swap) { if (shattered) return mid; shattered = true; @@ -373,14 +412,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); + (swap ? bg1 : bg2).add(null, p1.getE(mid), swap); + (swap ? bg2 : bg1).add(null, p2.getE(mid).pair, swap); return mid; }