From 370fe3dad98b6f471e6cf9888a36ca1606e47691 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 23 Oct 2013 05:22:29 -0700 Subject: [PATCH 1/6] make constant culling the default mode --- 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 5a217a71b0..1017bb9c52 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -292,7 +292,7 @@ Menu::Menu() : addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DontRemoveOutOfView); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::HideOutOfView); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::UseDeltaFrustumInHide); - addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::ConstantCulling); + addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableConstantCulling); QMenu* avatarOptionsMenu = developerMenu->addMenu("Avatar Options"); @@ -1115,9 +1115,9 @@ void Menu::setNewVoxelCullingMode(bool newMode) { /// voxel culling mode. void Menu::setVoxelCullingMode(bool oldMode) { const QString menus[] = { MenuOption::FastVoxelPipeline, MenuOption::DontRemoveOutOfView, MenuOption::HideOutOfView, - MenuOption::UseDeltaFrustumInHide, MenuOption::ConstantCulling}; - bool oldModeValue[] = { false, false, false, false, false }; - bool newModeValue[] = { true, true, true, true, true }; + MenuOption::UseDeltaFrustumInHide, MenuOption::DisableConstantCulling}; + bool oldModeValue[] = { false, false, false, false, true }; + bool newModeValue[] = { true, true, true, true, 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 798b74c362..83ab23d154 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -134,7 +134,6 @@ namespace MenuOption { const QString Bandwidth = "Bandwidth Display"; const QString BandwidthDetails = "Bandwidth Details"; const QString Collisions = "Collisions"; - const QString ConstantCulling = "Constant Culling"; const QString CopyVoxels = "Copy"; const QString CoverageMap = "Render Coverage Map"; const QString CoverageMapV2 = "Render Coverage Map V2"; @@ -144,6 +143,7 @@ namespace MenuOption { const QString DeleteVoxels = "Delete"; const QString DestructiveAddVoxel = "Create Voxel is Destructive"; const QString DeltaSending = "Delta Sending"; + const QString DisableConstantCulling = "Disable Constant Culling"; const QString DisplayFrustum = "Display Frustum"; const QString DontRenderVoxels = "Don't call _voxels.render()"; const QString DontCallOpenGLForVoxels = "Don't call glDrawElements()/glDrawRangeElementsEXT() for Voxels"; diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 6ae97a52b9..5461983f9a 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -744,7 +744,7 @@ void VoxelSystem::checkForCulling() { uint64_t start = usecTimestampNow(); uint64_t sinceLastViewCulling = (start - _lastViewCulling) / 1000; - bool constantCulling = Menu::getInstance()->isOptionChecked(MenuOption::ConstantCulling); + bool constantCulling = !Menu::getInstance()->isOptionChecked(MenuOption::DisableConstantCulling); // If the view frustum is no longer changing, but has changed, since last time, then remove nodes that are out of view if (constantCulling || ( From 1786049710ae14b4bc9c62db4b69252180fb37fe Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 23 Oct 2013 05:30:15 -0700 Subject: [PATCH 2/6] make use delta frustum in culling 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 1017bb9c52..c07e9051fe 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -291,7 +291,7 @@ Menu::Menu() : false, appInstance->getVoxels(), SLOT(setUseFastVoxelPipeline(bool))); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DontRemoveOutOfView); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::HideOutOfView); - addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::UseDeltaFrustumInHide); + addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::UseFullFrustumInHide); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableConstantCulling); @@ -1115,9 +1115,9 @@ void Menu::setNewVoxelCullingMode(bool newMode) { /// voxel culling mode. void Menu::setVoxelCullingMode(bool oldMode) { const QString menus[] = { MenuOption::FastVoxelPipeline, MenuOption::DontRemoveOutOfView, MenuOption::HideOutOfView, - MenuOption::UseDeltaFrustumInHide, MenuOption::DisableConstantCulling}; - bool oldModeValue[] = { false, false, false, false, true }; - bool newModeValue[] = { true, true, true, true, false }; + MenuOption::UseFullFrustumInHide, MenuOption::DisableConstantCulling}; + bool oldModeValue[] = { false, false, false, true, true }; + bool newModeValue[] = { true, true, true, 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 83ab23d154..0edd45c7d6 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -216,7 +216,7 @@ namespace MenuOption { const QString TreeStats = "Calculate Tree Stats"; const QString TransmitterDrive = "Transmitter Drive"; const QString Quit = "Quit"; - const QString UseDeltaFrustumInHide = "Use Delta View Frustums when Culling"; + const QString UseFullFrustumInHide = "Use Full View Frustums when Culling"; const QString UseVoxelShader = "Use Voxel Shader"; const QString VoxelsAsPoints = "Draw Voxels as Points"; const QString Voxels = "Voxels"; diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 5461983f9a..9ad3fb8042 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -1810,7 +1810,7 @@ void VoxelSystem::hideOutOfView() { bool showDebugDetails = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); PerformanceWarning warn(showDebugDetails, "hideOutOfView()", showDebugDetails); bool widenFrustum = true; - bool wantDeltaFrustums = Menu::getInstance()->isOptionChecked(MenuOption::UseDeltaFrustumInHide); + bool wantDeltaFrustums = !Menu::getInstance()->isOptionChecked(MenuOption::UseFullFrustumInHide); hideOutOfViewArgs args(this, this->_tree, _culledOnce, widenFrustum, wantDeltaFrustums); const bool wantViewFrustumDebugging = false; // change to true for additional debugging From 3c8e30c9564e206598a3d7073a6b98277377e2e7 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 23 Oct 2013 05:38:33 -0700 Subject: [PATCH 3/6] make HideOutOfView the default behavior --- interface/src/Menu.cpp | 8 ++++---- interface/src/Menu.h | 2 +- interface/src/VoxelSystem.cpp | 2 +- interface/src/VoxelSystem.h | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index c07e9051fe..03a7fd3242 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -290,7 +290,7 @@ Menu::Menu() : addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::FastVoxelPipeline, 0, false, appInstance->getVoxels(), SLOT(setUseFastVoxelPipeline(bool))); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DontRemoveOutOfView); - addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::HideOutOfView); + 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::HideOutOfView, + const QString menus[] = { MenuOption::FastVoxelPipeline, MenuOption::DontRemoveOutOfView, MenuOption::DisableHideOutOfView, MenuOption::UseFullFrustumInHide, MenuOption::DisableConstantCulling}; - bool oldModeValue[] = { false, false, false, true, true }; - bool newModeValue[] = { true, true, true, false, false }; + bool oldModeValue[] = { false, false, true, true, true }; + bool newModeValue[] = { true, true, 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 0edd45c7d6..6d84b3b5f0 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -168,7 +168,7 @@ namespace MenuOption { const QString GlowMode = "Cycle Glow Mode"; const QString GoToDomain = "Go To Domain..."; const QString GoToLocation = "Go To Location..."; - const QString HideOutOfView = "Hide Out of View Voxels"; + const QString DisableHideOutOfView = "Disable Hide Out of View Voxels"; const QString GoToUser = "Go To User..."; const QString ImportVoxels = "Import Voxels"; const QString ImportVoxelsClipboard = "Import Voxels to Clipboard"; diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 9ad3fb8042..01022fa342 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -757,7 +757,7 @@ void VoxelSystem::checkForCulling() { // When we call removeOutOfView() voxels, we don't actually remove the voxels from the VBOs, but we do remove // them from tree, this makes our tree caclulations faster, but doesn't require us to fully rebuild the VBOs (which // can be expensive). - if (Menu::getInstance()->isOptionChecked(MenuOption::HideOutOfView)) { + if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableHideOutOfView)) { hideOutOfView(); } if (!Menu::getInstance()->isOptionChecked(MenuOption::DontRemoveOutOfView)) { diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index 7428f82013..cc459cac5e 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -193,7 +193,6 @@ private: static bool forceRedrawEntireTreeOperation(VoxelNode* node, void* extraData); static bool clearAllNodesBufferIndexOperation(VoxelNode* node, void* extraData); static bool hideOutOfViewOperation(VoxelNode* node, void* extraData); - static bool hideOutOfViewUnrollOperation(VoxelNode* node, void* extraData); static bool hideAllSubTreeOperation(VoxelNode* node, void* extraData); static bool showAllSubTreeOperation(VoxelNode* node, void* extraData); static bool showAllLocalVoxelsOperation(VoxelNode* node, void* extraData); From 1430a083d193e8d3de522d8bf86d19683a6152a0 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 23 Oct 2013 05:44:20 -0700 Subject: [PATCH 4/6] 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(); } From 306b23d48905c697a458635efcb2e739e96bbd95 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 23 Oct 2013 05:58:47 -0700 Subject: [PATCH 5/6] make Fast Voxel Pipeline the default behavior --- interface/src/Application.cpp | 2 +- interface/src/Menu.cpp | 10 +++++----- interface/src/Menu.h | 2 +- interface/src/VoxelSystem.cpp | 7 ++++--- interface/src/VoxelSystem.h | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 439cbbebf2..1809c71d43 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1643,7 +1643,7 @@ void Application::init() { _voxels.setMaxVoxels(Menu::getInstance()->getMaxVoxels()); _voxels.setUseVoxelShader(Menu::getInstance()->isOptionChecked(MenuOption::UseVoxelShader)); _voxels.setVoxelsAsPoints(Menu::getInstance()->isOptionChecked(MenuOption::VoxelsAsPoints)); - _voxels.setUseFastVoxelPipeline(Menu::getInstance()->isOptionChecked(MenuOption::FastVoxelPipeline)); + _voxels.setDisableFastVoxelPipeline(Menu::getInstance()->isOptionChecked(MenuOption::DisableFastVoxelPipeline)); _voxels.init(); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 6b8bd0c93f..9f7f3138c9 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -287,8 +287,8 @@ Menu::Menu() : false, this, SLOT(setNewVoxelCullingMode(bool))); addDisabledActionAndSeparator(cullingOptionsMenu, "Individual Option Settings"); - addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::FastVoxelPipeline, 0, - false, appInstance->getVoxels(), SLOT(setUseFastVoxelPipeline(bool))); + addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableFastVoxelPipeline, 0, + false, appInstance->getVoxels(), SLOT(setDisableFastVoxelPipeline(bool))); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::RemoveOutOfView); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::DisableHideOutOfView); addCheckableActionToQMenuAndActionHash(cullingOptionsMenu, MenuOption::UseFullFrustumInHide); @@ -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::RemoveOutOfView, MenuOption::DisableHideOutOfView, + const QString menus[] = { MenuOption::DisableFastVoxelPipeline, MenuOption::RemoveOutOfView, MenuOption::DisableHideOutOfView, MenuOption::UseFullFrustumInHide, MenuOption::DisableConstantCulling}; - bool oldModeValue[] = { false, true, true, true, true }; - bool newModeValue[] = { true, false, false, false, false }; + bool oldModeValue[] = { true, true, true, true, true }; + bool newModeValue[] = { false, 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 1a56e67358..41ab27be35 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -159,7 +159,7 @@ namespace MenuOption { const QString FalseColorOccludedV2 = "FALSE Color Occluded V2 Voxels"; const QString FalseColorOutOfView = "FALSE Color Voxel Out of View"; const QString FalseColorRandomly = "FALSE Color Voxels Randomly"; - const QString FastVoxelPipeline = "Fast Voxel Pipeline"; + const QString DisableFastVoxelPipeline = "Disable Fast Voxel Pipeline"; const QString FirstPerson = "First Person"; const QString FrameTimer = "Show Timer"; const QString FrustumRenderMode = "Render Mode"; diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 6c1d112ac7..22e26b4027 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -123,9 +123,10 @@ void VoxelSystem::voxelDeleted(VoxelNode* node) { } } -void VoxelSystem::setUseFastVoxelPipeline(bool useFastVoxelPipeline) { - _useFastVoxelPipeline = useFastVoxelPipeline; - printf("setUseFastVoxelPipeline() _useFastVoxelPipeline=%s\n", debug::valueOf(_useFastVoxelPipeline)); +void VoxelSystem::setDisableFastVoxelPipeline(bool disableFastVoxelPipeline) { + _useFastVoxelPipeline = !disableFastVoxelPipeline; + printf("setDisableFastVoxelPipeline() disableFastVoxelPipeline=%s _useFastVoxelPipeline=%s\n", + debug::valueOf(disableFastVoxelPipeline), debug::valueOf(_useFastVoxelPipeline)); setupNewVoxelsForDrawing(); } diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index cc459cac5e..cf8e8b3e17 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -141,7 +141,7 @@ public slots: void cancelImport(); - void setUseFastVoxelPipeline(bool useFastVoxelPipeline); + void setDisableFastVoxelPipeline(bool disableFastVoxelPipeline); void setUseVoxelShader(bool useVoxelShader); void setVoxelsAsPoints(bool voxelsAsPoints); From 6e31f74236fe5248cb285e89259405233982f9bb Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 23 Oct 2013 06:00:26 -0700 Subject: [PATCH 6/6] tweak to menu text order --- interface/src/Menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 41ab27be35..c11997d1ce 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -144,6 +144,7 @@ namespace MenuOption { const QString DestructiveAddVoxel = "Create Voxel is Destructive"; const QString DeltaSending = "Delta Sending"; const QString DisableConstantCulling = "Disable Constant Culling"; + const QString DisableFastVoxelPipeline = "Disable Fast Voxel Pipeline"; const QString DisplayFrustum = "Display Frustum"; const QString DontRenderVoxels = "Don't call _voxels.render()"; const QString DontCallOpenGLForVoxels = "Don't call glDrawElements()/glDrawRangeElementsEXT() for Voxels"; @@ -159,7 +160,6 @@ namespace MenuOption { const QString FalseColorOccludedV2 = "FALSE Color Occluded V2 Voxels"; const QString FalseColorOutOfView = "FALSE Color Voxel Out of View"; const QString FalseColorRandomly = "FALSE Color Voxels Randomly"; - const QString DisableFastVoxelPipeline = "Disable Fast Voxel Pipeline"; const QString FirstPerson = "First Person"; const QString FrameTimer = "Show Timer"; const QString FrustumRenderMode = "Render Mode";