New GLucose, simpler packaging

diff --git a/DanKaminsky.pde b/DanKaminsky.pde
index f16c0bd2d2ed8df7a2f2df86a90d715f2ee54797..8e236a2a611d6b43aa9cc5902a65d4c8c587c2a9 100644 (file)
--- a/DanKaminsky.pde
+++ b/DanKaminsky.pde
@@ -3,15 +3,15 @@ class GenericController {
     public void RotateKnob(int type, int num, float val){
       LXParameter p = null;
       if(type==0) {
-        p = glucose.patternKnobs.get(num);
+        p = glucose.getPattern().getParameters().get(num);
         if(p!=null) { p.setValue(val); }
       }
       if(type==1) {
-        p = glucose.transitionKnobs.get(num);
+        p = glucose.getSelectedTransition().getParameters().get(num);
         if(p!=null) { p.setValue(val); }
       }
       if(type==2) {
-        p = glucose.effectKnobs.get(num);
+        p = glucose.getSelectedEffect().getParameters().get(num);
         if(p!=null) { p.setValue(val); }
       }
     }
@@ -38,9 +38,9 @@ OscP5 listener;
 //  }
 //  if(cc.getCC()==1){
 //    for(int i=0; i<16; i++){
-//      if(noteState[i] && i<8)  { LXParameter p = glucose.patternKnobs.get(i); p.setValue(cc.getValue()/127.0); }
-//      else if(noteState[i] && i<12) { LXParameter p = glucose.transitionKnobs.get(i-8); p.setValue(cc.getValue()/127.0); }
-//      else if(noteState[i] && i<16) { LXParameter p = glucose.effectKnobs.get(i-12); p.setValue(cc.getValue()/127.0); }
+//      if(noteState[i] && i<8)  { LXParameter p = glucose.getPattern().getParameters().get(i); p.setValue(cc.getValue()/127.0); }
+//      else if(noteState[i] && i<12) { LXParameter p = glucose.getSelectedTransition().getParameters().get(i-8); p.setValue(cc.getValue()/127.0); }
+//      else if(noteState[i] && i<16) { LXParameter p = glucose.getSelectedEffect().getParameters().get(i-12); p.setValue(cc.getValue()/127.0); }
 //    }
 //  }
 //}

diff --git a/_Internals.pde b/_Internals.pde
index 847eeb6c108a384e920945eba57b9f08a2cec4a6..c27a75b79c24a9c1138f8fd4dd06ce56d4a28f86 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -14,11 +14,7 @@
  */
 
 import glucose.*;
-import glucose.control.*;
-import glucose.effect.*;
 import glucose.model.*;
-import glucose.pattern.*;
-import glucose.transition.*;
 import heronarts.lx.*;
 import heronarts.lx.control.*;
 import heronarts.lx.effect.*;

diff --git a/code/GLucose.jar b/code/GLucose.jar
index 2321e338d7c71738848af9a13f223c60b1f211d5..ec6fa48643e7fb37c223e208c2633742e0c9f9d7 100755 (executable)
Binary files a/code/GLucose.jar and b/code/GLucose.jar differ