X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=64724a62a50b1a1d787dd82c6e42f16f51332bf6;hp=d5e0db2f0612205585a3f7131628f5e20fa61eff;hb=33fcd7732290bcd1c7108ba9388af173fd139ee2;hpb=468b086402bb0ccae7ce4dda8b009d61bfc37a71 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index d5e0db2..64724a6 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -45,6 +45,7 @@ public class Mesh implements Iterable { t.e2().dobind(); t.e3().dobind(); } + System.out.println("rebound!"); } public void transform(Matrix m) { @@ -161,12 +162,18 @@ public class Mesh implements Iterable { public boolean move(Matrix m, boolean ignoreProblems) { boolean good = true; - for(Vertex p : (Iterable)getBoundPeers()) - good &= p.transform(m.times(p.p), ignoreProblems); + // t1' = M * t1 + // t2' = t2.getMatrix(t1) * t1' + // t2' = t2.getMatrix(t1) * M * t1 + // t1 = t1.getMatrix(t2) * t2 + // M * t1 = M * t1.getMatrix(t2) * t2 + for(Vertex v : (Iterable)getBoundPeers()) + good &= v.transform(v.getBindingMatrix(this).times(m).times(this.p), + ignoreProblems); - for(Vertex p : (Iterable)getBoundPeers()) - if (good || ignoreProblems) p.reComputeErrorAround(); - else p.transform(p.oldp, true); + for(Vertex v : (Iterable)getBoundPeers()) + if (good || ignoreProblems) v.reComputeErrorAround(); + else v.transform(v.oldp, true); return good; } @@ -281,7 +288,7 @@ public class Mesh implements Iterable { e.bind_to = bind_others; for (E epeer : e_bind_peers.set) add(epeer); for (E eother : e_bind_to.set) bind_others.add(eother); - + /* for(E eother : bind_others.set) { if (e.next.bind_to.set.contains(eother.prev)) { e.next.next.bindEdge(eother.prev.prev); @@ -290,7 +297,7 @@ public class Mesh implements Iterable { e.prev.prev.bindEdge(eother.next.next); } } - + */ } public void dobind(E e) { for(E ebound : set) { @@ -298,11 +305,6 @@ public class Mesh implements Iterable { e.p2.bindTo(Matrix.ONE, ebound.p1); } } - public void shatter(BindingGroup bg1, BindingGroup bg2, boolean triangles) { - for(E e : set) { - e.shatter(e.midpoint(), bg1, bg2, triangles); - } - } } /** [UNIQUE] an edge */ @@ -320,13 +322,20 @@ public class Mesh implements Iterable { public boolean intersects(T t) { return t.intersects(p1.p, p2.p); } public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) { - edu.berkeley.qfat.geom.BindingGroup newBindingGroup = (edu.berkeley.qfat.geom.BindingGroup)newBindingGroup_; + + edu.berkeley.qfat.geom.BindingGroup newBindingGroup = + (edu.berkeley.qfat.geom.BindingGroup)newBindingGroup_; if (newBindingGroup==null) return; if (this==newBindingGroup.getMaster()) return; for(E eother : (Iterable)newBindingGroup) { - this.next.bindTo(newBindingGroup.getMatrix(eother), eother.next); - this.prev.bindTo(newBindingGroup.getMatrix(eother), eother.prev); + if (next==null || prev==null) continue; + if (eother.next==null || eother.prev==null) continue; + if (next.isBoundTo(eother.pair.prev.pair) && !prev.isBoundTo(eother.pair.next.pair)) + prev.bindTo(next.getBindingMatrix(eother.pair.prev.pair), eother.pair.next.pair); + if (!next.isBoundTo(eother.pair.prev.pair) && prev.isBoundTo(eother.pair.next.pair)) + next.bindTo(prev.getBindingMatrix(eother.pair.next.pair), eother.pair.prev.pair); } + } public float stretchRatio() { @@ -344,43 +353,86 @@ public class Mesh implements Iterable { public int compareTo(E e) { return e.comparator() > comparator() ? 1 : -1; } - public void bindEdge(E e) { bind_to.add(e); } - public void dobind() { bind_to.dobind(this); } + public void bindEdge(E e, Matrix m) { + _bindEdge(e, m); + pair._bindEdge(e.pair, m); + } + public void _bindEdge(E e, Matrix m) { + //bind_to.add(e); - public Point shatter() { return shatter(true); } - public Point shatter(boolean triangles) { return shatter(midpoint(), null, null, triangles); } - public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean triangles) { - return shatter(mid, bg1, bg2, triangles, false); + e = e.pair; + /* + //assumes edges are identical length at binding time + Vec reflectionPlaneNormal = e.p2.p.minus(e.p1.p).norm(); + float a = reflectionPlaneNormal.x; + float b = reflectionPlaneNormal.y; + float c = reflectionPlaneNormal.z; + Matrix reflectionMatrix = + new Matrix( 1-2*a*a, -2*a*b, -2*a*c, 0, + -2*a*b, 1-2*b*b, -2*b*c, 0, + -2*a*c, -2*b*c, 1-2*c*c, 0, + 0, 0, 0, 1); + m = m.times(Matrix.translate(e.midpoint().minus(Point.ORIGIN)) + .times(reflectionMatrix) + .times(Matrix.translate(Point.ORIGIN.minus(e.midpoint())))); + System.out.println(reflectionPlaneNormal); + System.out.println(" " + p1.p + " " + m.times(e.p1.p)); + System.out.println(" " + p2.p + " " + m.times(e.p2.p)); + */ + if (m.times(e.p1.p).minus(p1.p).mag() > EPSILON) throw new Error(); + if (m.times(e.p2.p).minus(p2.p).mag() > EPSILON) throw new Error(); + this.bindTo(m, e); + } + + public void dobind() { + //bind_to.dobind(this); + for(E e : (Iterable)getBoundPeers()) { + if (e==this) continue; + p1.bindTo(getBindingMatrix(e), e.p1); + p2.bindTo(getBindingMatrix(e), e.p2); + } } - public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean triangles, boolean leader) { - if (shattered || destroyed) return mid; - shattered = true; - Vertex r = next.p2; - E next = this.next; - E prev = this.prev; - - int old_colorclass = t==null ? 0 : t.colorclass; - if (bg1==null) bg1 = new BindingGroup(); - if (bg2==null) bg2 = new BindingGroup(); - BindingGroup old_bind_to = bind_to; - bind_peers.shatter(bg1, bg2, triangles); - old_bind_to.shatter(bg2.other(), bg1.other(), triangles); - if (!triangles) { - next.shatter(false); - prev.shatter(false); + public Point shatter() { + if (shattered || destroyed) return null; + shattered = true; + E first = null; + E firste = null; + E firstx = null; + E firstq = null; + for(E e : (Iterable)getBoundPeers()) { + E enext = e.next; + E eprev = e.prev; + E pnext = e.pair.next; + E pprev = e.pair.prev; + Point mid = e.midpoint(); + Vertex r = e.next.p2; + Vertex l = e.pair.next.p2; + e.destroy(); + e.pair.destroy(); + newT(r.p, e.p1.p, mid, null, 0); + newT(r.p, mid, e.p2.p, null, 0); + newT(l.p, mid, e.p1.p, null, 0); + newT(l.p, e.p2.p, mid, null, 0); + /* + */ } - pair.shatter(); - destroy(); - - if (triangles) { - newT(r.p, p1.p, mid, null, old_colorclass); - newT(r.p, mid, p2.p, null, old_colorclass); - bg1.add(p1.getE(mid)); - bg2.add(p2.getE(mid).pair); - if (leader) p1.getE(mid).shatter(); + for(E e : (Iterable)getBoundPeers()) { + Point mid = e.midpoint(); + if (first==null) { + first = e.p1.getE(mid); + firste = e; + firstx = e.pair; + firstq = e.p2.getE(mid).pair; + continue; + } + e.p1.getE(mid). bindTo(e.getBindingMatrix(firste), first); + e.p1.getE(mid).pair. bindTo(e.getBindingMatrix(firste), first.pair); + e.p2.getE(mid).pair. bindTo(e.getBindingMatrix(firste), firstq); + e.p2.getE(mid).pair.pair.bindTo(e.getBindingMatrix(firste), firstq.pair); + //e.p1.getE(mid).pair.prev.bindTo(e.pair.getBindingMatrix(firstx), first.pair.prev); } - return mid; + return null; } public boolean destroyed = false; @@ -599,12 +651,9 @@ public class Mesh implements Iterable { public void reinsert() { triangles.remove(this); triangles.add(this); } public boolean shouldBeDrawn() { - if (e1().bind_to==null) return false; - if (e2().bind_to==null) return false; - if (e3().bind_to==null) return false; - if (e1().bind_to.set.size() == 0) return false; - if (e2().bind_to.set.size() == 0) return false; - if (e3().bind_to.set.size() == 0) return false; + if (e1().bindingGroupSize() <= 1) return false; + if (e2().bindingGroupSize() <= 1) return false; + if (e3().bindingGroupSize() <= 1) return false; return true; }