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

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 67c230d..6b1a6c6 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,22 +22,39 @@
  * 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[] {
-
-    new ShiftingPlane(glucose),
-    new AskewPlanes(glucose),
+    
+    // Slee
     new Swarm(glucose),
     new SpaceTime(glucose),
-    new HelixPattern(glucose).setEligible(false),
-    new Pong(glucose),
-    new Noise(glucose),
+    new ShiftingPlane(glucose),
+    new AskewPlanes(glucose),
     new Blinders(glucose),
     new CrossSections(glucose),
     new Psychedelia(glucose),
+    
+    new Traktor(glucose).setEligible(false),
+    new BassPod(glucose).setEligible(false),
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
+
+    // DanH
+    new Noise(glucose),
+    gplay = new Play(glucose), // XXX do this properly
+    new Pong(glucose),
+
+    // Alex G
+    new SineSphere(glucose),
+
+    // Shaheen
+    new HelixPattern(glucose).setEligible(false),
+    
+    // Toby
     new GlitchPlasma(glucose),
     new FireEffect(glucose).setEligible(false),
     new StripBounce(glucose),
@@ -47,8 +64,9 @@ LXPattern[] patterns(GLucose glucose) {
 
     // Jack
     new Swim(glucose),
-    new Breathe(glucose),
+    new Balance(glucose),
 
+    // Tim
     new TimPlanes(glucose),
     new TimPinwheels(glucose),
     new TimRaindrops(glucose),
@@ -57,17 +75,30 @@ LXPattern[] patterns(GLucose glucose) {
     new TimSpheres(glucose),
 
     // Ben
+    // new Sandbox(glucose),
+    new TowerParams(glucose),
     new DriveableCrossSections(glucose),
     new GranimTestPattern2(glucose),
-     
+    
+    //JR
+    new Gimbal(glucose),
+    
     // Sam
     new JazzRainbow(glucose),
     
+    // Arjun
+    new TelevisionStatic(glucose),
+    new AbstractPainting(glucose),
+    new Spirality(glucose),
+
     // Basic test patterns for reference, not art    
     new TestCubePattern(glucose),
     new TestTowerPattern(glucose),
     new TestProjectionPattern(glucose),
     new TestStripPattern(glucose),
+    new TestBassMapping(glucose),
+    new TestFloorMapping(glucose),
+    new TestSpeakerMapping(glucose),    
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),
@@ -79,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),
   };
@@ -88,7 +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),
   };
 }
-