From 1786049710ae14b4bc9c62db4b69252180fb37fe Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 23 Oct 2013 05:30:15 -0700
Subject: [PATCH] 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