X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=MarkSlee.pde;h=62a474d84ec0d0ef261a43b9e5b8bfa203479eb6;hb=8f4e6c99775f2724edf3cec488860eb68b06491c;hp=fde5fc7eda9a7b828652ba2b25c0335ca20d6a44;hpb=66067e53a4adab2860ba09f88e2c3f8984ff65ba;p=SugarCubes.git diff --git a/MarkSlee.pde b/MarkSlee.pde index fde5fc7..62a474d 100644 --- a/MarkSlee.pde +++ b/MarkSlee.pde @@ -1,18 +1,128 @@ +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 (LXPoint 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] = lx.hsb( + (lx.getBaseHuef() + .2*abs(p.y - model.cy)) % 360, + min(100, sf*dist(abs(p.x - cx), p.y, arm, middle)), + constrain(120 - d*falloff, 0, 100)); + } + } +} + class MidiMusic extends SCPattern { + private final Stack newLayers = new Stack(); + private final Map lightMap = new HashMap(); - private final List allLights = new ArrayList(); + private final List lights = new ArrayList(); + private final BasicParameter lightSize = new BasicParameter("SIZE", 0.5); + + private final List sweeps = new ArrayList(); + + private final LinearEnvelope sparkle = new LinearEnvelope(0, 1, 500); + private boolean sparkleDirection = true; + private float sparkleBright = 100; - private final Stack newLayers = new Stack(); + private final BasicParameter wave = new BasicParameter("WAVE", 0); MidiMusic(GLucose glucose) { super(glucose); + addParameter(lightSize); + addParameter(wave); + addModulator(sparkle).setValue(1); + } + + void onReset() { + for (LightUp light : lights) { + light.noteOff(null); + } + } + + class Sweep extends LXLayer { + + final LinearEnvelope position = new LinearEnvelope(0, 1, 1000); + float bright = 100; + float falloff = 10; + + Sweep() { + addModulator(position); + } + + public void run(double deltaMs, color[] colors) { + if (!position.isRunning()) { + return; + } + float posf = position.getValuef(); + for (LXPoint p : model.points) { + colors[p.index] = blendColor(colors[p.index], lx.hsb( + (lx.getBaseHuef() + .2*abs(p.x - model.cx) + .2*abs(p.y - model.cy)) % 360, + 100, + max(0, bright - posf*100 - falloff*abs(p.y - posf*model.yMax)) + ), ADD); + } + } } class LightUp extends LXLayer { - private LinearEnvelope brt = new LinearEnvelope(0, 0, 0); - private Accelerator yPos = new Accelerator(0, 0, 0); + private final LinearEnvelope brt = new LinearEnvelope(0, 0, 0); + private final Accelerator yPos = new Accelerator(0, 0, 0); private float xPos; LightUp() { @@ -25,8 +135,8 @@ class MidiMusic extends SCPattern { } void noteOn(Note note) { - xPos = lerp(0, model.xMax, constrain(0.5 + (note.getPitch() - 64) / 12., 0, 1)); - yPos.setValue(lerp(20, model.yMax, note.getVelocity() / 127.)); + xPos = lerp(0, model.xMax, constrain(0.5 + (note.getPitch() - 60) / 28., 0, 1)); + yPos.setValue(lerp(20, model.yMax*.72, note.getVelocity() / 127.)).stop(); brt.setRangeFromHereTo(lerp(40, 100, note.getVelocity() / 127.), 20).start(); } @@ -41,11 +151,12 @@ class MidiMusic extends SCPattern { return; } float yVal = yPos.getValuef(); - for (Point p : model.points) { - float b = max(0, bVal - 3*dist(p.x, p.y, xPos, yVal)); + for (LXPoint p : model.points) { + float falloff = 6 - 5*lightSize.getValuef(); + float b = max(0, bVal - falloff*dist(p.x, p.y, xPos, yVal)); if (b > 0) { colors[p.index] = blendColor(colors[p.index], lx.hsb( - (lx.getBaseHuef() + abs(p.x - model.cx) + abs(p.y - model.cy)) % 360, + (lx.getBaseHuef() + .2*abs(p.x - model.cx) + .2*abs(p.y - model.cy)) % 360, 100, b ), ADD); @@ -54,22 +165,67 @@ class MidiMusic extends SCPattern { } } + private LightUp getLight() { + for (LightUp light : lights) { + if (light.isAvailable()) { + return light; + } + } + LightUp newLight = new LightUp(); + lights.add(newLight); + synchronized(newLayers) { + newLayers.push(newLight); + } + return newLight; + } + + private Sweep getSweep() { + for (Sweep s : sweeps) { + if (!s.position.isRunning()) { + return s; + } + } + Sweep newSweep = new Sweep(); + sweeps.add(newSweep); + synchronized(newLayers) { + newLayers.push(newSweep); + } + return newSweep; + } + public synchronized boolean noteOn(Note note) { if (note.getChannel() == 0) { - for (LightUp light : allLights) { - if (light.isAvailable()) { - light.noteOn(note); - lightMap.put(note.getPitch(), light); - return true; + LightUp light = getLight(); + lightMap.put(note.getPitch(), light); + light.noteOn(note); + } else if (note.getChannel() == 1) { + } else if (note.getChannel() == 9) { + if (note.getVelocity() > 0) { + switch (note.getPitch()) { + case 36: + Sweep s = getSweep(); + s.bright = 50 + note.getVelocity() / 127. * 50; + s.falloff = 20 - note.getVelocity() / 127. * 17; + s.position.trigger(); + break; + case 37: + sparkleBright = note.getVelocity() / 127. * 100; + sparkleDirection = true; + sparkle.trigger(); + break; + case 38: + sparkleBright = note.getVelocity() / 127. * 100; + sparkleDirection = false; + sparkle.trigger(); + break; + case 39: + effects.boom.trigger(); + break; + case 40: + effects.flash.trigger(); + break; } } - LightUp newLight = new LightUp(); - newLight.noteOn(note); - lightMap.put(note.getPitch(), newLight); - synchronized(newLayers) { - newLayers.push(newLight); - } - } else if (note.getChannel() == 1) { } return true; } @@ -84,8 +240,30 @@ class MidiMusic extends SCPattern { return true; } + final float[] wval = new float[16]; + float wavoff = 0; + public synchronized void run(double deltaMs) { - setColors(#000000); + wavoff += deltaMs * .001; + for (int i = 0; i < wval.length; ++i) { + wval[i] = model.cy + 0.2 * model.yMax/2. * sin(wavoff + i / 1.9); + } + float sparklePos = (sparkleDirection ? sparkle.getValuef() : (1 - sparkle.getValuef())) * (Cube.POINTS_PER_STRIP)/2.; + float maxBright = sparkleBright * (1 - sparkle.getValuef()); + for (Strip s : model.strips) { + int i = 0; + for (LXPoint p : s.points) { + int wavi = (int) constrain(p.x / model.xMax * wval.length, 0, wval.length-1); + float wavb = max(0, wave.getValuef()*100. - 8.*abs(p.y - wval[wavi])); + colors[p.index] = lx.hsb( + (lx.getBaseHuef() + .2*abs(p.x - model.cx) + .2*abs(p.y - model.cy)) % 360, + 100, + constrain(wavb + max(0, maxBright - 40.*abs(sparklePos - abs(i - (Cube.POINTS_PER_STRIP-1)/2.))), 0, 100) + ); + ++i; + } + } + if (!newLayers.isEmpty()) { synchronized(newLayers) { while (!newLayers.isEmpty()) { @@ -188,7 +366,7 @@ class Pulley extends SCPattern { fPos = .2 + 4 * (.2 - fPos); } float falloff = 100. / (3 + sz.getValuef() * 36 + fPos * beatAmount.getValuef()*48); - for (Point p : model.points) { + for (LXPoint p : model.points) { int gi = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1); colors[p.index] = lx.hsb( (lx.getBaseHuef() + abs(p.x - model.cx)*.8 + p.y*.4) % 360, @@ -260,7 +438,7 @@ class ViolinWave extends SCPattern { } float pFalloff = (30 - 27*pSize.getValuef()); - for (Point p : model.points) { + for (LXPoint p : model.points) { float b = 100 - pFalloff * (abs(p.x - x.getValuef()) + abs(p.y - y.getValuef())); if (b > 0) { colors[p.index] = blendColor(colors[p.index], lx.hsb( @@ -293,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(); @@ -311,7 +489,7 @@ class ViolinWave extends SCPattern { float rng = (78 - 64 * range.getValuef()) / (model.yMax - model.cy); float val = max(2, dbValue.getValuef()); - for (Point p : model.points) { + for (LXPoint p : model.points) { int ci = (int) lerp(0, centers.length-1, (p.x - model.xMin) / (model.xMax - model.xMin)); float rFactor = 1.0 - 0.9 * abs(p.x - model.cx) / (model.xMax - model.cx); colors[p.index] = lx.hsb( @@ -338,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.)); } @@ -367,7 +545,7 @@ class BouncyBalls extends SCPattern { float xv = xPos.getValuef(); float yv = yPos.getValuef(); - for (Point p : model.points) { + for (LXPoint p : model.points) { float d = sqrt((p.x-xv)*(p.x-xv) + (p.y-yv)*(p.y-yv) + .1*(p.z-zPos)*(p.z-zPos)); float b = constrain(130 - falloff*d, 0, 100); if (b > 0) { @@ -452,7 +630,7 @@ class SpaceTime extends SCPattern { int s = 0; for (Strip strip : model.strips) { int i = 0; - for (Point p : strip.points) { + for (LXPoint p : strip.points) { colors[p.index] = lx.hsb( (lx.getBaseHuef() + 360 - p.x*.2 + p.y * .3) % 360, constrain(.4 * min(abs(s - sVal1), abs(s - sVal2)), 20, 100), @@ -466,13 +644,13 @@ 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); - SinLFO fX = new SinLFO(0, model.xMax, 19000); - SinLFO fY = new SinLFO(0, model.yMax, 11000); - SinLFO hOffX = new SinLFO(0, model.xMax, 13000); + SinLFO fX = new SinLFO(model.xMin, model.xMax, 19000); + SinLFO fY = new SinLFO(model.yMin, model.yMax, 11000); + SinLFO hOffX = new SinLFO(model.xMin, model.xMax, 13000); public Swarm(GLucose glucose) { super(glucose); @@ -499,17 +677,18 @@ class Swarm extends SCPattern { void run(double deltaMs) { float s = 0; - for (Strip strip : model.strips ) { + for (Strip strip : model.strips) { int i = 0; - for (Point p : strip.points) { + for (LXPoint p : strip.points) { float fV = max(-1, 1 - dist(p.x/2., p.y, fX.getValuef()/2., fY.getValuef()) / 64.); 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; } } @@ -528,7 +707,7 @@ class SwipeTransition extends SCTransition { void computeBlend(int[] c1, int[] c2, double progress) { float bleedf = 10 + bleed.getValuef() * 200.; float xPos = (float) (-bleedf + progress * (model.xMax + bleedf)); - for (Point p : model.points) { + for (LXPoint p : model.points) { float d = (p.x - xPos) / bleedf; if (d < 0) { colors[p.index] = c2[p.index]; @@ -623,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); @@ -644,8 +828,10 @@ class BassPod extends SCPattern { float bassLevel = eq.getAverageLevel(0, 5); - 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); + float satBase = bassLevel*480*clr.getValuef(); + + for (LXPoint p : model.points) { + 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); @@ -655,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 ); } @@ -695,7 +881,7 @@ class CubeEQ extends SCPattern { float edgeConst = 2 + 30*edge.getValuef(); float clrConst = 1.1 + clr.getValuef(); - for (Point p : model.points) { + for (LXPoint p : model.points) { float avgIndex = constrain(2 + p.x / model.xMax * (eq.numBands-4), 0, eq.numBands-4); int avgFloor = (int) avgIndex; @@ -745,12 +931,12 @@ 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; float huev = lx.getBaseHuef(); - for (Point p : model.points) { + for (LXPoint p : model.points) { colors[p.index] = blendColor( colors[p.index], lx.hsb(huev, satv, constrain(brightv - falloffv*abs(boom.getValuef() - dist(p.x, 2*p.y, 3*p.z, model.xMax/2, model.yMax, model.zMax*1.5)), 0, 100)), @@ -785,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); } } } @@ -926,7 +1112,7 @@ class CrossSections extends SCPattern { float ywv = 100. / (10 + 40*yw.getValuef()); float zwv = 100. / (10 + 40*zw.getValuef()); - for (Point p : model.points) { + for (LXPoint p : model.points) { color c = 0; c = blendColor(c, lx.hsb( (lx.getBaseHuef() + p.x/10 + p.y/3) % 360, @@ -973,7 +1159,7 @@ class Blinders extends SCPattern { for (Strip strip : model.strips) { int i = 0; float mv = m[si % m.length].getValuef(); - for (Point p : strip.points) { + for (LXPoint p : strip.points) { colors[p.index] = lx.hsb( (hv + p.z + p.y*hs.getValuef()) % 360, min(100, abs(p.x - s.getValuef())/2.), @@ -1009,7 +1195,7 @@ class Psychedelia extends SCPattern { float mv = m.getValuef(); int i = 0; for (Strip strip : model.strips) { - for (Point p : strip.points) { + for (LXPoint p : strip.points) { colors[p.index] = lx.hsb( (huev + i*constrain(cv, 0, 2) + p.z/2. + p.x/4.) % 360, min(100, abs(p.y-sv)), @@ -1071,7 +1257,7 @@ class AskewPlanes extends SCPattern { planes[1].run(deltaMs); planes[2].run(deltaMs); - for (Point p : model.points) { + for (LXPoint p : model.points) { float d = MAX_FLOAT; for (Plane plane : planes) { if (plane.denom != 0) { @@ -1109,7 +1295,7 @@ class ShiftingPlane extends SCPattern { float cv = c.getValuef(); float dv = d.getValuef(); float denom = sqrt(av*av + bv*bv + cv*cv); - for (Point p : model.points) { + for (LXPoint p : model.points) { float d = abs(av*(p.x-model.cx) + bv*(p.y-model.cy) + cv*(p.z-model.cz) + dv) / denom; colors[p.index] = lx.hsb( (hv + abs(p.x-model.cx)*.6 + abs(p.y-model.cy)*.9 + abs(p.z - model.cz)) % 360, @@ -1176,14 +1362,14 @@ class Traktor extends SCPattern { bass[index] = rawBass * rawBass * rawBass * rawBass; treble[index] = rawTreble * rawTreble; - for (Point p : model.points) { + for (LXPoint p : model.points) { int i = (int) constrain((model.xMax - p.x) / model.xMax * FRAME_WIDTH, 0, FRAME_WIDTH-1); int pos = (index + FRAME_WIDTH - i) % FRAME_WIDTH; colors[p.index] = lx.hsb( (360 + lx.getBaseHuef() + .8*abs(p.x-model.cx)) % 360, 100, - constrain(9 * (bass[pos]*model.cy - abs(p.y - model.cy)), 0, 100) + constrain(9 * (bass[pos]*model.cy - abs(p.y - model.cy + 5)), 0, 100) ); colors[p.index] = blendColor(colors[p.index], lx.hsb( (400 + lx.getBaseHuef() + .5*abs(p.x-model.cx)) % 360, @@ -1199,11 +1385,12 @@ class ColorFuckerEffect extends SCEffect { final BasicParameter level = new BasicParameter("BRT", 1); final BasicParameter desat = new BasicParameter("DSAT", 0); + final BasicParameter hueShift = new BasicParameter("HSHFT", 0); final BasicParameter sharp = new BasicParameter("SHARP", 0); final BasicParameter soft = new BasicParameter("SOFT", 0); final BasicParameter mono = new BasicParameter("MONO", 0); final BasicParameter invert = new BasicParameter("INVERT", 0); - final BasicParameter hueShift = new BasicParameter("HSHFT", 0); + float[] hsb = new float[3]; @@ -1212,20 +1399,20 @@ class ColorFuckerEffect extends SCEffect { addParameter(level); addParameter(desat); addParameter(sharp); + addParameter(hueShift); addParameter(soft); addParameter(mono); addParameter(invert); - addParameter(hueShift); } - public void doApply(int[] colors) { + public void apply(int[] colors) { if (!enabled) { return; } float bMod = level.getValuef(); float sMod = 1 - desat.getValuef(); float hMod = hueShift.getValuef(); - float fSharp = 1/(1.0001-sharp.getValuef()); + float fSharp = sharp.getValuef(); float fSoft = soft.getValuef(); boolean mon = mono.getValuef() > 0.5; boolean ivt = invert.getValuef() > 0.5; @@ -1239,7 +1426,12 @@ class ColorFuckerEffect extends SCEffect { hsb[2] = 1 - hsb[2]; } if (fSharp > 0) { - hsb[2] = hsb[2] < .5 ? pow(hsb[2],fSharp) : 1-pow(1-hsb[2],fSharp); + fSharp = 1/(1-fSharp); + if (hsb[2] < .5) { + hsb[2] = pow(hsb[2],fSharp); + } else { + hsb[2] = 1-pow(1-hsb[2],fSharp); + } } if (fSoft > 0) { if (hsb[2] > 0.5) { @@ -1270,7 +1462,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)))); @@ -1291,7 +1483,7 @@ class QuantizeEffect extends SCEffect { class BlurEffect extends SCEffect { - final LXParameter amount = new BasicParameter("AMT", 0); + final BasicParameter amount = new BasicParameter("AMT", 0); final int[] frame; final LinearEnvelope env = new LinearEnvelope(0, 1, 100); @@ -1316,7 +1508,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); @@ -1329,3 +1521,4 @@ class BlurEffect extends SCEffect { } } +