Showing the changes to interface/src/main.cpp (1 of 16 files). Show all
Unified · Split
| @@ -163,6 +163,8 @@ bool paintOn = false; // Whether to paint voxels as you fly aroun · 162 unmodified lines | ||
| 163 | 163 | VoxelDetail paintingVoxel; // The voxel we're painting if we're painting |
| 164 | 164 | unsigned char dominantColor = 0; // The dominant color of the voxel we're painting |
| 165 | 165 | bool perfStatsOn = false; // Do we want to display perfStats? |
| 166 | +bool wantMonochrome = false; // ask server to send us in monochrome | |
| 167 | +bool wantResIn = false; // ask server to res in | |
| 166 | 168 | |
| 167 | 169 | bool logOn = true; // Whether to show on-screen log |
| 168 | 170 | |
| @@ -1278,6 +1280,22 @@ int setRenderWarnings(int state) { · 1109 unmodified lines | ||
| 1278 | 1280 | return value; |
| 1279 | 1281 | } |
| 1280 | 1282 | |
| 1283 | +int setWantResIn(int state) { | |
| 1284 | + int value = setValue(state, &::wantResIn); | |
| 1285 | + if (state == MENU_ROW_PICKED) { | |
| 1286 | + ::myAvatar.setWantResIn(::wantResIn); | |
| 1287 | + } | |
| 1288 | + return value; | |
| 1289 | +} | |
| 1290 | + | |
| 1291 | +int setWantMonochrome(int state) { | |
| 1292 | + int value = setValue(state, &::wantMonochrome); | |
| 1293 | + if (state == MENU_ROW_PICKED) { | |
| 1294 | + ::myAvatar.setWantColor(!::wantMonochrome); | |
| 1295 | + } | |
| 1296 | + return value; | |
| 1297 | +} | |
| 1298 | + | |
| 1281 | 1299 | int setDisplayFrustum(int state) { |
| 1282 | 1300 | return setValue(state, &::frustumOn); |
| 1283 | 1301 | } |
| @@ -1370,6 +1388,8 @@ int doFalseColorizeInView(int state) { · 86 unmodified lines | ||
| 1370 | 1388 | return state; |
| 1371 | 1389 | } |
| 1372 | 1390 | |
| 1391 | + | |
| 1392 | + | |
| 1373 | 1393 | const char* modeAll = " - All "; |
| 1374 | 1394 | const char* modeVectors = " - Vectors "; |
| 1375 | 1395 | const char* modePlanes = " - Planes "; |
| @@ -1441,6 +1461,8 @@ void initMenu() { · 65 unmodified lines | ||
| 1441 | 1461 | menuColumnDebug->addRow("FALSE Color Voxel Out of View", doFalseColorizeInView); |
| 1442 | 1462 | menuColumnDebug->addRow("Show TRUE Colors", doTrueVoxelColors); |
| 1443 | 1463 | menuColumnDebug->addRow("Calculate Tree Stats", doTreeStats); |
| 1464 | + menuColumnDebug->addRow("Wants Res-In", setWantResIn); | |
| 1465 | + menuColumnDebug->addRow("Wants Monochrome", setWantMonochrome); | |
| 1444 | 1466 | } |
| 1445 | 1467 | |
| 1446 | 1468 | void testPointToVoxel() { |
| @@ -1719,6 +1741,7 @@ void* networkReceive(void* args) { · 272 unmodified lines | ||
| 1719 | 1741 | myAvatar.processTransmitterData(incomingPacket, bytesReceived); |
| 1720 | 1742 | break; |
| 1721 | 1743 | case PACKET_HEADER_VOXEL_DATA: |
| 1744 | + case PACKET_HEADER_VOXEL_DATA_MONOCHROME: | |
| 1722 | 1745 | case PACKET_HEADER_Z_COMMAND: |
| 1723 | 1746 | case PACKET_HEADER_ERASE_VOXEL: |
| 1724 | 1747 | voxels.parseData(incomingPacket, bytesReceived); |