mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 20:23:06 +02:00
Merge pull request #12227 from ZappoMan/sendDataDescription
some settings cleanup
This commit is contained in:
commit
289356dfe7
9 changed files with 95 additions and 78 deletions
|
@ -0,0 +1,29 @@
|
||||||
|
//
|
||||||
|
// AdvancedPreferencesDialog.qml
|
||||||
|
//
|
||||||
|
// Created by Brad Hefta-Gaub on 20 Jan 2018
|
||||||
|
// Copyright 2018 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
|
||||||
|
//
|
||||||
|
|
||||||
|
import QtQuick 2.5
|
||||||
|
import Qt.labs.settings 1.0
|
||||||
|
|
||||||
|
import "../../dialogs"
|
||||||
|
|
||||||
|
PreferencesDialog {
|
||||||
|
id: root
|
||||||
|
objectName: "AdvancedPreferencesDialog"
|
||||||
|
title: "Advanced Settings"
|
||||||
|
showCategories: ["Advanced UI" ]
|
||||||
|
property var settings: Settings {
|
||||||
|
category: root.objectName
|
||||||
|
property alias x: root.x
|
||||||
|
property alias y: root.y
|
||||||
|
property alias width: root.width
|
||||||
|
property alias height: root.height
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ PreferencesDialog {
|
||||||
id: root
|
id: root
|
||||||
objectName: "GeneralPreferencesDialog"
|
objectName: "GeneralPreferencesDialog"
|
||||||
title: "General Settings"
|
title: "General Settings"
|
||||||
showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Game Controller", "Sixense Controllers", "Perception Neuron", "Kinect", "Leap Motion"]
|
showCategories: ["UI", "Snapshots", "Privacy", "HMD", "Game Controller", "Sixense Controllers", "Perception Neuron", "Kinect", "Leap Motion"]
|
||||||
property var settings: Settings {
|
property var settings: Settings {
|
||||||
category: root.objectName
|
category: root.objectName
|
||||||
property alias x: root.x
|
property alias x: root.x
|
||||||
|
|
|
@ -1436,8 +1436,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
|
||||||
userInputMapper->registerDevice(_touchscreenDevice->getInputDevice());
|
userInputMapper->registerDevice(_touchscreenDevice->getInputDevice());
|
||||||
}
|
}
|
||||||
|
|
||||||
// force the model the look at the correct directory (weird order of operations issue)
|
// this will force the model the look at the correct directory (weird order of operations issue)
|
||||||
scriptEngines->setScriptsLocation(scriptEngines->getScriptsLocation());
|
scriptEngines->reloadLocalFiles();
|
||||||
|
|
||||||
// do this as late as possible so that all required subsystems are initialized
|
// do this as late as possible so that all required subsystems are initialized
|
||||||
// If we've overridden the default scripts location, just load default scripts
|
// If we've overridden the default scripts location, just load default scripts
|
||||||
// otherwise, load 'em all
|
// otherwise, load 'em all
|
||||||
|
|
|
@ -756,6 +756,13 @@ Menu::Menu() {
|
||||||
// Developer > Stats
|
// Developer > Stats
|
||||||
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats);
|
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats);
|
||||||
|
|
||||||
|
// Developer > Advanced Settings...
|
||||||
|
action = addActionToQMenuAndActionHash(developerMenu, "Advanced Preferences...");
|
||||||
|
connect(action, &QAction::triggered, [] {
|
||||||
|
qApp->showDialog(QString("hifi/dialogs/AdvancedPreferencesDialog.qml"),
|
||||||
|
QString("hifi/tablet/AdvancedPreferencesDialog.qml"), "AdvancedPreferencesDialog");
|
||||||
|
});
|
||||||
|
|
||||||
// Developer > API Debugger
|
// Developer > API Debugger
|
||||||
action = addActionToQMenuAndActionHash(developerMenu, "API Debugger");
|
action = addActionToQMenuAndActionHash(developerMenu, "API Debugger");
|
||||||
connect(action, &QAction::triggered, [] {
|
connect(action, &QAction::triggered, [] {
|
||||||
|
|
|
@ -82,19 +82,42 @@ void setupPreferences() {
|
||||||
preference->setMax(500);
|
preference->setMax(500);
|
||||||
preferences->addPreference(preference);
|
preferences->addPreference(preference);
|
||||||
}
|
}
|
||||||
{
|
|
||||||
auto getter = []()->float { return qApp->getDesktopTabletScale(); };
|
|
||||||
auto setter = [](float value) { qApp->setDesktopTabletScale(value); };
|
|
||||||
auto preference = new SpinnerPreference(UI_CATEGORY, "Desktop Tablet Scale %", getter, setter);
|
|
||||||
preference->setMin(20);
|
|
||||||
preference->setMax(500);
|
|
||||||
preferences->addPreference(preference);
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
auto getter = []()->bool { return qApp->getPreferStylusOverLaser(); };
|
auto getter = []()->bool { return qApp->getPreferStylusOverLaser(); };
|
||||||
auto setter = [](bool value) { qApp->setPreferStylusOverLaser(value); };
|
auto setter = [](bool value) { qApp->setPreferStylusOverLaser(value); };
|
||||||
preferences->addPreference(new CheckPreference(UI_CATEGORY, "Prefer Stylus Over Laser", getter, setter));
|
preferences->addPreference(new CheckPreference(UI_CATEGORY, "Prefer Stylus Over Laser", getter, setter));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const QString ADVANCED_UI_CATEGORY { "Advanced UI" };
|
||||||
|
{
|
||||||
|
auto getter = []()->float { return qApp->getDesktopTabletScale(); };
|
||||||
|
auto setter = [](float value) { qApp->setDesktopTabletScale(value); };
|
||||||
|
auto preference = new SpinnerPreference(ADVANCED_UI_CATEGORY, "Desktop Tablet Scale %", getter, setter);
|
||||||
|
preference->setMin(20);
|
||||||
|
preference->setMax(500);
|
||||||
|
preferences->addPreference(preference);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
auto getter = [=]()->float { return myAvatar->getRealWorldFieldOfView(); };
|
||||||
|
auto setter = [=](float value) { myAvatar->setRealWorldFieldOfView(value); };
|
||||||
|
auto preference = new SpinnerPreference(ADVANCED_UI_CATEGORY, "Real world vertical field of view (angular size of monitor)", getter, setter);
|
||||||
|
preference->setMin(1);
|
||||||
|
preference->setMax(180);
|
||||||
|
preferences->addPreference(preference);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
auto getter = []()->float { return qApp->getFieldOfView(); };
|
||||||
|
auto setter = [](float value) { qApp->setFieldOfView(value); };
|
||||||
|
auto preference = new SpinnerPreference(ADVANCED_UI_CATEGORY, "Vertical field of view", getter, setter);
|
||||||
|
preference->setMin(1);
|
||||||
|
preference->setMax(180);
|
||||||
|
preference->setStep(1);
|
||||||
|
preferences->addPreference(preference);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// FIXME: Remove setting completely or make available through JavaScript API?
|
// FIXME: Remove setting completely or make available through JavaScript API?
|
||||||
/*
|
/*
|
||||||
{
|
{
|
||||||
|
@ -128,21 +151,13 @@ void setupPreferences() {
|
||||||
preferences->addPreference(preference);
|
preferences->addPreference(preference);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scripts
|
|
||||||
{
|
|
||||||
auto getter = []()->QString { return DependencyManager::get<ScriptEngines>()->getScriptsLocation(); };
|
|
||||||
auto setter = [](const QString& value) { DependencyManager::get<ScriptEngines>()->setScriptsLocation(value); };
|
|
||||||
preferences->addPreference(new BrowsePreference("Scripts", "Load scripts from this directory", getter, setter));
|
|
||||||
}
|
|
||||||
|
|
||||||
preferences->addPreference(new ButtonPreference("Scripts", "Load Default Scripts", [] {
|
|
||||||
DependencyManager::get<ScriptEngines>()->loadDefaultScripts();
|
|
||||||
}));
|
|
||||||
|
|
||||||
{
|
{
|
||||||
auto getter = []()->bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger); };
|
auto getter = []()->bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger); };
|
||||||
auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableActivityLogger, !value); };
|
auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableActivityLogger, !value); };
|
||||||
preferences->addPreference(new CheckPreference("Privacy", "Send data", getter, setter));
|
preferences->addPreference(new CheckPreference("Privacy", "Send data - High Fidelity uses information provided by your "
|
||||||
|
"client to improve the product through the logging of errors, tracking of usage patterns, "
|
||||||
|
"installation and system details, and crash events. By allowing High Fidelity to collect "
|
||||||
|
"this information you are helping to improve the product. ", getter, setter));
|
||||||
}
|
}
|
||||||
|
|
||||||
static const QString LOD_TUNING("Level of Detail Tuning");
|
static const QString LOD_TUNING("Level of Detail Tuning");
|
||||||
|
@ -167,23 +182,6 @@ void setupPreferences() {
|
||||||
}
|
}
|
||||||
|
|
||||||
static const QString AVATAR_TUNING { "Avatar Tuning" };
|
static const QString AVATAR_TUNING { "Avatar Tuning" };
|
||||||
{
|
|
||||||
auto getter = [=]()->float { return myAvatar->getRealWorldFieldOfView(); };
|
|
||||||
auto setter = [=](float value) { myAvatar->setRealWorldFieldOfView(value); };
|
|
||||||
auto preference = new SpinnerPreference(AVATAR_TUNING, "Real world vertical field of view (angular size of monitor)", getter, setter);
|
|
||||||
preference->setMin(1);
|
|
||||||
preference->setMax(180);
|
|
||||||
preferences->addPreference(preference);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
auto getter = []()->float { return qApp->getFieldOfView(); };
|
|
||||||
auto setter = [](float value) { qApp->setFieldOfView(value); };
|
|
||||||
auto preference = new SpinnerPreference(AVATAR_TUNING, "Vertical field of view", getter, setter);
|
|
||||||
preference->setMin(1);
|
|
||||||
preference->setMax(180);
|
|
||||||
preference->setStep(1);
|
|
||||||
preferences->addPreference(preference);
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
auto getter = [=]()->QString { return myAvatar->getDominantHand(); };
|
auto getter = [=]()->QString { return myAvatar->getDominantHand(); };
|
||||||
auto setter = [=](const QString& value) { myAvatar->setDominantHand(value); };
|
auto setter = [=](const QString& value) { myAvatar->setDominantHand(value); };
|
||||||
|
@ -297,26 +295,6 @@ void setupPreferences() {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
{
|
|
||||||
auto getter = []()->float { return qApp->getMaxOctreePacketsPerSecond(); };
|
|
||||||
auto setter = [](float value) { qApp->setMaxOctreePacketsPerSecond(value); };
|
|
||||||
auto preference = new SpinnerPreference("Octree", "Max packets sent each second", getter, setter);
|
|
||||||
preference->setMin(60);
|
|
||||||
preference->setMax(6000);
|
|
||||||
preference->setStep(10);
|
|
||||||
preferences->addPreference(preference);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
{
|
|
||||||
auto getter = []()->float { return qApp->getApplicationCompositor().getHmdUIAngularSize(); };
|
|
||||||
auto setter = [](float value) { qApp->getApplicationCompositor().setHmdUIAngularSize(value); };
|
|
||||||
auto preference = new SpinnerPreference("HMD", "UI horizontal angular size (degrees)", getter, setter);
|
|
||||||
preference->setMin(30);
|
|
||||||
preference->setMax(160);
|
|
||||||
preference->setStep(1);
|
|
||||||
preferences->addPreference(preference);
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
{
|
||||||
static const QString RENDER("Graphics");
|
static const QString RENDER("Graphics");
|
||||||
|
@ -342,7 +320,7 @@ void setupPreferences() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
static const QString RENDER("Networking");
|
static const QString NETWORKING("Networking");
|
||||||
|
|
||||||
auto nodelist = DependencyManager::get<NodeList>();
|
auto nodelist = DependencyManager::get<NodeList>();
|
||||||
{
|
{
|
||||||
|
@ -350,10 +328,21 @@ void setupPreferences() {
|
||||||
static const int MAX_PORT_NUMBER { 65535 };
|
static const int MAX_PORT_NUMBER { 65535 };
|
||||||
auto getter = [nodelist] { return static_cast<int>(nodelist->getSocketLocalPort()); };
|
auto getter = [nodelist] { return static_cast<int>(nodelist->getSocketLocalPort()); };
|
||||||
auto setter = [nodelist](int preset) { nodelist->setSocketLocalPort(static_cast<quint16>(preset)); };
|
auto setter = [nodelist](int preset) { nodelist->setSocketLocalPort(static_cast<quint16>(preset)); };
|
||||||
auto preference = new IntSpinnerPreference(RENDER, "Listening Port", getter, setter);
|
auto preference = new IntSpinnerPreference(NETWORKING, "Listening Port", getter, setter);
|
||||||
preference->setMin(MIN_PORT_NUMBER);
|
preference->setMin(MIN_PORT_NUMBER);
|
||||||
preference->setMax(MAX_PORT_NUMBER);
|
preference->setMax(MAX_PORT_NUMBER);
|
||||||
preferences->addPreference(preference);
|
preferences->addPreference(preference);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
auto getter = []()->float { return qApp->getMaxOctreePacketsPerSecond(); };
|
||||||
|
auto setter = [](float value) { qApp->setMaxOctreePacketsPerSecond(value); };
|
||||||
|
auto preference = new SpinnerPreference(NETWORKING, "Max entities packets sent each second", getter, setter);
|
||||||
|
preference->setMin(60);
|
||||||
|
preference->setMax(6000);
|
||||||
|
preference->setStep(10);
|
||||||
|
preferences->addPreference(preference);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,8 +53,6 @@ public:
|
||||||
|
|
||||||
bool calculateRayUICollisionPoint(const glm::vec3& position, const glm::vec3& direction, glm::vec3& result) const;
|
bool calculateRayUICollisionPoint(const glm::vec3& position, const glm::vec3& direction, glm::vec3& result) const;
|
||||||
|
|
||||||
float getHmdUIAngularSize() const { return _hmdUIAngularSize; }
|
|
||||||
void setHmdUIAngularSize(float hmdUIAngularSize) { _hmdUIAngularSize = hmdUIAngularSize; }
|
|
||||||
bool isHMD() const;
|
bool isHMD() const;
|
||||||
bool fakeEventActive() const { return _fakeMouseEvent; }
|
bool fakeEventActive() const { return _fakeMouseEvent; }
|
||||||
|
|
||||||
|
@ -139,7 +137,6 @@ private:
|
||||||
//quint64 _hoverItemEnterUsecs { 0 };
|
//quint64 _hoverItemEnterUsecs { 0 };
|
||||||
|
|
||||||
bool _isOverDesktop { true };
|
bool _isOverDesktop { true };
|
||||||
float _hmdUIAngularSize { glm::degrees(VIRTUAL_UI_TARGET_FOV.y) };
|
|
||||||
float _textureFov { VIRTUAL_UI_TARGET_FOV.y };
|
float _textureFov { VIRTUAL_UI_TARGET_FOV.y };
|
||||||
float _textureAspectRatio { VIRTUAL_UI_ASPECT_RATIO };
|
float _textureAspectRatio { VIRTUAL_UI_ASPECT_RATIO };
|
||||||
|
|
||||||
|
|
|
@ -62,8 +62,7 @@ void ScriptEngines::onErrorLoadingScript(const QString& url) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ScriptEngines::ScriptEngines(ScriptEngine::Context context)
|
ScriptEngines::ScriptEngines(ScriptEngine::Context context)
|
||||||
: _context(context),
|
: _context(context)
|
||||||
_scriptsLocationHandle("scriptsLocation", DESKTOP_LOCATION)
|
|
||||||
{
|
{
|
||||||
_scriptsModelFilter.setSourceModel(&_scriptsModel);
|
_scriptsModelFilter.setSourceModel(&_scriptsModel);
|
||||||
_scriptsModelFilter.sort(0, Qt::AscendingOrder);
|
_scriptsModelFilter.sort(0, Qt::AscendingOrder);
|
||||||
|
@ -429,13 +428,8 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) {
|
||||||
return stoppedScript;
|
return stoppedScript;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString ScriptEngines::getScriptsLocation() const {
|
void ScriptEngines::reloadLocalFiles() {
|
||||||
return _scriptsLocationHandle.get();
|
_scriptsModel.reloadLocalFiles();
|
||||||
}
|
|
||||||
|
|
||||||
void ScriptEngines::setScriptsLocation(const QString& scriptsLocation) {
|
|
||||||
_scriptsLocationHandle.set(scriptsLocation);
|
|
||||||
_scriptsModel.updateScriptsLocation(scriptsLocation);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScriptEngines::reloadAllScripts() {
|
void ScriptEngines::reloadAllScripts() {
|
||||||
|
|
|
@ -45,9 +45,9 @@ public:
|
||||||
QString getDebugScriptUrl() { return _debugScriptUrl; };
|
QString getDebugScriptUrl() { return _debugScriptUrl; };
|
||||||
void setDebugScriptUrl(const QString& url) { _debugScriptUrl = url; };
|
void setDebugScriptUrl(const QString& url) { _debugScriptUrl = url; };
|
||||||
|
|
||||||
QString getScriptsLocation() const;
|
|
||||||
void loadDefaultScripts();
|
void loadDefaultScripts();
|
||||||
void setScriptsLocation(const QString& scriptsLocation);
|
void reloadLocalFiles();
|
||||||
|
|
||||||
QStringList getRunningScripts();
|
QStringList getRunningScripts();
|
||||||
ScriptEnginePointer getScriptEngine(const QUrl& scriptHash);
|
ScriptEnginePointer getScriptEngine(const QUrl& scriptHash);
|
||||||
|
|
||||||
|
@ -115,7 +115,6 @@ protected:
|
||||||
QSet<ScriptEnginePointer> _allKnownScriptEngines;
|
QSet<ScriptEnginePointer> _allKnownScriptEngines;
|
||||||
QMutex _allScriptsMutex;
|
QMutex _allScriptsMutex;
|
||||||
std::list<ScriptInitializer> _scriptInitializers;
|
std::list<ScriptInitializer> _scriptInitializers;
|
||||||
mutable Setting::Handle<QString> _scriptsLocationHandle;
|
|
||||||
ScriptsModel _scriptsModel;
|
ScriptsModel _scriptsModel;
|
||||||
ScriptsModelFilter _scriptsModelFilter;
|
ScriptsModelFilter _scriptsModelFilter;
|
||||||
std::atomic<bool> _isStopped { false };
|
std::atomic<bool> _isStopped { false };
|
||||||
|
|
|
@ -100,6 +100,7 @@ QVariant ScriptsModel::data(const QModelIndex& index, int role) const {
|
||||||
return QVariant();
|
return QVariant();
|
||||||
}
|
}
|
||||||
if (node->getType() == TREE_NODE_TYPE_SCRIPT) {
|
if (node->getType() == TREE_NODE_TYPE_SCRIPT) {
|
||||||
|
|
||||||
TreeNodeScript* script = static_cast<TreeNodeScript*>(node);
|
TreeNodeScript* script = static_cast<TreeNodeScript*>(node);
|
||||||
if (role == Qt::DisplayRole) {
|
if (role == Qt::DisplayRole) {
|
||||||
return QVariant(script->getName() + (script->getOrigin() == SCRIPT_ORIGIN_LOCAL ? " (local)" : ""));
|
return QVariant(script->getName() + (script->getOrigin() == SCRIPT_ORIGIN_LOCAL ? " (local)" : ""));
|
||||||
|
@ -133,7 +134,6 @@ void ScriptsModel::updateScriptsLocation(const QString& newPath) {
|
||||||
_fsWatcher.addPath(_localDirectory.absolutePath());
|
_fsWatcher.addPath(_localDirectory.absolutePath());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
reloadLocalFiles();
|
reloadLocalFiles();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -305,6 +305,7 @@ void ScriptsModel::rebuildTree() {
|
||||||
_treeNodes.removeAt(i);
|
_treeNodes.removeAt(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QHash<QString, TreeNodeFolder*> folders;
|
QHash<QString, TreeNodeFolder*> folders;
|
||||||
for (int i = 0; i < _treeNodes.size(); i++) {
|
for (int i = 0; i < _treeNodes.size(); i++) {
|
||||||
TreeNodeBase* node = _treeNodes.at(i);
|
TreeNodeBase* node = _treeNodes.at(i);
|
||||||
|
|
Loading…
Reference in a new issue