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);
}
error += olderror;
}
+ /*
+ public Vertex hack(GL gl, Point mouse) {
+ double dist = Double.MAX_VALUE;
+ Vertex cur = null;
+ for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
+ Vertex v = e.getOther(this);
+ double dist2 = v.getPoint().glProject(gl).distance(mouse);
+ if ((cur==null || dist2 < dist) && v.visible) {
+ dist = dist2;
+ cur = v;
+ }
+ }
+ return cur;
+ }
+ */
+
public float averageTriangleArea() {
int count = 0;
float ret = 0;
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 = 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.01;
+ 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 (ang > minangle) nerror += (ang - minangle);
/*
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
if (bindingGroup != null) {
Matrix m2 = null;
for(int i=0; i<20 && !m.equals(m2); i++) {
- m2 = m.times(bindingGroup.krank);
+ 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()) {
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) {
}
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);
}
return !illegal;
}
+ public E getEdge() { return e; }
public E getFreeIncident() {
E ret = getFreeIncident(e, e);
if (ret != null) return ret;
public boolean intersects(T t) { return t.intersects(p1.p, p2.p); }
+ public Segment getSegment() { return new Segment(p1.getPoint(), p2.getPoint()); }
+
public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) {
edu.berkeley.qfat.geom.BindingGroup<E> newBindingGroup =
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))
}
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);
}
e.p2.getE(mid).pair. bindTo(e.getBindingMatrix(firste), firstq);
e.p2.getE(mid).pair.pair.bindTo(e.getBindingMatrix(firste), firstq.pair);
}
- if (firste.bindingGroup != null)
- firste.bindingGroup.setKrank(bindingGroup.krank);
- if (firstq.bindingGroup != null)
- firstq.bindingGroup.setKrank(bindingGroup.krank);
+ /*
+ first.setConstraint(firste.getConstraint());
+ firstq.setConstraint(firste.getConstraint());
+ */
return null;
}
return Math.acos(v1.norm().dot(v2.norm()));
}
+ public Vertex getOther(Vertex v) {
+ if (this.p1 == v) return p2;
+ if (this.p2 == v) return p1;
+ throw new Error();
+ }
+
public void makeAdjacent(E e) {
if (this.next == e) return;
if (p2 != e.p1) throw new Error("cannot make adjacent -- no shared vertex");
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;
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