Squashed commit of the following:

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 6318339df09a42b134ff47510950155233699551..8d9219d7017e57fe23937fc450763fb04b8e9183 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,14 +25,16 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-
-    new SineSphere(glucose),
-    new CubeCurl(glucose),
+     
+     new SineSphere(glucose),
+     //new CubeCurl(glucose), 
+     
     // Slee
-    new Cathedrals(glucose),
+    // new Cathedrals(glucose),
+     new Swarm(glucose),
     new MidiMusic(glucose),
     new Pulley(glucose),
-    new Swarm(glucose),
+    
     new ViolinWave(glucose),
     new BouncyBalls(glucose),
     new SpaceTime(glucose),
@@ -55,9 +57,17 @@ LXPattern[] patterns(GLucose glucose) {
 
     // Alex G
      
+     // Tim
+    new TimPlanes(glucose),
+    new TimPinwheels(glucose),
+    new TimRaindrops(glucose),
+    new TimCubes(glucose),
+    // new TimTrace(glucose),
+    new TimSpheres(glucose),
+
+    // Jackie
+    new JackieSquares(glucose),
 
-    // Shaheen
-    new HelixPattern(glucose).setEligible(false),
     
     // Toby
     new GlitchPlasma(glucose),
@@ -71,20 +81,16 @@ LXPattern[] patterns(GLucose glucose) {
     new Swim(glucose),
     new Balance(glucose),
 
-    // Tim
-    new TimPlanes(glucose),
-    new TimPinwheels(glucose),
-    new TimRaindrops(glucose),
-    new TimCubes(glucose),
-    // new TimTrace(glucose),
-    new TimSpheres(glucose),
-
+    
     // Ben
     // new Sandbox(glucose),
     new TowerParams(glucose),
     new DriveableCrossSections(glucose),
     new GranimTestPattern2(glucose),
     
+    // Shaheen
+    //new HelixPattern(glucose).setEligible(false),
+    
     //JR
     new Gimbal(glucose),
     
@@ -104,7 +110,6 @@ LXPattern[] patterns(GLucose glucose) {
     new TestBassMapping(glucose),
     new TestFloorMapping(glucose),
     new TestSpeakerMapping(glucose),    
-    new TestPerformancePattern(glucose),
     // new TestHuePattern(glucose),
     // new TestXPattern(glucose),
     // new TestYPattern(glucose),