projects
/
anneal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
713d66c
)
checkpoint
author
adam
<adam@megacz.com>
Sun, 16 Dec 2007 02:24:23 +0000
(18:24 -0800)
committer
adam
<adam@megacz.com>
Sun, 16 Dec 2007 02:24:23 +0000
(18:24 -0800)
darcs-hash:
20071216022423
-5007d-
f52e2ba5c8a11cf01a06e37e1716ef3cedb839be
.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
be699dd
..
2367999
100644
(file)
--- a/
src/edu/berkeley/qfat/Mesh.java
+++ b/
src/edu/berkeley/qfat/Mesh.java
@@
-118,8
+118,8
@@
public class Mesh implements Iterable<Mesh.T> {
/** the total error quadric (contributions from all vertices in other mesh for which this is nearest) */
Matrix quadric = Matrix.ZERO;
/** the total error quadric (contributions from all vertices in other mesh for which this is nearest) */
Matrix quadric = Matrix.ZERO;
- Vertex bound_to = this;
Matrix binding = Matrix.ONE;
Matrix binding = Matrix.ONE;
+ Vertex bound_to = this;
float oldscore = 0;
boolean quadricStale = false;
float oldscore = 0;
boolean quadricStale = false;
@@
-298,7
+298,7
@@
public class Mesh implements Iterable<Mesh.T> {
public E getFreeIncident() {
E ret = getFreeIncident(e, e);
if (ret != null) return ret;
public E getFreeIncident() {
E ret = getFreeIncident(e, e);
if (ret != null) return ret;
- ret = getFreeIncident(e.pair.next, e.pair.next);
+ //ret = getFreeIncident(e.pair.next, e.pair.next);
if (ret != null) return ret;
for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
System.out.println(e + " " + e.t);
if (ret != null) return ret;
for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
System.out.println(e + " " + e.t);