checkpoint

darcs-hash:20080707195626-5007d-2c7d43f379be707546d34a451c38cb39cca407f4.gz

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index e7ee361..237266b 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -8,6 +8,7 @@ import javax.media.opengl.glu.*;
 import java.util.*;
 import edu.berkeley.qfat.bind.*;
 import edu.berkeley.qfat.geom.*;
 import java.util.*;
 import edu.berkeley.qfat.bind.*;
 import edu.berkeley.qfat.geom.*;

+import edu.berkeley.qfat.stl.*;

 import edu.berkeley.qfat.geom.Point;
 import edu.berkeley.qfat.geom.Polygon;
 
 import edu.berkeley.qfat.geom.Point;
 import edu.berkeley.qfat.geom.Polygon;
 

diff --git a/src/edu/berkeley/qfat/bind/HasQuadric.java b/src/edu/berkeley/qfat/bind/HasQuadric.java
index afd2823..2e0f760 100644 (file)
--- a/src/edu/berkeley/qfat/bind/HasQuadric.java
+++ b/src/edu/berkeley/qfat/bind/HasQuadric.java
@@ -1,12 +1,12 @@
 package edu.berkeley.qfat.bind;
 import edu.berkeley.qfat.geom.*;
 package edu.berkeley.qfat.bind;
 import edu.berkeley.qfat.geom.*;

-import javax.media.opengl.*;

 
 /** any object associated with a specific point in 3D space */
 public abstract class HasQuadric extends HasBindingGroup {
 
     public Matrix errorQuadric() { return quadric; }
     public boolean quadricStale = false;
 
 /** any object associated with a specific point in 3D space */
 public abstract class HasQuadric extends HasBindingGroup {
 
     public Matrix errorQuadric() { return quadric; }
     public boolean quadricStale = false;

+

     /** the nearest vertex in the "score_against" mesh */
     public HasQuadric nearest_in_other_mesh;
 
     /** the nearest vertex in the "score_against" mesh */
     public HasQuadric nearest_in_other_mesh;
 

diff --git a/src/edu/berkeley/qfat/StlFile.java b/src/edu/berkeley/qfat/stl/StlFile.java
similarity index 99%
rename from src/edu/berkeley/qfat/StlFile.java
rename to src/edu/berkeley/qfat/stl/StlFile.java
index 5a283c9..0067627 100644 (file)
--- a/src/edu/berkeley/qfat/StlFile.java
+++ b/src/edu/berkeley/qfat/stl/StlFile.java
@@ -1,4 +1,4 @@
-package edu.berkeley.qfat;
+package edu.berkeley.qfat.stl;

 import com.sun.j3d.loaders.Loader;
 import com.sun.j3d.loaders.Scene;
 import com.sun.j3d.loaders.SceneBase;
 import com.sun.j3d.loaders.Loader;
 import com.sun.j3d.loaders.Scene;
 import com.sun.j3d.loaders.SceneBase;

diff --git a/src/edu/berkeley/qfat/StlFileParser.java b/src/edu/berkeley/qfat/stl/StlFileParser.java
similarity index 98%
rename from src/edu/berkeley/qfat/StlFileParser.java
rename to src/edu/berkeley/qfat/stl/StlFileParser.java
index 4f9da31..126cc81 100644 (file)
--- a/src/edu/berkeley/qfat/StlFileParser.java
+++ b/src/edu/berkeley/qfat/stl/StlFileParser.java
@@ -1,4 +1,4 @@
-package edu.berkeley.qfat;
+package edu.berkeley.qfat.stl;

 import java.io.StreamTokenizer;
 import java.io.Reader;
 import java.io.IOException;
 import java.io.StreamTokenizer;
 import java.io.Reader;
 import java.io.IOException;