Merge branch 'integration'

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index bb55e6fea0ca40c693dc7169ca9d9877d17cd275..615b3bd86c7da4b14620ee77ee1e601ea27138c1 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,6 +25,7 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
+    new HelixPattern(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
     new Swarm(glucose),
@@ -39,8 +40,17 @@ 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),
+
+    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),