repositories
/
SugarCubes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8185ec8
)
Change colors on balance
author
Jack Stahl
<jack@asana.com>
Wed, 21 Aug 2013 06:55:25 +0000
(23:55 -0700)
committer
Jack Stahl
<jack@asana.com>
Wed, 21 Aug 2013 06:55:25 +0000
(23:55 -0700)
JackStahl.pde
patch
|
blob
|
blame
|
history
diff --git
a/JackStahl.pde
b/JackStahl.pde
index dc28936fd2e4c2d88105c4b7896977ca5fdfa4a0..05e2ec66e7c1ebdee6de1147ca31f60e87a11875 100644
(file)
--- a/
JackStahl.pde
+++ b/
JackStahl.pde
@@
-172,7
+172,7
@@
class Balance extends SCPattern {
float v1 = max(0, 100 * (1 - 4*abs(sin_x - y_in_range)));
float hue_color = (lx.getBaseHuef() + hueScale.getValuef() * (abs(p.x-model.xMax/2.) + abs(p.y-model.yMax/2)*.2 + abs(p.z - model.zMax/2.)*.5)) % 360;
float v1 = max(0, 100 * (1 - 4*abs(sin_x - y_in_range)));
float hue_color = (lx.getBaseHuef() + hueScale.getValuef() * (abs(p.x-model.xMax/2.) + abs(p.y-model.yMax/2)*.2 + abs(p.z - model.zMax/2.)*.5)) % 360;
- color c = color(hue_color,
6
0, v1);
+ color c = color(hue_color,
8
0, v1);
// Now draw the spheres
for (Sphere s : spheres) {
// Now draw the spheres
for (Sphere s : spheres) {
@@
-195,7
+195,9
@@
class Balance extends SCPattern {
float value = min(beat_value, distance_value);
float value = min(beat_value, distance_value);
- c = blendColor(c, color((hue_color + 180) % 360, 100, min(1, value) * 100), ADD);
+ float sphere_color = (lx.getBaseHuef() - (1 - hueScale.getValuef()) * d/r * 45) % 360;
+
+ c = blendColor(c, color((sphere_color + 270) % 360, 60, min(1, value) * 100), ADD);
}
colors[p.index] = c;
}
}
colors[p.index] = c;
}