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
87cf35d
..
e3a7cde
100644
(file)
--- a/
src/edu/berkeley/qfat/Mesh.java
+++ b/
src/edu/berkeley/qfat/Mesh.java
@@
-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
@@
-238,15
+239,15
@@
public class Mesh implements Iterable<Mesh.T> {
else if (nearest_in_other_mesh == null) {
if (score_against != null) {
Vert ne = score_against.nearest(p);
else if (nearest_in_other_mesh == null) {
if (score_against != null) {
Vert ne = score_against.nearest(p);
- oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
+ oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 100;
} else {
oldscore = 0;
}
} else {
} else {
oldscore = 0;
}
} else {
- oldscore = nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
+ oldscore = nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 100;
}
} else {
}
} else {
- oldscore = (quadric.preAndPostMultiply(p) * 100) /*/ quadric_count*/;
+ oldscore = (quadric.preAndPostMultiply(p) * 100);
}
oldscore = oldscore;
}
oldscore = oldscore;
@@
-255,6
+256,7
@@
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();
/*
@@
-263,11
+265,11
@@
public class Mesh implements Iterable<Mesh.T> {
aspects += e.t.aspect()*e.t.aspect();
}
*/
aspects += e.t.aspect()*e.t.aspect();
}
*/
- /*
- float minangle = (float)(Math.PI * 0.8);
+
+ float minangle = (float)(Math.PI * 0.9);
if (ang > minangle)
oldscore += (ang - minangle);
if (ang > minangle)
oldscore += (ang - minangle);
- */
+
e = e.pair.next;
} while (e != this.e);
if (numaspects > 0) oldscore += (aspects / numaspects);
e = e.pair.next;
} while (e != this.e);
if (numaspects > 0) oldscore += (aspects / numaspects);
@@
-302,7
+304,8
@@
public class Mesh implements Iterable<Mesh.T> {
// FIXME: intersection test needed?
boolean good = true;
// 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;
@@
-316,7
+319,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;
}
@@
-336,7
+339,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;
}
@@
-448,10
+458,20
@@
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 length() + midpoint().distance(nearest.p);
}
public int compareTo(E e) {
return e.comparator() > comparator() ? 1 : -1;
}
public int compareTo(E e) {
return e.comparator() > comparator() ? 1 : -1;
@@
-798,11
+818,11
@@
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);
norm().glNormal(gl);
p1().glVertex(gl);
p2().glVertex(gl);
@@
-810,4
+830,5
@@
public class Mesh implements Iterable<Mesh.T> {
}
}
public boolean tilemesh = false;
}
}
public boolean tilemesh = false;
+ public boolean ignorecollision = false;
}
}