if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
(t1.v2().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
(t1.v3().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
- t1.e1().bindEdge(t2.e3());
- t1.e2().bindEdge(t2.e2());
- t1.e3().bindEdge(t2.e1());
+ t2.e3().bindEdge(t1.e1(), m);
+ t2.e2().bindEdge(t1.e2(), m);
+ t2.e1().bindEdge(t1.e3(), m);
}
if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
(t1.v3().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
(t1.v1().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
- t1.e2().bindEdge(t2.e3());
- t1.e3().bindEdge(t2.e2());
- t1.e1().bindEdge(t2.e1());
+ t2.e3().bindEdge(t1.e2(), m);
+ t2.e2().bindEdge(t1.e3(), m);
+ t2.e1().bindEdge(t1.e1(), m);
}
if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
(t1.v1().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
(t1.v2().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
- t1.e3().bindEdge(t2.e3());
- t1.e1().bindEdge(t2.e2());
- t1.e2().bindEdge(t2.e1());
+ t2.e3().bindEdge(t1.e3(), m);
+ t2.e2().bindEdge(t1.e1(), m);
+ t2.e1().bindEdge(t1.e2(), m);
}
}
}
public void breakit() {
- /*
int oldverts = verts;
System.out.println("doubling vertices.");
PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
Mesh.E e = es.poll();
verts++;
//System.out.println("shatter " + e);
- e.shatter();
+ //e.shatter(e.midpoint(), null, null, true, true);
+
+ //e.shatter(e.midpoint(), null, null, true, false);
Thread.yield();
repaint();
}
tile.rebindPoints();
- */
}
public synchronized void rand(float temp, Mesh.Vertex p) {
Matrix m = Matrix.translate(v);
boolean good = p.move(m, false);
- if (!good) { misses++; return; }
+ if (!good) { /*misses++;*/ return; }
double new_tile_error = tile.error();
double new_goal_error = goal.error();
goal_error = new_goal_error;
//System.out.println("error: " + tile_error + " / " + goal_error);
hits++;
+ p.goodp = p.p;
} else {
p.move(Matrix.translate(v.times(-1)), true);
misses++;
if (breaks > 0) {
while (breaks>0) {
breaks--;
- //breakit();
+ breakit();
}
- //seek_upward = true;
+ seek_upward = true;
} else if (acceptance > 0.96) gamma = 0.4f;
else if (acceptance > 0.9) gamma = 0.5f;
else if (acceptance > 0.8) gamma = 0.65f;
else if (acceptance > 0.15) gamma = 0.9f;
else if (acceptance > 0.05) gamma = 0.95f;
else if (acceptance > 0.01) gamma = 0.98f;
- else breaks++;
+ else { /*breaks++;*/ }
if (seek_upward) {
if (acceptance > 0.2) seek_upward = false;
for(Mesh.E e : new Mesh.E[] { t.e1(), t.e2(), t.e3() }) {
if (e==null) continue;
if (e.stretchRatio() > max) es.add(e);
- if (t.aspect() < 0.1) es.add(e);
+ if (t.aspect() < 0.1 && e.length()>e.next.length() && e.length()>e.prev.length()) es.add(e);
}
}
-
- for(int i=0; i<1; i++) {
+ /*
+ for(int i=0; i<5; i++) {
Mesh.E e = es.poll();
if (e==null) break;
e.shatter();
}
+ */
tile.rebindPoints();
System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " +
synchronized(safeTriangles) {
safeTriangles.clear();
- for(Mesh.T t : tile) if (t.shouldBeDrawn()) safeTriangles.add(t);
+ for(Mesh.T t : tile)
+ if (t.shouldBeDrawn())
+ safeTriangles.add(t);
}
}
}