X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=MarkSlee.pde;h=f955f97bd32474d7997ae50da122b729c73fa607;hb=bd33a0f155de19be679b13e02737b7a44956ed03;hp=2df823a38efb823884e082a7995254aa7e86af69;hpb=49815cc001318d4cd59874b41cc874a259900f14;p=SugarCubes.git

diff --git a/MarkSlee.pde b/MarkSlee.pde
index 2df823a..f955f97 100644
--- a/MarkSlee.pde
+++ b/MarkSlee.pde
@@ -3,10 +3,10 @@ class SpaceTime extends SCPattern {
   SinLFO pos = new SinLFO(0, 15, 3000);
   SinLFO rate = new SinLFO(1000, 9000, 13000);
   SinLFO falloff = new SinLFO(10, 70, 5000);
-  float sat = 0;
-  
-  BasicKnob rateKnob = new BasicKnob("RATE", 0.5);
-  BasicKnob sizeKnob = new BasicKnob("SIZE", 0.5);
+  float angle = 0;
+
+  BasicParameter rateParameter = new BasicParameter("RATE", 0.5);
+  BasicParameter sizeParameter = new BasicParameter("SIZE", 0.5);
 
   public SpaceTime(GLucose glucose) {
     super(glucose);
@@ -14,37 +14,38 @@ class SpaceTime extends SCPattern {
     addModulator(rate).trigger();
     addModulator(falloff).trigger();    
     pos.modulateDurationBy(rate);
-    addKnob(rateKnob);
-    addKnob(sizeKnob);
+    addParameter(rateParameter);
+    addParameter(sizeParameter);
   }
-  
-  public void onKnobChange(Knob knob) {
-    if (knob == rateKnob) {
-        rate.stop().setValue(9000 - 8000*knob.getValuef());
-    } else if (knob == sizeKnob) {
-        falloff.stop().setValue(70 - 60*knob.getValuef());
+
+  public void onParameterChanged(LXParameter parameter) {
+    if (parameter == rateParameter) {
+      rate.stop().setValue(9000 - 8000*parameter.getValuef());
+    }  else if (parameter == sizeParameter) {
+      falloff.stop().setValue(70 - 60*parameter.getValuef());
     }
   }
 
   void run(int deltaMs) {    
-    sat += deltaMs * 0.00004;
-    float sVal1 = Strip.list.size() * (0.5 + 0.5*sin(sat));
-    float sVal2 = Strip.list.size() * (0.5 + 0.5*cos(sat));
+    angle += deltaMs * 0.0007;
+    float sVal1 = model.strips.size() * (0.5 + 0.5*sin(angle));
+    float sVal2 = model.strips.size() * (0.5 + 0.5*cos(angle));
 
     float pVal = pos.getValuef();
     float fVal = falloff.getValuef();
 
     int s = 0;
-    for (Strip strip : Strip.list) {
+    for (Strip strip : model.strips) {
       int i = 0;
       for (Point p : strip.points) {
         colors[p.index] = color(
-        (lx.getBaseHuef() + s*.2 + i*3) % 360, 
-        min(100, min(abs(s - sVal1), abs(s - sVal2))), 
+        (lx.getBaseHuef() + 360 - p.fx*.2 + p.fy * .3) % 360, 
+        constrain(.4 * min(abs(s - sVal1), abs(s - sVal2)), 20, 100),
         max(0, 100 - fVal*abs(i - pVal))
           );
         ++i;
       }
+      ++s;
     }
   }
 }
@@ -54,18 +55,18 @@ class Swarm extends SCPattern {
   SawLFO offset = new SawLFO(0, 16, 1000);
   SinLFO rate = new SinLFO(350, 1200, 63000);
   SinLFO falloff = new SinLFO(15, 50, 17000);
-  SinLFO fY = new SinLFO(0, 250, 19000);
-  SinLFO fZ = new SinLFO(0, 127, 11000);
-  SinLFO hOffY = new SinLFO(0, 255, 13000);
+  SinLFO fX = new SinLFO(0, model.xMax, 19000);
+  SinLFO fY = new SinLFO(0, model.yMax, 11000);
+  SinLFO hOffX = new SinLFO(0, model.xMax, 13000);
 
   public Swarm(GLucose glucose) {
     super(glucose);
     addModulator(offset).trigger();
     addModulator(rate).trigger();
     addModulator(falloff).trigger();
+    addModulator(fX).trigger();
     addModulator(fY).trigger();
-    addModulator(fZ).trigger();
-    addModulator(hOffY).trigger();
+    addModulator(hOffX).trigger();
     offset.modulateDurationBy(rate);
   }
 
@@ -82,12 +83,12 @@ class Swarm extends SCPattern {
 
   void run(int deltaMs) {
     float s = 0;
-    for (Strip strip : Strip.list) {
+    for (Strip strip : model.strips) {
       int i = 0;
       for (Point p : strip.points) {
-        float fV = max(-1, 1 - dist(p.fy/2., p.fz, fY.getValuef()/2., fZ.getValuef()) / 64.);
+        float fV = max(-1, 1 - dist(p.fx/2., p.fy, fX.getValuef()/2., fY.getValuef()) / 64.);
         colors[p.index] = color(
-        (lx.getBaseHuef() + 0.3 * abs(p.fy - hOffY.getValuef())) % 360, 
+        (lx.getBaseHuef() + 0.3 * abs(p.fx - hOffX.getValuef())) % 360, 
         constrain(80 + 40 * fV, 0, 100), 
         constrain(100 - (30 - fV * falloff.getValuef()) * modDist(i + (s*63)%61, offset.getValuef(), 16), 0, 100)
           );
@@ -99,16 +100,20 @@ class Swarm extends SCPattern {
 }
 
 class SwipeTransition extends SCTransition {
+  
+  final BasicParameter bleed = new BasicParameter("WIDTH", 0.5);
+  
   SwipeTransition(GLucose glucose) {
     super(glucose);
     setDuration(5000);
+    addParameter(bleed);
   }
 
   void computeBlend(int[] c1, int[] c2, double progress) {
-    float bleed = 50.;
-    float yPos = (float) (-bleed + progress * (255. + bleed));
-    for (Point p : Point.list) {
-      float d = (p.fy - yPos) / 50.;
+    float bleedf = 10 + bleed.getValuef() * 200.;
+    float xPos = (float) (-bleedf + progress * (model.xMax + bleedf));
+    for (Point p : model.points) {
+      float d = (p.fx - xPos) / bleedf;
       if (d < 0) {
         colors[p.index] = c2[p.index];
       } else if (d > 1) {
@@ -126,23 +131,23 @@ class CubeEQ extends SCPattern {
   private LinearEnvelope[] bandVals = null;
   private int avgSize;
 
-  private final BasicKnob thrsh = new BasicKnob("LVL", 0.35);
-  private final BasicKnob range = new BasicKnob("RANG", 0.45);
-  private final BasicKnob edge = new BasicKnob("EDGE", 0.5);
-  private final BasicKnob speed = new BasicKnob("SPD", 0.5);
-  private final BasicKnob tone = new BasicKnob("TONE", 0.5);
-  private final BasicKnob clr = new BasicKnob("CLR", 0.5);
+  private final BasicParameter thrsh = new BasicParameter("LVL", 0.35);
+  private final BasicParameter range = new BasicParameter("RANG", 0.45);
+  private final BasicParameter edge = new BasicParameter("EDGE", 0.5);
+  private final BasicParameter speed = new BasicParameter("SPD", 0.5);
+  private final BasicParameter tone = new BasicParameter("TONE", 0.5);
+  private final BasicParameter clr = new BasicParameter("CLR", 0.5);
 
   public CubeEQ(GLucose glucose) {
     super(glucose);
-    addKnob(thrsh);
-    addKnob(range);
-    addKnob(edge);
-    addKnob(speed);
-    addKnob(tone);
-    addKnob(clr);
+    addParameter(thrsh);
+    addParameter(range);
+    addParameter(edge);
+    addParameter(speed);
+    addParameter(tone);
+    addParameter(clr);
   }
-  
+
   protected void onActive() {
     if (this.fft == null) {
       this.fft = new FFT(lx.audioInput().bufferSize(), lx.audioInput().sampleRate());
@@ -160,7 +165,7 @@ class CubeEQ extends SCPattern {
     this.fft.forward(this.lx.audioInput().mix);
     float toneConst = .35 + .4 * (tone.getValuef() - 0.5);
     float edgeConst = 2 + 30*(edge.getValuef()*edge.getValuef()*edge.getValuef());
-    
+
     for (int i = 0; i < avgSize; ++i) {
       float value = this.fft.getAvg(i);
       value = 20*log(1 + sqrt(value));
@@ -169,30 +174,434 @@ class CubeEQ extends SCPattern {
       value *= 6;
       if (value > this.bandVals[i].getValue()) {
         this.bandVals[i].setEndVal(value, 40).trigger();
-      } else {
+      } 
+      else {
         this.bandVals[i].setEndVal(value, 1000 - 900*speed.getValuef()).trigger();
       }
     }
-    
+
     float jBase = 120 - 360*thrsh.getValuef();
     float jConst = 300.*(1-range.getValuef());
     float clrConst = 1.1 + clr.getValuef();
 
-    for (Point p : Point.list) {
-      float avgIndex = constrain((p.fy / 256. * avgSize), 0, avgSize-2);
+    for (Point p : model.points) {
+      float avgIndex = constrain((p.fx / model.xMax * avgSize), 0, avgSize-2);
       int avgFloor = (int) avgIndex;
-      float j = jBase + jConst * (p.fz / 128.);
+      float j = jBase + jConst * (p.fy / model.yMax);
       float value = lerp(
-        this.bandVals[avgFloor].getValuef(),
-        this.bandVals[avgFloor+1].getValuef(),
-        avgIndex-avgFloor
-      );
-      
+      this.bandVals[avgFloor].getValuef(), 
+      this.bandVals[avgFloor+1].getValuef(), 
+      avgIndex-avgFloor
+        );
+
       float b = constrain(edgeConst * (value - j), 0, 100);
       colors[p.index] = color(
-        (480 + lx.getBaseHuef() - min(clrConst*p.fz, 120)) % 360, 
-        100, 
-        b);
+      (480 + lx.getBaseHuef() - min(clrConst*p.fy, 120)) % 360, 
+      100, 
+      b);
+    }
+  }
+}
+
+class BoomEffect extends SCEffect {
+
+  final BasicParameter falloff = new BasicParameter("WIDTH", 0.5);
+  final BasicParameter speed = new BasicParameter("SPD", 0.5);
+  final BasicParameter bright = new BasicParameter("BRT", 1.0);
+  final BasicParameter sat = new BasicParameter("SAT", 0.2);
+  List<Layer> layers = new ArrayList<Layer>();
+  final float maxr = sqrt(model.xMax*model.xMax + model.yMax*model.yMax + model.zMax*model.zMax) + 10;
+
+  class Layer {
+    LinearEnvelope boom = new LinearEnvelope(-40, 500, 1300);
+
+    Layer() {
+      addModulator(boom);
+      trigger();
+    }
+
+    void trigger() {
+      float falloffv = falloffv();
+      boom.setRange(-100 / falloffv, maxr + 100/falloffv, 4000 - speed.getValuef() * 3300);
+      boom.trigger();
+    }
+
+    void doApply(int[] colors) {
+      float brightv = 100 * bright.getValuef();
+      float falloffv = falloffv();
+      float satv = sat.getValuef() * 100;
+      float huev = lx.getBaseHuef();
+      for (Point p : model.points) {
+        colors[p.index] = blendColor(
+        colors[p.index], 
+        color(huev, satv, constrain(brightv - falloffv*abs(boom.getValuef() - dist(p.fx, 2*p.fy, 3*p.fz, model.xMax/2, model.yMax, model.zMax*1.5)), 0, 100)), 
+        ADD);
+      }
+    }
+  }
+
+  BoomEffect(GLucose glucose) {
+    super(glucose, true);
+    addParameter(falloff);
+    addParameter(speed);
+    addParameter(bright);
+    addParameter(sat);
+  }
+
+  public void onEnable() {
+    for (Layer l : layers) {
+      if (!l.boom.isRunning()) {
+        l.trigger();
+        return;
+      }
+    }
+    layers.add(new Layer());
+  }
+
+  private float falloffv() {
+    return 20 - 19 * falloff.getValuef();
+  }
+
+  public void onTrigger() {
+    onEnable();
+  }
+
+  public void doApply(int[] colors) {
+    for (Layer l : layers) {
+      if (l.boom.isRunning()) {
+        l.doApply(colors);
+      }
+    }
+  }
+}
+
+public class PianoKeyPattern extends SCPattern {
+  
+  final LinearEnvelope[] cubeBrt;
+  final SinLFO base[];  
+  final BasicParameter attack = new BasicParameter("ATK", 0.1);
+  final BasicParameter release = new BasicParameter("REL", 0.5);
+  final BasicParameter level = new BasicParameter("AMB", 0.6);
+  
+  PianoKeyPattern(GLucose glucose) {
+    super(glucose);
+    
+    for (MidiInputDevice input : RWMidi.getInputDevices()) {
+      input.createInput(this);
+    }
+    
+    addParameter(attack);
+    addParameter(release);
+    addParameter(level);
+    cubeBrt = new LinearEnvelope[model.cubes.size() / 4];
+    for (int i = 0; i < cubeBrt.length; ++i) {
+      addModulator(cubeBrt[i] = new LinearEnvelope(0, 0, 100));
+    }
+    base = new SinLFO[model.cubes.size() / 12];
+    for (int i = 0; i < base.length; ++i) {
+      addModulator(base[i] = new SinLFO(0, 1, 7000 + 1000*i)).trigger();
+    }
+  }
+  
+  private float getAttackTime() {
+    return 15 + attack.getValuef()*attack.getValuef() * 2000;
+  }
+  
+  private float getReleaseTime() {
+    return 15 + release.getValuef() * 3000;
+  }
+  
+  private LinearEnvelope getEnvelope(int index) {
+    return cubeBrt[index % cubeBrt.length];
+  }
+  
+  private SinLFO getBase(int index) {
+    return base[index % base.length];
+  }
+    
+  public void noteOnReceived(Note note) {
+    LinearEnvelope env = getEnvelope(note.getPitch());
+    env.setEndVal(min(1, env.getValuef() + (note.getVelocity() / 127.)), getAttackTime()).start();
+  }
+  
+  public void noteOffReceived(Note note) {
+    getEnvelope(note.getPitch()).setEndVal(0, getReleaseTime()).start();
+  }
+  
+  public void run(int deltaMs) {
+    int i = 0;
+    float huef = lx.getBaseHuef();
+    float levelf = level.getValuef();
+    for (Cube c : model.cubes) {
+      float v = max(getBase(i).getValuef() * levelf/4., getEnvelope(i++).getValuef());
+      setColor(c, color(
+        (huef + 20*v + abs(c.cx-model.xMax/2.)*.3 + c.cy) % 360,
+        min(100, 120*v),
+        100*v
+      ));
+    }
+  }
+}
+
+class CrossSections extends SCPattern {
+  
+  final SinLFO x = new SinLFO(0, model.xMax, 5000);
+  final SinLFO y = new SinLFO(0, model.yMax, 6000);
+  final SinLFO z = new SinLFO(0, model.zMax, 7000);
+  
+  final BasicParameter xw = new BasicParameter("XWID", 0.3);
+  final BasicParameter yw = new BasicParameter("YWID", 0.3);
+  final BasicParameter zw = new BasicParameter("ZWID", 0.3);  
+  final BasicParameter xr = new BasicParameter("XRAT", 0.7);
+  final BasicParameter yr = new BasicParameter("YRAT", 0.6);
+  final BasicParameter zr = new BasicParameter("ZRAT", 0.5);
+  final BasicParameter xl = new BasicParameter("XLEV", 1);
+  final BasicParameter yl = new BasicParameter("YLEV", 1);
+  final BasicParameter zl = new BasicParameter("ZLEV", 0.5);
+
+  
+  CrossSections(GLucose glucose) {
+    super(glucose);
+    addModulator(x).trigger();
+    addModulator(y).trigger();
+    addModulator(z).trigger();
+    addParams();
+  }
+  
+  public void addParams()
+  {
+    addParameter(xr);
+    addParameter(yr);
+    addParameter(zr);    
+    addParameter(xw);
+    addParameter(xl);
+    addParameter(yl);
+    addParameter(zl);
+    addParameter(yw);    
+    addParameter(zw);
+  }
+
+  public void onParameterChanged(LXParameter p) {
+    if (p == xr) {
+      x.setDuration(10000 - 8800*p.getValuef());
+    } else if (p == yr) {
+      y.setDuration(10000 - 9000*p.getValuef());
+    } else if (p == zr) {
+      z.setDuration(10000 - 9000*p.getValuef());
+    }
+  }
+
+  float xv;
+  float yv;
+  float zv;  
+
+  public void updateXYZVals()
+  {
+    xv = x.getValuef();
+    yv = y.getValuef();
+    zv = z.getValuef(); 
+  }
+
+  public void run(int deltaMs) {
+    updateXYZVals();   
+    float xlv = 100*xl.getValuef();
+    float ylv = 100*yl.getValuef();
+    float zlv = 100*zl.getValuef();
+    
+    float xwv = 100. / (10 + 40*xw.getValuef());
+    float ywv = 100. / (10 + 40*yw.getValuef());
+    float zwv = 100. / (10 + 40*zw.getValuef());
+    
+    for (Point p : model.points) {
+      color c = 0;
+      c = blendColor(c, color(
+      (lx.getBaseHuef() + p.fx/10 + p.fy/3) % 360, 
+      constrain(140 - 1.1*abs(p.fx - model.xMax/2.), 0, 100), 
+      max(0, xlv - xwv*abs(p.fx - xv))
+        ), ADD);
+      c = blendColor(c, color(
+      (lx.getBaseHuef() + 80 + p.fy/10) % 360, 
+      constrain(140 - 2.2*abs(p.fy - model.yMax/2.), 0, 100), 
+      max(0, ylv - ywv*abs(p.fy - yv))
+        ), ADD); 
+      c = blendColor(c, color(
+      (lx.getBaseHuef() + 160 + p.fz / 10 + p.fy/2) % 360, 
+      constrain(140 - 2.2*abs(p.fz - model.zMax/2.), 0, 100), 
+      max(0, zlv - zwv*abs(p.fz - zv))
+        ), ADD); 
+      colors[p.index] = c;
+    }
+  }
+}
+
+class Blinders extends SCPattern {
+    
+  final SinLFO[] m;
+  final TriangleLFO r;
+  final SinLFO s;
+  final TriangleLFO hs;
+
+  public Blinders(GLucose glucose) {
+    super(glucose);
+    m = new SinLFO[12];
+    for (int i = 0; i < m.length; ++i) {  
+      addModulator(m[i] = new SinLFO(0.5, 120, (120000. / (3+i)))).trigger();
+    }
+    addModulator(r = new TriangleLFO(9000, 15000, 29000)).trigger();
+    addModulator(s = new SinLFO(-20, 275, 11000)).trigger();
+    addModulator(hs = new TriangleLFO(0.1, 0.5, 15000)).trigger();
+    s.modulateDurationBy(r);
+  }
+
+  public void run(int deltaMs) {
+    float hv = lx.getBaseHuef();
+    int si = 0;
+    for (Strip strip : model.strips) {
+      int i = 0;
+      float mv = m[si % m.length].getValuef();
+      for (Point p : strip.points) {
+        colors[p.index] = color(
+          (hv + p.fz + p.fy*hs.getValuef()) % 360, 
+          min(100, abs(p.fx - s.getValuef())/2.), 
+          max(0, 100 - mv/2. - mv * abs(i - 7.5))
+        );
+        ++i;
+      }
+      ++si;
+    }
+  }
+}
+
+class Psychedelia extends SCPattern {
+  
+  final int NUM = 3;
+  SinLFO m = new SinLFO(-0.5, NUM-0.5, 9000);
+  SinLFO s = new SinLFO(-20, 147, 11000);
+  TriangleLFO h = new TriangleLFO(0, 240, 19000);
+  SinLFO c = new SinLFO(-.2, .8, 31000);
+
+  Psychedelia(GLucose glucose) {
+    super(glucose);
+    addModulator(m).trigger();
+    addModulator(s).trigger();
+    addModulator(h).trigger();
+    addModulator(c).trigger();
+  }
+
+  void run(int deltaMs) {
+    float huev = h.getValuef();
+    float cv = c.getValuef();
+    float sv = s.getValuef();
+    float mv = m.getValuef();
+    int i = 0;
+    for (Strip strip : model.strips) {
+      for (Point p : strip.points) {
+        colors[p.index] = color(
+          (huev + i*constrain(cv, 0, 2) + p.fz/2. + p.fx/4.) % 360, 
+          min(100, abs(p.fy-sv)), 
+          max(0, 100 - 50*abs((i%NUM) - mv))
+        );
+      }
+      ++i;
+    }
+  }
+}
+
+class AskewPlanes extends SCPattern {
+  
+  class Plane {
+    private final SinLFO a;
+    private final SinLFO b;
+    private final SinLFO c;
+    float av = 1;
+    float bv = 1;
+    float cv = 1;
+    float denom = 0.1;
+    
+    Plane(int i) {
+      addModulator(a = new SinLFO(-1, 1, 4000 + 1029*i)).trigger();
+      addModulator(b = new SinLFO(-1, 1, 11000 - 1104*i)).trigger();
+      addModulator(c = new SinLFO(-50, 50, 4000 + 1000*i * ((i % 2 == 0) ? 1 : -1))).trigger();      
+    }
+    
+    void run(int deltaMs) {
+      av = a.getValuef();
+      bv = b.getValuef();
+      cv = c.getValuef();
+      denom = sqrt(av*av + bv*bv);
+    }
+  }
+    
+  final Plane[] planes;
+  final int NUM_PLANES = 3;
+  
+  AskewPlanes(GLucose glucose) {
+    super(glucose);
+    planes = new Plane[NUM_PLANES];
+    for (int i = 0; i < planes.length; ++i) {
+      planes[i] = new Plane(i);
+    }
+  }
+  
+  public void run(int deltaMs) {
+    float huev = lx.getBaseHuef();
+    
+    // This is super fucking bizarre. But if this is a for loop, the framerate
+    // tanks to like 30FPS, instead of 60. Call them manually and it works fine.
+    // Doesn't make ANY sense... there must be some weird side effect going on
+    // with the Processing internals perhaps?
+//    for (Plane plane : planes) {
+//      plane.run(deltaMs);
+//    }
+    planes[0].run(deltaMs);
+    planes[1].run(deltaMs);
+    planes[2].run(deltaMs);    
+    
+    for (Point p : model.points) {
+      float d = MAX_FLOAT;
+      for (Plane plane : planes) {
+        if (plane.denom != 0) {
+          d = min(d, abs(plane.av*(p.fx-model.cx) + plane.bv*(p.fy-model.cy) + plane.cv) / plane.denom);
+        }
+      }
+      colors[p.index] = color(
+        (huev + abs(p.fx-model.cx)*.3 + p.fy*.8) % 360,
+        max(0, 100 - .8*abs(p.fx - model.cx)),
+        constrain(140 - 10.*d, 0, 100)
+      );
+    }
+  }
+}
+
+class ShiftingPlane extends SCPattern {
+
+  final SinLFO a = new SinLFO(-.2, .2, 5300);
+  final SinLFO b = new SinLFO(1, -1, 13300);
+  final SinLFO c = new SinLFO(-1.4, 1.4, 5700);
+  final SinLFO d = new SinLFO(-10, 10, 9500);
+
+  ShiftingPlane(GLucose glucose) {
+    super(glucose);
+    addModulator(a).trigger();
+    addModulator(b).trigger();
+    addModulator(c).trigger();
+    addModulator(d).trigger();    
+  }
+  
+  public void run(int deltaMs) {
+    float hv = lx.getBaseHuef();
+    float av = a.getValuef();
+    float bv = b.getValuef();
+    float cv = c.getValuef();
+    float dv = d.getValuef();    
+    float denom = sqrt(av*av + bv*bv + cv*cv);
+    for (Point p : model.points) {
+      float d = abs(av*(p.fx-model.cx) + bv*(p.fy-model.cy) + cv*(p.fz-model.cz) + dv) / denom;
+      colors[p.index] = color(
+        (hv + abs(p.fx-model.cx)*.6 + abs(p.fy-model.cy)*.9 + abs(p.fz - model.cz)) % 360,
+        constrain(110 - d*6, 0, 100),
+        constrain(130 - 7*d, 0, 100)
+      );
     }
   }
 }