Wider log, log screen in menu
Showing the changes to interface/src/main.cpp (1 of 2 files). Show all
Unified · Split
| @@ -157,6 +157,8 @@ VoxelDetail paintingVoxel; // The voxel we're painting if we're paintin · 156 unmodified lines | |||
| 157 | unsigned char dominantColor = 0; // The dominant color of the voxel we're painting | 157 | unsigned char dominantColor = 0; // The dominant color of the voxel we're painting |
| 158 | bool perfStatsOn = false; // Do we want to display perfStats? | 158 | bool perfStatsOn = false; // Do we want to display perfStats? |
| 159 | 159 | ||
| 160 | bool logOn = true; // Whether to show on-screen log | ||
| 161 | |||
| 160 | int noiseOn = 0; // Whether to add random noise | 162 | int noiseOn = 0; // Whether to add random noise |
| 161 | float noise = 1.0; // Overall magnitude scaling for random noise levels | 163 | float noise = 1.0; // Overall magnitude scaling for random noise levels |
| 162 | 164 | ||
| @@ -920,7 +922,7 @@ void display(void) · 757 unmodified lines | |||
| 920 | if ( !::lookingInMirror ) balls.render(); | 922 | if ( !::lookingInMirror ) balls.render(); |
| 921 | 923 | ||
| 922 | // Render the world box | 924 | // Render the world box |
| 923 | if (!::lookingInMirror && statsOn) render_world_box(); | 925 | if (!::lookingInMirror && ::statsOn) { render_world_box(); } |
| 924 | 926 | ||
| 925 | // brad's frustum for debugging | 927 | // brad's frustum for debugging |
| 926 | if (::frustumOn) renderViewFrustum(::viewFrustum); | 928 | if (::frustumOn) renderViewFrustum(::viewFrustum); |
| @@ -962,13 +964,12 @@ void display(void) · 35 unmodified lines | |||
| 962 | // Show detected levels from the serial I/O ADC channel sensors | 964 | // Show detected levels from the serial I/O ADC channel sensors |
| 963 | if (displayLevels) serialPort.renderLevels(WIDTH,HEIGHT); | 965 | if (displayLevels) serialPort.renderLevels(WIDTH,HEIGHT); |
| 964 | 966 | ||
| 965 | // Display miscellaneous text stats onscreen | 967 | // Display stats and log text onscreen |
| 966 | if (statsOn) { | 968 | glLineWidth(1.0f); |
| 967 | glLineWidth(1.0f); | 969 | glPointSize(1.0f); |
| 968 | glPointSize(1.0f); | 970 | |
| 969 | displayStats(); | 971 | if (::statsOn) { displayStats(); } |
| 970 | logger.render(WIDTH, HEIGHT); | 972 | if (::logOn) { logger.render(WIDTH, HEIGHT); } |
| 971 | } | ||
| 972 | 973 | ||
| 973 | // Show menu | 974 | // Show menu |
| 974 | if (::menuOn) { | 975 | if (::menuOn) { |
| @@ -1057,6 +1058,11 @@ int setNoise(int state) { · 82 unmodified lines | |||
| 1057 | return iRet; | 1058 | return iRet; |
| 1058 | } | 1059 | } |
| 1059 | 1060 | ||
| 1061 | int setLog(int state) { | ||
| 1062 | int iRet = setValue(state, &::logOn); | ||
| 1063 | return iRet; | ||
| 1064 | } | ||
| 1065 | |||
| 1060 | int setGyroLook(int state) { | 1066 | int setGyroLook(int state) { |
| 1061 | int iRet = setValue(state, &::gyroLook); | 1067 | int iRet = setValue(state, &::gyroLook); |
| 1062 | return iRet; | 1068 | return iRet; |
| @@ -1071,7 +1077,7 @@ int setStars(int state) { · 8 unmodified lines | |||
| 1071 | } | 1077 | } |
| 1072 | 1078 | ||
| 1073 | int setStats(int state) { | 1079 | int setStats(int state) { |
| 1074 | return setValue(state, &statsOn); | 1080 | return setValue(state, &::statsOn); |
| 1075 | } | 1081 | } |
| 1076 | 1082 | ||
| 1077 | int setMenu(int state) { | 1083 | int setMenu(int state) { |
| @@ -1196,7 +1202,8 @@ void initMenu() { · 118 unmodified lines | |||
| 1196 | 1202 | ||
| 1197 | // Tools | 1203 | // Tools |
| 1198 | menuColumnTools = menu.addColumn("Tools"); | 1204 | menuColumnTools = menu.addColumn("Tools"); |
| 1199 | menuColumnTools->addRow("Stats (/)", setStats); | 1205 | menuColumnTools->addRow("Stats (/)", setStats); |
| 1206 | menuColumnTools->addRow("Log ", setLog); | ||
| 1200 | menuColumnTools->addRow("(M)enu", setMenu); | 1207 | menuColumnTools->addRow("(M)enu", setMenu); |
| 1201 | 1208 | ||
| 1202 | // Frustum Options | 1209 | // Frustum Options |
| @@ -1354,7 +1361,7 @@ void key(unsigned char k, int x, int y) · 151 unmodified lines | |||
| 1354 | 1361 | ||
| 1355 | // Process keypresses | 1362 | // Process keypresses |
| 1356 | if (k == 'q' || k == 'Q') ::terminate(); | 1363 | if (k == 'q' || k == 'Q') ::terminate(); |
| 1357 | if (k == '/') statsOn = !statsOn; // toggle stats | 1364 | if (k == '/') ::statsOn = !::statsOn; // toggle stats |
| 1358 | if (k == '*') ::starsOn = !::starsOn; // toggle stars | 1365 | if (k == '*') ::starsOn = !::starsOn; // toggle stars |
| 1359 | if (k == 'V' || k == 'v') ::showingVoxels = !::showingVoxels; // toggle voxels | 1366 | if (k == 'V' || k == 'v') ::showingVoxels = !::showingVoxels; // toggle voxels |
| 1360 | if (k == 'F') ::frustumOn = !::frustumOn; // toggle view frustum debugging | 1367 | if (k == 'F') ::frustumOn = !::frustumOn; // toggle view frustum debugging |