Make yMin correct with unlit bassBox on model

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 6b1a6c6f07dd7577f312c06e71e98dcafdcc25b2..ef89237e2223531445568c8ca3507202e2de8bb6 100644 (file)
--- 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,18 +108,29 @@ 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),
   };
 }
 
+// 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),
   };
 }