X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=1d4967fe1bd76e279e2a0393ae133a7d2ebaef57;hp=f9c9b945551a3f292b503ee0bc78d209e937e338;hb=57376a862c00fa1c8731f9989085fcfceeee0370;hpb=725965a06dc9a59f88b36e387f07ec3600b9364b diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index f9c9b94..1d4967f 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -15,7 +15,7 @@ public class Mesh implements Iterable { public static final Random random = new Random(); private PointSet pointset = new PointSet(); - + public int size() { return pointset.size(); } public Iterable vertices() { return pointset; } public Iterable edges() { @@ -37,11 +37,15 @@ public class Mesh implements Iterable { } public Iterator iterator() { + /* for(Vert v : pointset) if (v.e != null && v.e.t != null) return new FaceIterator(v); return new FaceIterator(); + */ + return ts.iterator(); } + public HashSet ts = new HashSet(); public Mesh score_against = null; public double score = 0; @@ -122,6 +126,7 @@ public class Mesh implements Iterable { public Vert nearest(Point p) { return pointset.nearest(p); } public final class Vert extends HasPoint { + public String toString() { return p.toString(); } public Point p; E e; // some edge *leaving* this point @@ -153,18 +158,25 @@ public class Mesh implements Iterable { 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; E e = this.e; + int count = 0; do { T t = e.t; m = m.plus(t.norm().fundamentalQuadric(t.centroid())); + count++; e = e.pair.next; } while(e != this.e); - fundamentalQuadric = m; + fundamentalQuadric = m.times(1/(float)count); applyQuadricToNeighbor(); } @@ -203,6 +215,15 @@ public class Mesh implements Iterable { reComputeError(); } + public void reComputeErrorAround() { + reComputeError(); + if (nearest_in_other_mesh != null) nearest_in_other_mesh.reComputeError(); + E e = this.e; + do { + e.p2.reComputeError(); + e = e.pair.next; + } while (e != this.e); + } public void reComputeError() { unComputeError(); computeError(); @@ -212,7 +233,49 @@ public class Mesh implements Iterable { oldscore = 0; } public void computeError() { - oldscore = quadric_count == 0 ? 0 : (quadric.preAndPostMultiply(p) / quadric_count); + if (quadric_count == 0) { + if (!tilemesh) { + } + else if (nearest_in_other_mesh == null) { + if (score_against != null) { + Vert ne = score_against.nearest(p); + oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10; + } else { + oldscore = 0; + } + } else { + oldscore = nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10; + } + } else { + oldscore = (quadric.preAndPostMultiply(p) * 100) / quadric_count; + } + + oldscore = oldscore; + + int numaspects = 0; + float aspects = 0; + E e = this.e; + do { + //double ang = Math.abs(e.crossAngle()); + double ang = Math.abs(e.crossAngle()); + if (ang > Math.PI) throw new Error(); + /* + if (e.t != null) { + numaspects++; + aspects += e.t.aspect()*e.t.aspect(); + } + */ + + float minangle = (float)(Math.PI * 0.8); + if (ang > minangle) + oldscore += (ang - minangle); + + e = e.pair.next; + } while (e != this.e); + if (numaspects > 0) oldscore += (aspects / numaspects); + + //System.out.println(oldscore); + //oldscore = oldscore*oldscore; score += oldscore; } @@ -232,16 +295,42 @@ public class Mesh implements Iterable { } applyQuadricToNeighbor(); + // FIXME: intersection test needed? + boolean good = true; + // should recompute fundamental quadrics of all vertices sharing a face, but we defer... E e = this.e; do { + /* + if (Math.abs(e.crossAngle()) > (Math.PI * 0.9) || + Math.abs(e.next.crossAngle()) > (Math.PI * 0.9)) { + good = false; + } + if (e.t.aspect() < 0.1) { + good = false; + } + */ e.p2.quadricStale = true; e = e.pair.next; } while(e != this.e); + if (!ignorecollision) + 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); + } - // FIXME: intersection test needed? - return true; + reComputeErrorAround(); + return good; } public boolean move(Vec v) { @@ -259,7 +348,14 @@ public class Mesh implements Iterable { E ret = getFreeIncident(e, e); if (ret != null) return ret; ret = getFreeIncident(e.pair.next, e.pair.next); - if (ret == null) throw new Error("unable to find free incident to " + this); + if (ret == null) { + E ex = e; + do { + System.out.println(ex + " " + ex.t); + ex = ex.pair.next; + } while (ex != e); + throw new Error("unable to find free incident to " + this); + } return ret; } @@ -323,23 +419,24 @@ public class Mesh implements Iterable { 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() { this.bind_others = new BindingGroup(this); } + public BindingGroup(E e) { this(); set.add(e); } public void add(E e) { if (set.contains(e)) return; - for (E epeer : e.bind_peers.set) { - epeer.bind_peers = this; - set.add(epeer); - } - for (E eother : e.bind_to.set) { - eother.bind_to = bind_others; - bind_others.add(eother); - } - - for(E ex : (!swap ? right : left)) { - if (e.prev.isBoundTo(ex.prev)) { - System.out.println("hit!"); + 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); + } + if (e.prev.bind_to.set.contains(eother.next)) { + e.prev.prev.bindEdge(eother.next.next); } } @@ -352,7 +449,7 @@ public class Mesh implements Iterable { } public void shatter(BindingGroup bg1, BindingGroup bg2) { for(E e : set) { - e.shatter(e.midpoint(), bg1, bg2, false); + e.shatter(e.midpoint(), bg1, bg2); } } } @@ -365,32 +462,53 @@ public class Mesh implements Iterable { E prev; // previous half-edge E next; // next half-edge E pair; // partner half-edge - public BindingGroup bind_peers = new BindingGroup(); + public BindingGroup bind_peers = new BindingGroup(this); public BindingGroup bind_to = bind_peers.other(); boolean shattered = false; - public int compareTo(E e) { return e.length() > length() ? 1 : -1; } + public float comparator() { + Vert nearest = score_against.nearest(midpoint()); + //if (t==null) return length(); + /* + double ang = Math.abs(crossAngle()); + float minangle = (float)(Math.PI * 0.9); + if (ang > minangle) + return 300; + */ + /* + if ((length() * length()) / t.area() > 10) + return (float)(length()*Math.sqrt(t.area())); + return length()*t.area(); + */ + return (float)Math.max(length(), midpoint().distance(nearest.p)); + //return length(); + } + public int compareTo(E e) { + return e.comparator() > comparator() ? 1 : -1; + } 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(); + BindingGroup old_bind_to = bind_to; bind_peers.shatter(bg1, bg2); - bind_to.shatter(bg2.other(), bg1.other()); + 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); + 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; @@ -401,12 +519,23 @@ public class Mesh implements Iterable { if (destroyed) return; destroyed = true; pair.destroyed = true; + + if (t != null) t.destroy(); + t = null; + + if (pair.t != null) pair.t.destroy(); + pair.t = null; + if (next.t != null) next.t.destroy(); if (prev.t != null) prev.t.destroy(); next.t = null; prev.t = null; + + if (pair.next.t != null) pair.next.t.destroy(); + if (pair.prev.t != null) pair.next.t.destroy(); pair.next.t = null; pair.prev.t = null; + this.bind_to = null; pair.bind_to = null; this.bind_peers = null; @@ -439,7 +568,13 @@ public class Mesh implements Iterable { } 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() { @@ -601,7 +736,7 @@ public class Mesh implements Iterable { 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); @@ -616,7 +751,7 @@ public class Mesh implements Iterable { 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(); @@ -649,11 +784,13 @@ public class Mesh implements Iterable { public final class T extends Triangle { public final E e1; public final int color; + public final int colorclass; public void destroy() { + ts.remove(this); } - T(E e1) { + T(E e1, int colorclass) { this.e1 = e1; E e2 = e1.next; E e3 = e2.next; @@ -675,6 +812,8 @@ public class Mesh implements Iterable { break; } this.color = color; + this.colorclass = colorclass; + ts.add(this); } public E e1() { return e1; } public E e2() { return e1.next; } @@ -687,6 +826,19 @@ public class Mesh implements Iterable { 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); + } + } + public boolean tilemesh = false; + public boolean ignorecollision = false; }