Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all
Unified · Split
| @@ -1361,6 +1361,10 @@ void Application::doFalseColorizeOccludedV2() { · 1360 unmodified lines | |||
| 1361 | _voxels.falseColorizeOccludedV2(); | 1361 | _voxels.falseColorizeOccludedV2(); |
| 1362 | } | 1362 | } |
| 1363 | 1363 | ||
| 1364 | void Application::doFalseColorizeBySource() { | ||
| 1365 | _voxels.falseColorizeBySource(); | ||
| 1366 | } | ||
| 1367 | |||
| 1364 | void Application::doTrueVoxelColors() { | 1368 | void Application::doTrueVoxelColors() { |
| 1365 | _voxels.trueColorize(); | 1369 | _voxels.trueColorize(); |
| 1366 | } | 1370 | } |
| @@ -1837,6 +1841,7 @@ void Application::initMenu() { · 470 unmodified lines | |||
| 1837 | renderDebugMenu->addAction("FALSE Color Voxel Out of View", this, SLOT(doFalseColorizeInView())); | 1841 | renderDebugMenu->addAction("FALSE Color Voxel Out of View", this, SLOT(doFalseColorizeInView())); |
| 1838 | renderDebugMenu->addAction("FALSE Color Occluded Voxels", this, SLOT(doFalseColorizeOccluded()), Qt::CTRL | Qt::Key_O); | 1842 | renderDebugMenu->addAction("FALSE Color Occluded Voxels", this, SLOT(doFalseColorizeOccluded()), Qt::CTRL | Qt::Key_O); |
| 1839 | renderDebugMenu->addAction("FALSE Color Occluded V2 Voxels", this, SLOT(doFalseColorizeOccludedV2()), Qt::CTRL | Qt::Key_P); | 1843 | renderDebugMenu->addAction("FALSE Color Occluded V2 Voxels", this, SLOT(doFalseColorizeOccludedV2()), Qt::CTRL | Qt::Key_P); |
| 1844 | renderDebugMenu->addAction("FALSE Color By Source", this, SLOT(doFalseColorizeBySource()), Qt::CTRL | Qt::SHIFT | Qt::Key_S); | ||
| 1840 | renderDebugMenu->addAction("Show TRUE Colors", this, SLOT(doTrueVoxelColors()), Qt::CTRL | Qt::Key_T); | 1845 | renderDebugMenu->addAction("Show TRUE Colors", this, SLOT(doTrueVoxelColors()), Qt::CTRL | Qt::Key_T); |
| 1841 | 1846 | ||
| 1842 | (_shouldLowPassFilter = debugMenu->addAction("Test: LowPass filter"))->setCheckable(true); | 1847 | (_shouldLowPassFilter = debugMenu->addAction("Test: LowPass filter"))->setCheckable(true); |
| @@ -3518,7 +3523,9 @@ void* Application::networkReceive(void* args) { · 1675 unmodified lines | |||
| 3518 | if (messageData[0] == PACKET_TYPE_ENVIRONMENT_DATA) { | 3523 | if (messageData[0] == PACKET_TYPE_ENVIRONMENT_DATA) { |
| 3519 | app->_environment.parseData(&senderAddress, messageData, messageLength); | 3524 | app->_environment.parseData(&senderAddress, messageData, messageLength); |
| 3520 | } else { | 3525 | } else { |
| 3526 | app->_voxels.setDataSourceID(voxelServer->getNodeID()); | ||
| 3521 | app->_voxels.parseData(messageData, messageLength); | 3527 | app->_voxels.parseData(messageData, messageLength); |
| 3528 | app->_voxels.setDataSourceID(UNKNOWN_NODE_ID); | ||
| 3522 | } | 3529 | } |
| 3523 | 3530 | ||
| 3524 | voxelServer->unlock(); | 3531 | voxelServer->unlock(); |