X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=fbaccc38fd5f0915d5d8aab72df047b69f8401a4;hb=cc9e8c8be45767207e09c434bad100b0156877e6;hp=a685442b2eb1fcb5cb0a6ad61b10172647e08afe;hpb=69f25521118b6497cb88fc0d33a2cbfd8911bf7e;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index a685442..fbaccc3 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,7 +22,7 @@
  * 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[] {        
 
@@ -60,6 +60,9 @@ LXPattern[] patterns(GLucose glucose) {
     new Pong (glucose),
     new Worms(glucose),
 
+    // JR
+    new Gimbal(glucose),
+    
     // Alex G
      
      // Tim
@@ -77,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),
@@ -107,9 +110,6 @@ LXPattern[] patterns(GLucose glucose) {
     // Shaheen
     //new HelixPattern(glucose).setEligible(false),
     
-    //JR
-    new Gimbal(glucose),
-    
     // Sam
     new JazzRainbow(glucose),
     
@@ -152,7 +152,7 @@ LXTransition[] transitions(GLucose glucose) {
 
 // Handles to globally triggerable effects 
 class Effects {
-  FlashEffect flash = new FlashEffect(lx);
+  //FlashEffect flash = new FlashEffect(lx);
   BoomEffect boom = new BoomEffect(glucose);
   BlurEffect blur = new BlurEffect(glucose);
   QuantizeEffect quantize = new QuantizeEffect(glucose);