X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=MarkSlee.pde;h=8799b83d568e296e6d96439247501791b7386248;hb=a922e963a15c0991da5084d44a20b4c3e5980b50;hp=1ecb640dbd10c7bd59581ea3f34f3a6660171719;hpb=749eb72c6abd63e1f1d1253646e52b3c08954fd4;p=SugarCubes.git diff --git a/MarkSlee.pde b/MarkSlee.pde index 1ecb640..8799b83 100644 --- a/MarkSlee.pde +++ b/MarkSlee.pde @@ -1,6 +1,6 @@ class SpaceTime extends SCPattern { - SinLFO pos = new SinLFO(0, 15, 3000); + SinLFO pos = new SinLFO(0, 1, 3000); SinLFO rate = new SinLFO(1000, 9000, 13000); SinLFO falloff = new SinLFO(10, 70, 5000); float angle = 0; @@ -8,8 +8,10 @@ class SpaceTime extends SCPattern { BasicParameter rateParameter = new BasicParameter("RATE", 0.5); BasicParameter sizeParameter = new BasicParameter("SIZE", 0.5); + public SpaceTime(GLucose glucose) { super(glucose); + addModulator(pos).trigger(); addModulator(rate).trigger(); addModulator(falloff).trigger(); @@ -39,10 +41,10 @@ class SpaceTime extends SCPattern { int i = 0; for (Point p : strip.points) { colors[p.index] = color( - (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)) - ); + (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*(strip.metrics.numPoints - 1))) + ); ++i; } ++s; @@ -52,7 +54,7 @@ class SpaceTime extends SCPattern { class Swarm extends SCPattern { - SawLFO offset = new SawLFO(0, 16, 1000); + 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); @@ -61,6 +63,7 @@ class Swarm extends SCPattern { public Swarm(GLucose glucose) { super(glucose); + addModulator(offset).trigger(); addModulator(rate).trigger(); addModulator(falloff).trigger(); @@ -83,14 +86,14 @@ class Swarm extends SCPattern { void run(int deltaMs) { float s = 0; - for (Strip strip : model.strips) { + for (Strip strip : model.strips ) { int i = 0; for (Point p : strip.points) { 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.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) + constrain(100 - (30 - fV * falloff.getValuef()) * modDist(i + (s*63)%61, (int) (offset.getValuef() * strip.metrics.numPoints), strip.metrics.numPoints), 0, 100) ); ++i; } @@ -365,6 +368,10 @@ class CrossSections extends SCPattern { addModulator(x).trigger(); addModulator(y).trigger(); addModulator(z).trigger(); + addParams(); + } + + protected void addParams() { addParameter(xr); addParameter(yr); addParameter(zr); @@ -385,11 +392,18 @@ class CrossSections extends SCPattern { z.setDuration(10000 - 9000*p.getValuef()); } } + + float xv, yv, zv; + + protected void updateXYZVals() { + xv = x.getValuef(); + yv = y.getValuef(); + zv = z.getValuef(); + } public void run(int deltaMs) { - float xv = x.getValuef(); - float yv = y.getValuef(); - float zv = z.getValuef(); + updateXYZVals(); + float xlv = 100*xl.getValuef(); float ylv = 100*yl.getValuef(); float zlv = 100*zl.getValuef(); @@ -449,7 +463,7 @@ class Blinders extends SCPattern { 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)) + max(0, 100 - mv/2. - mv * abs(i - (strip.metrics.length-1)/2.)) ); ++i; } @@ -499,10 +513,10 @@ class AskewPlanes extends SCPattern { private final SinLFO a; private final SinLFO b; private final SinLFO c; - float av; - float bv; - float cv; - float denom; + 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(); @@ -528,25 +542,33 @@ class AskewPlanes extends SCPattern { planes[i] = new Plane(i); } } - - private final float denoms[] = new float[NUM_PLANES]; public void run(int deltaMs) { float huev = lx.getBaseHuef(); - int i = 0; - for (Plane p : planes) { - p.run(deltaMs); - } + + // 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) { - d = min(d, abs(plane.av*(p.fx-model.xMax/2.) + plane.bv*(p.fy-model.yMax/2.) + plane.cv) / plane.denom); - } - colors[p.index] = color( - (lx.getBaseHuef() + abs(p.fx-model.xMax/2.)*.3 + p.fy*.8) % 360, - max(0, 100 - .8*abs(p.fx - model.xMax/2.)), - constrain(140 - 10.*d, 0, 100) - ); + 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) + ); } } } @@ -574,9 +596,9 @@ class ShiftingPlane extends SCPattern { 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.xMax/2.) + bv*(p.fy-model.yMax/2.) + cv*(p.fz-model.zMax/2.) + dv) / denom; + 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.xMax/2.)*.6 + abs(p.fy-model.yMax/2)*.9 + abs(p.fz - model.zMax/2.)) % 360, + (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) );