projects
/
anneal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[anneal.git]
/
src
/
edu
/
berkeley
/
qfat
/
Mesh.java
diff --git
a/src/edu/berkeley/qfat/Mesh.java
b/src/edu/berkeley/qfat/Mesh.java
index
3696c0b
..
1d4967f
100644
(file)
--- a/
src/edu/berkeley/qfat/Mesh.java
+++ b/
src/edu/berkeley/qfat/Mesh.java
@@
-15,7
+15,7
@@
public class Mesh implements Iterable<Mesh.T> {
public static final Random random = new Random();
private PointSet<Vert> pointset = new PointSet<Vert>();
public static final Random random = new Random();
private PointSet<Vert> pointset = new PointSet<Vert>();
-
+ public int size() { return pointset.size(); }
public Iterable<Vert> vertices() { return pointset; }
public Iterable<E> edges() {
public Iterable<Vert> vertices() { return pointset; }
public Iterable<E> edges() {
@@
-126,6
+126,7
@@
public class Mesh implements Iterable<Mesh.T> {
public Vert nearest(Point p) { return pointset.nearest(p); }
public final class Vert extends HasPoint {
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
public Point p;
E e; // some edge *leaving* this point
@@
-233,15
+234,17
@@
public class Mesh implements Iterable<Mesh.T> {
}
public void computeError() {
if (quadric_count == 0) {
}
public void computeError() {
if (quadric_count == 0) {
- if (nearest_in_other_mesh == null) {
+ if (!tilemesh) {
+ }
+ else if (nearest_in_other_mesh == null) {
if (score_against != null) {
Vert ne = score_against.nearest(p);
if (score_against != null) {
Vert ne = score_against.nearest(p);
- oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 3;
+ oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
} else {
oldscore = 0;
}
} else {
} else {
oldscore = 0;
}
} else {
- oldscore = nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 3;
+ oldscore = nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
}
} else {
oldscore = (quadric.preAndPostMultiply(p) * 100) / quadric_count;
}
} else {
oldscore = (quadric.preAndPostMultiply(p) * 100) / quadric_count;
@@
-253,20
+256,23
@@
public class Mesh implements Iterable<Mesh.T> {
float aspects = 0;
E e = this.e;
do {
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();
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();
}
if (e.t != null) {
numaspects++;
aspects += e.t.aspect()*e.t.aspect();
}
+ */
- float minangle = (float)(Math.PI * 0.3);
+ float minangle = (float)(Math.PI * 0.8);
if (ang > minangle)
oldscore += (ang - minangle);
e = e.pair.next;
} while (e != this.e);
if (ang > minangle)
oldscore += (ang - minangle);
e = e.pair.next;
} while (e != this.e);
- //if (numaspects > 0) oldscore += (aspects / numaspects);
+ if (numaspects > 0) oldscore += (aspects / numaspects);
//System.out.println(oldscore);
//oldscore = oldscore*oldscore;
//System.out.println(oldscore);
//oldscore = oldscore*oldscore;
@@
-289,16
+295,26
@@
public class Mesh implements Iterable<Mesh.T> {
}
applyQuadricToNeighbor();
}
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 {
// 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);
e.p2.quadricStale = true;
e = e.pair.next;
} while(e != this.e);
- // FIXME: intersection test needed?
- boolean good = true;
- /*
+ if (!ignorecollision)
for(T t : Mesh.this) {
if (!good) break;
e = this.e;
for(T t : Mesh.this) {
if (!good) break;
e = this.e;
@@
-312,7
+328,7
@@
public class Mesh implements Iterable<Mesh.T> {
e = e.pair.next;
} while(e != this.e);
}
e = e.pair.next;
} while(e != this.e);
}
- */
+
reComputeErrorAround();
return good;
}
reComputeErrorAround();
return good;
}
@@
-332,7
+348,14
@@
public class Mesh implements Iterable<Mesh.T> {
E ret = getFreeIncident(e, e);
if (ret != null) return ret;
ret = getFreeIncident(e.pair.next, e.pair.next);
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;
}
return ret;
}
@@
-444,10
+467,21
@@
public class Mesh implements Iterable<Mesh.T> {
boolean shattered = false;
public float comparator() {
boolean shattered = false;
public float comparator() {
- if (t==null) return length();
+ 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();
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 int compareTo(E e) {
return e.comparator() > comparator() ? 1 : -1;
@@
-794,16
+828,17
@@
public class Mesh implements Iterable<Mesh.T> {
public boolean has(Vert v) { return v1()==v || v2()==v || v3()==v; }
public void glVertices(GL gl) {
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;
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);
}
}
norm().glNormal(gl);
p1().glVertex(gl);
p2().glVertex(gl);
p3().glVertex(gl);
}
}
-
+ public boolean tilemesh = false;
+ public boolean ignorecollision = false;
}
}