checkpoint

[anneal.git] / src / edu / berkeley / qfat / geom / BindingGroup.java

diff --git a/src/edu/berkeley/qfat/geom/BindingGroup.java b/src/edu/berkeley/qfat/geom/BindingGroup.java
index 8ea271e..4df8cc4 100644 (file)
--- a/src/edu/berkeley/qfat/geom/BindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/BindingGroup.java
@@ -2,6 +2,7 @@ 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;
@@ -12,16 +13,26 @@ public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
         matrices.put(master, Matrix.ONE);
     }
 
+    public int size() { return matrices.size(); }
+
     public void merge(BindingGroup<T> bg, Matrix m) {
+        if (bg==this) throw new Error();
         for(HasBindingGroup hbg : bg.matrices.keySet()) {
             matrices.put((T)hbg, bg.matrices.get(hbg).times(m));
             hbg.bindingGroup = this;
         }
+
+        Matrix v = getMatrix(bg.master, master);
+
+        HashSet<HasBindingGroup> stuff = new HashSet<HasBindingGroup>();
+        for(HasBindingGroup hbg : bg.matrices.keySet())
+            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(); }