From 154c6b4f3232221c0eb1550070c1917bbcd40dcc Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Aug 2013 15:32:44 -0700
Subject: [PATCH] fix disabling of occlusion culling from menu

---
 interface/src/Application.cpp      | 2 +-
 interface/src/Menu.cpp             | 9 ++++++---
 interface/src/Menu.h               | 2 +-
 libraries/avatars/src/AvatarData.h | 3 +--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 62f5770ee6..a35f0a3747 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -518,7 +518,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 
             case Qt::Key_C:
                 if (isShifted)  {
-                    Menu::getInstance()->triggerOption(MenuOption::DisableOcclusionCulling);
+                    Menu::getInstance()->triggerOption(MenuOption::OcclusionCulling);
                 } else {
                     _myAvatar.setDriveKeys(DOWN, 1);
                 }
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 2da9d81ee9..af7f371762 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -344,9 +344,12 @@ Menu::Menu() :
                                            appInstance->getAvatar(),
                                            SLOT(setWantDelta(bool)));
     
-    addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::DisableOcclusionCulling, Qt::SHIFT | Qt::Key_C);
-    //        (_occlusionCulling = debugMenu->addAction("Disable Occlusion Culling", this, SLOT(disableOcclusionCulling(bool)),
-    //                                                  Qt::SHIFT | Qt::Key_C))->setCheckable(true);
+    addCheckableActionToQMenuAndActionHash(debugMenu,
+                                           MenuOption::OcclusionCulling,
+                                           Qt::SHIFT | Qt::Key_C,
+                                           true,
+                                           appInstance->getAvatar(),
+                                           SLOT(setWantOcclusionCulling(bool)));
     
     addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::CoverageMap, Qt::SHIFT | Qt::CTRL | Qt::Key_O);
     addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::CoverageMapV2, Qt::SHIFT | Qt::CTRL | Qt::Key_P);
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index fa0655d4fa..94083fc8b9 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -121,7 +121,6 @@ namespace MenuOption {
     const QString DecreaseVoxelSize = "Decrease Voxel Size";
     const QString DestructiveAddVoxel = "Create Voxel is Destructive";
     const QString DeltaSending = "Delta Sending";
-    const QString DisableOcclusionCulling = "Disable Occlusion Culling";
     const QString DisplayFrustum = "Display Frustum";
     const QString EchoAudio = "Echo Audio";
     const QString ExportVoxels = "Export Voxels";
@@ -155,6 +154,7 @@ namespace MenuOption {
     const QString LookAtVectors = "Look-at Vectors";
     const QString LowRes = "Lower Resolution While Moving";
     const QString Mirror = "Mirror";
+    const QString OcclusionCulling = "Occlusion Culling";
     const QString Oscilloscope = "Audio Oscilloscope";
     const QString Pair = "Pair";
     const QString PasteVoxels = "Paste Voxels";
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 0af4e86280..24f361d4f0 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -115,8 +115,6 @@ public:
     bool getWantLowResMoving()     const { return _wantLowResMoving; }
     bool getWantOcclusionCulling() const { return _wantOcclusionCulling; }
     uint16_t getLeaderID()         const { return _leaderID; }
-
-    void setWantOcclusionCulling(bool wantOcclusionCulling) { _wantOcclusionCulling = wantOcclusionCulling; }
     
     void setHeadData(HeadData* headData) { _headData = headData; }
     void setHandData(HandData* handData) { _handData = handData; }
@@ -126,6 +124,7 @@ public slots:
     void setWantLowResMoving(bool wantLowResMoving) { _wantLowResMoving = wantLowResMoving; }
     void setWantColor(bool wantColor) { _wantColor = wantColor; }
     void setWantDelta(bool wantDelta) { _wantDelta = wantDelta; }
+    void setWantOcclusionCulling(bool wantOcclusionCulling) { _wantOcclusionCulling = wantOcclusionCulling; }
     
 protected:
     glm::vec3 _position;