Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 16:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make DontRemoveOutOfView the default behavior

Browse source
This commit is contained in:
ZappoMan 2013-10-23 05:44:20 -07:00
parent 3c8e30c956
commit 1430a083d1
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Menu.cpp
View file

@ -289,7 +289,7 @@ Menu::Menu() :
addDisabledActionAndSeparator(cullingOptionsMenu, "Individual Option Settings"); addDisabledActionAndSeparator(cullingOptionsMenu, "Individual Option Settings");
addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::FastVoxelPipeline, 0, addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::FastVoxelPipeline, 0,
false, appInstance->getVoxels(), SLOT(setUseFastVoxelPipeline(bool))); false, appInstance->getVoxels(), SLOT(setUseFastVoxelPipeline(bool)));
addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DontRemoveOutOfView); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::RemoveOutOfView);
addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableHideOutOfView); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableHideOutOfView);
addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::UseFullFrustumInHide); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::UseFullFrustumInHide);
addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableConstantCulling); 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 /// This will switch on or off several different individual settings options all at once based on choosing with Old or New
/// voxel culling mode. /// voxel culling mode.
void Menu::setVoxelCullingMode(bool oldMode) { 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}; MenuOption::UseFullFrustumInHide, MenuOption::DisableConstantCulling};
bool oldModeValue[] = { false, false, true, true, true }; bool oldModeValue[] = { false, true, true, true, true };
bool newModeValue[] = { true, true, false, false, false }; bool newModeValue[] = { true, false, false, false, false };
for (int i = 0; i < sizeof(menus) / sizeof(menus[0]); i++) { for (int i = 0; i < sizeof(menus) / sizeof(menus[0]); i++) {
bool desiredValue = oldMode ? oldModeValue[i] : newModeValue[i]; bool desiredValue = oldMode ? oldModeValue[i] : newModeValue[i];

2
interface/src/Menu.h
View file

@ -147,7 +147,6 @@ namespace MenuOption {
const QString DisplayFrustum = "Display Frustum"; const QString DisplayFrustum = "Display Frustum";
const QString DontRenderVoxels = "Don't call _voxels.render()"; const QString DontRenderVoxels = "Don't call _voxels.render()";
const QString DontCallOpenGLForVoxels = "Don't call glDrawElements()/glDrawRangeElementsEXT() for Voxels"; 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 EchoAudio = "Echo Audio";
const QString ExportVoxels = "Export Voxels"; const QString ExportVoxels = "Export Voxels";
const QString HeadMouse = "Head Mouse"; const QString HeadMouse = "Head Mouse";
@ -197,6 +196,7 @@ namespace MenuOption {
const QString PipelineWarnings = "Show Render Pipeline Warnings"; const QString PipelineWarnings = "Show Render Pipeline Warnings";
const QString Preferences = "Preferences..."; const QString Preferences = "Preferences...";
const QString RandomizeVoxelColors = "Randomize Voxel TRUE Colors"; const QString RandomizeVoxelColors = "Randomize Voxel TRUE Colors";
const QString RemoveOutOfView = "Remove Out of View Voxels";
const QString ResetAvatarSize = "Reset Avatar Size"; const QString ResetAvatarSize = "Reset Avatar Size";
const QString ResetSwatchColors = "Reset Swatch Colors"; const QString ResetSwatchColors = "Reset Swatch Colors";
const QString RunTimingTests = "Run Timing Tests"; const QString RunTimingTests = "Run Timing Tests";

2
interface/src/VoxelSystem.cpp
View file

@ -760,7 +760,7 @@ void VoxelSystem::checkForCulling() {
if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableHideOutOfView)) { if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableHideOutOfView)) {
hideOutOfView(); hideOutOfView();
} }
if (!Menu::getInstance()->isOptionChecked(MenuOption::DontRemoveOutOfView)) { if (Menu::getInstance()->isOptionChecked(MenuOption::RemoveOutOfView)) {
removeOutOfView(); removeOutOfView();
} }