repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed order, commented out bad anims
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index f9616b81b3bad96bf49bd55d4960c7beb08c4609..a6c4e4105e95a92587c5647262bd24d11dcdc696 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-25,12
+25,14
@@
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
-
- new SineSphere(glucose),
- new CubeCurl(glucose),
-
+
+
// Slee
// Slee
- new Swarm(glucose),
+ // new Cathedrals(glucose),
+ new Swarm(glucose),
+ new MidiMusic(glucose),
+ new Pulley(glucose),
+
new ViolinWave(glucose),
new BouncyBalls(glucose),
new SpaceTime(glucose),
new ViolinWave(glucose),
new BouncyBalls(glucose),
new SpaceTime(glucose),
@@
-52,9
+54,18
@@
LXPattern[] patterns(GLucose glucose) {
new Worms(glucose),
// Alex G
new Worms(glucose),
// Alex G
-
- // Shaheen
- new HelixPattern(glucose).setEligible(false),
+ new SineSphere(glucose),
+ //new CubeCurl(glucose),
+
+ // Tim
+ new TimPlanes(glucose),
+ new TimPinwheels(glucose),
+ new TimRaindrops(glucose),
+ new TimCubes(glucose),
+ // new TimTrace(glucose),
+ new TimSpheres(glucose),
+
+
// Toby
new GlitchPlasma(glucose),
// Toby
new GlitchPlasma(glucose),
@@
-68,20
+79,16
@@
LXPattern[] patterns(GLucose glucose) {
new Swim(glucose),
new Balance(glucose),
new Swim(glucose),
new Balance(glucose),
- // Tim
- new TimPlanes(glucose),
- new TimPinwheels(glucose),
- new TimRaindrops(glucose),
- new TimCubes(glucose),
- // new TimTrace(glucose),
- new TimSpheres(glucose),
-
+
// Ben
// new Sandbox(glucose),
new TowerParams(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
// Ben
// new Sandbox(glucose),
new TowerParams(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
+ // Shaheen
+ //new HelixPattern(glucose).setEligible(false),
+
//JR
new Gimbal(glucose),
//JR
new Gimbal(glucose),
@@
-126,15
+133,17
@@
LXTransition[] transitions(GLucose glucose) {
}
// Handles to globally triggerable effects
}
// Handles to globally triggerable effects
-BoomEffect EFF_boom;
-FlashEffect EFF_flash;
-
-LXEffect[] effects(GLucose glucose) {
- return new LXEffect[] {
- EFF_flash = new FlashEffect(lx),
- EFF_boom = new BoomEffect(glucose),
- new BlurEffect(glucose),
- new DesaturationEffect(lx),
- new ColorFuckerEffect(glucose),
- };
+class Effects {
+ FlashEffect flash = new FlashEffect(lx);
+ BoomEffect boom = new BoomEffect(glucose);
+ BlurEffect blur = new BlurEffect(glucose);
+ QuantizeEffect quantize = new QuantizeEffect(glucose);
+ ColorFuckerEffect colorFucker = new ColorFuckerEffect(glucose);
+
+ Effects() {
+ blur.enable();
+ quantize.enable();
+ colorFucker.enable();
+ }
}
}
+