X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=60aa9aba531a63fa35d43e29595939006140fe89;hp=02f589ed6f42a5b140a33dc7b3fe060d11754f19;hb=2b09dab499516873839b9bdbc972c980829e9bac;hpb=4561a5ff23ca77f6deb217d3cff6253057735d30 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 02f589e..60aa9ab 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -6,6 +6,7 @@ import javax.swing.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; import edu.berkeley.qfat.geom.*; +import edu.berkeley.qfat.geom.HasBindingGroup; import edu.wlu.cs.levy.CG.KDTree; import edu.berkeley.qfat.geom.Point; import com.infomatiq.jsi.IntProcedure; @@ -44,6 +45,7 @@ public class Mesh implements Iterable { t.e2().dobind(); t.e3().dobind(); } + System.out.println("rebound!"); } public void transform(Matrix m) { @@ -78,8 +80,6 @@ public class Mesh implements Iterable { public Point p, oldp, goodp; E e; // some edge *leaving* this point - Matrix binding = Matrix.ONE; - Vertex bound_to = this; private boolean illegal = false; public Point getPoint() { return p; } @@ -161,11 +161,20 @@ public class Mesh implements Iterable { public boolean move(Matrix m, boolean ignoreProblems) { boolean good = true; - for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to) - good &= p.transform(m.times(p.p), ignoreProblems); - for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to) - if (good || ignoreProblems) p.reComputeErrorAround(); - else p.transform(p.oldp, true); + + // 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 v : (Iterable)getBoundPeers()) + if (good || ignoreProblems) v.reComputeErrorAround(); + else v.transform(v.oldp, true); + return good; } @@ -260,24 +269,7 @@ public class Mesh implements Iterable { return norm.norm(); } - public boolean isBoundTo(Vertex p) { - for(Vertex px = p; px!=null; px=(px.bound_to==p?null:px.bound_to)) - if (px==this) - return true; - return false; - } - - public void unbind() { bound_to = this; binding = Matrix.ONE; } - public void bind(Vertex p) { bind(p, Matrix.ONE); } - public void bind(Vertex p, Matrix binding) { - if (isBoundTo(p)) return; - Vertex temp_bound_to = p.bound_to; - Matrix temp_binding = p.binding; - p.bound_to = this.bound_to; - p.binding = binding.times(this.binding); // FIXME: may have order wrong here - this.bound_to = temp_bound_to; - this.binding = temp_binding.times(temp_binding); // FIXME: may have order wrong here - } + public void bindTo(Vertex p) { bindTo(Matrix.ONE, p); } } public class BindingGroup { @@ -296,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); @@ -305,23 +297,23 @@ public class Mesh implements Iterable { e.prev.prev.bindEdge(eother.next.next); } } - + */ } public void dobind(E e) { for(E ebound : set) { - e.p1.bind(ebound.p2); - e.p2.bind(ebound.p1); + e.p1.bindTo(Matrix.ONE, ebound.p2); + e.p2.bindTo(Matrix.ONE, ebound.p1); } } - public void shatter(BindingGroup bg1, BindingGroup bg2) { + public void shatter(BindingGroup bg1, BindingGroup bg2, boolean triangles) { for(E e : set) { - e.shatter(e.midpoint(), bg1, bg2); + e.shatter(e.midpoint(), bg1, bg2, triangles); } } } /** [UNIQUE] an edge */ - public final class E implements Comparable { + public final class E extends HasBindingGroup implements Comparable { public final Vertex p1, p2; T t; // triangle to our "left" @@ -334,6 +326,19 @@ 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_; + 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); + } + */ + } + public float stretchRatio() { Vertex nearest = error_against.nearest(midpoint()); float nearest_distance = midpoint().distance(nearest.p); @@ -343,19 +348,54 @@ public class Mesh implements Iterable { return nearest_distance/other_distance; } public float comparator() { - - return length(); //return t==null?0:(1/t.aspect()); } 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) { + //bind_to.add(e); + + //assumes edges are identical length at binding time + e = e.pair; + 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() { return shatter(midpoint(), null, null); } - public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) { + 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); + } + public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean triangles, boolean leader) { if (shattered || destroyed) return mid; shattered = true; @@ -367,15 +407,22 @@ public class Mesh implements Iterable { if (bg1==null) bg1 = new BindingGroup(); if (bg2==null) bg2 = new BindingGroup(); BindingGroup old_bind_to = bind_to; - bind_peers.shatter(bg1, bg2); - old_bind_to.shatter(bg2.other(), bg1.other()); + bind_peers.shatter(bg1, bg2, triangles); + old_bind_to.shatter(bg2.other(), bg1.other(), triangles); + if (!triangles) { + next.shatter(false); + prev.shatter(false); + } pair.shatter(); destroy(); - 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 (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(); + } return mid; } @@ -595,9 +642,14 @@ 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; + */ return true; }