X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=9faf3ec45d2babd96a24089d549e86c370d96a90;hb=65450eb37e927a75899c1ab50c7eca15790477b1;hp=6e2e98688f33a2f9363b03c7ef87e648f07e4f23;hpb=0208d845a58e21b06271e685434006d89b9e5545;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 6e2e986..9faf3ec 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,9 +25,14 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-        
+
+    
     // Slee
+    // new MidiMusic(glucose),
+    new Pulley(glucose),
     new Swarm(glucose),
+    new ViolinWave(glucose),
+    new BouncyBalls(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -40,12 +45,15 @@ LXPattern[] patterns(GLucose glucose) {
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
 
-    // Dan
-    new Pong(glucose),
+    // DanH
     new Noise(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),
@@ -71,9 +79,14 @@ LXPattern[] patterns(GLucose glucose) {
     new TimSpheres(glucose),
 
     // Ben
+    // new Sandbox(glucose),
+    new TowerParams(glucose),
     new DriveableCrossSections(glucose),
     new GranimTestPattern2(glucose),
-     
+    
+    //JR
+    new Gimbal(glucose),
+    
     // Sam
     new JazzRainbow(glucose),
     
@@ -81,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),
@@ -90,6 +103,7 @@ LXPattern[] patterns(GLucose glucose) {
     new TestBassMapping(glucose),
     new TestFloorMapping(glucose),
     new TestSpeakerMapping(glucose),    
+    new TestPerformancePattern(glucose),
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),
@@ -101,17 +115,32 @@ 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
   };
 }
 
+// Handles to globally triggerable effects 
+BoomEffect EFF_boom;
+FlashEffect EFF_flash;
+ColorFuckerEffect EFF_colorFucker;
+BlurEffect EFF_blur;
+QuantizeEffect EFF_quantize;
+
 LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
-    new FlashEffect(lx),
-    new BoomEffect(glucose),
-    new DesaturationEffect(lx),
-    new ColorFuckerEffect(glucose),
+    EFF_flash = new FlashEffect(lx),
+    EFF_boom = new BoomEffect(glucose),
+    (EFF_blur = new BlurEffect(glucose)).enable(),
+    (EFF_quantize = new QuantizeEffect(glucose)).enable(),
+    (EFF_colorFucker =  new ColorFuckerEffect(glucose)).enable(),
   };
 }
-