X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=MarkSlee.pde;h=56c06536e5aa8d33bb787fa76af6331ac3934c5a;hb=ffc523c070e369b68fce2474b7b506f7d8968e9d;hp=928f7abd0d11449a9c886d9a8920a54cd2ef74dc;hpb=29d8acbb812206793be02523854cc34dfd73c592;p=SugarCubes.git diff --git a/MarkSlee.pde b/MarkSlee.pde index 928f7ab..56c0653 100644 --- a/MarkSlee.pde +++ b/MarkSlee.pde @@ -1,3 +1,70 @@ +class Cathedrals extends SCPattern { + + private final BasicParameter xpos = new BasicParameter("XPOS", 0.5); + private final BasicParameter wid = new BasicParameter("WID", 0.5); + private final BasicParameter arms = new BasicParameter("ARMS", 0.5); + private final BasicParameter sat = new BasicParameter("SAT", 0.5); + private GraphicEQ eq; + + Cathedrals(GLucose glucose) { + super(glucose); + addParameter(xpos); + addParameter(wid); + addParameter(arms); + addParameter(sat); + } + + protected void onActive() { + if (eq == null) { + eq = new GraphicEQ(lx, 16); + eq.slope.setValue(0.7); + eq.range.setValue(0.4); + eq.attack.setValue(0.4); + eq.release.setValue(0.4); + addParameter(eq.level); + addParameter(eq.range); + addParameter(eq.attack); + addParameter(eq.release); + addParameter(eq.slope); + } + } + + + public void run(double deltaMs) { + eq.run(deltaMs); + float bassLevel = eq.getAverageLevel(0, 4); + float trebleLevel = eq.getAverageLevel(8, 6); + + float falloff = 100 / (2 + 14*wid.getValuef()); + float cx = model.xMin + (model.xMax-model.xMin) * xpos.getValuef(); + float barm = 12 + 60*arms.getValuef()*max(0, 2*(bassLevel-0.1)); + float tarm = 12 + 60*arms.getValuef()*max(0, 2*(trebleLevel-0.1)); + + float arm = 0; + float middle = 0; + + float sf = 100. / (70 - 69.9*sat.getValuef()); + + for (Point p : model.points) { + float d = MAX_FLOAT; + if (p.y > model.cy) { + arm = tarm; + middle = model.yMax * 3/5.; + } else { + arm = barm; + middle = model.yMax * 1/5.; + } + if (abs(p.x - cx) < arm) { + d = min(abs(p.x - cx), abs(p.y - middle)); + } + colors[p.index] = color( + (lx.getBaseHuef() + .2*abs(p.y - model.cy)) % 360, + min(100, sf*dist(abs(p.x - cx), p.y, arm, middle)), + max(0, 120 - d*falloff)); + } + } +} + class MidiMusic extends SCPattern { private final Stack newLayers = new Stack(); @@ -404,7 +471,7 @@ class ViolinWave extends SCPattern { } float zeroDBReference = pow(10, (50 - 190*level.getValuef())/20.); - float dB = 20*GraphicEQ.log10(lx.audioInput().mix.level() / zeroDBReference); + float dB = 20*GraphicEQ.log10(lx.audioInput().mix.level() / zeroDBReference); if (dB > dbValue.getValuef()) { rising = true; dbValue.setRangeFromHereTo(dB, 10).trigger(); @@ -449,7 +516,7 @@ class BouncyBalls extends SCPattern { float zPos; BouncyBall(int i) { - addModulator(xPos).setBasis(random(0, TWO_PI)).start(); + addModulator(xPos.setBasis(random(0, TWO_PI)).start()); addModulator(yPos = new Accelerator(0, 0, 0)); zPos = lerp(model.zMin, model.zMax, (i+2.) / (NUM_BALLS + 4.)); } @@ -577,7 +644,7 @@ class SpaceTime extends SCPattern { } class Swarm extends SCPattern { - + SawLFO offset = new SawLFO(0, 1, 1000); SinLFO rate = new SinLFO(350, 1200, 63000); SinLFO falloff = new SinLFO(15, 50, 17000); @@ -617,10 +684,11 @@ class Swarm extends SCPattern { colors[p.index] = lx.hsb( (lx.getBaseHuef() + 0.3 * abs(p.x - hOffX.getValuef())) % 360, constrain(80 + 40 * fV, 0, 100), - constrain(100 - (30 - fV * falloff.getValuef()) * modDist(i + (s*63)%61, offset.getValuef() * strip.metrics.numPoints, strip.metrics.numPoints), 0, 100) + constrain(100 - + (30 - fV * falloff.getValuef()) * modDist(i + (s*63)%61, offset.getValuef() * strip.metrics.numPoints, strip.metrics.numPoints), 0, 100) ); ++i; - } + } ++s; } } @@ -734,13 +802,18 @@ class BassPod extends SCPattern { private GraphicEQ eq = null; + private final BasicParameter clr = new BasicParameter("CLR", 0.5); + public BassPod(GLucose glucose) { super(glucose); + addParameter(clr); } protected void onActive() { if (eq == null) { eq = new GraphicEQ(lx, 16); + eq.range.setValue(0.4); + eq.level.setValue(0.4); eq.slope.setValue(0.6); addParameter(eq.level); addParameter(eq.range); @@ -755,8 +828,10 @@ class BassPod extends SCPattern { float bassLevel = eq.getAverageLevel(0, 5); + float satBase = bassLevel*480*clr.getValuef(); + for (Point p : model.points) { - int avgIndex = (int) constrain(1 + abs(p.x-model.xMax/2.)/(model.xMax/2.)*(eq.numBands-5), 0, eq.numBands-5); + int avgIndex = (int) constrain(1 + abs(p.x-model.cx)/(model.cx)*(eq.numBands-5), 0, eq.numBands-5); float value = 0; for (int i = avgIndex; i < avgIndex + 5; ++i) { value += eq.getLevel(i); @@ -766,7 +841,7 @@ class BassPod extends SCPattern { float b = constrain(8 * (value*model.yMax - abs(p.y-model.yMax/2.)), 0, 100); colors[p.index] = lx.hsb( (lx.getBaseHuef() + abs(p.y - model.cy) + abs(p.x - model.cx)) % 360, - constrain(bassLevel*240 - .6*dist(p.x, p.y, model.cx, model.cy), 0, 100), + constrain(satBase - .6*dist(p.x, p.y, model.cx, model.cy), 0, 100), b ); } @@ -856,7 +931,7 @@ class BoomEffect extends SCEffect { boom.trigger(); } - void doApply(int[] colors) { + void apply(int[] colors) { float brightv = 100 * bright.getValuef(); float falloffv = falloffv(); float satv = sat.getValuef() * 100; @@ -896,10 +971,10 @@ class BoomEffect extends SCEffect { onEnable(); } - public void doApply(int[] colors) { + public void apply(int[] colors) { for (Layer l : layers) { if (l.boom.isRunning()) { - l.doApply(colors); + l.apply(colors); } } } @@ -1330,7 +1405,7 @@ class ColorFuckerEffect extends SCEffect { addParameter(invert); } - public void doApply(int[] colors) { + public void apply(int[] colors) { if (!enabled) { return; } @@ -1382,7 +1457,7 @@ class QuantizeEffect extends SCEffect { lastQuant = 0; } - public void doApply(int[] colors) { + public void apply(int[] colors) { float fQuant = amount.getValuef(); if (fQuant > 0) { float tRamp = (lx.tempo.rampf() % (1./pow(2,floor((1-fQuant) * 4)))); @@ -1428,7 +1503,7 @@ class BlurEffect extends SCEffect { env.setRangeFromHereTo(0, 1000).start(); } - public void doApply(int[] colors) { + public void apply(int[] colors) { float amt = env.getValuef() * amount.getValuef(); if (amt > 0) { amt = (1 - amt);