pointset.add(this);
}
+ private void glNormal(GL gl) {
+ Vec norm = norm();
+ gl.glNormal3f(norm.x, norm.y, norm.z);
+ }
+
public void recomputeFundamentalQuadric() {
- if (!quadricStale && fundamentalQuadric != null) return;
+ //if (!quadricStale && fundamentalQuadric != null) return;
quadricStale = false;
unApplyQuadricToNeighbor();
Matrix m = Matrix.ZERO;
oldscore = 0;
}
public void computeError() {
- oldscore = quadric_count == 0 ? 0 : (quadric.preAndPostMultiply(p) / quadric_count);
+ oldscore = quadric_count == 0 ? 0 : ((quadric.preAndPostMultiply(p) * 100) / quadric_count);
+ double ang = Math.abs(e.crossAngle());
+ if (ang < Math.PI * 0.2)
+ oldscore += ((Math.PI*0.2) - ang) * 10;
+ //System.out.println(oldscore);
score += oldscore;
}
e = e.pair.next;
} while(e != this.e);
-
// FIXME: intersection test needed?
- return true;
+ 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);
+ }
+*/
+ return good;
}
public boolean move(Vec v) {
}
public class BindingGroup {
- private HashSet<E> left = new HashSet<E>();
- private HashSet<E> right = new HashSet<E>();
- public BindingGroup() { }
- public BindingGroup(E e) { add(null, e, false); }
- public void add(E ethis, E e, boolean swap) {
- if (ethis==null) { }
- else if (right.contains(ethis)) swap = !swap;
- else if (!left.contains(ethis)) throw new Error();
-
- if (e.bg != null) {
- if (e.bg == this) {
- if ((!swap ? right : left).contains(e)) throw new Error("double bind!");
- return;
+ private HashSet<E> set = new HashSet<E>();
+ public BindingGroup bind_others;
+ public BindingGroup other() { return bind_others; }
+ public BindingGroup(BindingGroup bind_others) { this.bind_others = bind_others; }
+ public BindingGroup() { this.bind_others = new BindingGroup(this); }
+ public BindingGroup(E e) { this(); set.add(e); }
+ public void add(E e) {
+ if (set.contains(e)) return;
+ set.add(e);
+ BindingGroup e_bind_peers = e.bind_peers;
+ BindingGroup e_bind_to = e.bind_to;
+ e.bind_peers = this;
+ e.bind_to = bind_others;
+ for (E epeer : e_bind_peers.set) add(epeer);
+ for (E eother : e_bind_to.set) bind_others.add(eother);
+
+ for(E eother : bind_others.set) {
+ if (e.next.bind_to.set.contains(eother.prev)) {
+ e.next.next.bindEdge(eother.prev.prev);
}
- for(E ex : (!swap ? e.bg.left : e.bg.right)) {
- ex.bg = this;
- left.add(ex);
+ if (e.prev.bind_to.set.contains(eother.next)) {
+ e.prev.prev.bindEdge(eother.next.next);
}
- for(E ex : (!swap ? e.bg.right : e.bg.left)) {
- ex.bg = this;
- right.add(ex);
- }
-
- } else {
- (!swap ? left : right).add(e);
- e.bg = this;
}
- for(E ex : (!swap ? right : left)) {
- if (e.prev.isBoundTo(ex.prev)) {
- System.out.println("hit!");
- }
- }
- }
- public boolean isBoundTo(E e1, E e2) {
- if (left.contains(e1) && right.contains(e2)) return true;
- if (left.contains(e2) && right.contains(e1)) return true;
- return false;
+
}
public void dobind(E e) {
- Vert v1 = null;
- Vert v2 = null;
- if (left.contains(e)) { v1 = e.p1; v2 = e.p2; }
- if (right.contains(e)) { v1 = e.p2; v2 = e.p1; }
- for(E ex : left) {
- if (ex==e) continue;
- v1.bind(ex.p1);
- v2.bind(ex.p2);
- }
- for(E ex : right) {
- if (ex==e) continue;
- v1.bind(ex.p2);
- v2.bind(ex.p1);
+ for(E ebound : set) {
+ e.p1.bind(ebound.p2);
+ e.p2.bind(ebound.p1);
}
}
public void shatter(BindingGroup bg1, BindingGroup bg2) {
- for(E e : left) {
- e.shatter(e.midpoint(), bg1, bg2, false);
- }
- for(E e : right) {
- e.shatter(e.midpoint(), bg1, bg2, true); // swap correct?
+ for(E e : set) {
+ e.shatter(e.midpoint(), bg1, bg2);
}
}
}
E prev; // previous half-edge
E next; // next half-edge
E pair; // partner half-edge
- public BindingGroup bg = new BindingGroup(this);
+ public BindingGroup bind_peers = new BindingGroup(this);
+ public BindingGroup bind_to = bind_peers.other();
boolean shattered = false;
- public boolean isBoundTo(E e) { return bg.isBoundTo(this, e); }
-
-
public int compareTo(E e) { return e.length() > length() ? 1 : -1; }
- public void bindEdge(E e) { bg.add(this, e, true); }
- public void dobind() { if (bg != null) bg.dobind(this); }
+ public void bindEdge(E e) { bind_to.add(e); }
+ public void dobind() { bind_to.dobind(this); }
- public Point shatter() { return shatter(midpoint(), null, null, false); }
- public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean swap) {
- if (shattered) return mid;
+ public Point shatter() { return shatter(midpoint(), null, null); }
+ public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) {
+ if (shattered || destroyed) return mid;
shattered = true;
Vert r = next.p2;
E next = this.next;
E prev = this.prev;
+ int old_colorclass = t==null ? 0 : t.colorclass;
if (bg1==null) bg1 = new BindingGroup();
if (bg2==null) bg2 = new BindingGroup();
- bg.shatter(bg1, bg2);
+ BindingGroup old_bind_to = bind_to;
+ bind_peers.shatter(bg1, bg2);
+ old_bind_to.shatter(bg2.other(), bg1.other());
pair.shatter();
destroy();
- newT(r.p, p1.p, mid, null);
- newT(r.p, mid, p2.p, null);
- (swap ? bg1 : bg2).add(null, p1.getE(mid), swap);
- (swap ? bg2 : bg1).add(null, p2.getE(mid).pair, swap);
+ 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;
}
prev.t = null;
pair.next.t = null;
pair.prev.t = null;
- this.bg = null;
- pair.bg = null;
+ this.bind_to = null;
+ pair.bind_to = null;
+ this.bind_peers = null;
+ pair.bind_peers = null;
pair.prev.next = next;
next.prev = pair.prev;
prev.next = pair.next;
this.prev.next = this;
this.next.prev = this;
this.pair.pair = this;
+ bind_peers.add(this);
if (this.next.p1 != p2) throw new Error();
if (this.prev.p2 != p1) throw new Error();
if (this.p1.e == null) this.p1.e = this;
}
private boolean added = false;
- public T makeT() { return t==null ? (t = new T(this)) : t; }
+ public T makeT(int colorclass) { return t==null ? (t = new T(this, colorclass)) : t; }
+
+ public double crossAngle() {
+ Vec v1 = t.norm().times(-1);
+ Vec v2 = pair.t.norm().times(-1);
+ return Math.acos(v1.norm().dot(v2.norm()));
+ }
/** angle between this half-edge and the next */
public double angle() {
if (v2 != null) return new E(v2.getFreeIncident(), p1).pair;
return new E(p1, p2);
}
- public T newT(Point p1, Point p2, Point p3, Vec norm) {
+ public T newT(Point p1, Point p2, Point p3, Vec norm, int colorclass) {
if (norm != null) {
Vec norm2 = p3.minus(p1).cross(p2.minus(p1));
float dot = norm.dot(norm2);
e23.makeAdjacent(e31);
e31.makeAdjacent(e12);
}
- T ret = e12.makeT();
+ T ret = e12.makeT(colorclass);
if (e12.t == null) throw new Error();
if (e23.t == null) throw new Error();
if (e31.t == null) throw new Error();
public final class T extends Triangle {
public final E e1;
public final int color;
+ public final int colorclass;
public void destroy() {
}
- T(E e1) {
+ T(E e1, int colorclass) {
this.e1 = e1;
E e2 = e1.next;
E e3 = e2.next;
break;
}
this.color = color;
+ this.colorclass = colorclass;
}
public E e1() { return e1; }
public E e2() { return e1.next; }
public Point p3() { return e1.next.p2.p; }
public boolean hasE(E e) { return e1==e || e1.next==e || e1.prev==e; }
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);
+ }
}
}
projects / anneal.git / blobdiff