Merge branch 'master' into jack-breathe

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index bb55e6fea0ca40c693dc7169ca9d9877d17cd275..e0e7014c1f7970d8a25d89d5f898e05e6f77bb12 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,6 +25,8 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
+    new Breathe(glucose),
+
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
     new Swarm(glucose),
@@ -39,8 +41,28 @@ LXPattern[] patterns(GLucose glucose) {
     new GlitchPlasma(glucose),
     new FireEffect(glucose),
     new StripBounce(glucose),
-    new SoundCubes(glucose),
+    new SoundRain(glucose),
+    new SoundSpikes(glucose),
+    new FaceSync(glucose),
+
+    // Jack
+    new Swim(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),
@@ -50,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),
   };
 }