Merge branch 'integration'

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index c0ab10403b646a78790993fac57d7c4565d661d2..615b3bd86c7da4b14620ee77ee1e601ea27138c1 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,24 +25,40 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
+    new HelixPattern(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
     new Swarm(glucose),
     new SpaceTime(glucose),
+    new Pong(glucose),
+    new Noise(glucose),
     new Blinders(glucose),
     new CrossSections(glucose),
     new Psychedelia(glucose),
     new CubeEQ(glucose),
     new PianoKeyPattern(glucose),
-    new WarmPlasma(glucose),
-    new FireTest(glucose),
-    
-    // Basic test patterns for reference, not art
-//    new TestHuePattern(glucose),
-//    new TestXPattern(glucose),
-//    new TestYPattern(glucose),
-//    new TestZPattern(glucose),
-//    new TestProjectionPattern(glucose),
+    new GlitchPlasma(glucose),
+    new FireEffect(glucose),
+    new StripBounce(glucose),
+    new SoundRain(glucose),
+    new SoundSpikes(glucose),
+    new FaceSync(glucose),
+
+    new TimPlanes(glucose),
+    new TimPinwheels(glucose),
+    new TimRaindrops(glucose),
+    new TimCubes(glucose),
+//    new TimTrace(glucose),
+    new TimSpheres(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),
 
   };
 }