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

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 004940d..71f846e 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -24,42 +24,108 @@
  */ 
 
 LXPattern[] patterns(GLucose glucose) {
-  return new LXPattern[] {
-    new HelixPattern(glucose),
+  return new LXPattern[] {        
+
+    new SineSphere(glucose),
+    //new CubeCurl(glucose), 
+     
+    // Slee
+    // 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 Swarm(glucose),
-    new SpaceTime(glucose),
-    new Pong(glucose),
-    new Noise(glucose),
     new Blinders(glucose),
     new CrossSections(glucose),
     new Psychedelia(glucose),
-    new CubeEQ(glucose),
-    new PianoKeyPattern(glucose),
-    new GlitchPlasma(glucose),
-    new FireEffect(glucose),
-    new StripBounce(glucose),
-    new SoundRain(glucose),
-    new SoundSpikes(glucose),
-    new FaceSync(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),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
 
+    // Alex G
+     
+     // Tim
+    new TimMetronome(glucose),
     new TimPlanes(glucose),
     new TimPinwheels(glucose),
     new TimRaindrops(glucose),
     new TimCubes(glucose),
-    //new TimTrace(glucose),
+    // new TimTrace(glucose),
     new TimSpheres(glucose),
 
-    //Ben
+    // 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),
+    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),
+    
+
+    
+    // Ben
+    // new Sandbox(glucose),
+    new TowerParams(glucose),
     new DriveableCrossSections(glucose),
     new GranimTestPattern2(glucose),
+    
+    // Shaheen
+    //new HelixPattern(glucose).setEligible(false),
+    
+    //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),
@@ -71,16 +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),
-  };
+// 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();
+  }
 }