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

diff --git a/SugarCubes.pde b/SugarCubes.pde
index a89368c..8d9219d 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,10 +25,16 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-
-    new CubeCurl(glucose),
+     
+     new SineSphere(glucose),
+     //new CubeCurl(glucose), 
+     
     // Slee
-    new Swarm(glucose),
+    // new Cathedrals(glucose),
+     new Swarm(glucose),
+    new MidiMusic(glucose),
+    new Pulley(glucose),
+    
     new ViolinWave(glucose),
     new BouncyBalls(glucose),
     new SpaceTime(glucose),
@@ -50,10 +56,18 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
+     
+     // Tim
+    new TimPlanes(glucose),
+    new TimPinwheels(glucose),
+    new TimRaindrops(glucose),
+    new TimCubes(glucose),
+    // new TimTrace(glucose),
+    new TimSpheres(glucose),
+
+    // Jackie
+    new JackieSquares(glucose),
 
-    // Shaheen
-    new HelixPattern(glucose).setEligible(false),
     
     // Toby
     new GlitchPlasma(glucose),
@@ -67,20 +81,16 @@ LXPattern[] patterns(GLucose glucose) {
     new Swim(glucose),
     new Balance(glucose),
 
-    // Tim
-    new TimPlanes(glucose),
-    new TimPinwheels(glucose),
-    new TimRaindrops(glucose),
-    new TimCubes(glucose),
-    // new TimTrace(glucose),
-    new TimSpheres(glucose),
-
+    
     // Ben
     // new Sandbox(glucose),
     new TowerParams(glucose),
     new DriveableCrossSections(glucose),
     new GranimTestPattern2(glucose),
     
+    // Shaheen
+    //new HelixPattern(glucose).setEligible(false),
+    
     //JR
     new Gimbal(glucose),
     
@@ -125,15 +135,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();
+  }
 }
+