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

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 744624ef8abacb741a334e4175dce488f6e36f83..1af65b01e93997966fa974f1e649e4556ab24e49 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,8 +25,6 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-    new WarmPlasma(glucose),
-    new FireTest(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
     new Swarm(glucose),
@@ -36,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),
 
   };
 }