History

Merge branch 'master' of https://github.com/worklist/hifi

Andrzej Kapolka committed 13 years ago

Commit 75eee4b2 parents e038851 669336a16 files · +438 −89Browse files

Showing the changes to interface/src/main.cpp (1 of 16 files). Show all

Unified · Split

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