X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=57eda26d738feffcd6ed84b123aa8c7dc2edd40a;hp=b6ff38648ef5bda290303e2a30a8568b7df691d3;hb=30607e6bf4827d90fc055c8db1e7f363ef2693e6;hpb=e6ede2b794c97801f3890af9ea634e67012420ef diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index b6ff386..57eda26 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -51,7 +51,8 @@ public class Mesh implements Iterable { public void transform(Matrix m) { ArrayList set = new ArrayList(); for(Vertex v : vertices) set.add(v); - for(Vertex v : set) v.transform(m.times(v.p), true); + for(Vertex v : set) v.transform(m.times(v.p), true, null); + for(Vertex v : set) v.goodp = v.p; } public void rebuild() { /*vertices.rebuild();*/ } @@ -77,7 +78,8 @@ public class Mesh implements Iterable { /** a vertex in the mesh */ public final class Vertex extends HasQuadric implements Visitor { - public Point p, oldp, goodp; + public Point p, goodp; + public Point oldp; E e; // some edge *leaving* this point private boolean illegal = false; @@ -88,6 +90,7 @@ public class Mesh implements Iterable { private Vertex(Point p) { this.p = p; this.goodp = p; + this.oldp = p; if (vertices.get(p) != null) throw new Error(); vertices.add(this); } @@ -144,11 +147,17 @@ public class Mesh implements Iterable { if (quadric_count != 0) nerror = (nerror + quadric.preAndPostMultiply(p))/(quadric_count+1); + if (!immutableVertices && quadric_count == 0) + nerror *= 2; + //System.out.println(nerror); for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { - double ang = Math.abs(e.dihedralAngle()); + double ang = e.dihedralAngle(); if (ang > Math.PI) throw new Error(); - float minangle = (float)(Math.PI * 0.8); - if (ang > minangle) nerror += (ang - minangle); + if (ang < -Math.PI) throw new Error(); + //float minangle = (float)(Math.PI * 0.8); + nerror += ((ang / Math.PI)*(ang/Math.PI)) * e.length() * 0.05; + //System.out.println(((ang / Math.PI)*(ang/Math.PI)) * 0.000001); + //if (ang > minangle) nerror += (ang - minangle); /* if (e.t.aspect() < 0.2) { nerror += (0.2-e.t.aspect()) * 10; @@ -167,33 +176,76 @@ public class Mesh implements Iterable { // 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); + if (bindingGroup!=null && this != bindingGroup.getMaster()) { + Matrix v = getBindingMatrix(bindingGroup.getMaster()); + return ((Vertex)bindingGroup.getMaster()).move(v.inverse().times(m).times(v), ignoreProblems); + } + + if (bindingGroup != null) { + Matrix m2 = null; + for(int i=0; i<20 && !m.equals(m2); i++) { + m2 = m.times(getConstraint()); + //System.out.println(m.minus(m2)); + } + if (!m.equals(m2)) return true; + } + Point op = this.p; + Point pt = m.times(this.p); + for(Vertex v : (Iterable)getBoundPeers()) { + Point pt2 = v.getBindingMatrix(this).times(pt); + /* + if (Math.abs( v.p.minus(pt2).mag() / pt.minus(op).mag() ) > 5) + throw new Error(v.p+" "+pt2+"\n"+op+" "+pt+"\n"+v.getBindingMatrix(this)); + if (Math.abs( v.p.minus(pt2).mag() / pt.minus(op).mag() ) < 1/5) throw new Error(); + */ + good &= v.transform(pt2, ignoreProblems, v.getBindingMatrix(this)); + } + + if (!good && !ignoreProblems) { + for(Vertex v : (Iterable)getBoundPeers()) + v.transform(v.oldp, true, null); + } + + for(Vertex v : (Iterable)getBoundPeers()) + v.recomputeFundamentalQuadricIfNeighborChanged(); + for(Vertex v : (Iterable)getBoundPeers()) + v.reComputeErrorAround(); return good; } /** does NOT update bound pairs! */ - private boolean transform(Point newp, boolean ignoreProblems) { + private boolean transform(Point newp, boolean ignoreProblems, Matrix yes) { this.oldp = this.p; if (immutableVertices) throw new Error(); unApplyQuadricToNeighbor(); + + + boolean illegalbefore = illegal; + illegal = false; + /* + if (this.p.minus(newp).mag() > 0.1 && !ignoreProblems) { + try { + throw new Exception(""+this.p.minus(newp).mag()+" "+ignoreProblems+" "+yes); + } catch(Exception e) { + e.printStackTrace(); + } + illegal = true; + } + */ + this.p = newp; reinsert(); applyQuadricToNeighbor(); if (!ignoreProblems) { - illegal = false; checkLegality(); } - for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) e.p2.quadricStale = true; - return !illegal; + for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) + e.p2.quadricStale = true; + return !illegal || (illegalbefore && illegal); } public void checkLegality() { @@ -201,7 +253,7 @@ public class Mesh implements Iterable { for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { if (Math.abs(e.dihedralAngle()) > (Math.PI * 0.9) || Math.abs(e.next.dihedralAngle()) > (Math.PI * 0.9)) illegal = true; - if (e.t.aspect() < 0.1) illegal = true; + if (e.t.aspect() < 0.2) illegal = true; } */ if (!illegal) triangles.range(oldp, this.p, (Visitor)this); @@ -272,45 +324,6 @@ public class Mesh implements Iterable { public void bindTo(Vertex p) { bindTo(Matrix.ONE, p); } } - public class BindingGroup { - private HashSet set = new HashSet(); - public BindingGroup bind_others; - public BindingGroup other() { return bind_others; } - public BindingGroup(BindingGroup bind_others) { this.bind_others = bind_others; } - public BindingGroup() { this.bind_others = new BindingGroup(this); } - public BindingGroup(E e) { this(); set.add(e); } - public void add(E e) { - if (set.contains(e)) return; - set.add(e); - BindingGroup e_bind_peers = e.bind_peers; - BindingGroup e_bind_to = e.bind_to; - e.bind_peers = this; - 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); - } - if (e.prev.bind_to.set.contains(eother.next)) { - e.prev.prev.bindEdge(eother.next.next); - } - } - */ - } - public void dobind(E e) { - for(E ebound : set) { - e.p1.bindTo(Matrix.ONE, ebound.p2); - 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 */ public final class E extends HasBindingGroup implements Comparable { @@ -320,23 +333,33 @@ public class Mesh implements Iterable { E prev; // previous half-edge E next; // next half-edge E pair; // partner half-edge - public BindingGroup bind_peers = new BindingGroup(this); - public BindingGroup bind_to = bind_peers.other(); boolean shattered = false; 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); + HashSet nbg = new HashSet(); + for(E eother : (Iterable)newBindingGroup) nbg.add(eother); + for(E eother : nbg) { + 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); + + if (next.isBoundTo(eother.next) && !prev.isBoundTo(eother.prev)) + prev.bindTo(next.getBindingMatrix(eother.next), eother.prev); + if (!next.isBoundTo(eother.next) && prev.isBoundTo(eother.prev)) + next.bindTo(prev.getBindingMatrix(eother.prev), eother.next); } - */ + } public float stretchRatio() { @@ -359,8 +382,6 @@ public class Mesh implements Iterable { pair._bindEdge(e.pair, m); } public void _bindEdge(E e, Matrix m) { - //bind_to.add(e); - e = e.pair; /* //assumes edges are identical length at binding time @@ -386,48 +407,58 @@ public class Mesh implements Iterable { } 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); + e.p1.setConstraint(getConstraint()); + e.p2.setConstraint(getConstraint()); } } - 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; + public Point shatter() { + if (shattered || destroyed) return null; 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); + 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; + if (!e.destroyed) { + 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); } - return mid; + /* + first.setConstraint(firste.getConstraint()); + firstq.setConstraint(firste.getConstraint()); + */ + return null; } public boolean destroyed = false; @@ -452,10 +483,6 @@ public class Mesh implements Iterable { pair.next.t = null; pair.prev.t = null; - this.bind_to = null; - pair.bind_to = null; - this.bind_peers = null; - pair.bind_peers = null; pair.prev.next = next; next.prev = pair.prev; prev.next = pair.next; @@ -468,7 +495,6 @@ public class Mesh implements Iterable { this.prev.next = this; this.next.prev = this; this.pair.pair = this; - bind_peers.add(this); if (this.next.p1 != p2) throw new Error(); if (this.prev.p2 != p1) throw new Error(); if (this.p1.e == null) this.p1.e = this; @@ -481,7 +507,12 @@ public class Mesh implements Iterable { public double dihedralAngle() { Vec v1 = t.norm().times(-1); Vec v2 = pair.t.norm().times(-1); - return Math.acos(v1.norm().dot(v2.norm())); + double prod = v1.norm().dot(v2.norm()); + prod = Math.min(1,prod); + prod = Math.max(-1,prod); + double ret = Math.acos(prod); + if (Double.isNaN(ret)) throw new Error("nan! " + prod); + return ret; } /** angle between this half-edge and the next */ @@ -494,7 +525,7 @@ public class Mesh implements Iterable { public void makeAdjacent(E e) { if (this.next == e) return; if (p2 != e.p1) throw new Error("cannot make adjacent -- no shared vertex"); - if (t != null || e.t != null) throw new Error("cannot make adjacent -- edges not both free"); + if (t != null || e.t != null) throw new Error("cannot make adjacent -- edges not both free "); E freeIncident = p2.getFreeIncident(e, this); @@ -575,7 +606,22 @@ public class Mesh implements Iterable { if (v2 != null) return new E(v2.getFreeIncident(), p1).pair; return new E(p1, p2); } + public boolean coalesce = false; + private static float round(float f) { + return Math.round(f*1000)/1000f; + } public T newT(Point p1, Point p2, Point p3, Vec norm, int colorclass) { + if (coalesce) { + + for(Vertex v : vertices) { if (p1.distance(v.p) < EPSILON) { p1 = v.p; break; } } + for(Vertex v : vertices) { if (p2.distance(v.p) < EPSILON) { p2 = v.p; break; } } + for(Vertex v : vertices) { if (p3.distance(v.p) < EPSILON) { p3 = v.p; break; } } + /* + p1 = new Point(round(p1.x), round(p1.y), round(p1.z)); + p2 = new Point(round(p2.x), round(p2.y), round(p2.z)); + p3 = new Point(round(p3.x), round(p3.y), round(p3.z)); + */ + } if (norm != null) { Vec norm2 = p3.minus(p1).cross(p2.minus(p1)); float dot = norm.dot(norm2); @@ -646,14 +692,11 @@ 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; }