X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=c4d5aa78d2c15526e5b7867fa2f20a90e216c949;hb=b30f14fdacdcccafe123e00f20a4d6df46e6995c;hp=21bd8ac3d648823c76b0752b235a28968b70d165;hpb=fe30b2268bba1105dee4d48eeb9191103fc0e3fb;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 21bd8ac..c4d5aa7 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,12 +22,15 @@
  * 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 Swarm(glucose),
+    new ViolinWave(glucose),
+    new BouncyBalls(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -42,11 +45,13 @@ 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),
+     new CubeCurl(glucose),
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -107,23 +112,28 @@ 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 	EFF_boom;
+FlashEffect EFF_flash;
+
 LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
-    new FlashEffect(lx),
-    new BoomEffect(glucose),
+    EFF_flash	= new FlashEffect(lx),
+    EFF_boom 	= new BoomEffect(glucose),
+    new BlurEffect(glucose),
     new DesaturationEffect(lx),
     new ColorFuckerEffect(glucose),
   };