Merge branch 'newlayout' of https://github.com/sugarcubes/SugarCubes

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 3f6cc8f4e47494ad81954d9065c4fcc5c84985f8..1af65b01e93997966fa974f1e649e4556ab24e49 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -1,7 +1,7 @@
 /**
  *           +-+-+-+-+-+               +-+-+-+-+-+
  *          /         /|               |\         \
- *         /         / +               <+ \         \
+ *         /         / +               + \         \
  *        +-+-+-+-+-+  |   +-+-+-+-+   |  +-+-+-+-+-+
  *        |         |  +  /         \  +  |         |
  *        +   THE   + /  /           \  \ +  CUBES  +
@@ -34,13 +34,16 @@ LXPattern[] patterns(GLucose glucose) {
     new Psychedelia(glucose),
     new CubeEQ(glucose),
     new PianoKeyPattern(glucose),
+    new WarmPlasma(glucose),
+    new FireTest(glucose),
     
-    // Basic test patterns for reference, not art
-//    new TestHuePattern(glucose),
+    // Basic test patterns for reference, not art    
+    new TestCubePattern(glucose),
+    new TestHuePattern(glucose),
+    new TestProjectionPattern(glucose),
 //    new TestXPattern(glucose),
 //    new TestYPattern(glucose),
 //    new TestZPattern(glucose),
-//    new TestProjectionPattern(glucose),
 
   };
 }