Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 9faf3ec45d2babd96a24089d549e86c370d96a90..d1052bd5fddddf6c7722ae893e52ad1d9f0fafb2 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -26,9 +26,9 @@
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
 
-    
     // Slee
-    // new MidiMusic(glucose),
+    new Cathedrals(glucose),
+    new MidiMusic(glucose),
     new Pulley(glucose),
     new Swarm(glucose),
     new ViolinWave(glucose),
@@ -52,8 +52,7 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-     new SineSphere(glucose),
-//     new CubeCurl(glucose),
+     
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -103,7 +102,6 @@ LXPattern[] patterns(GLucose glucose) {
     new TestBassMapping(glucose),
     new TestFloorMapping(glucose),
     new TestSpeakerMapping(glucose),    
-    new TestPerformancePattern(glucose),
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),
@@ -129,18 +127,17 @@ LXTransition[] transitions(GLucose glucose) {
 }
 
 // Handles to globally triggerable effects 
-BoomEffect EFF_boom;
-FlashEffect EFF_flash;
-ColorFuckerEffect EFF_colorFucker;
-BlurEffect EFF_blur;
-QuantizeEffect EFF_quantize;
-
-LXEffect[] effects(GLucose glucose) {
-  return new LXEffect[] {
-    EFF_flash = new FlashEffect(lx),
-    EFF_boom = new BoomEffect(glucose),
-    (EFF_blur = new BlurEffect(glucose)).enable(),
-    (EFF_quantize = new QuantizeEffect(glucose)).enable(),
-    (EFF_colorFucker =  new ColorFuckerEffect(glucose)).enable(),
-  };
+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();
+  }
 }
+