Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 01:29:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

adding back overlay menu and avatar size

Browse source
This commit is contained in:
Dante Ruiz 2018-05-16 13:48:29 -07:00
parent 37c51a7246
commit fbc3d97af3
5 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -5107,7 +5107,7 @@ void Application::updateThreads(float deltaTime) {
void Application::toggleOverlays() {}
void Application::setOverlaysVisible(bool visible) {
Q_UNUSED(visible)
_overlaysVisible = visible;
}
void Application::centerUI() {

3
interface/src/Application.h
View file

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

26
interface/src/Menu.cpp
View file

@ -146,6 +146,32 @@ Menu::Menu() {
auto avatarManager = DependencyManager::get<AvatarManager>();
auto avatar = avatarManager->getMyAvatar();
// Avatar > Size
MenuWrapper* avatarSizeMenu = avatarMenu->addMenu("Size");
// Avatar > Size > Increase
addActionToQMenuAndActionHash(avatarSizeMenu,
MenuOption::IncreaseAvatarSize,
0, // QML Qt::Key_Plus,
avatar.get(), SLOT(increaseSize()));
// Avatar > Size > Decrease
addActionToQMenuAndActionHash(avatarSizeMenu,
MenuOption::DecreaseAvatarSize,
0, // QML Qt::Key_Minus,
avatar.get(), SLOT(decreaseSize()));
// Avatar > Size > Reset
addActionToQMenuAndActionHash(avatarSizeMenu,
MenuOption::ResetAvatarSize,
0, // QML Qt::Key_Equal,
avatar.get(), SLOT(resetSize()));
// Avatar > Reset Sensors
addActionToQMenuAndActionHash(avatarMenu,
MenuOption::ResetSensors,
0, // QML Qt::Key_Apostrophe,
qApp, SLOT(resetSensors()));
// Avatar > Attachments...
action = addActionToQMenuAndActionHash(avatarMenu, MenuOption::Attachments);
connect(action, &QAction::triggered, [] {

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

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

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

@ -146,6 +146,18 @@ void setupPreferences() {
preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use reticle cursor instead of arrow", getter, setter));
}
{
auto getter = [=]()->bool { return myAvatar->getClearOverlayWhenMoving(); };
auto setter = [=](bool value) { myAvatar->setClearOverlayWhenMoving(value); };
preferences->addPreference(new CheckPreference(UI_CATEGORY, "Clear overlays when moving", getter, setter));
}
{
auto getter = [=]()->bool { return qApp->getOverlaysVisible(); };
auto setter = [=](bool value) { qApp->setOverlaysVisible(value); };
preferences->addPreference(new CheckPreference(UI_CATEGORY, "Show Overlays", getter, setter));
}
static const QString VIEW_CATEGORY{ "View" };
{
auto getter = [=]()->float { return myAvatar->getRealWorldFieldOfView(); };