X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=edd82d645d311711ac61211045379e1e082181b2;hp=fb994880da734591fb6fefa0ec560273087f4e1b;hb=73ed19a2635750c10ed5ff71677f04ccfd3d0ef3;hpb=6fe08d5c50c341f47ded8ce9acd670aad9362614 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index fb99488..edd82d6 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -8,6 +8,7 @@ import javax.media.opengl.glu.*; import edu.berkeley.qfat.geom.*; import edu.wlu.cs.levy.CG.KDTree; import edu.berkeley.qfat.geom.Point; +import com.infomatiq.jsi.IntProcedure; public class Mesh implements Iterable { @@ -18,14 +19,13 @@ public class Mesh implements Iterable { private PointSet vertices = new PointSet(); public boolean immutableVertices; - public boolean ignorecollision = false; - public Mesh score_against = null; - public double score = 0; + public Mesh error_against = null; + public double error = 0; public Mesh(boolean immutableVertices) { this.immutableVertices = immutableVertices; } public void makeVerticesImmutable() { this.immutableVertices = true; } - public float score() { return (float)score; } + public float error() { return (float)error; } public int size() { return vertices.size(); } public Iterable vertices() { return vertices; } @@ -49,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();*/ } @@ -74,194 +74,152 @@ public class Mesh implements Iterable { // Vertexices ////////////////////////////////////////////////////////////////////////////// /** a vertex in the mesh */ - public final class Vertex extends HasPoint implements Visitor { - public String toString() { return p.toString(); } - public Point p; + public final class Vertex extends HasQuadric implements Visitor { + public Point p, oldp, goodp; E e; // some edge *leaving* this point - /** the nearest vertex in the "score_against" 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; - Matrix binding = Matrix.ONE; Vertex bound_to = this; - float oldscore = 0; - boolean quadricStale = false; + private boolean illegal = false; - public Matrix errorQuadric() { return quadric; } public Point getPoint() { return p; } - public float score() { return oldscore; } - - private Matrix fundamentalQuadric = null; - public Matrix fundamentalQuadric() { - if (fundamentalQuadric == null) recomputeFundamentalQuadric(); - return fundamentalQuadric; - } + public float error() { return olderror; } private Vertex(Point p) { this.p = p; + this.goodp = p; if (vertices.get(p) != null) throw new Error(); vertices.add(this); } - private void glNormal(GL gl) { - Vec norm = norm(); - gl.glNormal3f(norm.x, norm.y, norm.z); + 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 void recomputeFundamentalQuadric() { - unApplyQuadricToNeighbor(); - if (quadricStale || fundamentalQuadric==null) { - Matrix m = Matrix.ZERO; - int count = 0; - for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { - T t = e.t; - m = m.plus(t.norm().fundamentalQuadric(t.centroid())); - count++; - } - quadricStale = false; - fundamentalQuadric = m.times(1/(float)count); - } - applyQuadricToNeighbor(); + public float olderror = 0; + public void setError(float nerror) { + error -= olderror; + olderror = nerror; + error += olderror; } - public void unApplyQuadricToNeighbor() { - if (nearest_in_other_mesh == null) return; - if (fundamentalQuadric == null) return; - nearest_in_other_mesh.unComputeError(); - nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.minus(fundamentalQuadric); - nearest_in_other_mesh.quadric_count--; - if (nearest_in_other_mesh.quadric_count==0) - nearest_in_other_mesh.quadric = Matrix.ZERO; - nearest_in_other_mesh.computeError(); - nearest_in_other_mesh = null; + public float averageTriangleArea() { + int count = 0; + float ret = 0; + for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { + ret += e.t.area(); + count++; + } + return ret/count; } - - public void applyQuadricToNeighbor() { - if (score_against == null) return; - - 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(); - if (nearest_in_other_mesh != null) throw new Error(); - - nearest_in_other_mesh = new_nearest; - - // don't attract to vertices that face the other way - if (nearest_in_other_mesh.e == null || nearest_in_other_mesh.norm().dot(norm()) < 0) { - nearest_in_other_mesh = null; - } else { - nearest_in_other_mesh.unComputeError(); - nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric()); - nearest_in_other_mesh.quadric_count++; - nearest_in_other_mesh.computeError(); + public float averageEdgeLength() { + int count = 0; + float ret = 0; + for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { + ret += e.length(); + count++; } - reComputeError(); + return ret/count; } - public void reComputeErrorAround() { - 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 void reComputeError() { - unComputeError(); - computeError(); - } - public void unComputeError() { - score -= oldscore; - oldscore = 0; + public Matrix _recomputeFundamentalQuadric() { + Matrix m = Matrix.ZERO; + int count = 0; + for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { + m = m.plus(e.t.norm().fundamentalQuadric(e.t.centroid())); + count++; + } + return m.times(1/(float)count); } + + public HasQuadric nearest() { return error_against==null ? null : error_against.vertices.nearest(p, this); } public void computeError() { - oldscore = - quadric_count != 0 - ? (quadric.preAndPostMultiply(p) * 100) / quadric_count - : immutableVertices - ? oldscore - : nearest_in_other_mesh != null - ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10 - : score_against != null - ? score_against.nearest(p).fundamentalQuadric().preAndPostMultiply(p) * 100 * 10 - : 0; + if (error_against==null) return; + float nerror = + nearest_in_other_mesh != null + ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) + : nearest().fundamentalQuadric().preAndPostMultiply(p); + if (quadric_count != 0) + nerror = (nerror + quadric.preAndPostMultiply(p))/(quadric_count+1); + for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { - double ang = Math.abs(e.crossAngle()); + double ang = Math.abs(e.dihedralAngle()); if (ang > Math.PI) throw new Error(); float minangle = (float)(Math.PI * 0.8); - if (ang > minangle) - oldscore += (ang - minangle); + if (ang > minangle) nerror += (ang - minangle); + /* + if (e.t.aspect() < 0.2) { + nerror += (0.2-e.t.aspect()) * 10; + } + */ } - score += oldscore; - } - 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(); + setError(nerror); } - 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(); + + 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); + return good; } /** 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.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 (!illegal) triangles.range(oldp, this.p, (Visitor)this); + } - if (!ignorecollision && good) triangles.range(oldp, this.p, (Visitor)this); - - reComputeErrorAround(); - return good; + public void reComputeErrorAround() { + 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 void visit(T t) { - if (!good) return; + public boolean visit(Object o) { + 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)) { good = false; } + 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)) { 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 (!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; } } } - } - private boolean good; - - public boolean move(Vec v) { - Matrix m = Matrix.translate(v); - Vertex p = this; - boolean good = true; - do { - good &= p.transform(m); - p = p.bound_to; - } while (p != this); - return good; + return !illegal; } public E getFreeIncident() { @@ -290,6 +248,10 @@ public class Mesh implements Iterable { return null; } + private void glNormal(GL gl) { + Vec norm = norm(); + gl.glNormal3f(norm.x, norm.y, norm.z); + } public Vec norm() { Vec norm = new Vec(0, 0, 0); for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) @@ -351,9 +313,9 @@ public class Mesh implements Iterable { e.p2.bind(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); } } } @@ -371,9 +333,20 @@ public class Mesh implements Iterable { boolean shattered = false; public boolean intersects(T t) { return t.intersects(p1.p, p2.p); } + + public float stretchRatio() { + Vertex nearest = error_against.nearest(midpoint()); + float nearest_distance = midpoint().distance(nearest.p); + float other_distance = + (p1.p.distance(error_against.nearest(p1.p).p)+ + p2.p.distance(error_against.nearest(p2.p).p))/2; + return nearest_distance/other_distance; + } public float comparator() { - Vertex nearest = score_against.nearest(midpoint()); - return (float)Math.max(length(), midpoint().distance(nearest.p)); + + + return length(); + //return t==null?0:(1/t.aspect()); } public int compareTo(E e) { return e.comparator() > comparator() ? 1 : -1; @@ -381,8 +354,8 @@ public class Mesh implements Iterable { public void bindEdge(E e) { bind_to.add(e); } public void dobind() { bind_to.dobind(this); } - public Point shatter() { return shatter(midpoint(), null, null); } - public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) { + public Point shatter() { return shatter(midpoint(), null, null, true); } + public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean triangles) { if (shattered || destroyed) return mid; shattered = true; @@ -394,15 +367,17 @@ 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); 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); + } return mid; } @@ -454,7 +429,7 @@ public class Mesh implements Iterable { public T makeT(int colorclass) { return t==null ? (t = new T(this, colorclass)) : t; } - public double crossAngle() { + public double dihedralAngle() { Vec v1 = t.norm().times(-1); Vec v2 = pair.t.norm().times(-1); return Math.acos(v1.norm().dot(v2.norm())); @@ -573,18 +548,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; @@ -622,6 +591,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; @@ -629,5 +603,17 @@ public class Mesh implements Iterable { return true; } + /** issue gl.glVertex() for each of the triangle's points */ + public void glVertices(GL gl) { + if (!shouldBeDrawn()) return; + norm().glNormal(gl); + Point p1 = v1().goodp; + Point p2 = v2().goodp; + Point p3 = v3().goodp; + p1.glVertex(gl); + p2.glVertex(gl); + p3.glVertex(gl); + } + } }