X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=d1052bd5fddddf6c7722ae893e52ad1d9f0fafb2;hb=09f7f5dff86f1b54a789e39b4f6ab24ed072c17d;hp=d5892485e36658485b948be433512458c14d9868;hpb=348fed6606529be1cc8df6b4d8e6246a9e02358d;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index d589248..d1052bd 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,12 +22,17 @@
  * 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[] {
-    
+
     // Slee
+    new Cathedrals(glucose),
+    new MidiMusic(glucose),
+    new Pulley(glucose),
     new Swarm(glucose),
+    new ViolinWave(glucose),
+    new BouncyBalls(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -42,11 +47,12 @@ LXPattern[] patterns(GLucose glucose) {
 
     // DanH
     new Noise(glucose),
-    new Play(glucose),
-    new Pong(glucose),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
+     
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -107,25 +113,31 @@ LXPattern[] patterns(GLucose glucose) {
 LXTransition[] transitions(GLucose glucose) {
   return new LXTransition[] {
     new DissolveTransition(lx),
+    new AddTransition(glucose),
     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 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 BlurEffect(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();
+  }
 }
+