X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=ef89237e2223531445568c8ca3507202e2de8bb6;hb=3661fceed6aa9b6023c31850b42b86fc807d5abb;hp=7f8be7b14a9837d7f5fb5bb5453030b94f804110;hpb=f3a1ffdfb114dfb66c79ac1116efa63c248ba6b6;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 7f8be7b..ef89237 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,18 +22,13 @@
  * 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
+   // Slee
+    new Flitters(glucose),
     new Swarm(glucose),
-    //new ScreenScrape(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -46,9 +41,9 @@ LXPattern[] patterns(GLucose glucose) {
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
 
-    // DanH
+     // DanH
     new Noise(glucose),
-    gplay=new Play(glucose), // XXX do this properly
+    new Play(glucose),
     new Pong(glucose),
 
     // Alex G
@@ -78,11 +73,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 +88,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 +108,29 @@ LXPattern[] patterns(GLucose glucose) {
 LXTransition[] transitions(GLucose glucose) {
   return new LXTransition[] {
     new DissolveTransition(lx),
+    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 SwipeTransition(glucose),
     new FadeTransition(lx),
   };
 }
 
+// Handles to globally triggerable effects 
+BoomEffect 	EFF_boom;
+FlashEffect EFF_flash;
+
 LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
-    new FlashEffect(lx),
-    new BoomEffect(glucose),
-    //new DesaturationEffect(lx),
-    //new ColorFuckerEffect(glucose),
-    new DualBlender(glucose),
+    EFF_flash	= new FlashEffect(lx),
+    EFF_boom 	= new BoomEffect(glucose),
+    new BlurEffect(glucose),
+    new DesaturationEffect(lx),
+    new ColorFuckerEffect(glucose),
   };
 }