From 1430a083d193e8d3de522d8bf86d19683a6152a0 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 23 Oct 2013 05:44:20 -0700 Subject: [PATCH] make DontRemoveOutOfView the default behavior --- interface/src/Menu.cpp | 8 ++++---- interface/src/Menu.h | 2 +- interface/src/VoxelSystem.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 03a7fd3242..6b8bd0c93f 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -289,7 +289,7 @@ Menu::Menu() : addDisabledActionAndSeparator(cullingOptionsMenu, "Individual Option Settings"); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::FastVoxelPipeline, 0, false, appInstance->getVoxels(), SLOT(setUseFastVoxelPipeline(bool))); - addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DontRemoveOutOfView); + addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::RemoveOutOfView); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableHideOutOfView); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::UseFullFrustumInHide); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableConstantCulling); @@ -1114,10 +1114,10 @@ void Menu::setNewVoxelCullingMode(bool newMode) { /// This will switch on or off several different individual settings options all at once based on choosing with Old or New /// voxel culling mode. void Menu::setVoxelCullingMode(bool oldMode) { - const QString menus[] = { MenuOption::FastVoxelPipeline, MenuOption::DontRemoveOutOfView, MenuOption::DisableHideOutOfView, + const QString menus[] = { MenuOption::FastVoxelPipeline, MenuOption::RemoveOutOfView, MenuOption::DisableHideOutOfView, MenuOption::UseFullFrustumInHide, MenuOption::DisableConstantCulling}; - bool oldModeValue[] = { false, false, true, true, true }; - bool newModeValue[] = { true, true, false, false, false }; + bool oldModeValue[] = { false, true, true, true, true }; + bool newModeValue[] = { true, false, false, false, false }; for (int i = 0; i < sizeof(menus) / sizeof(menus[0]); i++) { bool desiredValue = oldMode ? oldModeValue[i] : newModeValue[i]; diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 6d84b3b5f0..1a56e67358 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -147,7 +147,6 @@ namespace MenuOption { const QString DisplayFrustum = "Display Frustum"; const QString DontRenderVoxels = "Don't call _voxels.render()"; const QString DontCallOpenGLForVoxels = "Don't call glDrawElements()/glDrawRangeElementsEXT() for Voxels"; - const QString DontRemoveOutOfView = "Don't Remove Out of View Voxels"; const QString EchoAudio = "Echo Audio"; const QString ExportVoxels = "Export Voxels"; const QString HeadMouse = "Head Mouse"; @@ -197,6 +196,7 @@ namespace MenuOption { const QString PipelineWarnings = "Show Render Pipeline Warnings"; const QString Preferences = "Preferences..."; const QString RandomizeVoxelColors = "Randomize Voxel TRUE Colors"; + const QString RemoveOutOfView = "Remove Out of View Voxels"; const QString ResetAvatarSize = "Reset Avatar Size"; const QString ResetSwatchColors = "Reset Swatch Colors"; const QString RunTimingTests = "Run Timing Tests"; diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 01022fa342..6c1d112ac7 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -760,7 +760,7 @@ void VoxelSystem::checkForCulling() { if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableHideOutOfView)) { hideOutOfView(); } - if (!Menu::getInstance()->isOptionChecked(MenuOption::DontRemoveOutOfView)) { + if (Menu::getInstance()->isOptionChecked(MenuOption::RemoveOutOfView)) { removeOutOfView(); }