From: adam Date: Sun, 16 Dec 2007 03:40:28 +0000 (-0800) Subject: checkpoint X-Git-Url: http://git.megacz.com/?p=anneal.git;a=commitdiff_plain;h=6b8b94ec2b88321d9f53b759200137657445a08a checkpoint darcs-hash:20071216034028-5007d-7cbfe15cd896870bc877915f026001d73bcd789d.gz --- diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index b4f282a..8243b18 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -112,7 +112,8 @@ public class Mesh implements Iterable { if (error_against==null) return null; return error_against.vertices.nearest(p, this); } - public void unComputeError() { setError(0); } + + public void computeError() { float nerror = quadric_count != 0 diff --git a/src/edu/berkeley/qfat/geom/HasQuadric.java b/src/edu/berkeley/qfat/geom/HasQuadric.java index e358e69..1c8d655 100644 --- a/src/edu/berkeley/qfat/geom/HasQuadric.java +++ b/src/edu/berkeley/qfat/geom/HasQuadric.java @@ -39,11 +39,12 @@ public abstract class HasQuadric extends HasPoint { applyQuadricToNeighbor(); } public abstract Matrix _recomputeFundamentalQuadric(); - public void reComputeError() { - unComputeError(); - computeError(); - } - public abstract void unComputeError(); + public void unComputeError() { setError(0); } + public void reComputeError() { + unComputeError(); + computeError(); + } + public abstract void setError(float nerror); public abstract void computeError(); public abstract HasQuadric nearest(); public void applyQuadricToNeighbor() {