X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=d5892485e36658485b948be433512458c14d9868;hb=348fed6606529be1cc8df6b4d8e6246a9e02358d;hp=6b1a6c6f07dd7577f312c06e71e98dcafdcc25b2;hpb=ed149627fb9ee9b77ff6204c8973a267c3c2eead;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 6b1a6c6..d589248 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -23,9 +23,6 @@
  * 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[] {
     
@@ -45,7 +42,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,7 +107,14 @@ LXPattern[] patterns(GLucose glucose) {
 LXTransition[] transitions(GLucose glucose) {
   return new LXTransition[] {
     new DissolveTransition(lx),
-    new MaskTransition(glucose),
+    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),
   };
@@ -120,8 +124,8 @@ LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
     new FlashEffect(lx),
     new BoomEffect(glucose),
-    new DualBlender(glucose),
-    // new DesaturationEffect(lx),
+    new BlurEffect(glucose),
+    new DesaturationEffect(lx),
     new ColorFuckerEffect(glucose),
   };
 }