diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d7533f0261..1389eb4945 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1116,19 +1116,7 @@ void Application::setRenderVoxels(bool voxelRender) { void Application::doKillLocalVoxels() { _wantToKillLocalVoxels = true; } -// -//void Application::doFalseRandomizeVoxelColors() { -// _voxels.falseColorizeRandom(); -//} -// -//void Application::doFalseRandomizeEveryOtherVoxelColors() { -// _voxels.falseColorizeRandomEveryOther(); -//} -// -//void Application::doFalseColorizeByDistance() { -// loadViewFrustum(_myCamera, _viewFrustum); -// _voxels.falseColorizeDistanceFromView(&_viewFrustum); -//} + // //void Application::doFalseColorizeInView() { // loadViewFrustum(_myCamera, _viewFrustum); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index d699b07f61..b166688b29 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -293,13 +293,17 @@ Menu::Menu() : appInstance->getVoxels(), SLOT(falseColorizeDistanceFromView())); - addActionToQMenuAndActionHash(renderDebugMenu, MenuOption::FalseColorOutOfView, NULL, NULL); + addActionToQMenuAndActionHash(renderDebugMenu, + MenuOption::FalseColorOutOfView, + 0, + appInstance->getVoxels(), + SLOT(falseColorizeInView())); - // renderDebugMenu->addAction("FALSE Color Voxel Out of View", this, SLOT(doFalseColorizeInView())); - - addActionToQMenuAndActionHash(renderDebugMenu, MenuOption::FalseColorOccluded, Qt::CTRL | Qt::Key_O); - - // renderDebugMenu->addAction("FALSE Color Occluded Voxels", this, SLOT(doFalseColorizeOccluded()), Qt::CTRL | Qt::Key_O); + addActionToQMenuAndActionHash(renderDebugMenu, + MenuOption::FalseColorOccluded, + 0, + appInstance->getVoxels(), + SLOT(falseColorizeOccluded())); addActionToQMenuAndActionHash(renderDebugMenu, MenuOption::FalseColorOccludedV2, Qt::CTRL | Qt::Key_P); diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index e4c0e71f3c..974595216b 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -812,7 +812,9 @@ bool VoxelSystem::falseColorizeInViewOperation(VoxelNode* node, void* extraData) return true; // keep going! } -void VoxelSystem::falseColorizeInView(ViewFrustum* viewFrustum) { +void VoxelSystem::falseColorizeInView() { + ViewFrustum* viewFrustum = Application::getInstance()->getViewFrustum(); + _nodeCount = 0; _tree->recurseTreeWithOperation(falseColorizeInViewOperation,(void*)viewFrustum); qDebug("setting in view false color for %d nodes\n", _nodeCount); diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index f3ca04ab03..c55bd552db 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -94,7 +94,7 @@ public slots: void randomizeVoxelColors(); void falseColorizeRandom(); void trueColorize(); - void falseColorizeInView(ViewFrustum* viewFrustum); + void falseColorizeInView(); void falseColorizeDistanceFromView(); void falseColorizeRandomEveryOther(); void falseColorizeOccluded();