X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=6318339df09a42b134ff47510950155233699551;hb=1c44211b1a15965afee7056a2f1d43a1306df61b;hp=805c32697d4075cde744d0f73a8c4e226926a33a;hpb=8cedfe61921b1f725a367eaef8d3c36e7e650e16;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 805c326..6318339 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -26,9 +26,11 @@
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
 
-    
+    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),
@@ -52,8 +54,7 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-     new SineSphere(glucose),
-//     new CubeCurl(glucose),
+     
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -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();
+  }
 }
+