projects
/
anneal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
23f01b5
)
checkpoint
author
adam
<adam@megacz.com>
Thu, 6 Dec 2007 00:49:57 +0000
(16:49 -0800)
committer
adam
<adam@megacz.com>
Thu, 6 Dec 2007 00:49:57 +0000
(16:49 -0800)
darcs-hash:
20071206004957
-5007d-
39abfc6a4d1e256cf61e3a659e4f1e3e70a3eb7d
.gz
src/edu/berkeley/qfat/Mesh.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/qfat/Mesh.java
b/src/edu/berkeley/qfat/Mesh.java
index
3696c0b
..
d3e85f9
100644
(file)
--- a/
src/edu/berkeley/qfat/Mesh.java
+++ b/
src/edu/berkeley/qfat/Mesh.java
@@
-236,12
+236,12
@@
public class Mesh implements Iterable<Mesh.T> {
if (nearest_in_other_mesh == null) {
if (score_against != null) {
Vert ne = score_against.nearest(p);
if (nearest_in_other_mesh == null) {
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;