/** a vertex in the mesh */
public final class Vertex extends HasQuadric implements Visitor {
- public Point p, oldp;
+ public Point p, oldp, goodp;
E e; // some edge *leaving* this point
Matrix binding = Matrix.ONE;
private Vertex(Point p) {
this.p = p;
+ this.goodp = p;
if (vertices.get(p) != null) throw new Error();
vertices.add(this);
}
? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p)
: nearest().fundamentalQuadric().preAndPostMultiply(p);
if (quadric_count != 0)
- nerror = (/*nerror +*/ quadric.preAndPostMultiply(p))/(quadric_count/*+1*/);
- /*
+ nerror = (nerror + quadric.preAndPostMultiply(p))/(quadric_count+1);
+
for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
double ang = Math.abs(e.dihedralAngle());
if (ang > Math.PI) throw new Error();
float minangle = (float)(Math.PI * 0.8);
if (ang > minangle) nerror += (ang - minangle);
+ /*
if (e.t.aspect() < 0.2) {
- nerror += (0.2-e.t.aspect()) * 300;
+ nerror += (0.2-e.t.aspect()) * 10;
}
- }
*/
+ }
+
setError(nerror);
}
e.p2.bind(ebound.p1);
}
}
- public void shatter(BindingGroup bg1, BindingGroup bg2) {
+ public void shatter(BindingGroup bg1, BindingGroup bg2, boolean triangles) {
for(E e : set) {
- e.shatter(e.midpoint(), bg1, bg2);
+ e.shatter(e.midpoint(), bg1, bg2, triangles);
}
}
}
public void bindEdge(E e) { bind_to.add(e); }
public void dobind() { bind_to.dobind(this); }
- public Point shatter() { return shatter(midpoint(), null, null); }
- public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) {
+ public Point shatter() { return shatter(midpoint(), null, null, true); }
+ public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean triangles) {
if (shattered || destroyed) return mid;
shattered = true;
if (bg1==null) bg1 = new BindingGroup();
if (bg2==null) bg2 = new BindingGroup();
BindingGroup old_bind_to = bind_to;
- bind_peers.shatter(bg1, bg2);
- old_bind_to.shatter(bg2.other(), bg1.other());
+ bind_peers.shatter(bg1, bg2, triangles);
+ old_bind_to.shatter(bg2.other(), bg1.other(), triangles);
pair.shatter();
destroy();
- newT(r.p, p1.p, mid, null, old_colorclass);
- newT(r.p, mid, p2.p, null, old_colorclass);
- bg1.add(p1.getE(mid));
- bg2.add(p2.getE(mid).pair);
+ if (triangles) {
+ newT(r.p, p1.p, mid, null, old_colorclass);
+ newT(r.p, mid, p2.p, null, old_colorclass);
+ bg1.add(p1.getE(mid));
+ bg2.add(p2.getE(mid).pair);
+ }
return mid;
}
public void glVertices(GL gl) {
if (!shouldBeDrawn()) return;
norm().glNormal(gl);
- Point p1 = v1().oldp;
- Point p2 = v2().oldp;
- Point p3 = v3().oldp;
- if (p1==null || p2==null || p3==null) return;
+ Point p1 = v1().goodp;
+ Point p2 = v2().goodp;
+ Point p3 = v3().goodp;
p1.glVertex(gl);
p2.glVertex(gl);
p3.glVertex(gl);