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

[SugarCubes.git] / _Overlay.pde

diff --git a/_Overlay.pde b/_Overlay.pde
index 0950b91c03b93e61beb8fafc545143bddf738b0f..50c037c1b46baf489faa4c21321a2c21d5da89ae 100644 (file)
--- a/_Overlay.pde
+++ b/_Overlay.pde
@@ -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;
@@ -769,6 +769,8 @@ class DebugUI {
   
   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) {
@@ -788,8 +790,8 @@ class DebugUI {
     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) {
@@ -943,7 +945,7 @@ class DebugUI {
     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;