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

diff --git a/SugarCubes.pde b/SugarCubes.pde
index a89368c..cf54800 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,9 +25,14 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
+     
+     new SineSphere(glucose),
+     new CubeCurl(glucose), 
 
-    new CubeCurl(glucose),
     // Slee
+    new Cathedrals(glucose),
+    new MidiMusic(glucose),
+    new Pulley(glucose),
     new Swarm(glucose),
     new ViolinWave(glucose),
     new BouncyBalls(glucose),
@@ -50,7 +55,7 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
+     
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -125,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();
+  }
 }
+