Merge branch 'alexdesktopworking' of https://github.com/sugarcubes/SugarCubes into...

diff --combined BenMorrow.pde
index 0bdb30e7548231e2527d33222c4cbc641cdb7118,9314c3ce44318661de3af7095c8b0eaa48a259a3..87b22be2ad785a4db8369a91b375fa388fe976de
mode 100644,100755..100755
--- 1/BenMorrow.pde
--- 2/BenMorrow.pde
+++ b/BenMorrow.pde
@@@ -1,85 -1,3 +1,85 @@@
 +class TowerParams extends SCPattern
 +{
 +      BasicParameter hueoff = new BasicParameter("Hueoff", 0.0);
 +      BasicParameter hueSpan = new BasicParameter("HueRange", 0.0);
 +      BasicParameter t1 = new BasicParameter("T1", 0.0);
 +      BasicParameter t2 = new BasicParameter("T2", 0.0);
 +      BasicParameter t3 = new BasicParameter("T3", 0.0);
 +      BasicParameter t4 = new BasicParameter("T4", 0.0);
 +      BasicParameter t5 = new BasicParameter("T5", 0.0);
 +      BasicParameter t6 = new BasicParameter("T6", 0.0);
 +      BasicParameter t7 = new BasicParameter("T7", 0.0);
 +      BasicParameter t8 = new BasicParameter("T8", 0.0);
 +      BasicParameter t9 = new BasicParameter("T9", 0.0);
 +      BasicParameter t10 = new BasicParameter("T10", 0.0);
 +      BasicParameter t11 = new BasicParameter("T11", 0.0);
 +      BasicParameter t12 = new BasicParameter("T12", 0.0);
 +      BasicParameter t13 = new BasicParameter("T13", 0.0);
 +      BasicParameter t14 = new BasicParameter("T14", 0.0);
 +      BasicParameter t15 = new BasicParameter("T15", 0.0);
 +      BasicParameter t16 = new BasicParameter("T16", 0.0);
 +
 +      ArrayList<BasicParameter> towerParams;
 +      int towerSize;
 +      int colorSpan;
 +      TowerParams(GLucose glucose) {
 +              super(glucose);
 +
 +              towerParams = new ArrayList<BasicParameter>();
 +              addParameter(hueoff);
 +              addParameter(hueSpan);
 +              towerParams.add(t1);
 +              towerParams.add(t2);
 +              towerParams.add(t3);
 +              towerParams.add(t4);
 +              towerParams.add(t5);
 +              towerParams.add(t6);
 +              towerParams.add(t7);
 +              towerParams.add(t8);
 +              towerParams.add(t9);
 +              towerParams.add(t10);
 +              towerParams.add(t11);
 +              towerParams.add(t12);
 +              towerParams.add(t13);
 +              towerParams.add(t14);
 +              towerParams.add(t15);
 +              towerParams.add(t16);
 +              for(BasicParameter p : towerParams)
 +              {
 +                      addParameter(p);
 +              }
 +              towerSize = model.towers.size();
 +              colorSpan = 255 / towerSize;
 +              println("towers "+towerSize);
 +      }
 +
 +      void run(int deltaMs)
 +      {
 +              clearALL();
 +              Tower t;
 +              for(int i=0; i<towerSize ;i++)
 +              {       
 +                      t= model.towers.get(i);
 +                      for(Point p : t.points)
 +                      {
 +                              if(p.y<towerParams.get(i).getValuef()*200)
 +                              {
 +                                      colors[p.index]=color(255 * hueoff.getValuef()+colorSpan * hueSpan.getValuef() * i, 255, 255);
 +                              }
 +                      }
 +              }
 +
 +      }
 +
 +      public void clearALL()
 +      {
 +              for(Point p : model.points)
 +              {
 +                      colors[p.index] = 0;
 +              }
 +      }
 +
 +}
  class Sandbox extends SCPattern
  {
        int c=0;
@@@ -265,4 -183,4 +265,4 @@@ class DriveableCrossSections extends Cr
                }
        }
  
- }
+ }

diff --combined SugarCubes.pde
index c80a4da38fd826b5ff3616cf98f742e93691d060,472285283397867711152f1d6d1a4946dfea190e..7f8be7b14a9837d7f5fb5bb5453030b94f804110
--- 1/SugarCubes.pde
--- 2/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -22,12 -22,18 +22,18 @@@
   * 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 gplay;
  
  LXPattern[] patterns(GLucose glucose) {
    return new LXPattern[] {
+     
+     new Gimbal(glucose),
+     
+     // DMK
          
      // Slee
      new Swarm(glucose),
+     //new ScreenScrape(glucose),
      new SpaceTime(glucose),
      new ShiftingPlane(glucose),
      new AskewPlanes(glucose),
@@@ -40,9 -46,10 +46,10 @@@
      new CubeEQ(glucose).setEligible(false),
      new PianoKeyPattern(glucose).setEligible(false),
  
-     // Dan
-     new Pong(glucose),
+     // DanH
      new Noise(glucose),
+     gplay=new Play(glucose), // XXX do this properly
+     new Pong(glucose),
  
      // Alex G
      new SineSphere(glucose),
@@@ -71,19 -78,12 +78,19 @@@
      new TimSpheres(glucose),
  
      // Ben
 +    //new Sandbox(glucose),
 +    new TowerParams(glucose),
      new DriveableCrossSections(glucose),
      new GranimTestPattern2(glucose),
       
      // Sam
      new JazzRainbow(glucose),
      
 +    // Arjun
 +    new TelevisionStatic(glucose),
 +    new AbstractPainting(glucose),
 +    new Spirality(glucose),
 +    
      // Basic test patterns for reference, not art    
      new TestCubePattern(glucose),
      new TestTowerPattern(glucose),
@@@ -112,8 -112,8 +119,8 @@@ LXEffect[] effects(GLucose glucose) 
    return new LXEffect[] {
      new FlashEffect(lx),
      new BoomEffect(glucose),
-     new DesaturationEffect(lx),
-     new ColorFuckerEffect(glucose),
+     //new DesaturationEffect(lx),
+     //new ColorFuckerEffect(glucose),
+     new DualBlender(glucose),
    };
  }
-