X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=ef89237e2223531445568c8ca3507202e2de8bb6;hb=3661fceed6aa9b6023c31850b42b86fc807d5abb;hp=ed2cf6dd9d77dded3a42a043c62cb9905f4fdd3f;hpb=2b6688e8e11d5421ec83f1c03efb6eb05508cc7b;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index ed2cf6d..ef89237 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,34 +25,112 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-//    new Swarm(glucose),
-//    new SpaceTime(glucose),
-//    new Blinders(glucose),
-//    new CrossSections(glucose),
-//    new CubeEQ(glucose),
-//    new PianoKeyPattern(glucose),
     
-    // Basic test patterns for reference, not art
-//    new TestHuePattern(glucose),
-//    new TestXPattern(glucose),
-//    new TestYPattern(glucose),
-    new TestZPattern(glucose),
+   // Slee
+    new Flitters(glucose),
+    new Swarm(glucose),
+    new SpaceTime(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),
+    new Play(glucose),
+    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),
+    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 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),
+
   };
 }
 
 LXTransition[] transitions(GLucose glucose) {
   return new LXTransition[] {
     new DissolveTransition(lx),
+    new MultiplyTransition(glucose),
+    new ScreenTransition(glucose),
+    new BurnTransition(glucose),
+    new DodgeTransition(glucose),
+    new OverlayTransition(glucose),
+    new AddTransition(glucose),
+    new SubtractTransition(glucose),
+    new SoftLightTransition(glucose),
     new SwipeTransition(glucose),
     new FadeTransition(lx),
   };
 }
 
+// Handles to globally triggerable effects 
+BoomEffect 	EFF_boom;
+FlashEffect EFF_flash;
+
 LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
-    new FlashEffect(lx),
-    new BoomEffect(glucose),
+    EFF_flash	= new FlashEffect(lx),
+    EFF_boom 	= new BoomEffect(glucose),
+    new BlurEffect(glucose),
     new DesaturationEffect(lx),
+    new ColorFuckerEffect(glucose),
   };
 }
-