X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=MarkSlee.pde;h=d3237e1e64fb2204e0ee6a41950ad80855e3d9cd;hb=1c44211b1a15965afee7056a2f1d43a1306df61b;hp=88759da00d83ef8f123dbf445eb8d8f79bfe9926;hpb=ef7118ad30ec90ed1a3e6d3f5d9fdb0a21a03fe9;p=SugarCubes.git diff --git a/MarkSlee.pde b/MarkSlee.pde index 88759da..d3237e1 100644 --- a/MarkSlee.pde +++ b/MarkSlee.pde @@ -684,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; } } @@ -1426,7 +1427,11 @@ class ColorFuckerEffect extends SCEffect { } if (fSharp > 0) { fSharp = 1/(1-fSharp); - hsb[2] = hsb[2] < .5 ? pow(hsb[2],fSharp) : 1-pow(1-hsb[2],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) {