X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=ff9819d580e93260d074b5d3ac488f4ab24dae15;hp=725e64760d8326a45976ca3b1c19e7403074b9a0;hb=fa493c7d6f06f51cd29354d02c69b7456609dd92;hpb=0f46c2445481610b7d4e7914bd4f3353652caf45 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 725e647..ff9819d 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -14,21 +14,22 @@ public class Mesh implements Iterable { public static final float EPSILON = (float)0.0001; public static final Random random = new Random(); - private RTree tris = new RTree(); - private PointSet vertices = new PointSet(); + private RTree triangles = new RTree(); + private PointSet vertices = new PointSet(); - public Mesh score_against = null; - public double score = 0; + public boolean immutableVertices; + public boolean ignorecollision = false; + public Mesh score_against = null; + public double score = 0; + + public Mesh(boolean immutableVertices) { this.immutableVertices = immutableVertices; } + + public void makeVerticesImmutable() { this.immutableVertices = true; } public float score() { return (float)score; } - public int numedges = 0; - public float avgedge = 0; public int size() { return vertices.size(); } - public Iterable vertices() { return vertices; } - - public Iterator iterator() { - return tris.iterator(); - } + public Iterable vertices() { return vertices; } + public Iterator iterator() { return triangles.iterator(); } public void rebindPoints() { // unbind all points @@ -46,18 +47,18 @@ public class Mesh implements Iterable { } public void unApplyQuadricToNeighborAll() { - HashSet done = new HashSet(); + HashSet done = new HashSet(); for(T t : this) - for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) { + for(Vertex p : new Vertex[] { t.v1(), t.v2(), t.v3() }) { if (done.contains(p)) continue; done.add(p); p.unApplyQuadricToNeighbor(); } } public void recomputeAllFundamentalQuadrics() { - HashSet done = new HashSet(); + HashSet done = new HashSet(); for(T t : this) - for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) { + for(Vertex p : new Vertex[] { t.v1(), t.v2(), t.v3() }) { if (done.contains(p)) continue; done.add(p); p.recomputeFundamentalQuadric(); @@ -66,9 +67,9 @@ public class Mesh implements Iterable { public float applyQuadricToNeighborAll() { int num = 0; double dist = 0; - HashSet done = new HashSet(); + HashSet done = new HashSet(); for(T t : this) - for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) { + for(Vertex p : new Vertex[] { t.v1(), t.v2(), t.v3() }) { if (done.contains(p)) continue; done.add(p); p.applyQuadricToNeighbor(); @@ -78,12 +79,17 @@ public class Mesh implements Iterable { } public void transform(Matrix m) { - ArrayList set = new ArrayList(); - for (Vert v : vertices) - set.add(v); - for(Vert v : set) v.transform(m); + ArrayList set = new ArrayList(); + for(Vertex v : vertices) set.add(v); + for(Vertex v : set) v.transform(m); } + public void rebuild() { /*vertices.rebuild();*/ } + public Vec diagonal() { return vertices.diagonal(); } + public Point centroid() { return vertices.centroid(); } + public Vertex nearest(Point p) { return vertices.nearest(p); } + + /** compute the volume of the mesh */ public float volume() { double total = 0; for(T t : this) { @@ -96,24 +102,23 @@ public class Mesh implements Iterable { return (float)total; } - public void rebuild() { /*vertices.rebuild();*/ } - public Vec diagonal() { return vertices.diagonal(); } - public Point centroid() { return vertices.centroid(); } - public Vert nearest(Point p) { return vertices.nearest(p); } - public final class Vert extends HasPoint { + // Vertexices ////////////////////////////////////////////////////////////////////////////// + + /** a vertex in the mesh */ + public final class Vertex extends HasPoint implements Visitor { public String toString() { return p.toString(); } public Point p; E e; // some edge *leaving* this point /** the nearest vertex in the "score_against" mesh */ - Vert nearest_in_other_mesh; + Vertex nearest_in_other_mesh; /** the number of vertices in the other mesh for which this is the nearest_in_other_mesh */ int quadric_count; /** the total error quadric (contributions from all vertices in other mesh for which this is nearest) */ Matrix quadric = Matrix.ZERO; - Vert bound_to = this; + Vertex bound_to = this; Matrix binding = Matrix.ONE; float oldscore = 0; boolean quadricStale = false; @@ -128,7 +133,7 @@ public class Mesh implements Iterable { return fundamentalQuadric; } - private Vert(Point p) { + private Vertex(Point p) { this.p = p; if (vertices.get(p) != null) throw new Error(); vertices.add(this); @@ -140,7 +145,7 @@ public class Mesh implements Iterable { } public void recomputeFundamentalQuadric() { - //if (!quadricStale && fundamentalQuadric != null) return; + if (!quadricStale && fundamentalQuadric != null) return; quadricStale = false; unApplyQuadricToNeighbor(); Matrix m = Matrix.ZERO; @@ -171,7 +176,7 @@ public class Mesh implements Iterable { public void applyQuadricToNeighbor() { if (score_against == null) return; - Vert new_nearest = score_against.nearest(p); + Vertex new_nearest = score_against.nearest(p); if (nearest_in_other_mesh != null && new_nearest == nearest_in_other_mesh) return; if (nearest_in_other_mesh != null) unApplyQuadricToNeighbor(); @@ -210,11 +215,10 @@ public class Mesh implements Iterable { } public void computeError() { if (quadric_count == 0) { - if (!tilemesh) { - } - else if (nearest_in_other_mesh == null) { + if (immutableVertices) { + } else if (nearest_in_other_mesh == null) { if (score_against != null) { - Vert ne = score_against.nearest(p); + Vertex ne = score_against.nearest(p); oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10; } else { oldscore = 0; @@ -272,6 +276,7 @@ public class Mesh implements Iterable { /** does NOT update bound pairs! */ public boolean transform(Matrix m) { + if (immutableVertices) throw new Error(); unApplyQuadricToNeighbor(); Point oldp = this.p; try { @@ -308,52 +313,32 @@ public class Mesh implements Iterable { e = e.pair.next; } while(e != this.e); + if (!ignorecollision && good) triangles.range(new Segment(oldp, this.p), this); - if (!ignorecollision && good) { - - tris.range(new Segment(oldp, this.p), - new Visitor() { - public void visit(T t) { - if (!good) return; - E e = Vert.this.e; - do { - 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; } - } - e = e.pair.next; - } while(e != Vert.this.e); - } - }); - - /* - for(T t : Mesh.this) { - if (!good) break; - e = this.e; - do { - if (!t.has(e.p1) && !t.has(e.p2) && e.intersects(t)) { good = false; break; } - if (e.t != null) { - if (!e.t.has(t.e1().p1) && !e.t.has(t.e1().p2) && t.e1().intersects(e.t)) { good = false; break; } - if (!e.t.has(t.e2().p1) && !e.t.has(t.e2().p2) && t.e2().intersects(e.t)) { good = false; break; } - if (!e.t.has(t.e3().p1) && !e.t.has(t.e3().p2) && t.e3().intersects(e.t)) { good = false; break; } - } - e = e.pair.next; - } while(e != this.e); - } - */ - } reComputeErrorAround(); return good; } + + public void visit(T t) { + if (!good) return; + E e = Vertex.this.e; + do { + 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; } + } + e = e.pair.next; + } while(e != Vertex.this.e); + } private boolean good; public boolean move(Vec v) { Matrix m = Matrix.translate(v); - Vert p = this; + Vertex p = this; boolean good = true; do { good &= p.transform(m); @@ -387,11 +372,11 @@ public class Mesh implements Iterable { } public E getE(Point p2) { - Vert v = vertices.get(p2); + Vertex v = vertices.get(p2); if (v==null) return null; return getE(v); } - public E getE(Vert p2) { + public E getE(Vertex p2) { E e = this.e; do { if (e==null) return null; @@ -411,8 +396,8 @@ public class Mesh implements Iterable { return norm.norm(); } - public boolean isBoundTo(Vert p) { - Vert px = p; + public boolean isBoundTo(Vertex p) { + Vertex px = p; do { if (px==this) return true; px = px.bound_to; @@ -420,10 +405,10 @@ public class Mesh implements Iterable { return false; } public void unbind() { bound_to = this; binding = Matrix.ONE; } - public void bind(Vert p) { bind(p, Matrix.ONE); } - public void bind(Vert p, Matrix binding) { + public void bind(Vertex p) { bind(p, Matrix.ONE); } + public void bind(Vertex p, Matrix binding) { if (isBoundTo(p)) return; - Vert temp_bound_to = p.bound_to; + 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 @@ -475,7 +460,7 @@ public class Mesh implements Iterable { /** [UNIQUE] an edge */ public final class E implements Comparable { - public final Vert p1, p2; + public final Vertex p1, p2; T t; // triangle to our "left" E prev; // previous half-edge E next; // next half-edge @@ -486,7 +471,7 @@ public class Mesh implements Iterable { public boolean intersects(T t) { return t.intersects(p1.p, p2.p); } public float comparator() { - Vert nearest = score_against.nearest(midpoint()); + Vertex nearest = score_against.nearest(midpoint()); //if (t==null) return length(); /* double ang = Math.abs(crossAngle()); @@ -513,7 +498,7 @@ public class Mesh implements Iterable { if (shattered || destroyed) return mid; shattered = true; - Vert r = next.p2; + Vertex r = next.p2; E next = this.next; E prev = this.prev; @@ -565,10 +550,6 @@ public class Mesh implements Iterable { pair.next = prev; if (p1.e == this) p1.e = prev.next; if (pair.p1.e == pair) pair.p1.e = pair.prev.next; - avgedge -= this.length(); - avgedge -= pair.length(); - numedges--; - numedges--; } private void sync() { @@ -579,11 +560,7 @@ public class Mesh implements Iterable { 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; - if (!added) { - added = true; - numedges++; - avgedge += length(); - } + if (!added) added = true; } private boolean added = false; @@ -626,8 +603,8 @@ public class Mesh implements Iterable { public E(Point p1, Point p2) { if (vertices.get(p1) != null) throw new Error(); if (vertices.get(p2) != null) throw new Error(); - this.p1 = new Vert(p1); - this.p2 = new Vert(p2); + this.p1 = new Vertex(p1); + this.p2 = new Vertex(p2); this.prev = this.next = this.pair = new E(this, this, this); this.p1.e = this; this.p2.e = this.pair; @@ -636,9 +613,9 @@ public class Mesh implements Iterable { /** adds a new half-edge from prev.p2 to p2 */ public E(E prev, Point p) { - Vert p2; + Vertex p2; p2 = vertices.get(p); - if (p2 == null) p2 = new Vert(p); + if (p2 == null) p2 = new Vertex(p); this.p1 = prev.p2; this.p2 = p2; this.prev = prev; @@ -667,15 +644,15 @@ public class Mesh implements Iterable { sync(); } public Point midpoint() { return new Point((p1.p.x+p2.p.x)/2, (p1.p.y+p2.p.y)/2, (p1.p.z+p2.p.z)/2); } - public boolean has(Vert v) { return v==p1 || v==p2; } + public boolean has(Vertex v) { return v==p1 || v==p2; } public float length() { return p1.p.minus(p2.p).mag(); } public String toString() { return p1+"->"+p2; } } public E makeE(Point p1, Point p2) { - Vert v1 = vertices.get(p1); - Vert v2 = vertices.get(p2); + Vertex v1 = vertices.get(p1); + Vertex v2 = vertices.get(p2); if (v1 != null && v2 != null) { E e = v1.getE(v2); if (e != null) return e; @@ -709,107 +686,16 @@ public class Mesh implements Iterable { } - public class FaceIterator implements Iterator { - private HashSet visited = new HashSet(); - private LinkedList next = new LinkedList(); - public FaceIterator() { } - public FaceIterator(Vert v) { next.addFirst(v.e.t); } - public boolean hasNext() { return next.peek()!=null; } - public void remove() { throw new Error(); } - public T next() { - T ret = next.removeFirst(); - if (ret == null) return null; - visited.add(ret); - T t1 = ret.e1().pair.t; - T t2 = ret.e2().pair.t; - T t3 = ret.e3().pair.t; - if (t1 != null && !visited.contains(t1)) next.addFirst(t1); - if (t2 != null && !visited.contains(t2)) next.addFirst(t2); - if (t3 != null && !visited.contains(t3)) next.addFirst(t3); - 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 boolean intersects(Point p1, Point p2) { - double A0=v1().p.x, A1=v1().p.y, A2=v1().p.z; - double B0=v2().p.x, B1=v2().p.y, B2=v2().p.z; - double C0=v3().p.x, C1=v3().p.y, C2=v3().p.z; - double j0=p1.x, j1=p1.y, j2=p1.z; - double k0=p2.x, k1=p2.y, k2=p2.z; - double J0, J1, J2; - double K0, K1, K2; - double i0, i1, i2; - double a0, a1, a2; - double b0, b1, b2; - double c0, c1, c2; - double in_det; - double R00, R01, R02, R03, - R10, R11, R12, R13, - R20, R21, R22, R23, - R30, R31, R32, R33; - - - /* a = B - A */ - a0 = B0 - A0; - a1 = B1 - A1; - a2 = B2 - A2; - /* b = C - B */ - b0 = C0 - A0; - b1 = C1 - A1; - b2 = C2 - A2; - /* c = a × b */ - c0 = a1 * b2 - a2 * b1; - c1 = a2 * b0 - a0 * b2; - c2 = a0 * b1 - a1 * b0; - - /* M^(-1) = (1/det(M)) * adj(M) */ - in_det = 1 / (c0 * c0 + c1 * c1 + c2 * c2); - R00 = (b1 * c2 - b2 * c1) * in_det; - R01 = (b2 * c0 - b0 * c2) * in_det; - R02 = (b0 * c1 - b1 * c0) * in_det; - R10 = (c1 * a2 - c2 * a1) * in_det; - R11 = (c2 * a0 - c0 * a2) * in_det; - R12 = (c0 * a1 - c1 * a0) * in_det; - R20 = (c0) * in_det; - R21 = (c1) * in_det; - R22 = (c2) * in_det; - - /* O = M^(-1) * A */ - R03 = -(R00 * A0 + R01 * A1 + R02 * A2); - R13 = -(R10 * A0 + R11 * A1 + R12 * A2); - R23 = -(R20 * A0 + R21 * A1 + R22 * A2); - - /* fill in last row of 4x4 matrix */ - R30 = R31 = R32 = 0; - R33 = 1; - - J2 = R20 * j0 + R21 * j1 + R22 * j2 + R23; - K2 = R20 * k0 + R21 * k1 + R22 * k2 + R23; - if (J2 * K2 >= 0) return false; - - J0 = R00 * j0 + R01 * j1 + R02 * j2 + R03; - K0 = R00 * k0 + R01 * k1 + R02 * k2 + R03; - i0 = J0 + J2 * ((K0 - J0) / (J2 - K2)); - if (i0 < 0 || i0 > 1) return false; - - J1 = R10 * j0 + R11 * j1 + R12 * j2 + R13; - K1 = R10 * k0 + R11 * k1 + R12 * k2 + R13; - i1 = J1 + J2 * ((K1 - J1) / (J2 - K2)); - if (i1 < 0 || i1 > 1 || i0 + i1 > 1) return false; - - return true; - } - - public void removeFromRTree() { tris.remove(this); } - public void addToRTree() { tris.insert(this); } - - public void destroy() { tris.remove(this); } + 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; @@ -834,34 +720,26 @@ public class Mesh implements Iterable { } this.color = color; this.colorclass = colorclass; - tris.add(this); + triangles.add(this); } public E e1() { return e1; } public E e2() { return e1.next; } public E e3() { return e1.prev; } - public Vert v1() { return e1.p1; } - public Vert v2() { return e1.p2; } - public Vert v3() { return e1.next.p2; } + public Vertex v1() { return e1.p1; } + public Vertex v2() { return e1.p2; } + public Vertex v3() { return e1.next.p2; } public Point p1() { return e1.p1.p; } public Point p2() { return e1.p2.p; } public Point p3() { return e1.next.p2.p; } public boolean hasE(E e) { return e1==e || e1.next==e || e1.prev==e; } - public boolean has(Vert v) { return v1()==v || v2()==v || v3()==v; } - - public void glVertices(GL gl) { - - /* - if (e1().bind_to.set.size() == 0) return; - if (e2().bind_to.set.size() == 0) return; - if (e3().bind_to.set.size() == 0) return; - */ + public boolean has(Vertex v) { return v1()==v || v2()==v || v3()==v; } - norm().glNormal(gl); - p1().glVertex(gl); - p2().glVertex(gl); - p3().glVertex(gl); + public boolean shouldBeDrawn() { + 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; } + } - public boolean tilemesh = false; - public boolean ignorecollision = false; }