From 305623d8a7d3a2a45e592d48eac2e765be630c40 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 8 Jul 2014 21:37:08 -0700 Subject: [PATCH] Add option to hide focus indicators --- interface/src/Menu.cpp | 1 + interface/src/Menu.h | 1 + interface/src/avatar/Avatar.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index c0c25bb00d..019ce1df9e 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -406,6 +406,7 @@ Menu::Menu() : addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::GlowWhenSpeaking, 0, true); addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false); + addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::HideFocusIndicators, 0, false); QMenu* oculusOptionsMenu = developerMenu->addMenu("Oculus Options"); addCheckableActionToQMenuAndActionHash(oculusOptionsMenu, MenuOption::DisplayOculusOverlays, 0, true); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index e8146f8038..32458e1883 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -382,6 +382,7 @@ namespace MenuOption { const QString ObeyEnvironmentalGravity = "Obey Environmental Gravity"; const QString HandsCollideWithSelf = "Collide With Self"; const QString HeadMouse = "Head Mouse"; + const QString HideFocusIndicators = "Hide Focus Indicators"; const QString IncreaseAvatarSize = "Increase Avatar Size"; const QString IncreaseVoxelSize = "Increase Voxel Size"; const QString LoadScript = "Open and Run Script File..."; diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 9bb54efe20..e2e111c210 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -257,7 +257,7 @@ void Avatar::render(const glm::vec3& cameraPosition, RenderMode renderMode) { } // If this is the avatar being looked at, render a little ball above their head - if (_isLookAtTarget) { + if (_isLookAtTarget && !Menu::getInstance()->isOptionChecked(MenuOption::HideFocusIndicators)) { const float LOOK_AT_INDICATOR_RADIUS = 0.03f; const float LOOK_AT_INDICATOR_OFFSET = 0.22f; const float LOOK_AT_INDICATOR_COLOR[] = { 0.8f, 0.0f, 0.0f, 0.75f };