X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=c50e34ccd2e9629cea45660a136c4122bd680946;hp=cd696b0703cab3b5276f259710c0775049e0e22e;hb=f42953f58e189d611803dcb4661bb840d785c30a;hpb=40b6b99bd4b0bd6041b8ab94a22201faab23ed90 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index cd696b0..c50e34c 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -14,48 +14,22 @@ public class Mesh implements Iterable { public static final float EPSILON = (float)0.0001; public static final Random random = new Random(); - private PointSet pointset = new PointSet(); - public int size() { return pointset.size(); } - public Iterable vertices() { return pointset; } - - public Iterable edges() { - return - new Iterable() { - public Iterator iterator() { - // HACK - HashSet hse = new HashSet(); - for(T t : Mesh.this) { - hse.add(t.e1()); - hse.add(t.e2()); - hse.add(t.e3()); - hse.add(t.e1().pair); - hse.add(t.e2().pair); - hse.add(t.e3().pair); - } - return hse.iterator(); - } }; - } - - public Iterator iterator() { - /* - for(Vert v : pointset) - if (v.e != null && v.e.t != null) - return new FaceIterator(v); - return new FaceIterator(); - */ - return ts.iterator(); - } - - public HashSet ts = new HashSet(); - public RTree tris = new RTree(); + private RTree tris = new RTree(); + private PointSet vertices = new PointSet(); public Mesh score_against = null; public double score = 0; 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 void rebindPoints() { // unbind all points for(Mesh.T t : this) { @@ -105,7 +79,7 @@ public class Mesh implements Iterable { public void transform(Matrix m) { ArrayList set = new ArrayList(); - for (Vert v : pointset) + for (Vert v : vertices) set.add(v); for(Vert v : set) v.transform(m); } @@ -122,10 +96,10 @@ public class Mesh implements Iterable { return (float)total; } - public void rebuildPointSet() { pointset.rebuild(); } - public Vec diagonal() { return pointset.diagonal(); } - public Point centroid() { return pointset.centroid(); } - public Vert nearest(Point p) { return pointset.nearest(p); } + 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 { public String toString() { return p.toString(); } @@ -156,8 +130,8 @@ public class Mesh implements Iterable { private Vert(Point p) { this.p = p; - if (pointset.get(p) != null) throw new Error(); - pointset.add(this); + if (vertices.get(p) != null) throw new Error(); + vertices.add(this); } private void glNormal(GL gl) { @@ -301,15 +275,15 @@ public class Mesh implements Iterable { unApplyQuadricToNeighbor(); Point oldp = this.p; try { - if (pointset.get(this.p)==null) throw new Error(); - pointset.remove(this); + 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(); - pointset.add(this); + vertices.add(this); } catch (Exception e) { throw new RuntimeException(e); } @@ -378,7 +352,7 @@ public class Mesh implements Iterable { private boolean good; public boolean move(Vec v) { - Matrix m = new Matrix(v); + Matrix m = Matrix.translate(v); Vert p = this; boolean good = true; do { @@ -413,7 +387,7 @@ public class Mesh implements Iterable { } public E getE(Point p2) { - Vert v = pointset.get(p2); + Vert v = vertices.get(p2); if (v==null) return null; return getE(v); } @@ -649,8 +623,8 @@ public class Mesh implements Iterable { /** creates an isolated edge out in the middle of space */ public E(Point p1, Point p2) { - if (pointset.get(p1) != null) throw new Error(); - if (pointset.get(p2) != null) throw new Error(); + 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.prev = this.next = this.pair = new E(this, this, this); @@ -662,7 +636,7 @@ public class Mesh implements Iterable { /** adds a new half-edge from prev.p2 to p2 */ public E(E prev, Point p) { Vert p2; - p2 = pointset.get(p); + p2 = vertices.get(p); if (p2 == null) p2 = new Vert(p); this.p1 = prev.p2; this.p2 = p2; @@ -768,8 +742,8 @@ public class Mesh implements Iterable { } public E makeE(Point p1, Point p2) { - Vert v1 = pointset.get(p1); - Vert v2 = pointset.get(p2); + Vert v1 = vertices.get(p1); + Vert v2 = vertices.get(p2); if (v1 != null && v2 != null) { E e = v1.getE(v2); if (e != null) return e; @@ -833,10 +807,7 @@ public class Mesh implements Iterable { public void removeFromRTree() { tris.remove(this); } public void addToRTree() { tris.insert(this); } - public void destroy() { - tris.remove(this); - ts.remove(this); - } + public void destroy() { tris.remove(this); } T(E e1, int colorclass) { this.e1 = e1; @@ -861,7 +832,6 @@ public class Mesh implements Iterable { } this.color = color; this.colorclass = colorclass; - ts.add(this); tris.add(this); } public E e1() { return e1; } @@ -878,9 +848,11 @@ public class Mesh implements Iterable { 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; + */ norm().glNormal(gl); p1().glVertex(gl);