X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=7c3867295ba1eddbe011cd812f1d739ecd659288;hp=57eda26d738feffcd6ed84b123aa8c7dc2edd40a;hb=076fc38f95ee874e4bb01e03cb1021f5d137f35e;hpb=30607e6bf4827d90fc055c8db1e7f363ef2693e6 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 57eda26..7c38672 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -19,6 +19,47 @@ public class Mesh implements Iterable { private RTree triangles = new RTree(); private PointSet vertices = new PointSet(); + public boolean option_wireframe = false; + public boolean option_errorNormals = false; + public boolean option_selectable = true; + + public void render(GL gl, Matrix m) { + if (option_wireframe) { + gl.glDisable(GL.GL_LIGHTING); + gl.glBegin(GL.GL_LINES); + gl.glColor3f(1, 1, 1); + for (T t : this) { + m.times(t.e1().p1.goodp).glVertex(gl); + m.times(t.e1().p2.goodp).glVertex(gl); + m.times(t.e2().p1.goodp).glVertex(gl); + m.times(t.e2().p2.goodp).glVertex(gl); + m.times(t.e3().p1.goodp).glVertex(gl); + m.times(t.e3().p2.goodp).glVertex(gl); + } + gl.glEnd(); + gl.glEnable(GL.GL_LIGHTING); + return; + } + for(T t : this) { + gl.glColor4f((float)(0.25+(0.05*t.color)), + (float)(0.25+(0.05*t.color)), + (float)(0.75+(0.05*t.color)), + (float)0.3); + t.glTriangle(gl, m); + } + if (option_errorNormals) + for(T t : this) + for(Mesh.Vertex p : new Mesh.Vertex[] { t.v1(), t.v2(), t.v3() }) { + if (p.ok) { + gl.glBegin(GL.GL_LINES); + gl.glColor3f(1, 1, 1); + p.p.glVertex(gl); + p.p.plus(p.norm().times((float)p.error()*10)).glVertex(gl); + gl.glEnd(); + } + } + } + public boolean immutableVertices; public Mesh error_against = null; public double error = 0; @@ -84,6 +125,8 @@ public class Mesh implements Iterable { private boolean illegal = false; + public boolean visible = false; + public Point getPoint() { return p; } public float error() { return olderror; } @@ -108,6 +151,22 @@ public class Mesh implements Iterable { 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; @@ -134,6 +193,10 @@ public class Mesh implements Iterable { 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); } @@ -147,28 +210,45 @@ public class Mesh implements Iterable { 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.05; + 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) { + public boolean move(Vec vv, boolean ignoreProblems) { + boolean good = true; // t1' = M * t1 @@ -178,21 +258,26 @@ public class Mesh implements Iterable { // 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); + Matrix m2 = getBindingMatrix(bindingGroup.getMaster()); + Vec v2 = m2.times(vv.plus(getPoint())).minus(m2.times(getPoint())); + return ((Vertex)bindingGroup.getMaster()).move(v2, ignoreProblems); } + Point op = this.p; + Point pp = vv.plus(getPoint()); if (bindingGroup != null) { - Matrix m2 = null; - for(int i=0; i<20 && !m.equals(m2); i++) { - m2 = m.times(getConstraint()); + /* + for(int i=0; i<20 ; i++) { + Point p2 = getConstraint().times(pp); + pp = pp.midpoint(p2); //System.out.println(m.minus(m2)); } - if (!m.equals(m2)) return true; + */ + pp = getConstraint().times(pp); } - - Point op = this.p; - Point pt = m.times(this.p); + pp = pp.minus(op).norm().times(vv.mag()).plus(op); + ok = false; + Point pt = pp; for(Vertex v : (Iterable)getBoundPeers()) { Point pt2 = v.getBindingMatrix(this).times(pt); /* @@ -212,8 +297,10 @@ public class Mesh implements Iterable { v.recomputeFundamentalQuadricIfNeighborChanged(); for(Vertex v : (Iterable)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) { @@ -222,7 +309,6 @@ public class Mesh implements Iterable { unApplyQuadricToNeighbor(); - boolean illegalbefore = illegal; illegal = false; /* @@ -283,6 +369,7 @@ public class Mesh implements Iterable { return !illegal; } + public E getEdge() { return e; } public E getFreeIncident() { E ret = getFreeIncident(e, e); if (ret != null) return ret; @@ -337,6 +424,8 @@ public class Mesh implements Iterable { 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 newBindingGroup = @@ -354,6 +443,12 @@ public class Mesh implements Iterable { 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)) @@ -372,7 +467,6 @@ public class Mesh implements Iterable { } public float comparator() { return length(); - //return t==null?0:(1/t.aspect()); } public int compareTo(E e) { return e.comparator() > comparator() ? 1 : -1; @@ -401,8 +495,10 @@ public class Mesh implements Iterable { 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); } @@ -522,6 +618,12 @@ public class Mesh implements Iterable { 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"); @@ -643,12 +745,16 @@ public class Mesh implements Iterable { 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; @@ -700,17 +806,18 @@ public class Mesh implements Iterable { 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); } - } }