X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=8d9219d7017e57fe23937fc450763fb04b8e9183;hb=37ab5878ac35aff7c880c7fb47ed38e7b742764d;hp=c80a4da38fd826b5ff3616cf98f742e93691d060;hpb=467c8c60aa86396ccc96690cdaf90f41ad8f60e5;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index c80a4da..8d9219d 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,9 +25,18 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-        
+     
+     new SineSphere(glucose),
+     //new CubeCurl(glucose), 
+     
     // Slee
-    new Swarm(glucose),
+    // 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),
@@ -40,15 +49,25 @@ LXPattern[] patterns(GLucose glucose) {
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
 
-    // Dan
-    new Pong(glucose),
+    // DanH
     new Noise(glucose),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
+     
+     // Tim
+    new TimPlanes(glucose),
+    new TimPinwheels(glucose),
+    new TimRaindrops(glucose),
+    new TimCubes(glucose),
+    // new TimTrace(glucose),
+    new TimSpheres(glucose),
+
+    // Jackie
+    new JackieSquares(glucose),
 
-    // Shaheen
-    new HelixPattern(glucose).setEligible(false),
     
     // Toby
     new GlitchPlasma(glucose),
@@ -62,20 +81,19 @@ LXPattern[] patterns(GLucose glucose) {
     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 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),
     
@@ -83,7 +101,7 @@ LXPattern[] patterns(GLucose glucose) {
     new TelevisionStatic(glucose),
     new AbstractPainting(glucose),
     new Spirality(glucose),
-    
+
     // Basic test patterns for reference, not art    
     new TestCubePattern(glucose),
     new TestTowerPattern(glucose),
@@ -103,17 +121,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),
-    new ColorFuckerEffect(glucose),
-  };
+// 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();
+  }
 }