From f3b6e21a6d4fbe858c8d9305efe81992d3503b40 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Fri, 8 Nov 2013 13:58:48 -0800
Subject: [PATCH] Voxel click to fly is now an option in the Tools Menu

---
 interface/src/Application.cpp | 3 ++-
 interface/src/Menu.cpp        | 3 +++
 interface/src/Menu.h          | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 5d7b7ee67b..7724ff0cd2 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1132,7 +1132,8 @@ void Application::mousePressEvent(QMouseEvent* event) {
                 glm::vec3 myPosition = _myAvatar.getPosition();
                 
                 // If there is not an action tool set (add, delete, color), move to this voxel
-                if (!(Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode) ||
+                if (Menu::getInstance()->isOptionChecked(MenuOption::ClickToFly) &&
+                     !(Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode) ||
                      Menu::getInstance()->isOptionChecked(MenuOption::VoxelDeleteMode) ||
                      Menu::getInstance()->isOptionChecked(MenuOption::VoxelColorMode))) {
                     _myAvatar.setMoveTarget(myPosition + (newTarget - myPosition) * PERCENTAGE_TO_MOVE_TOWARD);
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 48f5a4ed3c..602d2131c2 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -170,6 +170,9 @@ Menu::Menu() :
     QAction* getColorMode = addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::VoxelGetColorMode, Qt::Key_G);
     _voxelModeActionsGroup->addAction(getColorMode);
     
+    addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::ClickToFly);
+    
+    
     // connect each of the voxel mode actions to the updateVoxelModeActionsSlot
     foreach (QAction* action, _voxelModeActionsGroup->actions()) {
         connect(action, SIGNAL(triggered()), this, SLOT(updateVoxelModeActions()));
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index dc8f6051a4..6e70fb44e4 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -208,6 +208,7 @@ namespace MenuOption {
     const QString OffAxisProjection = "Off-Axis Projection";
     const QString OldVoxelCullingMode = "Old Voxel Culling Mode";
     const QString TurnWithHead = "Turn using Head";
+    const QString ClickToFly = "Fly to voxel on click";
     const QString Oscilloscope = "Audio Oscilloscope";
     const QString Pair = "Pair";
     const QString PasteVoxels = "Paste";