X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=MarkSlee.pde;h=7a556d5d0f7850d5a463f7ba7f890365e664b828;hb=c539129588fc6cf8edd9ca9da85cd685f0e3b996;hp=b9105768c952521114996505a985f5ead2faf5c4;hpb=190d91c2948b274a2dbaf4ec07450b4ebf2feece;p=SugarCubes.git diff --git a/MarkSlee.pde b/MarkSlee.pde index b910576..7a556d5 100644 --- a/MarkSlee.pde +++ b/MarkSlee.pde @@ -44,7 +44,7 @@ class MidiMusic extends SCPattern { for (Point p : model.points) { float b = max(0, bVal - 3*dist(p.x, p.y, xPos, yVal)); if (b > 0) { - colors[p.index] = blendColor(colors[p.index], color( + colors[p.index] = blendColor(colors[p.index], lx.hsb( (lx.getBaseHuef() + abs(p.x - model.cx) + abs(p.y - model.cy)) % 360, 100, b @@ -54,7 +54,7 @@ class MidiMusic extends SCPattern { } } - public synchronized boolean noteOnReceived(Note note) { + public synchronized boolean noteOn(Note note) { if (note.getChannel() == 0) { for (LightUp light : allLights) { if (light.isAvailable()) { @@ -74,7 +74,7 @@ class MidiMusic extends SCPattern { return true; } - public synchronized boolean noteOffReceived(Note note) { + public synchronized boolean noteOff(Note note) { if (note.getChannel() == 0) { LightUp light = lightMap.get(note.getPitch()); if (light != null) { @@ -106,7 +106,7 @@ class Pulley extends SCPattern { private boolean isRising = false; private BasicParameter sz = new BasicParameter("SIZE", 0.5); - private BasicParameter beatAmount = new BasicParameter("BEAT", 0.1); + private BasicParameter beatAmount = new BasicParameter("BEAT", 0); Pulley(GLucose glucose) { super(glucose); @@ -118,6 +118,7 @@ class Pulley extends SCPattern { addParameter(sz); addParameter(beatAmount); trigger(); + } private void trigger() { @@ -125,7 +126,7 @@ class Pulley extends SCPattern { int i = 0; for (Accelerator g : gravity) { if (isRising) { - g.setSpeed(random(40, 50), 0).start(); + g.setSpeed(random(20, 33), 0).start(); } else { g.setVelocity(0).setAcceleration(-420); delays[i].setDuration(random(0, 500)).trigger(); @@ -138,33 +139,47 @@ class Pulley extends SCPattern { if (reset.click()) { trigger(); } - int j = 0; - for (Click d : delays) { - if (d.click()) { - gravity[j].start(); - d.stop(); - } - ++j; - } - - for (Accelerator g : gravity) { - if (isRising) { - if (g.getValuef() > model.yMax) { - g.stop(); - } else if (g.getValuef() > model.yMax*.55) { - if (g.getVelocityf() > 10) { - g.setAcceleration(-16); - } else { - g.setAcceleration(0); - } + + if (isRising) { + // Fucking A, had to comment this all out because of that bizarre + // Processing bug where some simple loop takes an absurd amount of + // time, must be some pre-processor bug +// for (Accelerator g : gravity) { +// if (g.getValuef() > model.yMax) { +// g.stop(); +// } else if (g.getValuef() > model.yMax*.55) { +// if (g.getVelocityf() > 10) { +// g.setAcceleration(-16); +// } else { +// g.setAcceleration(0); +// } +// } +// } + } else { + int j = 0; + for (Click d : delays) { + if (d.click()) { + gravity[j].start(); + d.stop(); } - } else { + ++j; + } + for (Accelerator g : gravity) { if (g.getValuef() < 0) { g.setValue(-g.getValuef()); g.setVelocity(-g.getVelocityf() * random(0.74, 0.84)); } } } + + // A little silliness to test the grid API + for (int i = 0; i < 7; ++i) { + for (int j = 0; j < 8; ++j) { + int gi = (int) constrain(j * NUM_DIVISIONS / 8, 0, NUM_DIVISIONS-1); + float b = 1 - 4.*abs((6-i)/7. - gravity[gi].getValuef() / model.yMax); + midiEngine.grid.setState(i, j, (b < 0) ? 0 : 1); + } + } float fPos = 1 - lx.tempo.rampf(); if (fPos < .2) { @@ -172,11 +187,11 @@ class Pulley extends SCPattern { } float falloff = 100. / (3 + sz.getValuef() * 36 + fPos * beatAmount.getValuef()*48); for (Point p : model.points) { - int i = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1); - colors[p.index] = color( + 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, constrain(130 - p.y*.8, 0, 100), - max(0, 100 - abs(p.y - gravity[i].getValuef())*falloff) + max(0, 100 - abs(p.y - gravity[gi].getValuef())*falloff) ); } } @@ -246,7 +261,7 @@ class ViolinWave extends SCPattern { for (Point 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], color( + colors[p.index] = blendColor(colors[p.index], lx.hsb( lx.getBaseHuef(), 20, b ), ADD); } @@ -297,7 +312,7 @@ class ViolinWave extends SCPattern { for (Point 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] = color( + colors[p.index] = lx.hsb( (lx.getBaseHuef() + abs(p.x - model.cx)) % 360, min(100, 20 + 8*abs(p.y - centers[ci])), constrain(edg*(val*rFactor - rng * abs(p.y-centers[ci])), 0, 100) @@ -354,7 +369,7 @@ class BouncyBalls extends SCPattern { 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) { - colors[p.index] = blendColor(colors[p.index], color( + colors[p.index] = blendColor(colors[p.index], lx.hsb( (lx.getBaseHuef() + p.y*.5 + abs(model.cx - p.x) * .5) % 360, max(0, 100 - .45*(p.y - flrLevel)), b @@ -387,7 +402,7 @@ class BouncyBalls extends SCPattern { } } - public boolean noteOnReceived(Note note) { + public boolean noteOn(Note note) { int pitch = (note.getPitch() + note.getChannel()) % NUM_BALLS; balls[pitch].bounce(note.getVelocity()); return true; @@ -436,7 +451,7 @@ class SpaceTime extends SCPattern { for (Strip strip : model.strips) { int i = 0; for (Point p : strip.points) { - colors[p.index] = color( + 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), max(0, 100 - fVal*abs(i - pVal*(strip.metrics.numPoints - 1))) @@ -486,7 +501,7 @@ class Swarm extends SCPattern { int i = 0; for (Point p : strip.points) { float fV = max(-1, 1 - dist(p.x/2., p.y, fX.getValuef()/2., fY.getValuef()) / 64.); - colors[p.index] = color( + 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) @@ -636,7 +651,7 @@ class BassPod extends SCPattern { value /= 5.; float b = constrain(8 * (value*model.yMax - abs(p.y-model.yMax/2.)), 0, 100); - colors[p.index] = color( + 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), b @@ -696,7 +711,7 @@ class CubeEQ extends SCPattern { float value = lerp(smoothValue, chunkyValue, blockiness.getValuef()); float b = constrain(edgeConst * (value*model.yMax - p.y), 0, 100); - colors[p.index] = color( + colors[p.index] = lx.hsb( (480 + lx.getBaseHuef() - min(clrConst*p.y, 120)) % 360, 100, b @@ -736,7 +751,7 @@ class BoomEffect extends SCEffect { for (Point p : model.points) { colors[p.index] = blendColor( colors[p.index], - color(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)), + 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)), ADD); } } @@ -817,13 +832,13 @@ public class PianoKeyPattern extends SCPattern { return base[index % base.length]; } - public boolean noteOnReceived(Note note) { + public boolean noteOn(Note note) { LinearEnvelope env = getEnvelope(note.getPitch()); env.setEndVal(min(1, env.getValuef() + (note.getVelocity() / 127.)), getAttackTime()).start(); return true; } - public boolean noteOffReceived(Note note) { + public boolean noteOff(Note note) { getEnvelope(note.getPitch()).setEndVal(0, getReleaseTime()).start(); return true; } @@ -834,7 +849,7 @@ public class PianoKeyPattern extends SCPattern { float levelf = level.getValuef(); for (Cube c : model.cubes) { float v = max(getBase(i).getValuef() * levelf/4., getEnvelope(i++).getValuef()); - setColor(c, color( + setColor(c, lx.hsb( (huef + 20*v + abs(c.cx-model.xMax/2.)*.3 + c.cy) % 360, min(100, 120*v), 100*v @@ -911,17 +926,17 @@ class CrossSections extends SCPattern { for (Point p : model.points) { color c = 0; - c = blendColor(c, color( + c = blendColor(c, lx.hsb( (lx.getBaseHuef() + p.x/10 + p.y/3) % 360, constrain(140 - 1.1*abs(p.x - model.xMax/2.), 0, 100), max(0, xlv - xwv*abs(p.x - xv)) ), ADD); - c = blendColor(c, color( + c = blendColor(c, lx.hsb( (lx.getBaseHuef() + 80 + p.y/10) % 360, constrain(140 - 2.2*abs(p.y - model.yMax/2.), 0, 100), max(0, ylv - ywv*abs(p.y - yv)) ), ADD); - c = blendColor(c, color( + c = blendColor(c, lx.hsb( (lx.getBaseHuef() + 160 + p.z / 10 + p.y/2) % 360, constrain(140 - 2.2*abs(p.z - model.zMax/2.), 0, 100), max(0, zlv - zwv*abs(p.z - zv)) @@ -957,7 +972,7 @@ class Blinders extends SCPattern { int i = 0; float mv = m[si % m.length].getValuef(); for (Point p : strip.points) { - colors[p.index] = color( + colors[p.index] = lx.hsb( (hv + p.z + p.y*hs.getValuef()) % 360, min(100, abs(p.x - s.getValuef())/2.), max(0, 100 - mv/2. - mv * abs(i - (strip.metrics.length-1)/2.)) @@ -993,7 +1008,7 @@ class Psychedelia extends SCPattern { int i = 0; for (Strip strip : model.strips) { for (Point p : strip.points) { - colors[p.index] = color( + colors[p.index] = lx.hsb( (huev + i*constrain(cv, 0, 2) + p.z/2. + p.x/4.) % 360, min(100, abs(p.y-sv)), max(0, 100 - 50*abs((i%NUM) - mv)) @@ -1061,7 +1076,7 @@ class AskewPlanes extends SCPattern { d = min(d, abs(plane.av*(p.x-model.cx) + plane.bv*(p.y-model.cy) + plane.cv) / plane.denom); } } - colors[p.index] = color( + colors[p.index] = lx.hsb( (huev + abs(p.x-model.cx)*.3 + p.y*.8) % 360, max(0, 100 - .8*abs(p.x - model.cx)), constrain(140 - 10.*d, 0, 100) @@ -1094,7 +1109,7 @@ class ShiftingPlane extends SCPattern { float denom = sqrt(av*av + bv*bv + cv*cv); for (Point 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] = color( + colors[p.index] = lx.hsb( (hv + abs(p.x-model.cx)*.6 + abs(p.y-model.cy)*.9 + abs(p.z - model.cz)) % 360, constrain(110 - d*6, 0, 100), constrain(130 - 7*d, 0, 100) @@ -1163,12 +1178,12 @@ class Traktor extends SCPattern { 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] = color( + 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) ); - colors[p.index] = blendColor(colors[p.index], color( + colors[p.index] = blendColor(colors[p.index], lx.hsb( (400 + lx.getBaseHuef() + .5*abs(p.x-model.cx)) % 360, 60, constrain(5 * (treble[pos]*.6*model.cy - abs(p.y - model.cy)), 0, 100) @@ -1180,38 +1195,98 @@ class Traktor extends SCPattern { class ColorFuckerEffect extends SCEffect { - BasicParameter hueShift = new BasicParameter("HSHFT", 0); - BasicParameter sat = new BasicParameter("SAT", 1); - BasicParameter bright = new BasicParameter("BRT", 1); + final BasicParameter level = new BasicParameter("BRT", 1); + final BasicParameter desat = new BasicParameter("DSAT", 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]; ColorFuckerEffect(GLucose glucose) { super(glucose); + addParameter(level); + addParameter(desat); + addParameter(sharp); + addParameter(soft); + addParameter(mono); + addParameter(invert); addParameter(hueShift); - addParameter(bright); - addParameter(sat); } public void doApply(int[] colors) { if (!enabled) { return; } - float bMod = bright.getValuef(); - float sMod = sat.getValuef(); + float bMod = level.getValuef(); + float sMod = 1 - desat.getValuef(); float hMod = hueShift.getValuef(); - if (bMod < 1 || sMod < 1 || hMod > 0) { + float fSharp = 1/(1.0001-sharp.getValuef()); + float fSoft = soft.getValuef(); + boolean mon = mono.getValuef() > 0.5; + boolean ivt = invert.getValuef() > 0.5; + if (bMod < 1 || sMod < 1 || hMod > 0 || fSharp > 0 || ivt || mon || fSoft > 0) { for (int i = 0; i < colors.length; ++i) { lx.RGBtoHSB(colors[i], hsb); + if (mon) { + hsb[0] = lx.getBaseHuef() / 360.; + } + if (ivt) { + hsb[2] = 1 - hsb[2]; + } + if (fSharp > 0) { + hsb[2] = hsb[2] < .5 ? pow(hsb[2],fSharp) : 1-pow(1-hsb[2],fSharp); + } + if (fSoft > 0) { + if (hsb[2] > 0.5) { + hsb[2] = lerp(hsb[2], 0.5 + 2 * (hsb[2]-0.5)*(hsb[2]-0.5), fSoft); + } else { + hsb[2] = lerp(hsb[2], 0.5 * sqrt(2*hsb[2]), fSoft); + } + } colors[i] = lx.hsb( - (360. * hsb[0] + hueShift.getValuef()*360.) % 360, - 100. * hsb[1] * sat.getValuef(), - 100. * hsb[2] * bright.getValuef() + (360. * hsb[0] + hMod*360.) % 360, + 100. * hsb[1] * sMod, + 100. * hsb[2] * bMod ); } } } } +class QuantizeEffect extends SCEffect { + + color[] quantizedFrame; + float lastQuant; + final BasicParameter amount = new BasicParameter("AMT", 0); + + QuantizeEffect(GLucose glucose) { + super(glucose); + quantizedFrame = new color[glucose.lx.total]; + lastQuant = 0; + } + + public void doApply(int[] colors) { + float fQuant = amount.getValuef(); + if (fQuant > 0) { + float tRamp = (lx.tempo.rampf() % (1./pow(2,floor((1-fQuant) * 4)))); + float f = lastQuant; + lastQuant = tRamp; + if (tRamp > f) { + for (int i = 0; i < colors.length; ++i) { + colors[i] = quantizedFrame[i]; + } + return; + } + } + for (int i = 0; i < colors.length; ++i) { + quantizedFrame[i] = colors[i]; + } + } +} + class BlurEffect extends SCEffect { final LXParameter amount = new BasicParameter("AMT", 0);