Merge branch 'processing-2'

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 0afeefecc75bb85893e0dbee8f3ca367dd9178cb..9d72c5dfd49a6c0b2443d61e199ef611f82bca4c 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -26,7 +26,7 @@
 LXPattern[] patterns(LX lx) {
   return new LXPattern[] {        
 
-    new SineSphere(lx),
+    //new SineSphere(lx),
     //new CubeCurl(lx), 
      
     // Slee
@@ -116,6 +116,9 @@ LXPattern[] patterns(LX lx) {
     new AbstractPainting(lx),
     new Spirality(lx),
 
+    // Micah
+    new Rings(lx),
+
     // Basic test patterns for reference, not art    
     new TestCubePattern(lx),
     new TestTowerPattern(lx),