X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=9faf3ec45d2babd96a24089d549e86c370d96a90;hb=65450eb37e927a75899c1ab50c7eca15790477b1;hp=0f7be33856f3416c18d78c6b561d16e1af7cf7e8;hpb=b18be7d34737efb183fdbb9bcd413451a9ac868f;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 0f7be33..9faf3ec 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,64 +25,122 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
+
     
-    new ShiftingPlane(glucose),
-    new AskewPlanes(glucose),
+    // Slee
+    // new MidiMusic(glucose),
+    new Pulley(glucose),
     new Swarm(glucose),
+    new ViolinWave(glucose),
+    new BouncyBalls(glucose),
     new SpaceTime(glucose),
-    new Pong(glucose),
-    new Noise(glucose),
+    new ShiftingPlane(glucose),
+    new AskewPlanes(glucose),
     new Blinders(glucose),
     new CrossSections(glucose),
     new Psychedelia(glucose),
-    new CubeEQ(glucose),
-    new PianoKeyPattern(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),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
+
+    // Alex G
+     new SineSphere(glucose),
+//     new CubeCurl(glucose),
+
+    // Shaheen
+    new HelixPattern(glucose).setEligible(false),
+    
+    // Toby
     new GlitchPlasma(glucose),
-    new FireEffect(glucose),
+    new FireEffect(glucose).setEligible(false),
     new StripBounce(glucose),
-    new SoundRain(glucose),
-    new SoundSpikes(glucose),
+    new SoundRain(glucose).setEligible(false),
+    new SoundSpikes(glucose).setEligible(false),
     new FaceSync(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 TimTrace(glucose),
     new TimSpheres(glucose),
 
-    //Ben
+    // 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 TestPerformancePattern(glucose),
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),
     // new TestZPattern(glucose),
 
-    //slow for now, relegated to the bottom until faster!
-    new HelixPattern(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;
+ColorFuckerEffect EFF_colorFucker;
+BlurEffect EFF_blur;
+QuantizeEffect EFF_quantize;
+
 LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
-    new FlashEffect(lx),
-    new BoomEffect(glucose),
-    new DesaturationEffect(lx),
+    EFF_flash = new FlashEffect(lx),
+    EFF_boom = new BoomEffect(glucose),
+    (EFF_blur = new BlurEffect(glucose)).enable(),
+    (EFF_quantize = new QuantizeEffect(glucose)).enable(),
+    (EFF_colorFucker =  new ColorFuckerEffect(glucose)).enable(),
   };
 }
-