X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=2156bad83a925de5a7dbdcba9c6123e7585970ad;hb=cc8b3f8210cea5377cc7e28116626e7bc4defa7a;hp=3f6cc8f4e47494ad81954d9065c4fcc5c84985f8;hpb=b11ff42b4235ebf514245ac177cb4809067c988b;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 3f6cc8f..2156bad 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -1,7 +1,7 @@
 /**
  *           +-+-+-+-+-+               +-+-+-+-+-+
  *          /         /|               |\         \
- *         /         / +               <+ \         \
+ *         /         / +               + \         \
  *        +-+-+-+-+-+  |   +-+-+-+-+   |  +-+-+-+-+-+
  *        |         |  +  /         \  +  |         |
  *        +   THE   + /  /           \  \ +  CUBES  +
@@ -22,25 +22,85 @@
  * 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.
  */ 
-
+ 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-    new ShiftingPlane(glucose),
-    new AskewPlanes(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 CubeEQ(glucose),
-    new PianoKeyPattern(glucose),
     
-    // Basic test patterns for reference, not art
-//    new TestHuePattern(glucose),
-//    new TestXPattern(glucose),
-//    new TestYPattern(glucose),
-//    new TestZPattern(glucose),
-//    new TestProjectionPattern(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),
 
   };
 }
@@ -48,6 +108,14 @@ LXPattern[] patterns(GLucose 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),
   };
@@ -57,7 +125,8 @@ LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
     new FlashEffect(lx),
     new BoomEffect(glucose),
+    new BlurEffect(glucose),
     new DesaturationEffect(lx),
+    new ColorFuckerEffect(glucose),
   };
 }
-