checkpoint

darcs-hash:20080707190235-5007d-356db90d4e6717eba9d792adc3a7bf7193ac2d3f.gz

diff --git a/src/edu/berkeley/qfat/InteractiveMeshViewer.java b/src/edu/berkeley/qfat/InteractiveMeshViewer.java
index 3a2787d..068dc56 100644 (file)
--- a/src/edu/berkeley/qfat/InteractiveMeshViewer.java
+++ b/src/edu/berkeley/qfat/InteractiveMeshViewer.java
@@ -8,6 +8,7 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import com.sun.opengl.util.*;
 import java.util.*;
+import edu.berkeley.qfat.bind.*;
 import edu.berkeley.qfat.geom.*;
 import edu.berkeley.qfat.geom.Point;
 

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

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 3a250c7..e124072 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -6,8 +6,8 @@ import javax.swing.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import edu.berkeley.qfat.geom.*;
-import edu.berkeley.qfat.geom.HasBindingGroup;
 import edu.wlu.cs.levy.CG.KDTree;
+import edu.berkeley.qfat.bind.*;
 import edu.berkeley.qfat.geom.Point;
 import com.infomatiq.jsi.IntProcedure;
 
@@ -610,10 +610,9 @@ public class Mesh implements Iterable<Mesh.T> {
 
         }
 
-        public void bindingGroupChanged(edu.berkeley.qfat.geom.BindingGroup newBindingGroup_) {
+        public void bindingGroupChanged(BindingGroup newBindingGroup_) {
 
-            edu.berkeley.qfat.geom.BindingGroup<E> newBindingGroup =
-                (edu.berkeley.qfat.geom.BindingGroup<E>)newBindingGroup_;
+            BindingGroup<E> newBindingGroup = (BindingGroup<E>)newBindingGroup_;
             if (newBindingGroup==null) return;
             //if (this==newBindingGroup.getMaster()) return;
             HashSet<E> nbg = new HashSet<E>();

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 57d1543..d02470c 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -8,6 +8,7 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import com.sun.opengl.util.*;
 import java.util.*;
+import edu.berkeley.qfat.bind.*;
 import edu.berkeley.qfat.geom.*;
 import edu.berkeley.qfat.geom.Point;
 

diff --git a/src/edu/berkeley/qfat/geom/BindingGroup.java b/src/edu/berkeley/qfat/bind/BindingGroup.java
similarity index 97%
rename from src/edu/berkeley/qfat/geom/BindingGroup.java
rename to src/edu/berkeley/qfat/bind/BindingGroup.java
index 34259ab..0882fa5 100644 (file)
--- a/src/edu/berkeley/qfat/geom/BindingGroup.java
+++ b/src/edu/berkeley/qfat/bind/BindingGroup.java
@@ -1,4 +1,5 @@
-package edu.berkeley.qfat.geom;
+package edu.berkeley.qfat.bind;
+import edu.berkeley.qfat.geom.*;
 import javax.media.opengl.*;
 import java.util.*;
 

diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/bind/HasBindingGroup.java
similarity index 97%
rename from src/edu/berkeley/qfat/geom/HasBindingGroup.java
rename to src/edu/berkeley/qfat/bind/HasBindingGroup.java
index 1316f19..a50a430 100644 (file)
--- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java
+++ b/src/edu/berkeley/qfat/bind/HasBindingGroup.java
@@ -1,4 +1,5 @@
-package edu.berkeley.qfat.geom;
+package edu.berkeley.qfat.bind;
+import edu.berkeley.qfat.geom.*;
 import javax.media.opengl.*;
 import java.util.*;
 import edu.berkeley.qfat.Mesh;

diff --git a/src/edu/berkeley/qfat/geom/HasQuadric.java b/src/edu/berkeley/qfat/bind/HasQuadric.java
similarity index 98%
rename from src/edu/berkeley/qfat/geom/HasQuadric.java
rename to src/edu/berkeley/qfat/bind/HasQuadric.java
index 1c8d655..d5c32da 100644 (file)
--- a/src/edu/berkeley/qfat/geom/HasQuadric.java
+++ b/src/edu/berkeley/qfat/bind/HasQuadric.java
@@ -1,4 +1,5 @@
-package 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 */

diff --git a/src/edu/berkeley/qfat/geom/HasPoint.java b/src/edu/berkeley/qfat/geom/HasPoint.java
index 99a19dc..f086c68 100644 (file)
--- a/src/edu/berkeley/qfat/geom/HasPoint.java
+++ b/src/edu/berkeley/qfat/geom/HasPoint.java
@@ -2,7 +2,7 @@ package edu.berkeley.qfat.geom;
 import javax.media.opengl.*;
 
 /** any object associated with a specific point in 3D space */
-public abstract class HasPoint extends HasBindingGroup implements HasBoundingBox {
+public abstract class HasPoint extends edu.berkeley.qfat.bind.HasBindingGroup implements HasBoundingBox {
     public abstract Point getPoint();
     public float getMaxX() { return getPoint().getMaxX(); }
     public float getMinX() { return getPoint().getMinX(); }