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

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 5504001bf88d3834f2d82b3b40f12340c35b00cf..80128950eb70ac0757923fc2145b09ae18b5b667 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -29,19 +29,51 @@ LXPattern[] patterns(GLucose glucose) {
     new AskewPlanes(glucose),
     new Swarm(glucose),
     new SpaceTime(glucose),
+    new HelixPattern(glucose),
+    new Pong(glucose),
+    new Noise(glucose),
     new Blinders(glucose),
     new CrossSections(glucose),
     new Psychedelia(glucose),
     new CubeEQ(glucose),
     new PianoKeyPattern(glucose),
+    new GlitchPlasma(glucose),
+    new FireEffect(glucose),
+    new StripBounce(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),
     
-    // Basic test patterns for reference, not art
-//    new TestHuePattern(glucose),
-//    new TestXPattern(glucose),
-//    new TestYPattern(glucose),
-//    new TestZPattern(glucose),
-//    new TestProjectionPattern(glucose),
+    //Sam
+    new JazzRainbow(glucose),
+
+    // Basic test patterns for reference, not art    
+    new TestCubePattern(glucose),
+    new TestTowerPattern(glucose),
+    new TestProjectionPattern(glucose),
+    // new TestHuePattern(glucose),
+    // new TestXPattern(glucose),
+    // new TestYPattern(glucose),
+    // new TestZPattern(glucose),
 
+    //slow for now, relegated to the bottom until faster!
+    new HelixPattern(glucose),
   };
 }