X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=c6431d8fe85ee2f4e871b38776e32ca9527b4429;hb=a521a50b10037871a64746a7d5c40ed5f38e59e3;hp=227a75c6e2eea61bff55ce771048f492b93eeab9;hpb=4a6fef0116ebcb73dc3b2bffd87225bab8bd693d;p=SugarCubes.git

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 227a75c..c6431d8 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -22,21 +22,10 @@
  * If you're an artist, create a new tab in the Processing environment with
  * your name. Implement your classes there, and add them to the list below.
  */ 
-
 LXPattern[] patterns(LX lx) {
   return new LXPattern[] {        
 
-
-    new SineSphere(glucose),
-    //new CubeCurl(glucose), 
-     // DanH
-    new Noise(glucose),
-    new Play (glucose),
-    new Pong (glucose),
-    new Worms(glucose),
-
-
-    new SineSphere(lx),
+    //new SineSphere(lx),
     //new CubeCurl(lx), 
      
     // Slee
@@ -45,32 +34,6 @@ LXPattern[] patterns(LX lx) {
     new MidiMusic(lx),
     new Pulley(lx),
     
-
-    new ViolinWave(glucose),
-    new BouncyBalls(glucose),
-    new SpaceTime(glucose),
-    new ShiftingPlane(glucose),
-    new AskewPlanes(glucose),
-    new Blinders(glucose),
-    new CrossSections(glucose),
-    new Psychedelia(glucose),
-     new TimRaindrops(glucose),
-    new TimCubes(glucose),
-    new MultipleCubes(glucose),
-    
-    new Traktor(glucose).setEligible(false),
-    new BassPod(glucose).setEligible(false),
-    new CubeEQ(glucose).setEligible(false),
-    new PianoKeyPattern(glucose).setEligible(false),
-    
-     new StripBounce(glucose),
-
-	// AntonK
-	//new AKPong(glucose),
-    new Swim(glucose),
-    new Balance(glucose),
-    
-
     new ViolinWave(lx),
     new BouncyBalls(lx),
     new SpaceTime(lx),
@@ -96,22 +59,11 @@ LXPattern[] patterns(LX lx) {
     new Pong (lx),
     new Worms(lx),
 
-    
-    
     // JR
     new Gimbal(lx),
     
     // Alex G
      
-
-     // Tim
-    new TimMetronome(glucose),
-    new TimPlanes(glucose),
-    new TimPinwheels(glucose),
-    
-    // new TimTrace(glucose),
-    new TimSpheres(glucose),
-
     // Tim
     new TimMetronome(lx),
     new TimPlanes(lx),
@@ -135,16 +87,6 @@ LXPattern[] patterns(LX lx) {
     new VSTowers(lx),
     
     // Toby
-
-    new GlitchPlasma(glucose),
-    new FireEffect(glucose).setEligible(false),
-   
-    new SoundRain(glucose).setEligible(false),
-    new SoundSpikes(glucose).setEligible(false),
-    new FaceSync(glucose),
-
-    // Jack
-
     new GlitchPlasma(lx),
     new FireEffect(lx).setEligible(false),
     new StripBounce(lx),
@@ -154,7 +96,9 @@ LXPattern[] patterns(LX lx) {
 
     // Jack
     new Swim(lx),
-    new Balance(lx),    // Ben
+    new Balance(lx),
+    
+    // Ben
     // new Sandbox(lx),
     new TowerParams(lx),
     new DriveableCrossSections(lx),
@@ -171,6 +115,12 @@ LXPattern[] patterns(LX lx) {
     new AbstractPainting(lx),
     new Spirality(lx),
 
+    // Micah
+    new Rings(lx),
+
+    // Open pixel control server
+    new OpenPixelControl(lx, this),
+
     // Basic test patterns for reference, not art    
     new TestCubePattern(lx),
     new TestTowerPattern(lx),