added JGraphT to code folder, seems to be working but it's possible I screwed somethi...

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 84a311a54675ba2a00c36c2283a41a0fe36b1e50..e8b15735861fd95dcdc34620e201e459f055a0ee 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -24,13 +24,22 @@
  */ 
 
 LXPattern[] patterns(GLucose glucose) {
-  return new LXPattern[] {
+  return new LXPattern[] {        
+
+    new SineSphere(glucose),
+    //new CubeCurl(glucose), 
+     // DanH
+    new Noise(glucose),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
 
-    
     // Slee
-    // new MidiMusic(glucose),
+    // new Cathedrals(glucose),
+     new Swarm(glucose),
+    new MidiMusic(glucose),
     new Pulley(glucose),
-    new Swarm(glucose),
+    
     new ViolinWave(glucose),
     new BouncyBalls(glucose),
     new SpaceTime(glucose),
@@ -39,52 +48,69 @@ LXPattern[] patterns(GLucose glucose) {
     new Blinders(glucose),
     new CrossSections(glucose),
     new Psychedelia(glucose),
+     new TimRaindrops(glucose),
+    new TimCubes(glucose),
+    new MultipleCubes(glucose),
     
     new Traktor(glucose).setEligible(false),
     new BassPod(glucose).setEligible(false),
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
+    
+     new StripBounce(glucose),
 
-    // DanH
-    new Noise(glucose),
-    new Play (glucose),
-    new Pong (glucose),
-    new Worms(glucose),
+       // AntonK
+       //new AKPong(glucose),
+    new Swim(glucose),
+    new Balance(glucose),
+    
 
+    
+    
+    // JR
+    new Gimbal(glucose),
+    
     // Alex G
-    new SineSphere(glucose),
+     
+     // Tim
+    new TimMetronome(glucose),
+    new TimPlanes(glucose),
+    new TimPinwheels(glucose),
+    
+    // new TimTrace(glucose),
+    new TimSpheres(glucose),
 
-    // Shaheen
-    new HelixPattern(glucose).setEligible(false),
+    // 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),
-
-    // 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),
+    // Shaheen
+    //new HelixPattern(glucose).setEligible(false),
     
     // Sam
     new JazzRainbow(glucose),
@@ -102,7 +128,6 @@ LXPattern[] patterns(GLucose glucose) {
     new TestBassMapping(glucose),
     new TestFloorMapping(glucose),
     new TestSpeakerMapping(glucose),    
-    new TestPerformancePattern(glucose),
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),
@@ -128,15 +153,17 @@ LXTransition[] transitions(GLucose glucose) {
 }
 
 // Handles to globally triggerable effects 
-BoomEffect     EFF_boom;
-FlashEffect EFF_flash;
-
-LXEffect[] effects(GLucose glucose) {
-  return new LXEffect[] {
-    EFF_flash  = new FlashEffect(lx),
-    EFF_boom   = new BoomEffect(glucose),
-    new BlurEffect(glucose),
-    new DesaturationEffect(lx),
-    new ColorFuckerEffect(glucose),
-  };
+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();
+  }
 }
+