Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:58:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename focus indicators menu item and default to off

Browse source
This commit is contained in:
David Rowe 2014-07-09 15:12:29 -07:00
parent 305623d8a7
commit f2d49fa6a1
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -406,7 +406,7 @@ Menu::Menu() :
addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::GlowWhenSpeaking, 0, true); addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::GlowWhenSpeaking, 0, true);
addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false); addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false);
addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::HideFocusIndicators, 0, false); addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::FocusIndicators, 0, false);
QMenu* oculusOptionsMenu = developerMenu->addMenu("Oculus Options"); QMenu* oculusOptionsMenu = developerMenu->addMenu("Oculus Options");
addCheckableActionToQMenuAndActionHash(oculusOptionsMenu, MenuOption::DisplayOculusOverlays, 0, true); addCheckableActionToQMenuAndActionHash(oculusOptionsMenu, MenuOption::DisplayOculusOverlays, 0, true);

2
interface/src/Menu.h
View file

@ -369,6 +369,7 @@ namespace MenuOption {
const QString Faceshift = "Faceshift"; const QString Faceshift = "Faceshift";
const QString FilterSixense = "Smooth Sixense Movement"; const QString FilterSixense = "Smooth Sixense Movement";
const QString FirstPerson = "First Person"; const QString FirstPerson = "First Person";
const QString FocusIndicators = "Focus Indicators";
const QString FrameTimer = "Show Timer"; const QString FrameTimer = "Show Timer";
const QString FrustumRenderMode = "Render Mode"; const QString FrustumRenderMode = "Render Mode";
const QString Fullscreen = "Fullscreen"; const QString Fullscreen = "Fullscreen";
@ -382,7 +383,6 @@ namespace MenuOption {
const QString ObeyEnvironmentalGravity = "Obey Environmental Gravity"; const QString ObeyEnvironmentalGravity = "Obey Environmental Gravity";
const QString HandsCollideWithSelf = "Collide With Self"; const QString HandsCollideWithSelf = "Collide With Self";
const QString HeadMouse = "Head Mouse"; const QString HeadMouse = "Head Mouse";
const QString HideFocusIndicators = "Hide Focus Indicators";
const QString IncreaseAvatarSize = "Increase Avatar Size"; const QString IncreaseAvatarSize = "Increase Avatar Size";
const QString IncreaseVoxelSize = "Increase Voxel Size"; const QString IncreaseVoxelSize = "Increase Voxel Size";
const QString LoadScript = "Open and Run Script File..."; const QString LoadScript = "Open and Run Script File...";

2
interface/src/avatar/Avatar.cpp
View file

@ -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 this is the avatar being looked at, render a little ball above their head
if (_isLookAtTarget && !Menu::getInstance()->isOptionChecked(MenuOption::HideFocusIndicators)) { if (_isLookAtTarget && Menu::getInstance()->isOptionChecked(MenuOption::FocusIndicators)) {
const float LOOK_AT_INDICATOR_RADIUS = 0.03f; const float LOOK_AT_INDICATOR_RADIUS = 0.03f;
const float LOOK_AT_INDICATOR_OFFSET = 0.22f; const float LOOK_AT_INDICATOR_OFFSET = 0.22f;
const float LOOK_AT_INDICATOR_COLOR[] = { 0.8f, 0.0f, 0.0f, 0.75f }; const float LOOK_AT_INDICATOR_COLOR[] = { 0.8f, 0.0f, 0.0f, 0.75f };