repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sinesphere working with notes
[SugarCubes.git]
/
MarkSlee.pde
diff --git
a/MarkSlee.pde
b/MarkSlee.pde
index 59798c5eb88a3fc7e4d609e1b716144657f6f824..d3237e1e64fb2204e0ee6a41950ad80855e3d9cd 100644
(file)
--- 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),
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;
);
++i;
- }
+ }
++s;
}
}
++s;
}
}
@@
-1411,7
+1412,7
@@
class ColorFuckerEffect extends SCEffect {
float bMod = level.getValuef();
float sMod = 1 - desat.getValuef();
float hMod = hueShift.getValuef();
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;
float fSoft = soft.getValuef();
boolean mon = mono.getValuef() > 0.5;
boolean ivt = invert.getValuef() > 0.5;
@@
-1425,7
+1426,12
@@
class ColorFuckerEffect extends SCEffect {
hsb[2] = 1 - hsb[2];
}
if (fSharp > 0) {
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) {
}
if (fSoft > 0) {
if (hsb[2] > 0.5) {