X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=893152f31148221424950f696c5cad306abb4f04;hb=6b163a98976a5f2adf9da1b7bd3297e39d6dd7bf;hp=76d0390d28f3a3fc453350ee76f6d933d28a9460;hpb=51227786d68ba9b8e89d463acc1bc36db8f478c7;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 76d0390..893152f 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,15 +22,19 @@
  * 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 SineSphere(glucose),
+     new CubeCurl(glucose),
+
     // Slee
+    // new MidiMusic(glucose),
+    new Pulley(glucose),
     new Swarm(glucose),
+    new ViolinWave(glucose),
+    new BouncyBalls(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -45,12 +49,12 @@ LXPattern[] patterns(GLucose glucose) {
 
     // DanH
     new Noise(glucose),
-    gplay = new Play(glucose), // XXX do this properly
-    new Pong(glucose),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
-
+   
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
     
@@ -99,6 +103,7 @@ LXPattern[] patterns(GLucose glucose) {
     new TestBassMapping(glucose),
     new TestFloorMapping(glucose),
     new TestSpeakerMapping(glucose),    
+    new TestPerformancePattern(glucose),
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),
@@ -110,17 +115,29 @@ LXPattern[] patterns(GLucose glucose) {
 LXTransition[] transitions(GLucose glucose) {
   return new LXTransition[] {
     new DissolveTransition(lx),
+    new AddTransition(glucose),
+    new MultiplyTransition(glucose),
+    new OverlayTransition(glucose),
+    new DodgeTransition(glucose),
     new SwipeTransition(glucose),
     new FadeTransition(lx),
+//  new SubtractTransition(glucose),	// similar to multiply - dh
+//  new BurnTransition(glucose),		// similar to multiply - dh
+//  new ScreenTransition(glucose), 		// same as add -dh
+//  new SoftLightTransition(glucose),	// same as overlay -dh
   };
 }
 
+// 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 DesaturationEffect(lx),
-    // new ColorFuckerEffect(glucose),
-    new DualBlender(glucose),
+    EFF_flash	= new FlashEffect(lx),
+    EFF_boom 	= new BoomEffect(glucose),
+    new BlurEffect(glucose),
+    new DesaturationEffect(lx),
+    new ColorFuckerEffect(glucose),
   };
 }