repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modified mappings to render more cubes, modified internals
[SugarCubes.git]
/
MarkSlee.pde
diff --git
a/MarkSlee.pde
b/MarkSlee.pde
index 6cf0da01c5e68ba054c8efdf283b37d9c04cf45a..3d6cda6b47293b392a1a329d9177b5958d4cd031 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;
}
}
@@
-801,13
+802,18
@@
class BassPod extends SCPattern {
private GraphicEQ eq = null;
private GraphicEQ eq = null;
+ private final BasicParameter clr = new BasicParameter("CLR", 0.5);
+
public BassPod(GLucose glucose) {
super(glucose);
public BassPod(GLucose glucose) {
super(glucose);
+ addParameter(clr);
}
protected void onActive() {
if (eq == null) {
eq = new GraphicEQ(lx, 16);
}
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);
eq.slope.setValue(0.6);
addParameter(eq.level);
addParameter(eq.range);
@@
-822,8
+828,10
@@
class BassPod extends SCPattern {
float bassLevel = eq.getAverageLevel(0, 5);
float bassLevel = eq.getAverageLevel(0, 5);
+ float satBase = bassLevel*480*clr.getValuef();
+
for (Point p : model.points) {
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);
+ 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);
float value = 0;
for (int i = avgIndex; i < avgIndex + 5; ++i) {
value += eq.getLevel(i);
@@
-833,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,
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
);
}
b
);
}