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;
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;
}
}
case ChannelMapping.MODE_SPEAKER:
drawNumBox(xPos, yPos, "S" + channel.objectIndices[0], debugState[channelNum][1]);
break;
- case ChannelMapping.MODE_FLOOR:
+ case ChannelMapping.MODE_STRUTS_AND_FLOOR:
drawNumBox(xPos, yPos, "F", debugState[channelNum][1]);
break;
case ChannelMapping.MODE_NULL:
state = debugState[channelIndex][1];
if (state != DEBUG_STATE_ANIM) {
color debugColor = (state == DEBUG_STATE_WHITE) ? white : off;
- for (Point p : glucose.model.bassBox.points) {
- colors[p.index] = debugColor;
+ for (Strip s : glucose.model.bassBox.boxStrips) {
+ for (Point p : s.points) {
+ colors[p.index] = debugColor;
+ }
}
}
break;
- case ChannelMapping.MODE_FLOOR:
+ case ChannelMapping.MODE_STRUTS_AND_FLOOR:
state = debugState[channelIndex][1];
if (state != DEBUG_STATE_ANIM) {
color debugColor = (state == DEBUG_STATE_WHITE) ? white : off;
for (Point p : glucose.model.boothFloor.points) {
colors[p.index] = debugColor;
}
+ for (Strip s : glucose.model.bassBox.struts) {
+ for (Point p : s.points) {
+ colors[p.index] = debugColor;
+ }
+ }
}
break;