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

having stats mirror master

Browse source
This commit is contained in:
Wayne Chen 2018-12-11 19:29:17 -08:00
parent 4b8200d5bb
commit dbebf1a67f
3 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -5196,7 +5196,6 @@ void Application::pauseUntilLoginDetermined() {
menu->getMenu("Navigate")->setVisible(false); menu->getMenu("Navigate")->setVisible(false);
menu->getMenu("Settings")->setVisible(false); menu->getMenu("Settings")->setVisible(false);
_developerMenuVisible = menu->getMenu("Developer")->isVisible(); _developerMenuVisible = menu->getMenu("Developer")->isVisible();
_showStatsEnabled = menu->isOptionChecked(MenuOption::Stats);
menu->setIsOptionChecked(MenuOption::Stats, false); menu->setIsOptionChecked(MenuOption::Stats, false);
if (_developerMenuVisible) { if (_developerMenuVisible) {
menu->getMenu("Developer")->setVisible(false); menu->getMenu("Developer")->setVisible(false);
@ -5285,7 +5284,6 @@ void Application::resumeAfterLoginDialogActionTaken() {
menu->getMenu("Navigate")->setVisible(true); menu->getMenu("Navigate")->setVisible(true);
menu->getMenu("Settings")->setVisible(true); menu->getMenu("Settings")->setVisible(true);
menu->getMenu("Developer")->setVisible(_developerMenuVisible); menu->getMenu("Developer")->setVisible(_developerMenuVisible);
menu->setIsOptionChecked(MenuOption::Stats, _showStatsEnabled);
_myCamera.setMode(_previousCameraMode); _myCamera.setMode(_previousCameraMode);
cameraModeChanged(); cameraModeChanged();
} }

1
interface/src/Application.h
View file

@ -688,7 +688,6 @@ private:
int _maxOctreePPS = DEFAULT_MAX_OCTREE_PPS; int _maxOctreePPS = DEFAULT_MAX_OCTREE_PPS;
bool _interstitialModeEnabled{ false }; bool _interstitialModeEnabled{ false };
bool _showStatsEnabled{ false };
bool _loginDialogPoppedUp = false; bool _loginDialogPoppedUp = false;
// if visible before login popped up. // if visible before login popped up.

2
interface/src/Menu.cpp
View file

@ -806,7 +806,7 @@ Menu::Menu() {
connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); }); connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });
// Developer > Show Statistics // Developer > Show Statistics
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats); addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats, 0, true);
// Developer > Show Animation Statistics // Developer > Show Animation Statistics
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::AnimStats); addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::AnimStats);