repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into newmaster
[SugarCubes.git]
/
AlexGreen.pde
diff --git
a/AlexGreen.pde
b/AlexGreen.pde
index 3e164d8bff34509891657cf09d585d69026c3f8a..61754b162194315879565d92261f8b209dd29b50 100644
(file)
--- a/
AlexGreen.pde
+++ b/
AlexGreen.pde
@@
-195,9
+195,9
@@
boolean noteOn(Note note) {
//public grid
final Sphery[] spherys;
//public grid
final Sphery[] spherys;
- SineSphere(
GLucose glucose
)
+ SineSphere(
LX lx
)
{
{
- super(
glucose
);
+ super(
lx
);
println("modelrad " + modelrad);
sinespin = new LXProjection(model);
sinespin2 = new LXProjection(model);
println("modelrad " + modelrad);
sinespin = new LXProjection(model);
sinespin2 = new LXProjection(model);
@@
-451,8
+451,8
@@
public class APat extends SCPattern
updateLights();
}
updateLights();
}
- APat(
GLucose glucose
) {
- super(
glucose
);
+ APat(
LX lx
) {
+ super(
lx
);
@@
-521,8
+521,8
@@
private SinLFO curl = new SinLFO(0, Cube.EDGE_HEIGHT, 5000 );
private SinLFO bg = new SinLFO(180, 220, 3000);
private SinLFO bg = new SinLFO(180, 220, 3000);
-CubeCurl(
GLucose glucose
){
-super(
glucose
);
+CubeCurl(
LX lx
){
+super(
lx
);
addModulator(curl).trigger();
addModulator(bg).trigger();
this.CH = Cube.EDGE_HEIGHT;
addModulator(curl).trigger();
addModulator(bg).trigger();
this.CH = Cube.EDGE_HEIGHT;
@@
-595,8
+595,8
@@
float cfloor = c.y;
BasicParameter SatT = new BasicParameter("Sat", .5);
BasicParameter BriT = new BasicParameter("Bright", .5);
BasicParameter SatT = new BasicParameter("Sat", .5);
BasicParameter BriT = new BasicParameter("Bright", .5);
-HueTestHSB(
GLucose glucose
) {
- super(
glucose
);
+HueTestHSB(
LX lx
) {
+ super(
lx
);
addParameter(HueT);
addParameter(SatT);
addParameter(BriT);
addParameter(HueT);
addParameter(SatT);
addParameter(BriT);