public static final float EPSILON = (float)0.0001;
public static final Random random = new Random();
- private PointSet<Vert> pointset = new PointSet<Vert>();
+ private PointSet<Vert> vertices = new PointSet<Vert>();
- public Iterable<Vert> vertices() { return pointset; }
+ public int size() { return vertices.size(); }
+ public Iterable<Vert> vertices() { return vertices; }
public Iterable<E> edges() {
return
public Iterator<T> iterator() {
/*
- for(Vert v : pointset)
+ for(Vert v : vertices)
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>();
+ public RTree<T> tris = new RTree<T>();
public Mesh score_against = null;
public double score = 0;
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(); }
public Point p;
E e; // some edge *leaving* this point
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) {
}
public void computeError() {
if (quadric_count == 0) {
- if (nearest_in_other_mesh == null) {
+ if (!tilemesh) {
+ }
+ else if (nearest_in_other_mesh == null) {
if (score_against != null) {
Vert ne = score_against.nearest(p);
- oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 3;
+ oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
} else {
oldscore = 0;
}
} else {
- oldscore = nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 3;
+ oldscore = nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
}
} else {
oldscore = (quadric.preAndPostMultiply(p) * 100) / quadric_count;
float aspects = 0;
E e = this.e;
do {
+ //double ang = Math.abs(e.crossAngle());
double ang = Math.abs(e.crossAngle());
if (ang > Math.PI) throw new Error();
+ /*
if (e.t != null) {
numaspects++;
aspects += e.t.aspect()*e.t.aspect();
}
+ */
- float minangle = (float)(Math.PI * 0.3);
+ 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);
+ if (numaspects > 0) oldscore += (aspects / numaspects);
//System.out.println(oldscore);
//oldscore = oldscore*oldscore;
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;
- /*
- 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 {
E ret = getFreeIncident(e, e);
if (ret != null) return ret;
ret = getFreeIncident(e.pair.next, e.pair.next);
- if (ret == null) throw new Error("unable to find free incident to " + this);
+ if (ret == null) {
+ E ex = e;
+ do {
+ System.out.println(ex + " " + ex.t);
+ ex = ex.pair.next;
+ } while (ex != e);
+ throw new Error("unable to find free incident to " + this);
+ }
return ret;
}
}
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;
boolean shattered = false;
public float comparator() {
- if (t==null) return length();
+ Vert 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;
/** 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 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;
public final int color;
public final int colorclass;
+ public void removeFromRTree() { tris.remove(this); }
+ public void addToRTree() { tris.insert(this); }
+
public void destroy() {
+ tris.remove(this);
ts.remove(this);
}
this.color = color;
this.colorclass = colorclass;
ts.add(this);
+ tris.add(this);
}
public E e1() { return e1; }
public E e2() { return e1.next; }
public boolean has(Vert v) { return v1()==v || v2()==v || v3()==v; }
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);
p2().glVertex(gl);
p3().glVertex(gl);
}
}
-
+ public boolean tilemesh = false;
+ public boolean ignorecollision = false;
}
projects / anneal.git / blobdiff