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
9d98783
..
b051816
100644
(file)
--- a/
src/edu/berkeley/qfat/Mesh.java
+++ b/
src/edu/berkeley/qfat/Mesh.java
@@
-122,7
+122,7
@@
public class Mesh implements Iterable<Mesh.T> {
return (float)total;
}
return (float)total;
}
- public void rebuildPointSet() { pointset.rebuild(); }
+ public void rebuildPointSet() { /*pointset.rebuild();*/ }
public Vec diagonal() { return pointset.diagonal(); }
public Point centroid() { return pointset.centroid(); }
public Vert nearest(Point p) { return pointset.nearest(p); }
public Vec diagonal() { return pointset.diagonal(); }
public Point centroid() { return pointset.centroid(); }
public Vert nearest(Point p) { return pointset.nearest(p); }
@@
-140,7
+140,7
@@
public class Mesh implements Iterable<Mesh.T> {
Matrix quadric = Matrix.ZERO;
Vert bound_to = this;
Matrix quadric = Matrix.ZERO;
Vert bound_to = this;
- Matrix binding = new Matrix();
+ Matrix binding = Matrix.ONE;
float oldscore = 0;
boolean quadricStale = false;
float oldscore = 0;
boolean quadricStale = false;
@@
-378,7
+378,7
@@
public class Mesh implements Iterable<Mesh.T> {
private boolean good;
public boolean move(Vec v) {
private boolean good;
public boolean move(Vec v) {
- Matrix m = new Matrix(v);
+ Matrix m = Matrix.translate(v);
Vert p = this;
boolean good = true;
do {
Vert p = this;
boolean good = true;
do {
@@
-445,8
+445,8
@@
public class Mesh implements Iterable<Mesh.T> {
} while(px != p);
return false;
}
} while(px != p);
return false;
}
- public void unbind() { bound_to = this; binding = new Matrix(); }
- public void bind(Vert p) { bind(p, new Matrix()); }
+ public void unbind() { bound_to = this; binding = Matrix.ONE; }
+ public void bind(Vert p) { bind(p, Matrix.ONE); }
public void bind(Vert p, Matrix binding) {
if (isBoundTo(p)) return;
Vert temp_bound_to = p.bound_to;
public void bind(Vert p, Matrix binding) {
if (isBoundTo(p)) return;
Vert temp_bound_to = p.bound_to;