X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=2156bad83a925de5a7dbdcba9c6123e7585970ad;hb=cc8b3f8210cea5377cc7e28116626e7bc4defa7a;hp=76d0390d28f3a3fc453350ee76f6d933d28a9460;hpb=51227786d68ba9b8e89d463acc1bc36db8f478c7;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 76d0390..2156bad 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -23,13 +23,11 @@
  * 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
+    new Flitters(glucose),
     new Swarm(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
@@ -45,7 +43,7 @@ LXPattern[] patterns(GLucose glucose) {
 
     // DanH
     new Noise(glucose),
-    gplay = new Play(glucose), // XXX do this properly
+    new Play(glucose),
     new Pong(glucose),
 
     // Alex G
@@ -110,6 +108,14 @@ 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),
   };
@@ -119,8 +125,8 @@ LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
     new FlashEffect(lx),
     new BoomEffect(glucose),
-    // new DesaturationEffect(lx),
-    // new ColorFuckerEffect(glucose),
-    new DualBlender(glucose),
+    new BlurEffect(glucose),
+    new DesaturationEffect(lx),
+    new ColorFuckerEffect(glucose),
   };
 }