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

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index bf545b533d69984bfb0dde20bc1d5d2eabf0876f..893152f31148221424950f696c5cad306abb4f04 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -26,8 +26,12 @@
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
 
-    
+    new SineSphere(glucose),
+     new CubeCurl(glucose),
+
     // Slee
+    // new MidiMusic(glucose),
+    new Pulley(glucose),
     new Swarm(glucose),
     new ViolinWave(glucose),
     new BouncyBalls(glucose),
@@ -50,8 +54,7 @@ LXPattern[] patterns(GLucose glucose) {
     new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
-
+   
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
     
@@ -100,6 +103,7 @@ 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),