X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=1484b662d59c2edd55abeae34e667798370a9adc;hp=8243b184b6ab89f303f144719509d07892c6cbb8;hb=a4491ca8f8b67e8693a44424c2300af10a404f17;hpb=6b8b94ec2b88321d9f53b759200137657445a08a diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 8243b18..1484b66 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -19,7 +19,6 @@ public class Mesh implements Iterable { private PointSet vertices = new PointSet(); public boolean immutableVertices; - public boolean ignorecollision = false; public Mesh error_against = null; public double error = 0; @@ -50,7 +49,7 @@ 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); + for(Vertex v : set) v.transform(m.times(v.p), true); } public void rebuild() { /*vertices.rebuild();*/ } @@ -76,11 +75,12 @@ public class Mesh implements Iterable { /** a vertex in the mesh */ public final class Vertex extends HasQuadric implements Visitor { - public Point p; + public Point p, oldp; E e; // some edge *leaving* this point Matrix binding = Matrix.ONE; Vertex bound_to = this; + private boolean illegal = false; public Point getPoint() { return p; } public float error() { return olderror; } @@ -91,6 +91,12 @@ public class Mesh implements Iterable { vertices.add(this); } + public void reinsert() { + vertices.remove(this); + vertices.add(this); + for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) e.t.reinsert(); + } + public float olderror = 0; public void setError(float nerror) { error -= olderror; @@ -108,12 +114,7 @@ public class Mesh implements Iterable { return m.times(1/(float)count); } - public HasQuadric nearest() { - if (error_against==null) return null; - return error_against.vertices.nearest(p, this); - } - - + public HasQuadric nearest() { return error_against==null ? null : error_against.vertices.nearest(p, this); } public void computeError() { float nerror = quadric_count != 0 @@ -132,86 +133,63 @@ public class Mesh implements Iterable { setError(nerror); } - private void removeTrianglesFromRTree() { - for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) - if (e.t != null) e.t.removeFromRTree(); - } - private void addTrianglesToRTree() { - for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) - if (e.t != null) e.t.addToRTree(); - } - /** does NOT update bound pairs! */ - public boolean transform(Matrix m) { + private boolean transform(Point newp, boolean ignoreProblems) { + this.oldp = this.p; if (immutableVertices) throw new Error(); unApplyQuadricToNeighbor(); - Point oldp = this.p; - - if (vertices.get(this.p)==null) throw new Error(); - vertices.remove(this); - removeTrianglesFromRTree(); - float newx = m.a*p.x + m.b*p.y + m.c*p.z + m.d; - float newy = m.e*p.x + m.f*p.y + m.g*p.z + m.h; - float newz = m.i*p.x + m.j*p.y + m.k*p.z + m.l; - this.p = new Point(newx, newy, newz); - addTrianglesToRTree(); - vertices.add(this); - + this.p = newp; + reinsert(); applyQuadricToNeighbor(); - good = true; + 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; + } + public void checkLegality() { for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { - if (Math.abs(e.crossAngle()) > (Math.PI * 0.9) || Math.abs(e.next.crossAngle()) > (Math.PI * 0.9)) good = false; - if (e.t.aspect() < 0.1) good = false; - e.p2.quadricStale = true; + if (Math.abs(e.crossAngle()) > (Math.PI * 0.9) || Math.abs(e.next.crossAngle()) > (Math.PI * 0.9)) illegal = true; + if (e.t.aspect() < 0.1) illegal = true; } - - if (!ignorecollision && good) triangles.range(oldp, this.p, (Visitor)this); - - reComputeErrorAround(); - - return good; + if (illegal) triangles.range(oldp, this.p, (Visitor)this); } public void reComputeErrorAround() { reComputeError(); - if (nearest_in_other_mesh != null) nearest_in_other_mesh.reComputeError(); + if (nearest_in_other_mesh != null) + nearest_in_other_mesh.reComputeError(); for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) e.p2.reComputeError(); } public boolean visit(Object o) { - if (o instanceof T) { - T t = (T)o; - if (!good) return false; - for(E e = Vertex.this.e; e!=null; e=e.pair.next==Vertex.this.e?null:e.pair.next) { - if (!t.has(e.p1) && !t.has(e.p2) && e.intersects(t)) { good = false; } - if (e.t != null) { - if (!e.t.has(t.e1().p1) && !e.t.has(t.e1().p2) && t.e1().intersects(e.t)) { good = false; } - if (!e.t.has(t.e2().p1) && !e.t.has(t.e2().p2) && t.e2().intersects(e.t)) { good = false; } - if (!e.t.has(t.e3().p1) && !e.t.has(t.e3().p2) && t.e3().intersects(e.t)) { good = false; } - } + if (o instanceof Vertex) + return ((Vertex)o).e != null && ((Vertex)o).norm().dot(Vertex.this.norm()) >= 0; + T t = (T)o; + if (illegal) return false; + for(E e = Vertex.this.e; e!=null; e=e.pair.next==Vertex.this.e?null:e.pair.next) { + if (!t.has(e.p1) && !t.has(e.p2) && e.intersects(t)) { illegal = true; } + if (e.t != null) { + if (!e.t.has(t.e1().p1) && !e.t.has(t.e1().p2) && t.e1().intersects(e.t)) { illegal = true; } + if (!e.t.has(t.e2().p1) && !e.t.has(t.e2().p2) && t.e2().intersects(e.t)) { illegal = true; } + if (!e.t.has(t.e3().p1) && !e.t.has(t.e3().p2) && t.e3().intersects(e.t)) { illegal = true; } } - return good; - } else { - Vertex v = (Vertex)o; - if (v.e==null || v.norm().dot(Vertex.this.norm()) < 0) - return false; - return true; } + return !illegal; } - private boolean good; - public boolean move(Vec v) { - Matrix m = Matrix.translate(v); - Vertex p = this; + public boolean move(Matrix m, boolean ignoreProblems) { boolean good = true; - do { - good &= p.transform(m); - p = p.bound_to; - } while (p != this); + 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); return good; } @@ -528,18 +506,12 @@ public class Mesh implements Iterable { return ret; } - /** [UNIQUE] a triangle (face) */ public final class T extends Triangle { public final E e1; public final int color; public final int colorclass; - public void removeFromRTree() { triangles.remove(this); } - public void addToRTree() { triangles.insert(this); } - - public void destroy() { triangles.remove(this); } - T(E e1, int colorclass) { this.e1 = e1; E e2 = e1.next; @@ -577,6 +549,11 @@ public class Mesh implements Iterable { public boolean hasE(E e) { return e1==e || e1.next==e || e1.prev==e; } public boolean has(Vertex v) { return v1()==v || v2()==v || v3()==v; } + public void removeFromRTree() { triangles.remove(this); } + public void addToRTree() { triangles.insert(this); } + public void destroy() { triangles.remove(this); } + public void reinsert() { triangles.remove(this); triangles.add(this); } + public boolean shouldBeDrawn() { if (e1().bind_to.set.size() == 0) return false; if (e2().bind_to.set.size() == 0) return false;