X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=SugarCubes.pde;h=71f846e5926e8bb58eaf12658f529a1d45d2cbb9;hp=76d0390d28f3a3fc453350ee76f6d933d28a9460;hb=8f4e6c99775f2724edf3cec488860eb68b06491c;hpb=51227786d68ba9b8e89d463acc1bc36db8f478c7

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 76d0390..71f846e 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,37 +22,67 @@
  * 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[] {
-    
+  return new LXPattern[] {        
+
+    new SineSphere(glucose),
+    //new CubeCurl(glucose), 
+     
     // Slee
-    new Swarm(glucose),
+    // new Cathedrals(glucose),
+     new Swarm(glucose),
+    new MidiMusic(glucose),
+    new Pulley(glucose),
+    
+    new ViolinWave(glucose),
+    new BouncyBalls(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
     new Blinders(glucose),
     new CrossSections(glucose),
     new Psychedelia(glucose),
+
+    new MultipleCubes(glucose),
     
     new Traktor(glucose).setEligible(false),
     new BassPod(glucose).setEligible(false),
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
 
+	// AntonK
+	new AKPong(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),
+     
+     // Tim
+    new TimMetronome(glucose),
+    new TimPlanes(glucose),
+    new TimPinwheels(glucose),
+    new TimRaindrops(glucose),
+    new TimCubes(glucose),
+    // new TimTrace(glucose),
+    new TimSpheres(glucose),
 
-    // Shaheen
-    new HelixPattern(glucose).setEligible(false),
+    // Jackie
+    new JackieSquares(glucose),
+    new JackieLines(glucose),
+    new JackieDots(glucose),
+
+    // L8on
+    new L8onAutomata(glucose),
+    new L8onLife(glucose),
+    new L8onStripLife(glucose),
+
+    // Vincent
+    new VSTowers(glucose),
     
     // Toby
     new GlitchPlasma(glucose),
@@ -65,21 +95,18 @@ LXPattern[] patterns(GLucose glucose) {
     // Jack
     new Swim(glucose),
     new Balance(glucose),
+    
 
-    // Tim
-    new TimPlanes(glucose),
-    new TimPinwheels(glucose),
-    new TimRaindrops(glucose),
-    new TimCubes(glucose),
-    // new TimTrace(glucose),
-    new TimSpheres(glucose),
-
+    
     // Ben
     // new Sandbox(glucose),
     new TowerParams(glucose),
     new DriveableCrossSections(glucose),
     new GranimTestPattern2(glucose),
     
+    // Shaheen
+    //new HelixPattern(glucose).setEligible(false),
+    
     //JR
     new Gimbal(glucose),
     
@@ -110,17 +137,31 @@ 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
   };
 }
 
-LXEffect[] effects(GLucose glucose) {
-  return new LXEffect[] {
-    new FlashEffect(lx),
-    new BoomEffect(glucose),
-    // new DesaturationEffect(lx),
-    // new ColorFuckerEffect(glucose),
-    new DualBlender(glucose),
-  };
+// Handles to globally triggerable effects 
+class Effects {
+  FlashEffect flash = new FlashEffect(lx);
+  BoomEffect boom = new BoomEffect(glucose);
+  BlurEffect blur = new BlurEffect(glucose);
+  QuantizeEffect quantize = new QuantizeEffect(glucose);
+  ColorFuckerEffect colorFucker = new ColorFuckerEffect(glucose);
+  
+  Effects() {
+    blur.enable();
+    quantize.enable();
+    colorFucker.enable();
+  }
 }
+