X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=DanKaminsky.pde;h=c94b57396b07ccb4ba542248b3af31537f82b5d3;hb=dde759833df1c0190d9d3a982a90c0a4f8d76a26;hp=4021d07b34fde920886f88d95d99c5acbdd9f9fe;hpb=ceb90bf70c1e315c679ea1a5df9c06305f625d7d;p=SugarCubes.git

diff --git a/DanKaminsky.pde b/DanKaminsky.pde
index 4021d07..c94b573 100644
--- 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 = 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;
@@ -146,7 +146,7 @@ import oscP5.*;
 
 
 abstract class OSCPattern extends SCPattern {
-  public OSCPattern(GLucose glucose){super(glucose);}
+  public OSCPattern(LX lx){super(lx);}
   public abstract void oscEvent(OscMessage msg);
 }
 
@@ -160,8 +160,8 @@ class Ball {
 
 class OSC_Balls extends OSCPattern {
   Ball[] balls;
-  public OSC_Balls(GLucose glucose){
-    super(glucose);
+  public OSC_Balls(LX lx){
+    super(lx);
     balls = new Ball[20];
     for(int i=0; i<balls.length; i++) { balls[i] = new Ball(); }    
   }
@@ -174,10 +174,10 @@ class OSC_Balls extends OSCPattern {
   }
   
   void run(double deltaMs){
-    for(Point p: model.points){ colors[p.index]=0; }
+    for(LXPoint p: model.points){ colors[p.index]=0; }
     for(int i=1; i<balls.length; i++){
       if(millis() - balls[i].lastSeen < 1000) {
-        for(Point p: model.points){
+        for(LXPoint p: model.points){
           int x = int(balls[i].x * 255.0);
           int y = int(balls[i].y * 127.0);
           if(p.x < x+4 && p.x > x-4 && p.y < y+4 && p.y > y-4) { colors[p.index] = #FF0000; } 
@@ -193,8 +193,8 @@ import processing.serial.*;
 /*class ScreenScrape extends SCPattern {
   PImage pret;
   ScreenShot ss;
-  public ScreenScrape(GLucose glucose) {
-    super(glucose);
+  public ScreenScrape(LX lx) {
+    super(lx);
     System.loadLibrary("ScreenShot");
     pret = new PImage(8, 128, ARGB);
     ss = new ScreenShot();
@@ -207,7 +207,7 @@ import processing.serial.*;
      pret.pixels = ss.getScreenShotJNI2(x, y, w, h);
      //for(int i=0; i<px.length; i++){ pret.pixels[i] = px[i]; }
      //println(pret.get(10,10));
-     for(Point p: model.points){
+     for(LXPoint p: model.points){
        colors[p.index] = pret.get((int(p.x)/8)*8, 128-int(p.y));
      }     
   }