No more SCEffect or SCTransition

[SugarCubes.git] / DanKaminsky.pde

diff --git a/DanKaminsky.pde b/DanKaminsky.pde
index f16c0bd2d2ed8df7a2f2df86a90d715f2ee54797..87bfa3b60da7436c0ca339f587ae95afd18d1eaa 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); }
 //    }
 //  }
 //}
@@ -75,9 +75,9 @@ OscP5 listener;
 //
 
 
-class ObjectMuckerEffect extends SCEffect {
-  ObjectMuckerEffect(GLucose glucose) {
-    super(glucose);
+class ObjectMuckerEffect extends LXEffect {
+  ObjectMuckerEffect(LX lx) {
+    super(lx);
   }
   public void apply(int[] colors){
     /*for(Strip s: model.strips){
@@ -90,13 +90,13 @@ class ObjectMuckerEffect extends SCEffect {
   }
 }
 
-class BlendFrames extends SCEffect {
+class BlendFrames extends LXEffect {
   int fcount;
   int frames[][];
   int maxfbuf;
   int blendfactor;
-  BlendFrames(GLucose glucose) {
-    super(glucose);
+  BlendFrames(LX lx) {
+    super(lx);
     maxfbuf = 30;
     blendfactor=30;
     fcount=0;