ArrayList<Vertex> set = new ArrayList<Vertex>();
for(Vertex v : vertices) set.add(v);
for(Vertex v : set) v.transform(m.times(v.p), true, null);
+ for(Vertex v : set) v.goodp = v.p;
}
public void rebuild() { /*vertices.rebuild();*/ }
private boolean illegal = false;
+ public boolean visible = false;
+
public Point getPoint() { return p; }
public float error() { return olderror; }
private Vertex(Point p) {
this.p = p;
this.goodp = p;
+ this.oldp = p;
if (vertices.get(p) != null) throw new Error();
vertices.add(this);
}
m = m.plus(e.t.norm().fundamentalQuadric(e.t.centroid()));
count++;
}
+ if (count > 0) {
+ m = m.plus(norm().fundamentalQuadric(this.p).times(count));
+ count *= 2;
+ }
return m.times(1/(float)count);
}
if (quadric_count != 0)
nerror = (nerror + quadric.preAndPostMultiply(p))/(quadric_count+1);
- if (!immutableVertices && quadric_count == 0)
- nerror *= 2;
-
+ if (!immutableVertices && quadric_count == 0) {
+ //nerror = Math.max(nerror, 0.4f);
+ //nerror *= 2;
+ }
+ //System.out.println(nerror);
for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
- double ang = Math.abs(e.dihedralAngle());
+ double ang = e.dihedralAngle();
if (ang > Math.PI) throw new Error();
+ if (ang < -Math.PI) throw new Error();
float minangle = (float)(Math.PI * 0.8);
+ //nerror += ((ang / Math.PI)*(ang/Math.PI)) * e.length() * 0.05;
+
+ nerror += (1-e.t.quality())*0.0001;
if (ang > minangle) nerror += (ang - minangle);
+
+ //System.out.println(((ang / Math.PI)*(ang/Math.PI)) * 0.000001);
+ /*
if (e.t.aspect() < 0.2) {
nerror += (0.2-e.t.aspect()) * 10;
}
+ */
+ }
+ if (!immutableVertices) {
+ Vertex n = (Vertex)nearest();
+ float d = norm().dot(n.norm());
+ if (d > 1 || d < -1) throw new Error();
+ if (d >= 0) {
+ nerror *= (2.0f - d);
+ } else {
+ nerror += 0.0003 * (2.0f + d);
+ nerror *= (2.0f + d);
+ }
}
setError(nerror);
}
public boolean move(Matrix m, boolean ignoreProblems) {
+
boolean good = true;
// t1' = M * t1
// t2' = t2.getMatrix(t1) * M * t1
// t1 = t1.getMatrix(t2) * t2
// M * t1 = M * t1.getMatrix(t2) * t2
+
+ if (bindingGroup!=null && this != bindingGroup.getMaster()) {
+ Matrix v = getBindingMatrix(bindingGroup.getMaster());
+ return ((Vertex)bindingGroup.getMaster()).move(v.inverse().times(m).times(v), ignoreProblems);
+ }
+
+ if (bindingGroup != null) {
+ Matrix m2 = null;
+ for(int i=0; i<20 && !m.equals(m2); i++) {
+ m2 = m.times(getConstraint());
+ //System.out.println(m.minus(m2));
+ }
+ if (!m.equals(m2)) return true;
+ }
+ ok = false;
Point op = this.p;
Point pt = m.times(this.p);
for(Vertex v : (Iterable<Vertex>)getBoundPeers()) {
throw new Error(v.p+" "+pt2+"\n"+op+" "+pt+"\n"+v.getBindingMatrix(this));
if (Math.abs( v.p.minus(pt2).mag() / pt.minus(op).mag() ) < 1/5) throw new Error();
*/
- good &= v.transform(pt2,
- ignoreProblems, v.getBindingMatrix(this));
+ good &= v.transform(pt2, ignoreProblems, v.getBindingMatrix(this));
+ }
+
+ if (!good && !ignoreProblems) {
+ for(Vertex v : (Iterable<Vertex>)getBoundPeers())
+ v.transform(v.oldp, true, null);
}
for(Vertex v : (Iterable<Vertex>)getBoundPeers())
v.recomputeFundamentalQuadricIfNeighborChanged();
+ for(Vertex v : (Iterable<Vertex>)getBoundPeers())
+ v.reComputeErrorAround();
+ ok = true;
return good;
}
+ public boolean ok = true;
/** does NOT update bound pairs! */
private boolean transform(Point newp, boolean ignoreProblems, Matrix yes) {
unApplyQuadricToNeighbor();
+ boolean illegalbefore = illegal;
illegal = false;
- if (this.p.minus(newp).mag() > 0.1 && !ignoreProblems) {
/*
+ if (this.p.minus(newp).mag() > 0.1 && !ignoreProblems) {
try {
throw new Exception(""+this.p.minus(newp).mag()+" "+ignoreProblems+" "+yes);
} catch(Exception e) {
e.printStackTrace();
}
- */
illegal = true;
}
+ */
this.p = newp;
reinsert();
}
for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
e.p2.quadricStale = true;
- return !illegal;
+ return !illegal || (illegalbefore && illegal);
}
public void checkLegality() {
+ /*
for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
if (Math.abs(e.dihedralAngle()) > (Math.PI * 0.9) ||
Math.abs(e.next.dihedralAngle()) > (Math.PI * 0.9)) illegal = true;
if (e.t.aspect() < 0.2) illegal = true;
}
+ */
if (!illegal) triangles.range(oldp, this.p, (Visitor<T>)this);
}
(edu.berkeley.qfat.geom.BindingGroup<E>)newBindingGroup_;
if (newBindingGroup==null) return;
if (this==newBindingGroup.getMaster()) return;
- for(E eother : (Iterable<E>)newBindingGroup) {
+ HashSet<E> nbg = new HashSet<E>();
+ for(E eother : (Iterable<E>)newBindingGroup) nbg.add(eother);
+ for(E eother : nbg) {
if (next==null || prev==null) continue;
if (eother.next==null || eother.prev==null) continue;
+
if (next.isBoundTo(eother.pair.prev.pair) && !prev.isBoundTo(eother.pair.next.pair))
prev.bindTo(next.getBindingMatrix(eother.pair.prev.pair), eother.pair.next.pair);
if (!next.isBoundTo(eother.pair.prev.pair) && prev.isBoundTo(eother.pair.next.pair))
next.bindTo(prev.getBindingMatrix(eother.pair.next.pair), eother.pair.prev.pair);
+
+ /*
+ if (next.isBoundTo(eother.prev) && !prev.isBoundTo(eother.next))
+ prev.bindTo(next.getBindingMatrix(eother.prev), eother.next);
+ if (!next.isBoundTo(eother.prev) && prev.isBoundTo(eother.next))
+ next.bindTo(prev.getBindingMatrix(eother.next), eother.prev);
+ */
+ if (next.isBoundTo(eother.next) && !prev.isBoundTo(eother.prev))
+ prev.bindTo(next.getBindingMatrix(eother.next), eother.prev);
+ if (!next.isBoundTo(eother.next) && prev.isBoundTo(eother.prev))
+ next.bindTo(prev.getBindingMatrix(eother.prev), eother.next);
}
}
}
public float comparator() {
return length();
- //return t==null?0:(1/t.aspect());
}
public int compareTo(E e) {
return e.comparator() > comparator() ? 1 : -1;
System.out.println(" " + p1.p + " " + m.times(e.p1.p));
System.out.println(" " + p2.p + " " + m.times(e.p2.p));
*/
+ /*
if (m.times(e.p1.p).minus(p1.p).mag() > EPSILON) throw new Error();
if (m.times(e.p2.p).minus(p2.p).mag() > EPSILON) throw new Error();
+ */
this.bindTo(m, e);
}
if (e==this) continue;
p1.bindTo(getBindingMatrix(e), e.p1);
p2.bindTo(getBindingMatrix(e), e.p2);
+ e.p1.setConstraint(getConstraint());
+ e.p2.setConstraint(getConstraint());
}
}
Point mid = e.midpoint();
Vertex r = e.next.p2;
Vertex l = e.pair.next.p2;
- e.destroy();
- e.pair.destroy();
- newT(r.p, e.p1.p, mid, null, 0);
- newT(r.p, mid, e.p2.p, null, 0);
- newT(l.p, mid, e.p1.p, null, 0);
- newT(l.p, e.p2.p, mid, null, 0);
+ if (!e.destroyed) {
+ e.destroy();
+ e.pair.destroy();
+ newT(r.p, e.p1.p, mid, null, 0);
+ newT(r.p, mid, e.p2.p, null, 0);
+ newT(l.p, mid, e.p1.p, null, 0);
+ newT(l.p, e.p2.p, mid, null, 0);
+ }
}
for(E e : (Iterable<E>)getBoundPeers()) {
Point mid = e.midpoint();
e.p2.getE(mid).pair. bindTo(e.getBindingMatrix(firste), firstq);
e.p2.getE(mid).pair.pair.bindTo(e.getBindingMatrix(firste), firstq.pair);
}
+ /*
+ first.setConstraint(firste.getConstraint());
+ firstq.setConstraint(firste.getConstraint());
+ */
return null;
}
public double dihedralAngle() {
Vec v1 = t.norm().times(-1);
Vec v2 = pair.t.norm().times(-1);
- return Math.acos(v1.norm().dot(v2.norm()));
+ double prod = v1.norm().dot(v2.norm());
+ prod = Math.min(1,prod);
+ prod = Math.max(-1,prod);
+ double ret = Math.acos(prod);
+ if (Double.isNaN(ret)) throw new Error("nan! " + prod);
+ return ret;
}
/** angle between this half-edge and the next */
if (v2 != null) return new E(v2.getFreeIncident(), p1).pair;
return new E(p1, p2);
}
+ public boolean coalesce = false;
+ private static float round(float f) {
+ return Math.round(f*1000)/1000f;
+ }
public T newT(Point p1, Point p2, Point p3, Vec norm, int colorclass) {
+ if (coalesce) {
+
+ for(Vertex v : vertices) { if (p1.distance(v.p) < EPSILON) { p1 = v.p; break; } }
+ for(Vertex v : vertices) { if (p2.distance(v.p) < EPSILON) { p2 = v.p; break; } }
+ for(Vertex v : vertices) { if (p3.distance(v.p) < EPSILON) { p3 = v.p; break; } }
+ /*
+ p1 = new Point(round(p1.x), round(p1.y), round(p1.z));
+ p2 = new Point(round(p2.x), round(p2.y), round(p2.z));
+ p3 = new Point(round(p3.x), round(p3.y), round(p3.z));
+ */
+ }
if (norm != null) {
Vec norm2 = p3.minus(p1).cross(p2.minus(p1));
float dot = norm.dot(norm2);
return ret;
}
+ private int max_serial = 0;
/** [UNIQUE] a triangle (face) */
public final class T extends Triangle {
public final E e1;
public final int color;
public final int colorclass;
+ public final int serial = max_serial++;
+ public boolean occluded;
+
T(E e1, int colorclass) {
this.e1 = e1;
E e2 = e1.next;
public void reinsert() { triangles.remove(this); triangles.add(this); }
public boolean shouldBeDrawn() {
- /*
+
if (e1().bindingGroupSize() <= 1) return false;
if (e2().bindingGroupSize() <= 1) return false;
if (e3().bindingGroupSize() <= 1) return false;
- */
+
return true;
}
+ public void glTriangle(GL gl, Matrix m) {
+ gl.glPushName(serial);
+ gl.glBegin(GL.GL_TRIANGLES);
+ glVertices(gl, m);
+ gl.glEnd();
+ gl.glPopName();
+ }
+
/** issue gl.glVertex() for each of the triangle's points */
- public void glVertices(GL gl) {
+ public void glVertices(GL gl, Matrix m) {
if (!shouldBeDrawn()) return;
- norm().glNormal(gl);
- Point p1 = v1().goodp;
- Point p2 = v2().goodp;
- Point p3 = v3().goodp;
- p1.glVertex(gl);
- p2.glVertex(gl);
- p3.glVertex(gl);
+ super.glVertices(gl, m);
}
-
}
}
projects / anneal.git / blobdiff