X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=cf54800cf0e44508eead6c77ee7872f287d8872c;hb=09437b3e395227ad2061512f9f0333091aeef2b7;hp=893152f31148221424950f696c5cad306abb4f04;hpb=6b163a98976a5f2adf9da1b7bd3297e39d6dd7bf;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 893152f..cf54800 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,12 +25,13 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-
-    new SineSphere(glucose),
-     new CubeCurl(glucose),
+     
+     new SineSphere(glucose),
+     new CubeCurl(glucose), 
 
     // Slee
-    // new MidiMusic(glucose),
+    new Cathedrals(glucose),
+    new MidiMusic(glucose),
     new Pulley(glucose),
     new Swarm(glucose),
     new ViolinWave(glucose),
@@ -54,7 +55,8 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-   
+     
+
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
     
@@ -103,7 +105,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,15 +130,17 @@ LXTransition[] transitions(GLucose glucose) {
 }
 
 // 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();
+  }
 }
+