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

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 0f5ca26c08a6c07597df45d2f822d8e72329c2f4..893152f31148221424950f696c5cad306abb4f04 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,11 +25,16 @@
 
 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),
-    new Swarm(glucose),
     new SpaceTime(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -44,12 +49,12 @@ LXPattern[] patterns(GLucose glucose) {
 
     // DanH
     new Noise(glucose),
-    new Play(glucose),
-    new Pong(glucose),
+    new Play (glucose),
+    new Pong (glucose),
+    new Worms(glucose),
 
     // Alex G
-    new SineSphere(glucose),
-
+   
     // Shaheen
     new HelixPattern(glucose).setEligible(false),
     
@@ -98,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),