public static final float EPSILON = (float)0.0001;
public static final Random random = new Random();
- private PointSet<Vert> pointset = new PointSet<Vert>();
-
- public Iterable<Vert> vertices() { return pointset; }
-
- public Iterable<E> edges() {
- return
- new Iterable<E>() {
- public Iterator<E> iterator() {
- // HACK
- HashSet<E> hse = new HashSet<E>();
- 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<T> 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<T> ts = new HashSet<T>();
+ private RTree<T> tris = new RTree<T>();
+ private PointSet<Vert> vertices = new PointSet<Vert>();
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<Vert> vertices() { return vertices; }
+
+ public Iterator<T> iterator() {
+ return tris.iterator();
+ }
+
public void rebindPoints() {
// unbind all points
for(Mesh.T t : this) {
public void transform(Matrix m) {
ArrayList<Vert> set = new ArrayList<Vert>();
- for (Vert v : pointset)
+ for (Vert v : vertices)
set.add(v);
for(Vert v : set) v.transform(m);
}
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(); }
Matrix quadric = Matrix.ZERO;
Vert bound_to = this;
- Matrix binding = new Matrix();
+ Matrix binding = Matrix.ONE;
float oldscore = 0;
boolean quadricStale = false;
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) {
aspects += e.t.aspect()*e.t.aspect();
}
*/
- /*
- float minangle = (float)(Math.PI * 0.9);
+
+ float minangle = (float)(Math.PI * 0.8);
if (ang > minangle)
oldscore += (ang - minangle);
- */
+
e = e.pair.next;
} while (e != this.e);
if (numaspects > 0) oldscore += (aspects / numaspects);
score += oldscore;
}
+ private void removeTrianglesFromRTree() {
+ E e = this.e;
+ do {
+ if (e.t != null) e.t.removeFromRTree();
+ e = e.pair.next;
+ } while(e != this.e);
+ }
+ private void addTrianglesToRTree() {
+ E e = this.e;
+ do {
+ if (e.t != null) e.t.addToRTree();
+ e = e.pair.next;
+ } while(e != this.e);
+ }
+
/** does NOT update bound pairs! */
public boolean transform(Matrix m) {
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);
- pointset.add(this);
+ addTrianglesToRTree();
+ vertices.add(this);
} catch (Exception e) {
throw new RuntimeException(e);
}
applyQuadricToNeighbor();
+ // FIXME: intersection test needed?
+ good = true;
+
// should recompute fundamental quadrics of all vertices sharing a face, but we defer...
E e = this.e;
do {
+ /*
+ 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;
e = e.pair.next;
} while(e != this.e);
- // FIXME: intersection test needed?
- boolean good = true;
- if (!ignorecollision)
- 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);
+ if (!ignorecollision && good) {
+
+ tris.range(new Segment(oldp, this.p),
+ new Visitor<T>() {
+ 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;
}
+ 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 {
}
public E getE(Point p2) {
- Vert v = pointset.get(p2);
+ Vert v = vertices.get(p2);
if (v==null) return null;
return getE(v);
}
} while(px != p);
return false;
}
- public void unbind() { bound_to = this; binding = new Matrix(); }
- public void bind(Vert p) { bind(p, new Matrix()); }
+ 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) {
if (isBoundTo(p)) return;
Vert temp_bound_to = p.bound_to;
public BindingGroup bind_to = bind_peers.other();
boolean shattered = false;
+ public boolean intersects(T t) { return t.intersects(p1.p, p2.p); }
public float comparator() {
Vert nearest = score_against.nearest(midpoint());
//if (t==null) return length();
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;
/** 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);
/** 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;
public float length() { return p1.p.minus(p2.p).mag(); }
public String toString() { return p1+"->"+p2; }
- public boolean intersects(T t) {
- double A0=t.v1().p.x, A1=t.v1().p.y, A2=t.v1().p.z;
- double B0=t.v2().p.x, B1=t.v2().p.y, B2=t.v2().p.z;
- double C0=t.v3().p.x, C1=t.v3().p.y, C2=t.v3().p.z;
- double j0=p1.p.x, j1=p1.p.y, j2=p1.p.z;
- double k0=p2.p.x, k1=p2.p.y, k2=p2.p.z;
+ }
+
+ public E makeE(Point p1, Point 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;
+ e = v2.getE(v1);
+ if (e != null) return e;
+ }
+ if (v1 != null) return new E(v1.getFreeIncident(), p2);
+ if (v2 != null) return new E(v2.getFreeIncident(), p1).pair;
+ return new E(p1, p2);
+ }
+ public T newT(Point p1, Point p2, Point p3, Vec norm, int colorclass) {
+ if (norm != null) {
+ Vec norm2 = p3.minus(p1).cross(p2.minus(p1));
+ float dot = norm.dot(norm2);
+ //if (Math.abs(dot) < EPointSILON) throw new Error("dot products within evertsilon of each other: "+norm+" "+norm2);
+ if (dot < 0) { Point p = p1; p1=p2; p2 = p; }
+ }
+ E e12 = makeE(p1, p2);
+ E e23 = makeE(p2, p3);
+ E e31 = makeE(p3, p1);
+ while(e12.next != e23 || e23.next != e31 || e31.next != e12) {
+ e12.makeAdjacent(e23);
+ e23.makeAdjacent(e31);
+ e31.makeAdjacent(e12);
+ }
+ T ret = e12.makeT(colorclass);
+ if (e12.t == null) throw new Error();
+ if (e23.t == null) throw new Error();
+ if (e31.t == null) throw new Error();
+ return ret;
+ }
+
+
+ public class FaceIterator implements Iterator<T> {
+ private HashSet<T> visited = new HashSet<T>();
+ private LinkedList<T> next = new LinkedList<T>();
+ 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;
return true;
}
- }
-
- public E makeE(Point p1, Point p2) {
- Vert v1 = pointset.get(p1);
- Vert v2 = pointset.get(p2);
- if (v1 != null && v2 != null) {
- E e = v1.getE(v2);
- if (e != null) return e;
- e = v2.getE(v1);
- if (e != null) return e;
- }
- if (v1 != null) return new E(v1.getFreeIncident(), p2);
- if (v2 != null) return new E(v2.getFreeIncident(), p1).pair;
- return new E(p1, p2);
- }
- public T newT(Point p1, Point p2, Point p3, Vec norm, int colorclass) {
- if (norm != null) {
- Vec norm2 = p3.minus(p1).cross(p2.minus(p1));
- float dot = norm.dot(norm2);
- //if (Math.abs(dot) < EPointSILON) throw new Error("dot products within evertsilon of each other: "+norm+" "+norm2);
- if (dot < 0) { Point p = p1; p1=p2; p2 = p; }
- }
- E e12 = makeE(p1, p2);
- E e23 = makeE(p2, p3);
- E e31 = makeE(p3, p1);
- while(e12.next != e23 || e23.next != e31 || e31.next != e12) {
- e12.makeAdjacent(e23);
- e23.makeAdjacent(e31);
- e31.makeAdjacent(e12);
- }
- T ret = e12.makeT(colorclass);
- if (e12.t == null) throw new Error();
- if (e23.t == null) throw new Error();
- if (e31.t == null) throw new Error();
- return ret;
- }
+ public void removeFromRTree() { tris.remove(this); }
+ public void addToRTree() { tris.insert(this); }
- public class FaceIterator implements Iterator<T> {
- private HashSet<T> visited = new HashSet<T>();
- private LinkedList<T> next = new LinkedList<T>();
- 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 void destroy() {
- ts.remove(this);
- }
+ public void destroy() { tris.remove(this); }
T(E e1, int colorclass) {
this.e1 = e1;
}
this.color = color;
this.colorclass = colorclass;
- ts.add(this);
+ tris.add(this);
}
public E e1() { return e1; }
public E e2() { return e1.next; }
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);
projects / anneal.git / blobdiff