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

move overlays menu back

Browse source
This commit is contained in:
Dante Ruiz 2018-05-16 14:36:55 -07:00
parent 237b0d7483
commit 3be4b01d2c
5 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -5104,10 +5104,14 @@ void Application::updateThreads(float deltaTime) {
} }
} }
void Application::toggleOverlays() {} void Application::toggleOverlays() {
auto meu = Menu::getInstance();
menu->setIsOptionChecked(MenuOption::Overlays, !menu->isOptionChecked(menuOption::Overlays));
}
void Application::setOverlaysVisible(bool visible) { void Application::setOverlaysVisible(bool visible) {
_overlaysVisible = visible; auto menu = Menu::getInstance();
menu->setIsOptionChecked(MenuOption::Overlays, visible)
} }
void Application::centerUI() { void Application::centerUI() {

3
interface/src/Application.h
View file

@ -377,7 +377,6 @@ public slots:
void cameraMenuChanged(); void cameraMenuChanged();
void toggleOverlays(); void toggleOverlays();
void setOverlaysVisible(bool visible); void setOverlaysVisible(bool visible);
bool getOverlaysVisible() { return _overlaysVisible; };
Q_INVOKABLE void centerUI(); Q_INVOKABLE void centerUI();
void resetPhysicsReadyInformation(); void resetPhysicsReadyInformation();
@ -694,8 +693,6 @@ private:
bool _fakedMouseEvent { false }; bool _fakedMouseEvent { false };
bool _overlaysVisible { true };
void checkChangeCursor(); void checkChangeCursor();
mutable QMutex _changeCursorLock { QMutex::Recursive }; mutable QMutex _changeCursorLock { QMutex::Recursive };
Qt::CursorShape _desiredCursor{ Qt::BlankCursor }; Qt::CursorShape _desiredCursor{ Qt::BlankCursor };

2
interface/src/Menu.cpp
View file

@ -239,6 +239,8 @@ Menu::Menu() {
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView, addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
0, true, qApp, SLOT(rotationModeChanged())); 0, true, qApp, SLOT(rotationModeChanged()));
addCheckableActrionToQMenuActionHash(viewMenu, MenuOption::Overlays, 0, true);
// View > Enter First Person Mode in HMD // View > Enter First Person Mode in HMD
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true); addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true);

2
interface/src/ui/OverlayConductor.cpp
View file

@ -144,7 +144,7 @@ void OverlayConductor::update(float dt) {
} }
bool targetVisible = qApp->getOverlaysVisible() && (0 == (_flags & SuppressMask)); bool targetVisible = Menu::getInstance()->isOptionChecked(MenuOption::Overlays) && (0 == (_flags & SuppressMask));
if (targetVisible != currentVisible) { if (targetVisible != currentVisible) {
offscreenUi->setPinned(!targetVisible); offscreenUi->setPinned(!targetVisible);
} }

12
interface/src/ui/PreferencesDialog.cpp
View file

@ -58,18 +58,6 @@ void setupPreferences() {
preferences->addPreference(preference); preferences->addPreference(preference);
} }
static const QString MOUSE_SENSIVITY { "Mouse Sensivity" };
{
auto getterY = []()->float { return 1.0; };
auto setterY = [](float value) { };
preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look Y", getterY, setterY));
auto getterX = []()->float { return 1.0; };
auto setterX = [](float value) { };
preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look X", getterX, setterX));
auto getterSW = []()->float { return 1.0; };
auto setterSW = [](float value) { };
preferences->addPreference(new SliderPreference(MOUSE_SENSIVITY, "Mouse Look Zoom", getterSW, setterSW));
}
// Graphics quality // Graphics quality
static const QString GRAPHICS_QUALITY { "Graphics Quality" }; static const QString GRAPHICS_QUALITY { "Graphics Quality" };
{ {