Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates

interface/src/Application.cpp

@@ -3705,6 +3705,8 @@ void Application::keyPressEvent(QKeyEvent* event) {
                     Menu::getInstance()->triggerOption(MenuOption::Log);
                 } else if (isMeta) {
                     Menu::getInstance()->triggerOption(MenuOption::AddressBar);
+                } else if (isShifted) {
+                    Menu::getInstance()->triggerOption(MenuOption::LodTools);
                 }
                 break;
 
@@ -7527,6 +7529,17 @@ SharedSoundPointer Application::getSampleSound() const {
     return _sampleSound;
 }
 
+void Application::loadLODToolsDialog() {
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
+    if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) {
+        auto dialogsManager = DependencyManager::get<DialogsManager>();
+        dialogsManager->lodTools();
+    } else {
+        tablet->pushOntoStack("hifi/dialogs/TabletLODTools.qml");
+    }
+}
+
 void Application::loadEntityStatisticsDialog() {
     auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
     auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));

interface/src/Application.h

@@ -65,6 +65,7 @@
 #include "scripting/DialogsManagerScriptingInterface.h"
 #include "ui/ApplicationOverlay.h"
 #include "ui/EntityScriptServerLogDialog.h"
+#include "ui/LodToolsDialog.h"
 #include "ui/LogDialog.h"
 #include "ui/OctreeStatsDialog.h"
 #include "ui/OverlayConductor.h"
@@ -402,6 +403,7 @@ public slots:
 
     void addAssetToWorldMessageClose();
 
+    void loadLODToolsDialog();
     void loadEntityStatisticsDialog();
     void loadDomainConnectionDialog();
     void showScriptLogs();

interface/src/LODManager.cpp

@@ -122,7 +122,10 @@ void LODManager::autoAdjustLOD(float realTimeDelta) {
     }
 
     if (oldOctreeSizeScale != _octreeSizeScale) {
-        //TODO: check Preferences dialog
+        auto lodToolsDialog = DependencyManager::get<DialogsManager>()->getLodToolsDialog();
+        if (lodToolsDialog) {
+            lodToolsDialog->reloadSliders();
+        }
     }
 }
 

interface/src/Menu.cpp

@@ -479,6 +479,10 @@ Menu::Menu() {
         });
     }
 
