X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FHasBindingGroup.java;h=16dee1c8f4753f6d733370a8b2102a1313ca4456;hp=5b761a313f7e05dffae1eea05c0aee4a3f5f7ed7;hb=64c6939d78acfa06e7bc380cb713e3800bf16be5;hpb=e6ede2b794c97801f3890af9ea634e67012420ef

diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
index 5b761a3..16dee1c 100644
--- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
@@ -1,10 +1,11 @@
 package edu.berkeley.qfat.geom;
 import javax.media.opengl.*;
 import java.util.*;
+import edu.berkeley.qfat.Mesh;
 
 public abstract class HasBindingGroup {
 
-    BindingGroup bindingGroup;
+    public BindingGroup bindingGroup;
 
     // know:      self   = bindingGroup[self] * master
     // know:      other  = other.bindingGroup[other] * other.bindingGroup.master
@@ -15,15 +16,6 @@ public abstract class HasBindingGroup {
         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().inverse()
             .times(bindingMatrix)
@@ -31,20 +23,22 @@ public abstract class HasBindingGroup {
         other.bindingGroup.merge(bindingGroup, bindingMatrix);
     }
 
+    public int bindingGroupSize() {
+        if (bindingGroup == null) return 1;
+        return bindingGroup.size();
+    }
+
+
     public Matrix getBindingMatrix() {
         if (bindingGroup==null) return Matrix.ONE;
         return bindingGroup.getMatrix(this);
     }
 
     public Matrix getBindingMatrix(HasBindingGroup other) {
+        if (other==this) return Matrix.ONE;
         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);
@@ -53,7 +47,7 @@ public abstract class HasBindingGroup {
     }
 
     public boolean isBoundTo(HasBindingGroup t) {
-        return bindingGroup.contains(t);
+        return t==this || (bindingGroup!=null && bindingGroup.contains(t));
     }
 
     public Iterable getBoundPeers() {