X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=d1052bd5fddddf6c7722ae893e52ad1d9f0fafb2;hb=09f7f5dff86f1b54a789e39b4f6ab24ed072c17d;hp=0f5ca26c08a6c07597df45d2f822d8e72329c2f4;hpb=4760e696dd25f659896876c10ff5cb98b69fb84f;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 0f5ca26..d1052bd 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,11 +25,14 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-    
+
     // Slee
+    new Cathedrals(glucose),
+    new MidiMusic(glucose),
+    new Pulley(glucose),
+    new Swarm(glucose),
     new ViolinWave(glucose),
     new BouncyBalls(glucose),
-    new Swarm(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -44,11 +47,12 @@ LXPattern[] patterns(GLucose glucose) {
 
     // DanH
     new Noise(glucose),
-    new Play(glucose),
-    new Pong(glucose),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
+     
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -123,15 +127,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();
+  }
 }
+