New ViolinWave pattern to play with for Paramount show

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 5ce692746d69ef6230a47f29b7fb2d19a9171df3..0f5ca26c08a6c07597df45d2f822d8e72329c2f4 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -27,7 +27,8 @@ LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
     
     // Slee
-    new Flitters(glucose),
+    new ViolinWave(glucose),
+    new BouncyBalls(glucose),
     new Swarm(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
@@ -108,26 +109,27 @@ 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
   };
 }
 
 // Handles to globally triggerable effects 
-BoomEffect boom;
+BoomEffect     EFF_boom;
+FlashEffect EFF_flash;
 
 LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
-    new FlashEffect(lx),
-    boom = new BoomEffect(glucose),
+    EFF_flash  = new FlashEffect(lx),
+    EFF_boom   = new BoomEffect(glucose),
     new BlurEffect(glucose),
     new DesaturationEffect(lx),
     new ColorFuckerEffect(glucose),