X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=7083d7669ba43c46a34037597509eb87557070f8;hp=3208442c47f0bc31ad5ef1a8085bf0317fd8011b;hb=85bf586c55813abe79fab0476e2196700a6d0ea1;hpb=4e22c754574f3d410e1ddc0bc5cdedd6b3586497 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 3208442..7083d76 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -80,7 +80,7 @@ public class Mesh implements Iterable { Matrix binding = Matrix.ONE; Vertex bound_to = this; - private boolean good; + private boolean illegal = false; public Point getPoint() { return p; } public float error() { return olderror; } @@ -91,7 +91,11 @@ public class Mesh implements Iterable { vertices.add(this); } - public void reinsert() { vertices.remove(this); 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) { @@ -100,6 +104,25 @@ public class Mesh implements Iterable { error += olderror; } + 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 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++; + } + return ret/count; + } + public Matrix _recomputeFundamentalQuadric() { Matrix m = Matrix.ZERO; int count = 0; @@ -112,19 +135,23 @@ public class Mesh implements Iterable { public HasQuadric nearest() { return error_against==null ? null : error_against.vertices.nearest(p, this); } public void computeError() { + if (error_against==null) return; float nerror = quadric_count != 0 - ? (quadric.preAndPostMultiply(p) * 100) / quadric_count + ? (quadric.preAndPostMultiply(p) * 100)/quadric_count : nearest_in_other_mesh != null - ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10 - : error_against != null - ? nearest().fundamentalQuadric().preAndPostMultiply(p) * 100 * 10 - : 0; + ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 + : nearest().fundamentalQuadric().preAndPostMultiply(p) * 100; for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { double ang = Math.abs(e.crossAngle()); if (ang > Math.PI) throw new Error(); float minangle = (float)(Math.PI * 0.8); if (ang > minangle) nerror += (ang - minangle); + /* + if (e.t.aspect() < 0.2) { + nerror += (0.2-e.t.aspect()) * 300; + } + */ } setError(nerror); } @@ -135,23 +162,27 @@ public class Mesh implements Iterable { if (immutableVertices) throw new Error(); unApplyQuadricToNeighbor(); - this.p = newp; - for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) e.t.reinsert(); reinsert(); - applyQuadricToNeighbor(); - if (ignoreProblems) return 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; + } - good = true; + 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 (good) triangles.range(oldp, this.p, (Visitor)this); - return good; + */ + if (!illegal) triangles.range(oldp, this.p, (Visitor)this); } public void reComputeErrorAround() { @@ -166,16 +197,16 @@ public class Mesh implements Iterable { if (o instanceof Vertex) return ((Vertex)o).e != null && ((Vertex)o).norm().dot(Vertex.this.norm()) >= 0; T t = (T)o; - if (!good) return false; + 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; } } } - return good; + return !illegal; } public boolean move(Matrix m, boolean ignoreProblems) { @@ -300,8 +331,18 @@ public class Mesh implements Iterable { public boolean intersects(T t) { return t.intersects(p1.p, p2.p); } public float comparator() { + /* Vertex nearest = error_against.nearest(midpoint()); - return (float)Math.max(length(), midpoint().distance(nearest.p)); + //return (float)Math.max(length(), midpoint().distance(nearest.p)); + //return length(); + 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; + */ + return length(); + //return t==null?0:(1/t.aspect()); } public int compareTo(E e) { return e.comparator() > comparator() ? 1 : -1; @@ -556,5 +597,17 @@ public class Mesh implements Iterable { return true; } + /** issue gl.glVertex() for each of the triangle's points */ + public void glVertices(GL gl) { + norm().glNormal(gl); + Point p1 = v1().oldp; + Point p2 = v2().oldp; + Point p3 = v3().oldp; + if (p1==null || p2==null || p3==null) return; + p1.glVertex(gl); + p2.glVertex(gl); + p3.glVertex(gl); + } + } }