X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=DanKaminsky.pde;h=4021d07b34fde920886f88d95d99c5acbdd9f9fe;hb=1c44211b1a15965afee7056a2f1d43a1306df61b;hp=02907867dac64e51355e0630d4bbf75bf2990e69;hpb=fe30b2268bba1105dee4d48eeb9191103fc0e3fb;p=SugarCubes.git

diff --git a/DanKaminsky.pde b/DanKaminsky.pde
index 0290786..4021d07 100644
--- a/DanKaminsky.pde
+++ b/DanKaminsky.pde
@@ -79,12 +79,12 @@ class ObjectMuckerEffect extends SCEffect {
   ObjectMuckerEffect(GLucose glucose) {
     super(glucose);
   }
-  public void doApply(int[] colors){
+  public void apply(int[] colors){
     /*for(Strip s: model.strips){
       for(int i=0; i<s.points.size(); i++){
          int index = s.points.get(i).index;
          color c = colors[index];
-         colors[index] = color((i*22.5), saturation(c), brightness(c));
+         colors[index] = lx.hsb((i*22.5), saturation(c), brightness(c));
       }
     }*/
   }
@@ -105,7 +105,7 @@ class BlendFrames extends SCEffect {
        frames[i] = new int[model.points.size()];       
     }
   }
-  public void doApply(int[] colors) {
+  public void apply(int[] colors) {
     if(fcount<maxfbuf){
       for(int i=0; i<colors.length; i++){
         frames[(maxfbuf-1)-fcount][i]=colors[i];
@@ -173,7 +173,7 @@ class OSC_Balls extends OSCPattern {
     balls[ballnum].y = msg.get(1).floatValue();    
   }
   
-  void run(int deltaMs){
+  void run(double deltaMs){
     for(Point p: model.points){ colors[p.index]=0; }
     for(int i=1; i<balls.length; i++){
       if(millis() - balls[i].lastSeen < 1000) {
@@ -199,7 +199,7 @@ import processing.serial.*;
     pret = new PImage(8, 128, ARGB);
     ss = new ScreenShot();
   }
-  void run(int deltaMs){
+  void run(double deltaMs){
      int x=(1366/2)+516;
      int y=768-516;
      int w=8;