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

diff --combined SugarCubes.pde
index 2586b1aa507fda594e25ed9a798d1cd839f7d1c7,b7a5be6ad39a1be0d49838c547f4ab8ede12a3ab..ab81e307cc8357ddc7a8385fac9c800f97035c7d
--- 1/SugarCubes.pde
--- 2/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -27,10 -27,10 +27,10 @@@ LXPattern[] patterns(GLucose glucose) 
    return new LXPattern[] {
      
      // Slee
 -    new ShiftingPlane(glucose),
 -    new AskewPlanes(glucose),
      new Swarm(glucose),
      new SpaceTime(glucose),
 +    new ShiftingPlane(glucose),
 +    new AskewPlanes(glucose),
      new Blinders(glucose),
      new CrossSections(glucose),
      new Psychedelia(glucose),
@@@ -44,6 -44,9 +44,9 @@@
      new Pong(glucose),
      new Noise(glucose),
  
+     // Alex G
+     new SineSphere(glucose),
+ 
      // Shaheen
      new HelixPattern(glucose).setEligible(false),
      

diff --combined _Overlay.pde
index e21be8e6f8cdc1947e4290c3753ecccc220fb8a0,0950b91c03b93e61beb8fafc545143bddf738b0f..50c037c1b46baf489faa4c21321a2c21d5da89ae
--- 1/_Overlay.pde
--- 2/_Overlay.pde
+++ b/_Overlay.pde
@@@ -42,7 -42,7 +42,7 @@@ abstract class OverlayUI 
    protected final int STATE_PENDING = 2;
    
    protected int[] pandaLeft = new int[pandaBoards.length];
-   protected final int pandaWidth = 56;
+   protected final int pandaWidth = 64;
    protected final int pandaHeight = 13;
    protected final int pandaTop = height-16;
    
@@@ -79,22 -79,30 +79,30 @@@
      textFont(titleFont);
      textAlign(LEFT);
      fill(#666666);
-     text("FPS: " + (((int)(frameRate * 10)) / 10.), 4, height-6);
-     text("Target (-/+):", 50, height-6);
+     int lPos = 4;
+     String fps = "FPS: " + (((int)(frameRate * 10)) / 10.);
+     text(fps, lPos, height-6);
+     lPos += 48;
+     
+     String target = "Target (-/+):";
+     text(target, lPos, height-6);
      fill(#000000);
-     rect(104, height-16, 20, 13);
+     lPos += textWidth(target) + 4;
+     rect(lPos, height-16, 24, 13);
      fill(#666666);
-     text("" + targetFramerate, 108, height-6);
-     text("PandaOutput (p):", 134, height-6);
-     int lPos = 214;
+     text("" + targetFramerate, lPos + (24 - textWidth("" + targetFramerate))/2, height-6);
+     lPos += 32;
+     String pandaOutput = "PandaOutput (p):";
+     text(pandaOutput, lPos, height-6);
+     lPos += textWidth(pandaOutput)+4;
      int pi = 0;
      for (PandaDriver p : pandaBoards) {
        pandaLeft[pi++] = lPos;
        fill(p.enabled ? #666666 : #000000);
        rect(lPos, pandaTop, pandaWidth, pandaHeight);
        fill(p.enabled ? #000000 : #666666);
-       text(p.ip, lPos + 4, height-6);
-       lPos += 60;
+       text(p.ip, lPos + (pandaWidth - textWidth(p.ip)) / 2, height-6);
+       lPos += pandaWidth + 8;
      }
  
    }
@@@ -749,11 -757,11 +757,11 @@@ class MappingUI extends OverlayUI 
  class DebugUI {
    
    final ChannelMapping[] channelList;
 -  final int debugX = 10;
 -  final int debugY = 42;
 +  final int debugX = 5;
 +  final int debugY = 5;
    final int debugXSpacing = 28;
 -  final int debugYSpacing = 22;
 -  final int[][] debugState = new int[17][6];
 +  final int debugYSpacing = 21;
 +  final int[][] debugState;
    
    final int DEBUG_STATE_ANIM = 0;
    final int DEBUG_STATE_WHITE = 1;
@@@ -761,8 -769,6 +769,8 @@@
    
    DebugUI(PandaMapping[] pandaMappings) {
      int totalChannels = pandaMappings.length * PandaMapping.CHANNELS_PER_BOARD;
 +    debugState = new int[totalChannels+1][ChannelMapping.CUBES_PER_CHANNEL+1];
 +    
      channelList = new ChannelMapping[totalChannels];
      int channelIndex = 0;
      for (PandaMapping pm : pandaMappings) {
@@@ -782,8 -788,8 +790,8 @@@
      int xBase = debugX;
      int yPos = debugY;
      
 -    fill(color(0, 0, 0, 80));
 -    rect(4, 32, 172, 388);
 +    fill(#000000);
 +    rect(0, 0, debugX + 5*debugXSpacing, height);
      
      int channelNum = 0;
      for (ChannelMapping channel : channelList) {
@@@ -937,7 -943,7 +945,7 @@@
      if ((dy >= 0) && (dy < debugState.length)) {
        if ((dx >= 0) && (dx < debugState[dy].length)) {
          int newState = debugState[dy][dx] = (debugState[dy][dx] + 1) % 3;
 -        if (dy == 16) {
 +        if (dy == debugState.length-1) {
            for (int[] states : debugState) {
              for (int i = 0; i < states.length; ++i) {
                states[i] = newState;