X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FHasBindingGroup.java;h=fc12a29465d1643fc928703a29f22ec05505e511;hb=2b09dab499516873839b9bdbc972c980829e9bac;hp=cf72a08a125168808b024c484e385b577354acb9;hpb=bebc4007cb48fe93ca03f97047d3445a881afe9e;p=anneal.git

diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
index cf72a08..fc12a29 100644
--- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
@@ -11,9 +11,17 @@ public abstract class HasBindingGroup {
     // want:      self   = bindingMatrix * other
     // therefore: master = bindingGroup[self]^-1 * bindingMatrix * other
     // therefore:        = bindingGroup[self]^-1 * bindingMatrix * other.bindingGroup[other] * other.bindingGroup.master
-    public void bindTo(HasBindingGroup other, Matrix bindingMatrix) {
-        if (other.bindingGroup == this.bindingGroup)
-            throw new Error("rebind attempt");
+    public void bindTo(Matrix bindingMatrix, HasBindingGroup other) {
+        if (bindingGroup == null) bindingGroup = new BindingGroup(this);
+        if (other.bindingGroup == null) other.bindingGroup = new BindingGroup(other);
+
+        if (other.bindingGroup == this.bindingGroup) {
+            if (getBindingMatrix(other).equals(bindingMatrix)) return;
+            throw new Error("rebind attempt: "+this+" and "+other+" with "
+                            + bindingMatrix
+                            + "; expected "
+                            + getBindingMatrix(other));
+        }
 
         bindingMatrix =
             getBindingMatrix()
@@ -23,11 +31,33 @@ public abstract class HasBindingGroup {
     }
 
     public Matrix getBindingMatrix() {
+        if (bindingGroup==null) return Matrix.ONE;
         return bindingGroup.getMatrix(this);
     }
 
+    public Matrix getBindingMatrix(HasBindingGroup other) {
+        return bindingGroup.getMatrix(this, other);
+    }
+
     public HasBindingGroup getMaster() {
+        if (bindingGroup==null) return this;
         return bindingGroup.getMaster();
     }
 
+    public void unbind() {
+        if (bindingGroup==null) return;
+        bindingGroup.unbind(this);
+        bindingGroup = null;
+        bindingGroupChanged(bindingGroup);
+    }
+
+    public boolean isBoundTo(HasBindingGroup t) {
+        return bindingGroup.contains(t);
+    }
+
+    public Iterable getBoundPeers() {
+        if (bindingGroup==null) bindingGroup = new BindingGroup(this);
+        return bindingGroup;
+    }
+    public void bindingGroupChanged(BindingGroup newBindingGroup) { }
 }