X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=ef89237e2223531445568c8ca3507202e2de8bb6;hb=3661fceed6aa9b6023c31850b42b86fc807d5abb;hp=ec68668b854b8f1aa5525e38553ef01ad6cdb84e;hpb=d626bc9b0197a1b5fd51a86f33f666a2a46579a2;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index ec68668..ef89237 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,14 +22,12 @@
  * If you're an artist, create a new tab in the Processing environment with
  * your name. Implement your classes there, and add them to the list below.
  */ 
- 
-// TODO(mcslee): get rid of this global, make engine support two decks
-LXPattern gplay;
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
     
-    // Slee
+   // Slee
+    new Flitters(glucose),
     new Swarm(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
@@ -43,9 +41,9 @@ LXPattern[] patterns(GLucose glucose) {
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
 
-    // DanH
+     // DanH
     new Noise(glucose),
-    gplay = new Play(glucose), // XXX do this properly
+    new Play(glucose),
     new Pong(glucose),
 
     // Alex G
@@ -110,17 +108,29 @@ LXPattern[] patterns(GLucose glucose) {
 LXTransition[] transitions(GLucose glucose) {
   return new LXTransition[] {
     new DissolveTransition(lx),
+    new MultiplyTransition(glucose),
+    new ScreenTransition(glucose),
+    new BurnTransition(glucose),
+    new DodgeTransition(glucose),
+    new OverlayTransition(glucose),
+    new AddTransition(glucose),
+    new SubtractTransition(glucose),
+    new SoftLightTransition(glucose),
     new SwipeTransition(glucose),
     new FadeTransition(lx),
   };
 }
 
+// Handles to globally triggerable effects 
+BoomEffect 	EFF_boom;
+FlashEffect EFF_flash;
+
 LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
-    new FlashEffect(lx),
-    new BoomEffect(glucose),
-    new DualBlender(glucose),
-    // new DesaturationEffect(lx),
+    EFF_flash	= new FlashEffect(lx),
+    EFF_boom 	= new BoomEffect(glucose),
+    new BlurEffect(glucose),
+    new DesaturationEffect(lx),
     new ColorFuckerEffect(glucose),
   };
 }