Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:24:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix in view and occluded false colorization

Browse source
This commit is contained in:
Stephen Birarda 2013-08-15 15:15:19 -07:00
parent c7be2e13cd
commit e77aae157b
4 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/Application.cpp
View file

@ -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);

16
interface/src/Menu.cpp
View file

@ -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);

4
interface/src/VoxelSystem.cpp
View file

@ -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);

2
interface/src/VoxelSystem.h
View file

@ -94,7 +94,7 @@ public slots:
void randomizeVoxelColors();
void falseColorizeRandom();
void trueColorize();
void falseColorizeInView(ViewFrustum* viewFrustum);
void falseColorizeInView();
void falseColorizeDistanceFromView();
void falseColorizeRandomEveryOther();
void falseColorizeOccluded();