X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=SugarCubes.pde;h=6b1a6c6f07dd7577f312c06e71e98dcafdcc25b2;hb=ed149627fb9ee9b77ff6204c8973a267c3c2eead;hp=c80a4da38fd826b5ff3616cf98f742e93691d060;hpb=467c8c60aa86396ccc96690cdaf90f41ad8f60e5;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index c80a4da..6b1a6c6 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,10 +22,13 @@
  * 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
     new Swarm(glucose),
     new SpaceTime(glucose),
@@ -40,9 +43,10 @@ LXPattern[] patterns(GLucose glucose) {
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
 
-    // Dan
-    new Pong(glucose),
+    // DanH
     new Noise(glucose),
+    gplay = new Play(glucose), // XXX do this properly
+    new Pong(glucose),
 
     // Alex G
     new SineSphere(glucose),
@@ -71,11 +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
+    new Gimbal(glucose),
+    
     // Sam
     new JazzRainbow(glucose),
     
@@ -83,7 +90,7 @@ LXPattern[] patterns(GLucose glucose) {
     new TelevisionStatic(glucose),
     new AbstractPainting(glucose),
     new Spirality(glucose),
-    
+
     // Basic test patterns for reference, not art    
     new TestCubePattern(glucose),
     new TestTowerPattern(glucose),
@@ -103,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),
   };
@@ -112,8 +120,8 @@ LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
     new FlashEffect(lx),
     new BoomEffect(glucose),
-    new DesaturationEffect(lx),
+    new DualBlender(glucose),
+    // new DesaturationEffect(lx),
     new ColorFuckerEffect(glucose),
   };
 }
-