X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=6877613e4cca823f389e25b53c0aa024a4d967f3;hb=4bca76c39956015a5ca3021acdef4d7241d20e77;hp=bf545b533d69984bfb0dde20bc1d5d2eabf0876f;hpb=7e3329d23ca78fbf1464e4f29d4f1ad25e8348de;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index bf545b5..6877613 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -28,6 +28,8 @@ LXPattern[] patterns(GLucose glucose) {
 
     
     // Slee
+    // new MidiMusic(glucose),
+    new Pulley(glucose),
     new Swarm(glucose),
     new ViolinWave(glucose),
     new BouncyBalls(glucose),
@@ -50,7 +52,8 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
+     new SineSphere(glucose),
+//     new CubeCurl(glucose),
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -100,6 +103,7 @@ LXPattern[] patterns(GLucose glucose) {
     new TestBassMapping(glucose),
     new TestFloorMapping(glucose),
     new TestSpeakerMapping(glucose),    
+    new TestPerformancePattern(glucose),
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),
@@ -125,15 +129,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();
+  }
 }
+