merged slee's lx changes

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 00cc3b85725357fe911451147469dbaf3abcfde5..cf54800cf0e44508eead6c77ee7872f287d8872c 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,9 +25,12 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
+     
+     new SineSphere(glucose),
+     new CubeCurl(glucose), 
 
-    
     // Slee
+    new Cathedrals(glucose),
     new MidiMusic(glucose),
     new Pulley(glucose),
     new Swarm(glucose),
@@ -52,8 +55,7 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-     new SineSphere(glucose),
-//     new CubeCurl(glucose),
+     
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -103,7 +105,6 @@ LXPattern[] patterns(GLucose glucose) {
     new TestBassMapping(glucose),
     new TestFloorMapping(glucose),
     new TestSpeakerMapping(glucose),    
-    new TestPerformancePattern(glucose),
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),