X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=f95b33d58789138146bd3dcdf912510337f071f0;hp=23679996f40ac502f06c7af42e1b232589879e41;hb=5239d59bb876c25b263a24dbff11dc7a9082a431;hpb=4cfb993775d0547ba2e864bbfac16bea59711ff6 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 2367999..f95b33d 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,9 +19,9 @@ 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 boolean ignorecollision = false; + public Mesh score_against = null; + public double score = 0; public Mesh(boolean immutableVertices) { this.immutableVertices = immutableVertices; } @@ -46,38 +47,6 @@ public class Mesh implements Iterable { } } - public void unApplyQuadricToNeighborAll() { - HashSet done = new HashSet(); - for(T t : this) - 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(); - for(T t : this) - for(Vertex p : new Vertex[] { t.v1(), t.v2(), t.v3() }) { - if (done.contains(p)) continue; - done.add(p); - p.recomputeFundamentalQuadric(); - } - } - public float applyQuadricToNeighborAll() { - int num = 0; - double dist = 0; - HashSet done = new HashSet(); - for(T t : this) - for(Vertex p : new Vertex[] { t.v1(), t.v2(), t.v3() }) { - if (done.contains(p)) continue; - done.add(p); - p.applyQuadricToNeighbor(); - - } - return (float)(dist/num); - } - public void transform(Matrix m) { ArrayList set = new ArrayList(); for(Vertex v : vertices) set.add(v); @@ -106,33 +75,17 @@ public class Mesh implements Iterable { // Vertexices ////////////////////////////////////////////////////////////////////////////// /** a vertex in the mesh */ - public final class Vertex extends HasPoint implements Visitor { + public final class Vertex extends HasQuadric 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 */ - 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; - 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; - } - private Vertex(Point p) { this.p = p; if (vertices.get(p) != null) throw new Error(); @@ -144,10 +97,7 @@ public class Mesh implements Iterable { gl.glNormal3f(norm.x, norm.y, norm.z); } - public void recomputeFundamentalQuadric() { - if (!quadricStale && fundamentalQuadric != null) return; - quadricStale = false; - unApplyQuadricToNeighbor(); + public void _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) { @@ -155,26 +105,14 @@ public class Mesh implements Iterable { m = m.plus(t.norm().fundamentalQuadric(t.centroid())); count++; } + quadricStale = false; fundamentalQuadric = m.times(1/(float)count); - applyQuadricToNeighbor(); - } - - 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 void applyQuadricToNeighbor() { if (score_against == null) return; - Vertex new_nearest = score_against.nearest(p); + Vertex new_nearest = (Vertex)nearest(); if (nearest_in_other_mesh != null && new_nearest == nearest_in_other_mesh) return; if (nearest_in_other_mesh != null) unApplyQuadricToNeighbor(); @@ -183,7 +121,7 @@ public class Mesh implements Iterable { 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) { + if (((Vertex)nearest_in_other_mesh).e == null || ((Vertex)nearest_in_other_mesh).norm().dot(norm()) < 0) { nearest_in_other_mesh = null; } else { nearest_in_other_mesh.unComputeError(); @@ -191,6 +129,7 @@ public class Mesh implements Iterable { nearest_in_other_mesh.quadric_count++; nearest_in_other_mesh.computeError(); } + reComputeError(); } @@ -208,6 +147,7 @@ public class Mesh implements Iterable { score -= oldscore; oldscore = 0; } + public HasQuadric nearest() { return score_against.vertices.nearest(p, this); } public void computeError() { oldscore = quadric_count != 0 @@ -217,7 +157,7 @@ public class Mesh implements Iterable { : 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 + ? nearest().fundamentalQuadric().preAndPostMultiply(p) * 100 * 10 : 0; for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) { double ang = Math.abs(e.crossAngle()); @@ -271,15 +211,24 @@ public class Mesh implements Iterable { return good; } - public void visit(T t) { - if (!good) return; - 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; } + 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; } + } } + return good; + } else { + Vertex v = (Vertex)o; + if (v.e==null || v.norm().dot(Vertex.this.norm()) < 0) + return false; + return true; } } private boolean good; @@ -298,8 +247,6 @@ public class Mesh implements Iterable { public E getFreeIncident() { E ret = getFreeIncident(e, e); if (ret != null) return ret; - //ret = getFreeIncident(e.pair.next, e.pair.next); - if (ret != null) return ret; for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) System.out.println(e + " " + e.t); throw new Error("unable to find free incident to " + this); @@ -332,13 +279,12 @@ public class Mesh implements Iterable { } public boolean isBoundTo(Vertex p) { - Vertex px = p; - do { - if (px==this) return true; - px = px.bound_to; - } while(px != p); + for(Vertex px = p; px!=null; px=(px.bound_to==p?null:px.bound_to)) + if (px==this) + return true; return false; } + public void unbind() { bound_to = this; binding = Matrix.ONE; } public void bind(Vertex p) { bind(p, Matrix.ONE); } public void bind(Vertex p, Matrix binding) { @@ -407,20 +353,7 @@ public class Mesh implements Iterable { public boolean intersects(T t) { return t.intersects(p1.p, p2.p); } public float comparator() { Vertex nearest = score_against.nearest(midpoint()); - //if (t==null) return length(); - /* - double ang = Math.abs(crossAngle()); - float minangle = (float)(Math.PI * 0.9); - if (ang > minangle) - return 300; - */ - /* - if ((length() * length()) / t.area() > 10) - return (float)(length()*Math.sqrt(t.area())); - return length()*t.area(); - */ return (float)Math.max(length(), midpoint().distance(nearest.p)); - //return length(); } public int compareTo(E e) { return e.comparator() > comparator() ? 1 : -1;