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

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 4a94143..6b1a6c6 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,18 +22,15 @@
  * 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[] {
     
-    
-    
-    // DMK
-        
     // Slee
     new Swarm(glucose),
-    //new ScreenScrape(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -48,7 +45,7 @@ LXPattern[] patterns(GLucose glucose) {
 
     // DanH
     new Noise(glucose),
-    gplay=new Play(glucose), // XXX do this properly
+    gplay = new Play(glucose), // XXX do this properly
     new Pong(glucose),
 
     // Alex G
@@ -78,12 +75,14 @@ LXPattern[] patterns(GLucose glucose) {
     new TimSpheres(glucose),
 
     // Ben
-    //new Sandbox(glucose),
+    // new Sandbox(glucose),
     new TowerParams(glucose),
     new DriveableCrossSections(glucose),
     new GranimTestPattern2(glucose),
-     //JR
+    
+    //JR
     new Gimbal(glucose),
+    
     // Sam
     new JazzRainbow(glucose),
     
@@ -91,7 +90,6 @@ LXPattern[] patterns(GLucose glucose) {
     new TelevisionStatic(glucose),
     new AbstractPainting(glucose),
     new Spirality(glucose),
-    
 
     // Basic test patterns for reference, not art    
     new TestCubePattern(glucose),
@@ -112,6 +110,7 @@ LXPattern[] patterns(GLucose glucose) {
 LXTransition[] transitions(GLucose glucose) {
   return new LXTransition[] {
     new DissolveTransition(lx),
+    new MaskTransition(glucose),
     new SwipeTransition(glucose),
     new FadeTransition(lx),
   };
@@ -121,8 +120,8 @@ LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
     new FlashEffect(lx),
     new BoomEffect(glucose),
-    //new DesaturationEffect(lx),
-    //new ColorFuckerEffect(glucose),
     new DualBlender(glucose),
+    // new DesaturationEffect(lx),
+    new ColorFuckerEffect(glucose),
   };
 }