From 26fd0ec674f521a9b53acd1d7cf4eaad1a76a1bc Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 15 Dec 2007 19:58:26 -0800 Subject: [PATCH] checkpoint darcs-hash:20071216035826-5007d-f56059a647f6d71c600073d976929c63bdac7e26.gz --- src/edu/berkeley/qfat/Main.java | 2 +- src/edu/berkeley/qfat/Mesh.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index 810173a..7841ad3 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -329,7 +329,7 @@ public class Main extends MeshViewer { //System.out.println("error: " + tile_error + " / " + goal_error); hits++; } else { - p.move(m.inverse(), true); + p.move(Matrix.translate(v.times(-1)), true); misses++; } } diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 5c913c4..b4d9f5b 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -163,7 +163,8 @@ public class Mesh implements Iterable { public void reComputeErrorAround() { reComputeError(); - if (nearest_in_other_mesh != null) nearest_in_other_mesh.reComputeError(); + if (nearest_in_other_mesh != null) + nearest_in_other_mesh.reComputeError(); for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) e.p2.reComputeError(); } @@ -189,7 +190,7 @@ public class Mesh implements Iterable { for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to) good &= p.transform(m.times(p.p), ignoreProblems); for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to) - if (good) p.reComputeErrorAround(); + if (good) { /*p.reComputeErrorAround();*/ } else p.transform(p.oldp, true); return good; } -- 1.7.10.4