repositories
/
SugarCubes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
05ebfd1
)
Fix up to lx.hsb
author
Mark Slee
<mcslee@Mark-Slees-MacBook-Pro.local>
Fri, 8 Nov 2013 22:22:09 +0000
(14:22 -0800)
committer
Mark Slee
<mcslee@Mark-Slees-MacBook-Pro.local>
Fri, 8 Nov 2013 22:22:09 +0000
(14:22 -0800)
MarkSlee.pde
patch
|
blob
|
blame
|
history
diff --git
a/MarkSlee.pde
b/MarkSlee.pde
index bcd5c62c81898b82240a6c075f8f151555587fbb..59798c5eb88a3fc7e4d609e1b716144657f6f824 100644
(file)
--- a/
MarkSlee.pde
+++ b/
MarkSlee.pde
@@
-57,10
+57,10
@@
class Cathedrals extends SCPattern {
if (abs(p.x - cx) < arm) {
d = min(abs(p.x - cx), abs(p.y - middle));
}
if (abs(p.x - cx) < arm) {
d = min(abs(p.x - cx), abs(p.y - middle));
}
- colors[p.index] =
color
(
+ colors[p.index] =
lx.hsb
(
(lx.getBaseHuef() + .2*abs(p.y - model.cy)) % 360,
min(100, sf*dist(abs(p.x - cx), p.y, arm, middle)),
(lx.getBaseHuef() + .2*abs(p.y - model.cy)) % 360,
min(100, sf*dist(abs(p.x - cx), p.y, arm, middle)),
-
max(0, 120 - d*falloff
));
+
constrain(120 - d*falloff, 0, 100
));
}
}
}
}
}
}
@@
-110,7
+110,7
@@
class MidiMusic extends SCPattern {
}
float posf = position.getValuef();
for (Point p : model.points) {
}
float posf = position.getValuef();
for (Point p : model.points) {
- colors[p.index] = blendColor(colors[p.index],
color
(
+ colors[p.index] = blendColor(colors[p.index],
lx.hsb
(
(lx.getBaseHuef() + .2*abs(p.x - model.cx) + .2*abs(p.y - model.cy)) % 360,
100,
max(0, bright - posf*100 - falloff*abs(p.y - posf*model.yMax))
(lx.getBaseHuef() + .2*abs(p.x - model.cx) + .2*abs(p.y - model.cy)) % 360,
100,
max(0, bright - posf*100 - falloff*abs(p.y - posf*model.yMax))
@@
-255,7
+255,7
@@
class MidiMusic extends SCPattern {
for (Point p : s.points) {
int wavi = (int) constrain(p.x / model.xMax * wval.length, 0, wval.length-1);
float wavb = max(0, wave.getValuef()*100. - 8.*abs(p.y - wval[wavi]));
for (Point p : s.points) {
int wavi = (int) constrain(p.x / model.xMax * wval.length, 0, wval.length-1);
float wavb = max(0, wave.getValuef()*100. - 8.*abs(p.y - wval[wavi]));
- colors[p.index] =
color
(
+ colors[p.index] =
lx.hsb
(
(lx.getBaseHuef() + .2*abs(p.x - model.cx) + .2*abs(p.y - model.cy)) % 360,
100,
constrain(wavb + max(0, maxBright - 40.*abs(sparklePos - abs(i - (Cube.POINTS_PER_STRIP-1)/2.))), 0, 100)
(lx.getBaseHuef() + .2*abs(p.x - model.cx) + .2*abs(p.y - model.cy)) % 360,
100,
constrain(wavb + max(0, maxBright - 40.*abs(sparklePos - abs(i - (Cube.POINTS_PER_STRIP-1)/2.))), 0, 100)