X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=57eda26d738feffcd6ed84b123aa8c7dc2edd40a;hp=774c7f97f577d9a9442e796dfb114a32bc161f20;hb=30607e6bf4827d90fc055c8db1e7f363ef2693e6;hpb=4c6451ef747ae7ffc2aa8955e55254673ac49d16 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 774c7f9..57eda26 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -52,6 +52,7 @@ public class Mesh implements Iterable { ArrayList set = new ArrayList(); for(Vertex v : vertices) set.add(v); 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();*/ } @@ -89,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); } @@ -147,15 +149,20 @@ public class Mesh implements Iterable { 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; } + */ } setError(nerror); @@ -169,6 +176,21 @@ public class Mesh implements Iterable { // t2' = t2.getMatrix(t1) * M * t1 // t1 = t1.getMatrix(t2) * t2 // M * t1 = M * t1.getMatrix(t2) * t2 + + 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()) { @@ -178,12 +200,18 @@ public class Mesh implements Iterable { 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)); + 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; } @@ -195,17 +223,18 @@ public class Mesh implements Iterable { unApplyQuadricToNeighbor(); + boolean illegalbefore = illegal; illegal = false; - if (this.p.minus(newp).mag() > 0.1 && !ignoreProblems) { /* + 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(); @@ -216,15 +245,17 @@ public class Mesh implements Iterable { } for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) e.p2.quadricStale = true; - return !illegal; + return !illegal || (illegalbefore && illegal); } public void checkLegality() { + /* 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.2) illegal = true; } + */ if (!illegal) triangles.range(oldp, this.p, (Visitor)this); } @@ -312,13 +343,21 @@ public class Mesh implements Iterable { (edu.berkeley.qfat.geom.BindingGroup)newBindingGroup_; if (newBindingGroup==null) return; if (this==newBindingGroup.getMaster()) return; - for(E eother : (Iterable)newBindingGroup) { + 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); } } @@ -372,6 +411,8 @@ public class Mesh implements Iterable { if (e==this) continue; p1.bindTo(getBindingMatrix(e), e.p1); p2.bindTo(getBindingMatrix(e), e.p2); + e.p1.setConstraint(getConstraint()); + e.p2.setConstraint(getConstraint()); } } @@ -390,12 +431,14 @@ public class Mesh implements Iterable { 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); + 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); + } } for(E e : (Iterable)getBoundPeers()) { Point mid = e.midpoint(); @@ -411,6 +454,10 @@ public class Mesh implements Iterable { e.p2.getE(mid).pair. bindTo(e.getBindingMatrix(firste), firstq); e.p2.getE(mid).pair.pair.bindTo(e.getBindingMatrix(firste), firstq.pair); } + /* + first.setConstraint(firste.getConstraint()); + firstq.setConstraint(firste.getConstraint()); + */ return null; } @@ -460,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 */ @@ -554,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); @@ -625,11 +692,11 @@ public class Mesh implements Iterable { public void reinsert() { triangles.remove(this); triangles.add(this); } public boolean shouldBeDrawn() { - /* + if (e1().bindingGroupSize() <= 1) return false; if (e2().bindingGroupSize() <= 1) return false; if (e3().bindingGroupSize() <= 1) return false; - */ + return true; }