Merge branch 'integration'

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 7a03248dfab9d113beca7404a9505afaad4e9b0f..615b3bd86c7da4b14620ee77ee1e601ea27138c1 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,10 +25,6 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-    new DriveableCrossSections(glucose),
-    new GranimTestPattern2(glucose),
-    new GranimTestPattern(glucose),
-    new Sandbox(glucose),
     new HelixPattern(glucose),
     new ShiftingPlane(glucose),
     new AskewPlanes(glucose),
@@ -47,7 +43,14 @@ LXPattern[] patterns(GLucose 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),