+    // Developer > Render > LOD Tools
+    addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, 0,
+                                  qApp, SLOT(loadLODToolsDialog()));
+
     // HACK enable texture decimation
     {
         auto action = addCheckableActionToQMenuAndActionHash(renderOptionsMenu, "Decimate Textures");

interface/src/Menu.h

@@ -121,6 +121,7 @@ namespace MenuOption {
     const QString ActionMotorControl = "Enable Default Motor Control";
     const QString LoadScript = "Open and Run Script File...";
     const QString LoadScriptURL = "Open and Run Script from URL...";
+    const QString LodTools = "LOD Tools";
     const QString Login = "Login/Sign Up";
     const QString Log = "Log";
     const QString LogExtraTimings = "Log Extra Timing Details";

interface/src/ui/DialogsManager.cpp

@@ -23,6 +23,7 @@
 #include "ConnectionFailureDialog.h"
 #include "DomainConnectionDialog.h"
 #include "HMDToolsDialog.h"
+#include "LodToolsDialog.h"
 #include "LoginDialog.h"
 #include "OctreeStatsDialog.h"
 #include "PreferencesDialog.h"
@@ -125,6 +126,16 @@ void DialogsManager::octreeStatsDetails() {
     _octreeStatsDialog->raise();
 }
 
+void DialogsManager::lodTools() {
+    if (!_lodToolsDialog) {
+        maybeCreateDialog(_lodToolsDialog);
+
+        connect(_lodToolsDialog, SIGNAL(closed()), _lodToolsDialog, SLOT(deleteLater()));
+        _lodToolsDialog->show();
+    }
+    _lodToolsDialog->raise();
+}
+
 void DialogsManager::hmdTools(bool showTools) {
     if (showTools) {
         if (!_hmdToolsDialog) {

interface/src/ui/DialogsManager.h

@@ -22,6 +22,7 @@
 class AnimationsDialog;
 class AttachmentsDialog;
 class CachesSizeDialog;
+class LodToolsDialog;
 class OctreeStatsDialog;
 class ScriptEditorWindow;
 class TestingDialog;
@@ -34,6 +35,7 @@ class DialogsManager : public QObject, public Dependency {
 
 public:
     QPointer<HMDToolsDialog> getHMDToolsDialog() const { return _hmdToolsDialog; }
+    QPointer<LodToolsDialog> getLodToolsDialog() const { return _lodToolsDialog; }
     QPointer<OctreeStatsDialog> getOctreeStatsDialog() const { return _octreeStatsDialog; }
     QPointer<TestingDialog> getTestingDialog() const { return _testingDialog; }
     void emitAddressBarShown(bool visible) { emit addressBarShown(visible); }
@@ -47,6 +49,7 @@ public slots:
     void toggleLoginDialog();
     void showLoginDialog();
     void octreeStatsDetails();
+    void lodTools();
     void hmdTools(bool showTools);
     void showDomainConnectionDialog();
     void showTestingResults();
@@ -73,6 +76,7 @@ private:
     QPointer<CachesSizeDialog> _cachesSizeDialog;
     QPointer<QMessageBox> _ircInfoBox;
     QPointer<HMDToolsDialog> _hmdToolsDialog;
+    QPointer<LodToolsDialog> _lodToolsDialog;
     QPointer<OctreeStatsDialog> _octreeStatsDialog;
     QPointer<TestingDialog> _testingDialog;
     QPointer<DomainConnectionDialog> _domainConnectionDialog;

interface/src/ui/HMDToolsDialog.cpp

@@ -83,7 +83,10 @@ HMDToolsDialog::HMDToolsDialog(QWidget* parent) :
     if (dialogsManager->getOctreeStatsDialog()) {
         watchWindow(dialogsManager->getOctreeStatsDialog()->windowHandle());
     }
-    
+    if (dialogsManager->getLodToolsDialog()) {
+        watchWindow(dialogsManager->getLodToolsDialog()->windowHandle());
+    }
+
     connect(_switchModeButton, &QPushButton::clicked, [this]{
         toggleHMDMode();
     });

interface/src/ui/LodToolsDialog.cpp

@@ -0,0 +1,132 @@
+//
+//  LodToolsDialog.cpp
+//  interface/src/ui
+//
+//  Created by Brad Hefta-Gaub on 7/19/13.
+//  Copyright 2013 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "LodToolsDialog.h"
+
+#include <QCheckBox>
+#include <QColor>
+#include <QDialogButtonBox>
+#include <QDoubleSpinBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QPalette>
+#include <QPushButton>
+#include <QSlider>
+#include <QString>
+
+#include <LODManager.h>
+
+#include "Menu.h"
+
+
+LodToolsDialog::LodToolsDialog(QWidget* parent) :
+    QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint) 
+{
+    this->setWindowTitle("LOD Tools");
+    auto lodManager = DependencyManager::get<LODManager>();
+
+    // Create layouter
+    QFormLayout* form = new QFormLayout(this);
+
+    // Create a label with feedback...
+    _feedback = new QLabel(this);
+    QPalette palette = _feedback->palette();
+    const unsigned redish  = 0xfff00000;
+    palette.setColor(QPalette::WindowText, QColor::fromRgb(redish));
+    _feedback->setPalette(palette);
+    _feedback->setText(lodManager->getLODFeedbackText());
+    const int FEEDBACK_WIDTH = 350;
+    _feedback->setFixedWidth(FEEDBACK_WIDTH);
+    form->addRow("You can see... ", _feedback);
+
+    form->addRow("Manually Adjust Level of Detail:", _manualLODAdjust = new QCheckBox(this));
+    _manualLODAdjust->setChecked(!lodManager->getAutomaticLODAdjust());
+    connect(_manualLODAdjust, SIGNAL(toggled(bool)), SLOT(updateAutomaticLODAdjust()));
+    
+    _lodSize = new QSlider(Qt::Horizontal, this);
+    const int MAX_LOD_SIZE = 2000; // ~20:4 vision -- really good.
+    const int MIN_LOD_SIZE = 5; // ~20:1600 vision -- really bad!
+    const int STEP_LOD_SIZE = 1;
+    const int PAGE_STEP_LOD_SIZE = 100;
+    const int SLIDER_WIDTH = 300;
+    _lodSize->setMaximum(MAX_LOD_SIZE);
+    _lodSize->setMinimum(MIN_LOD_SIZE);
+    _lodSize->setSingleStep(STEP_LOD_SIZE);
+    _lodSize->setTickInterval(PAGE_STEP_LOD_SIZE);
+    _lodSize->setTickPosition(QSlider::TicksBelow);
+    _lodSize->setFixedWidth(SLIDER_WIDTH);
+    _lodSize->setPageStep(PAGE_STEP_LOD_SIZE);
+    int sliderValue = lodManager->getOctreeSizeScale() / TREE_SCALE;
+    _lodSize->setValue(sliderValue);
+    form->addRow("Level of Detail:", _lodSize);
+    connect(_lodSize,SIGNAL(valueChanged(int)),this,SLOT(sizeScaleValueChanged(int)));
+    
+    // Add a button to reset
+    QPushButton* resetButton = new QPushButton("Reset", this);
+    form->addRow("", resetButton);
+    connect(resetButton, SIGNAL(clicked(bool)), this, SLOT(resetClicked(bool)));
+
+    this->QDialog::setLayout(form);
+    
+    updateAutomaticLODAdjust();
+}
+
+void LodToolsDialog::reloadSliders() {
+    auto lodManager = DependencyManager::get<LODManager>();
+    _lodSize->setValue(lodManager->getOctreeSizeScale() / TREE_SCALE);
+    _feedback->setText(lodManager->getLODFeedbackText());
+}
+
+void LodToolsDialog::updateAutomaticLODAdjust() {
+    auto lodManager = DependencyManager::get<LODManager>();
+    lodManager->setAutomaticLODAdjust(!_manualLODAdjust->isChecked());
+    _lodSize->setEnabled(_manualLODAdjust->isChecked());
+}
+
+void LodToolsDialog::sizeScaleValueChanged(int value) {
+    auto lodManager = DependencyManager::get<LODManager>();
+    float realValue = value * TREE_SCALE;
+    lodManager->setOctreeSizeScale(realValue);
+    
+    _feedback->setText(lodManager->getLODFeedbackText());
+}
+
+void LodToolsDialog::resetClicked(bool checked) {
+
+    int sliderValue = DEFAULT_OCTREE_SIZE_SCALE / TREE_SCALE;
+    _lodSize->setValue(sliderValue);
+    _manualLODAdjust->setChecked(false);
+    
+    updateAutomaticLODAdjust(); // tell our LOD manager about the reset
+}
+
+void LodToolsDialog::reject() {
+    // Just regularly close upon ESC
+    this->QDialog::close();
+}
+
+void LodToolsDialog::closeEvent(QCloseEvent* event) {
+    this->QDialog::closeEvent(event);
+    emit closed();
+    
+#if RESET_TO_AUTOMATIC_WHEN_YOU_CLOSE_THE_DIALOG_BOX
+    auto lodManager = DependencyManager::get<LODManager>();
+    
+    // always revert back to automatic LOD adjustment when closed
+    lodManager->setAutomaticLODAdjust(true); 
+
+    // if the user adjusted the LOD above "normal" then always revert back to default
+    if (lodManager->getOctreeSizeScale() > DEFAULT_OCTREE_SIZE_SCALE) {
+        lodManager->setOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE);
+    }
+#endif
+}
+

interface/src/ui/LodToolsDialog.h

@@ -0,0 +1,55 @@
+//
+//  LodToolsDialog.h
+//  interface/src/ui
+//
+//  Created by Brad Hefta-Gaub on 7/19/13.
+//  Copyright 2013 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_LodToolsDialog_h
+#define hifi_LodToolsDialog_h
+
+#include <QDialog>
+
+class QCheckBox;
+class QDoubleSpinBox;
+class QLabel;
+class QSlider;
+
+class LodToolsDialog : public QDialog {
+    Q_OBJECT
+public:
+    // Sets up the UI
+    LodToolsDialog(QWidget* parent);
+
+signals:
+    void closed();
+
+public slots:
+    void reject() override;
+    void sizeScaleValueChanged(int value);
+    void resetClicked(bool checked);
+    void reloadSliders();
+    void updateAutomaticLODAdjust();
+
+protected:
+
+    // Emits a 'closed' signal when this dialog is closed.
+    void closeEvent(QCloseEvent* event) override;
+
+private:
+    QSlider* _lodSize;
+
+    QCheckBox* _manualLODAdjust;
+
+    QDoubleSpinBox* _desktopLODDecreaseFPS;
+
+    QDoubleSpinBox* _hmdLODDecreaseFPS;
+
+    QLabel* _feedback;
+};
+
+#endif // hifi_LodToolsDialog_h