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

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 0f102e334f5acaa688743c95eb1adec344aeae7a..80128950eb70ac0757923fc2145b09ae18b5b667 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,11 +25,11 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-    new HelixPattern(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
     new Swarm(glucose),
     new SpaceTime(glucose),
+    new HelixPattern(glucose),
     new Pong(glucose),
     new Noise(glucose),
     new Blinders(glucose),
@@ -43,7 +43,26 @@ LXPattern[] patterns(GLucose glucose) {
     new SoundRain(glucose),
     new SoundSpikes(glucose),
     new FaceSync(glucose),
+
+    // Jack
+    new Swim(glucose),
+    // new Breathe(glucose),
+
+
+    new TimPlanes(glucose),
+    new TimPinwheels(glucose),
+    new TimRaindrops(glucose),
+    new TimCubes(glucose),
+    //new TimTrace(glucose),
+    new TimSpheres(glucose),
+
+    //Ben
+    new DriveableCrossSections(glucose),
+    new GranimTestPattern2(glucose),
     
+    //Sam
+    new JazzRainbow(glucose),
+
     // Basic test patterns for reference, not art    
     new TestCubePattern(glucose),
     new TestTowerPattern(glucose),
@@ -53,6 +72,8 @@ LXPattern[] patterns(GLucose glucose) {
     // new TestYPattern(glucose),
     // new TestZPattern(glucose),
 
+    //slow for now, relegated to the bottom until faster!
+    new HelixPattern(glucose),
   };
 }