X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=a599b4389e9ed475667f10ab8d6d03f832c9927e;hb=b8bb27489db7dc687bf150576e9d9439f1fa17a6;hp=84a311a54675ba2a00c36c2283a41a0fe36b1e50;hpb=19d16a168003953f5abcb90d73849673d3d06f16;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 84a311a..a599b43 100644
--- 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,7 +52,8 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
+     new SineSphere(glucose),
+//     new CubeCurl(glucose),
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -102,7 +103,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),
@@ -128,15 +128,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();
+  }
 }
+