Add obj1/2 accessors for Dan to use on Strip objects

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 893152f31148221424950f696c5cad306abb4f04..9faf3ec45d2babd96a24089d549e86c370d96a90 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -26,9 +26,7 @@
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
 
-    new SineSphere(glucose),
-     new CubeCurl(glucose),
-
+    
     // Slee
     // new MidiMusic(glucose),
     new Pulley(glucose),
@@ -54,7 +52,9 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-   
+     new SineSphere(glucose),
+//     new CubeCurl(glucose),
+
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
     
@@ -129,15 +129,18 @@ LXTransition[] transitions(GLucose glucose) {
 }
 
 // Handles to globally triggerable effects 
-BoomEffect     EFF_boom;
+BoomEffect EFF_boom;
 FlashEffect EFF_flash;
+ColorFuckerEffect EFF_colorFucker;
+BlurEffect EFF_blur;
+QuantizeEffect EFF_quantize;
 
 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),
+    EFF_flash = new FlashEffect(lx),
+    EFF_boom = new BoomEffect(glucose),
+    (EFF_blur = new BlurEffect(glucose)).enable(),
+    (EFF_quantize = new QuantizeEffect(glucose)).enable(),
+    (EFF_colorFucker =  new ColorFuckerEffect(glucose)).enable(),
   };
 }