X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=cf54800cf0e44508eead6c77ee7872f287d8872c;hb=09437b3e395227ad2061512f9f0333091aeef2b7;hp=eb8df7434deff70b27d023925a7d26fbcca790b9;hpb=bfff6bc27dad58d5f3674295d6b94d08b8da5e51;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index eb8df74..cf54800 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,23 +25,90 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-    new ShiftingPlane(glucose),
-    new AskewPlanes(glucose),
+     
+     new SineSphere(glucose),
+     new CubeCurl(glucose), 
+
+    // Slee
+    new Cathedrals(glucose),
+    new MidiMusic(glucose),
+    new Pulley(glucose),
     new Swarm(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 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
+     
+
+    // Shaheen
+    new HelixPattern(glucose).setEligible(false),
+    
+    // Toby
+    new GlitchPlasma(glucose),
+    new FireEffect(glucose).setEligible(false),
+    new StripBounce(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 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 TestHuePattern(glucose),
-//    new TestXPattern(glucose),
-    new TestYPattern(glucose),
-//    new TestZPattern(glucose),
-//    new TestProjectionPattern(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),
+    // new TestZPattern(glucose),
 
   };
 }
@@ -49,16 +116,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),
-  };
+// 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();
+  }
 }