From: Micah Elizabeth Scott <micah@scanlime.org>
Date: Sat, 8 Mar 2014 03:47:42 +0000 (-0800)
Subject: Merge branch 'processing-2'
X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=commitdiff_plain;h=f109415988e59cd5e255ce6baac40abc57f307d8;hp=-c

Merge branch 'processing-2'
---

f109415988e59cd5e255ce6baac40abc57f307d8
diff --combined SugarCubes.pde
index 36e6317,b941bdb..9d72c5d
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -26,7 -26,7 +26,7 @@@
  LXPattern[] patterns(LX lx) {
    return new LXPattern[] {        
  
-     new SineSphere(lx),
+     //new SineSphere(lx),
      //new CubeCurl(lx), 
       
      // Slee
@@@ -116,9 -116,6 +116,9 @@@
      new AbstractPainting(lx),
      new Spirality(lx),
  
 +    // Micah
 +    new Rings(lx),
 +
      // Basic test patterns for reference, not art    
      new TestCubePattern(lx),
      new TestTowerPattern(lx),