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

weird stuff changed default editor during merge
ust ordering stuff in sugarcubes list

diff --combined MarkSlee.pde
index 3d6cda6b47293b392a1a329d9177b5958d4cd031,efcf7d7f6832d36a22ca90e0c4fcf014197a7a1b..56c06536e5aa8d33bb787fa76af6331ac3934c5a
--- 1/MarkSlee.pde
--- 2/MarkSlee.pde
+++ b/MarkSlee.pde
@@@ -516,7 -516,7 +516,7 @@@ class BouncyBalls extends SCPattern 
      float zPos;
      
      BouncyBall(int i) {
-       addModulator(xPos).setBasis(random(0, TWO_PI)).start();
+       addModulator(xPos.setBasis(random(0, TWO_PI)).start());
        addModulator(yPos = new Accelerator(0, 0, 0));
        zPos = lerp(model.zMin, model.zMax, (i+2.) / (NUM_BALLS + 4.));
      }
@@@ -644,7 -644,7 +644,7 @@@ class SpaceTime extends SCPattern 
  }
  
  class Swarm extends SCPattern {
- 
+   
    SawLFO offset = new SawLFO(0, 1, 1000);
    SinLFO rate = new SinLFO(350, 1200, 63000);
    SinLFO falloff = new SinLFO(15, 50, 17000);
@@@ -684,11 -684,10 +684,11 @@@
          colors[p.index] = lx.hsb(
          (lx.getBaseHuef() + 0.3 * abs(p.x - hOffX.getValuef())) % 360, 
          constrain(80 + 40 * fV, 0, 100), 
 -        constrain(100 - (30 - fV * falloff.getValuef()) * modDist(i + (s*63)%61, offset.getValuef() * strip.metrics.numPoints, strip.metrics.numPoints), 0, 100)
 +        constrain(100 - 
 +          (30 - fV * falloff.getValuef()) * modDist(i + (s*63)%61, offset.getValuef() * strip.metrics.numPoints, strip.metrics.numPoints), 0, 100)
            );
          ++i;
 -      }
 +      } 
        ++s;
      }
    }
@@@ -931,7 -930,7 +931,7 @@@ class BoomEffect extends SCEffect 
        boom.trigger();
      }
  
-     void doApply(int[] colors) {
+     void apply(int[] colors) {
        float brightv = 100 * bright.getValuef();
        float falloffv = falloffv();
        float satv = sat.getValuef() * 100;
@@@ -971,10 -970,10 +971,10 @@@
      onEnable();
    }
  
-   public void doApply(int[] colors) {
+   public void apply(int[] colors) {
      for (Layer l : layers) {
        if (l.boom.isRunning()) {
-         l.doApply(colors);
+         l.apply(colors);
        }
      }
    }
@@@ -1405,7 -1404,7 +1405,7 @@@ class ColorFuckerEffect extends SCEffec
      addParameter(invert);
    }
    
-   public void doApply(int[] colors) {
+   public void apply(int[] colors) {
      if (!enabled) {
        return;
      }
@@@ -1457,7 -1456,7 +1457,7 @@@ class QuantizeEffect extends SCEffect 
      lastQuant = 0;
    } 
    
-   public void doApply(int[] colors) {
+   public void apply(int[] colors) {
      float fQuant = amount.getValuef();
      if (fQuant > 0) {
        float tRamp = (lx.tempo.rampf() % (1./pow(2,floor((1-fQuant) * 4))));
@@@ -1503,7 -1502,7 +1503,7 @@@ class BlurEffect extends SCEffect 
      env.setRangeFromHereTo(0, 1000).start();
    }
    
-   public void doApply(int[] colors) {
+   public void apply(int[] colors) {
      float amt = env.getValuef() * amount.getValuef();
      if (amt > 0) {    
        amt = (1 - amt);

diff --combined _Internals.pde
index cdd4ba5ac64d755b4665fc4f5070e2b15b48fb72,58187f119e9463ab1b982e2c6fece39ff62f8254..2cc799f8eda4f94fcd7a6e3470ae33e4096f710c
--- 1/_Internals.pde
--- 2/_Internals.pde
+++ b/_Internals.pde
@@@ -4,7 -4,7 +4,7 @@@
   *         //\\   //\\                 //\\   //\\  
   *        ///\\\ ///\\\               ///\\\ ///\\\
   *        \\\/// \\\///               \\\/// \\\///
-  *         \\//   \\//                 \\//   \\//
+  *         \\//   \\//                 \\//   \\//H
   *
   *        EXPERTS ONLY!!              EXPERTS ONLY!!
   *
@@@ -40,15 -40,15 +40,15 @@@ final float TRAILER_WIDTH = 240
  final float TRAILER_DEPTH = 97;
  final float TRAILER_HEIGHT = 33;
  
 -final int MaxCubeHeight = 5;
 -final int NumBackTowers = 11;
 +final int MaxCubeHeight = 7;
 +final int NumBackTowers = 18;
  
  int targetFramerate = 60;
  int startMillis, lastMillis;
  
  // Core engine variables
  GLucose glucose;
- HeronLX lx;
+ LX lx;
  LXPattern[] patterns;
  Effects effects;
  MappingTool mappingTool;