X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=a599b4389e9ed475667f10ab8d6d03f832c9927e;hb=b8bb27489db7dc687bf150576e9d9439f1fa17a6;hp=7f8be7b14a9837d7f5fb5bb5453030b94f804110;hpb=d33c2d1d64234dd5f54942a9b76afaec3833c206;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 7f8be7b..a599b43 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,18 +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 gplay;
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-    
-    new Gimbal(glucose),
-    
-    // DMK
-        
+
     // Slee
+    new Cathedrals(glucose),
+    new MidiMusic(glucose),
+    new Pulley(glucose),
     new Swarm(glucose),
-    //new ScreenScrape(glucose),
+    new ViolinWave(glucose),
+    new BouncyBalls(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -48,11 +47,13 @@ LXPattern[] patterns(GLucose glucose) {
 
     // DanH
     new Noise(glucose),
-    gplay=new Play(glucose), // XXX do this properly
-    new Pong(glucose),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
+     new SineSphere(glucose),
+//     new CubeCurl(glucose),
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -78,11 +79,14 @@ LXPattern[] patterns(GLucose glucose) {
     new TimSpheres(glucose),
 
     // Ben
-    //new Sandbox(glucose),
+    // new Sandbox(glucose),
     new TowerParams(glucose),
     new DriveableCrossSections(glucose),
     new GranimTestPattern2(glucose),
-     
+    
+    //JR
+    new Gimbal(glucose),
+    
     // Sam
     new JazzRainbow(glucose),
     
@@ -90,7 +94,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),
@@ -110,17 +114,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),
-    new DualBlender(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();
+  }
 }
+