X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FBindingGroup.java;h=e64cc17e119efb480ead9cbe830bfb775b732214;hp=5f6bf2bfe3f67f2e30bb52da7fdcd941a0aed8c6;hb=64c6939d78acfa06e7bc380cb713e3800bf16be5;hpb=33fcd7732290bcd1c7108ba9388af173fd139ee2

diff --git a/src/edu/berkeley/qfat/geom/BindingGroup.java b/src/edu/berkeley/qfat/geom/BindingGroup.java
index 5f6bf2b..e64cc17 100644
--- a/src/edu/berkeley/qfat/geom/BindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/BindingGroup.java
@@ -2,10 +2,12 @@ package edu.berkeley.qfat.geom;
 import javax.media.opengl.*;
 import java.util.*;
 
+/** tracks an equivalence class of geometric objects which are related to each other by transformation matrices */
 public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
 
-    private T                  master   = null;
-    private HashMap<T,Matrix>  matrices = new HashMap<T,Matrix>();
+    private T                  master     = null;
+    private AffineConstraint   constraint = new AffineConstraint.All();
+    private HashMap<T,Matrix>  matrices   = new HashMap<T,Matrix>();
 
     public BindingGroup(T master) {
         this.master = master;
@@ -15,18 +17,30 @@ public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
     public int size() { return matrices.size(); }
 
     public void merge(BindingGroup<T> bg, Matrix m) {
-        if (bg==this) throw new Error();
+        if (bg==this) {
+            if (m.equalsModuloEpsilon(Matrix.ONE, 0.001f)) return;
+            System.err.println(m.getAffineConstraint(0.001f));
+            return;
+        }
+
         for(HasBindingGroup hbg : bg.matrices.keySet()) {
             matrices.put((T)hbg, bg.matrices.get(hbg).times(m));
             hbg.bindingGroup = this;
         }
+
+        // FIXME: what if points do not fall on the merged constraint-line?
+        AffineConstraint ac = bg.constraint.multiply(getMatrix(master, bg.master));
+        constraint = constraint.intersect(ac, 0.001f);
+
+        HashSet<HasBindingGroup> stuff = new HashSet<HasBindingGroup>();
         for(HasBindingGroup hbg : bg.matrices.keySet())
-            hbg.bindingGroupChanged(this);
+            stuff.add(hbg);
         bg.matrices.clear();
         bg.master = null;
+        for(HasBindingGroup hbg : stuff)
+            hbg.bindingGroupChanged(this);
     }
 
-    public T getMaster() { return master; }
     public Matrix getMatrix(T t) { return matrices.get(t); }
 
     public Iterator<T> iterator() { return matrices.keySet().iterator(); }
@@ -39,6 +53,10 @@ public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
         return getMatrix(t1).times(getMatrix(t2).inverse());
     }
 
+    public AffineConstraint getConstraint(T t) {
+        return constraint.multiply(matrices.get(t));
+    }
+
     public void unbind(T trem) {
         if (trem != master) {
             matrices.remove(trem);