X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FHasBindingGroup.java;h=1316f19d779aa40a96c4f91ae746cb370db63a42;hp=064b65715eb94fcb7f443386fe7f4a988d7f2ad5;hb=eabe4f7acd947415f183290dc3269b2502a25a1c;hpb=33fcd7732290bcd1c7108ba9388af173fd139ee2

diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
index 064b657..1316f19 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)
@@ -36,6 +28,10 @@ public abstract class HasBindingGroup {
         return bindingGroup.size();
     }
 
+    public AffineConstraint getBindingConstraint() {
+        if (bindingGroup==null) return new AffineConstraint.All();
+        return bindingGroup.getConstraint(this);
+    }
 
     public Matrix getBindingMatrix() {
         if (bindingGroup==null) return Matrix.ONE;
@@ -47,11 +43,6 @@ public abstract class HasBindingGroup {
         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);