X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=16e2402b59b24282119846a88322f7819b16ea7a;hb=4749563ed0cc35bde6bdd13eecdfc6e361d5320b;hp=bef521dc133c271993825b82a7be9cae3fbff899;hpb=7782bf8e0aed244c40505976b451a2aed5527a0e;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index bef521d..16e2402 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -15,8 +15,8 @@
  *
  * Welcome to the Sugar Cubes! This Processing sketch is a fun place to build
  * animations, effects, and interactions for the platform. Most of the icky
- * code guts are embedded in the GLucose library extension. If you're an
- * artist, you shouldn't need to worry about any of that.
+ * code guts are embedded in the HeronLX library, or files prefixed with
+ * an underscore. If you're an artist, you shouldn't need to worry about that.
  *
  * Below, you will find definitions of the Patterns, Effects, and Interactions.
  * If you're an artist, create a new tab in the Processing environment with
@@ -31,7 +31,7 @@ LXPattern[] patterns(GLucose glucose) {
      
     // Slee
     // new Cathedrals(glucose),
-     new Swarm(glucose),
+    new Swarm(glucose),
     new MidiMusic(glucose),
     new Pulley(glucose),
     
@@ -51,15 +51,21 @@ LXPattern[] patterns(GLucose glucose) {
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
 
+    // AntonK
+    new AKPong(glucose),
+
     // DanH
     new Noise(glucose),
     new Play (glucose),
     new Pong (glucose),
     new Worms(glucose),
 
+    // JR
+    new Gimbal(glucose),
+    
     // Alex G
      
-     // Tim
+    // Tim
     new TimMetronome(glucose),
     new TimPlanes(glucose),
     new TimPinwheels(glucose),
@@ -74,9 +80,9 @@ LXPattern[] patterns(GLucose glucose) {
     new JackieDots(glucose),
 
     // L8on
-    new L8onLife(glucose),
     new L8onAutomata(glucose),
-    new L8onStrips(glucose),
+    new L8onLife(glucose),
+    new L8onStripLife(glucose),
 
     // Vincent
     new VSTowers(glucose),
@@ -93,8 +99,6 @@ LXPattern[] patterns(GLucose glucose) {
     new Swim(glucose),
     new Balance(glucose),
     
-
-    
     // Ben
     // new Sandbox(glucose),
     new TowerParams(glucose),
@@ -102,10 +106,7 @@ LXPattern[] patterns(GLucose glucose) {
     new GranimTestPattern2(glucose),
     
     // Shaheen
-    //new HelixPattern(glucose).setEligible(false),
-    
-    //JR
-    new Gimbal(glucose),
+    // new HelixPattern(glucose).setEligible(false),
     
     // Sam
     new JazzRainbow(glucose),
@@ -120,9 +121,6 @@ LXPattern[] patterns(GLucose glucose) {
     new TestTowerPattern(glucose),
     new TestProjectionPattern(glucose),
     new TestStripPattern(glucose),
-    new TestBassMapping(glucose),
-    new TestFloorMapping(glucose),
-    new TestSpeakerMapping(glucose),    
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),
@@ -134,15 +132,15 @@ 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 AddTransition(lx),
+    new MultiplyTransition(lx),
+    new OverlayTransition(lx),
+    new DodgeTransition(lx),
+    new SwipeTransition(lx),
     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 BurnTransition(glucose),	// similar to multiply - dh
+//  new ScreenTransition(glucose), 	// same as add -dh
 //  new SoftLightTransition(glucose),	// same as overlay -dh
   };
 }
@@ -150,10 +148,10 @@ LXTransition[] transitions(GLucose 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);
+  BoomEffect boom = new BoomEffect(lx);
+  BlurEffect blur = new BlurEffect(lx);
+  QuantizeEffect quantize = new QuantizeEffect(lx);
+  ColorFuckerEffect colorFucker = new ColorFuckerEffect(lx);
   
   Effects() {
     blur.enable();