From c930d058b14a829c164dd8791a33afabf8f530b0 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Aug 2013 15:23:26 -0700
Subject: [PATCH] fix monochrome option menu hook

---
 interface/src/Application.cpp      | 23 -----------------------
 interface/src/Menu.cpp             | 12 ++++++------
 interface/src/Menu.h               |  3 +--
 libraries/avatars/src/AvatarData.h |  5 +++--
 4 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1389eb4945..62f5770ee6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1117,29 +1117,6 @@ void Application::doKillLocalVoxels() {
     _wantToKillLocalVoxels = true;
 }
 
-//
-//void Application::doFalseColorizeInView() {
-//    loadViewFrustum(_myCamera, _viewFrustum);
-//    // we probably want to make sure the viewFrustum is initialized first
-//    _voxels.falseColorizeInView(&_viewFrustum);
-//}
-//
-//void Application::doFalseColorizeOccluded() {
-//    CoverageMap::wantDebugging = true;
-//    _voxels.falseColorizeOccluded();
-//}
-//
-//void Application::doFalseColorizeOccludedV2() {
-//    _voxels.falseColorizeOccludedV2();
-//}
-//
-//void Application::doFalseColorizeBySource() {
-//    _voxels.falseColorizeBySource();
-//}
-//
-//void Application::doTrueVoxelColors() {
-//    _voxels.trueColorize();
-//}
 //
 //void Application::disableLowResMoving(bool disableLowResMoving) {
 //    _myAvatar.setWantLowResMoving(!disableLowResMoving);
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 64e6b02ce8..0db6f3456a 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -323,12 +323,12 @@ Menu::Menu() :
                                   appInstance->getVoxels(),
                                   SLOT(trueColorize()));
     
-    
-    addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::LowPassFilter);
-    
-    addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::Monochrome, NULL, NULL);
-    
-    //        debugMenu->addAction("Wants Monochrome", this, SLOT(setWantsMonochrome(bool)))->setCheckable(true);
+    addCheckableActionToQMenuAndActionHash(debugMenu,
+                                           MenuOption::SendVoxelColors,
+                                           0,
+                                           true,
+                                           appInstance->getAvatar(),
+                                           SLOT(setWantColor(bool)));
     
     addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::DisableLowRes, NULL, NULL);
     
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 5bf795b92e..ae0e2edcbe 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -154,9 +154,7 @@ namespace MenuOption {
     const QString Log = "Log";
     const QString LookAtIndicator = "Look-at Indicator";
     const QString LookAtVectors = "Look-at Vectors";
-    const QString LowPassFilter = "Low-pass Filter";
     const QString Mirror = "Mirror";
-    const QString Monochrome = "Monochrome";
     const QString Oscilloscope = "Audio Oscilloscope";
     const QString Pair = "Pair";
     const QString PasteVoxels = "Paste Voxels";
@@ -166,6 +164,7 @@ namespace MenuOption {
     const QString ResetAvatarSize = "Reset Avatar Size";
     const QString ResetSwatchColors = "Reset Swatch Colors";
     const QString RunTimingTests = "Run Timing Tests";
+    const QString SendVoxelColors = "Colored Voxels";
     const QString SettingsAutosave = "Autosave";
     const QString SettingsLoad = "Load Settings";
     const QString SettingsSave = "Save Settings";
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index c3def00140..75c1a19146 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -116,9 +116,8 @@ public:
     bool getWantOcclusionCulling() const { return _wantOcclusionCulling; }
     uint16_t getLeaderID()         const { return _leaderID; }
 
-    void setWantColor(bool wantColor)                       { _wantColor = wantColor; }
     void setWantDelta(bool wantDelta)                       { _wantDelta = wantDelta; }
-    void setWantLowResMoving(bool wantLowResMoving)         { _wantLowResMoving = wantLowResMoving; }
+    
     void setWantOcclusionCulling(bool wantOcclusionCulling) { _wantOcclusionCulling = wantOcclusionCulling; }
     
     void setHeadData(HeadData* headData) { _headData = headData; }
@@ -126,6 +125,8 @@ public:
     
 public slots:
     void sendData();
+    void setWantLowResMoving(bool wantLowResMoving) { _wantLowResMoving = wantLowResMoving; }
+    void setWantColor(bool wantColor) { _wantColor = wantColor; }
     
 protected:
     glm::vec3 _position;