Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 6877613e4cca823f389e25b53c0aa024a4d967f3..d1052bd5fddddf6c7722ae893e52ad1d9f0fafb2 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -26,9 +26,9 @@
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
 
-    
     // Slee
-    // new MidiMusic(glucose),
+    new Cathedrals(glucose),
+    new MidiMusic(glucose),
     new Pulley(glucose),
     new Swarm(glucose),
     new ViolinWave(glucose),
@@ -52,8 +52,7 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-     new SineSphere(glucose),
-//     new CubeCurl(glucose),
+     
 
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
@@ -103,7 +102,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),