Showing the changes to interface/src/Menu.cpp (1 of 5 files). Show all
Unified · Split
| @@ -287,8 +287,8 @@ Menu::Menu() : · 286 unmodified lines | |||
| 287 | false, this, SLOT(setNewVoxelCullingMode(bool))); | 287 | false, this, SLOT(setNewVoxelCullingMode(bool))); |
| 288 | 288 | ||
| 289 | addDisabledActionAndSeparator(cullingOptionsMenu, "Individual Option Settings"); | 289 | addDisabledActionAndSeparator(cullingOptionsMenu, "Individual Option Settings"); |
| 290 | addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::FastVoxelPipeline, 0, | 290 | addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableFastVoxelPipeline, 0, |
| 291 | false, appInstance->getVoxels(), SLOT(setUseFastVoxelPipeline(bool))); | 291 | false, appInstance->getVoxels(), SLOT(setDisableFastVoxelPipeline(bool))); |
| 292 | addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::RemoveOutOfView); | 292 | addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::RemoveOutOfView); |
| 293 | addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableHideOutOfView); | 293 | addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableHideOutOfView); |
| 294 | addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::UseFullFrustumInHide); | 294 | addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::UseFullFrustumInHide); |
| @@ -1114,10 +1114,10 @@ void Menu::setNewVoxelCullingMode(bool newMode) { · 819 unmodified lines | |||
| 1114 | /// This will switch on or off several different individual settings options all at once based on choosing with Old or New | 1114 | /// This will switch on or off several different individual settings options all at once based on choosing with Old or New |
| 1115 | /// voxel culling mode. | 1115 | /// voxel culling mode. |
| 1116 | void Menu::setVoxelCullingMode(bool oldMode) { | 1116 | void Menu::setVoxelCullingMode(bool oldMode) { |
| 1117 | const QString menus[] = { MenuOption::FastVoxelPipeline, MenuOption::RemoveOutOfView, MenuOption::DisableHideOutOfView, | 1117 | const QString menus[] = { MenuOption::DisableFastVoxelPipeline, MenuOption::RemoveOutOfView, MenuOption::DisableHideOutOfView, |
| 1118 | MenuOption::UseFullFrustumInHide, MenuOption::DisableConstantCulling}; | 1118 | MenuOption::UseFullFrustumInHide, MenuOption::DisableConstantCulling}; |
| 1119 | bool oldModeValue[] = { false, true, true, true, true }; | 1119 | bool oldModeValue[] = { true, true, true, true, true }; |
| 1120 | bool newModeValue[] = { true, false, false, false, false }; | 1120 | bool newModeValue[] = { false, false, false, false, false }; |
| 1121 | 1121 | ||
| 1122 | for (int i = 0; i < sizeof(menus) / sizeof(menus[0]); i++) { | 1122 | for (int i = 0; i < sizeof(menus) / sizeof(menus[0]); i++) { |
| 1123 | bool desiredValue = oldMode ? oldModeValue[i] : newModeValue[i]; | 1123 | bool desiredValue = oldMode ? oldModeValue[i] : newModeValue[i]; |