From 64534913af8edf5e7eeb07b9990508b036be1963 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 13:59:18 -0700 Subject: [PATCH] more vs changes udo --- interface/src/ui/PreferencesDialog.cpp | 101 ++++++++++++------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index a13d19741d..65595bac95 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -32,7 +32,7 @@ void setupPreferences() { auto myAvatar = DependencyManager::get()->getMyAvatar(); static const QString AVATAR_BASICS{ "Avatar Basics" }; { - auto getter = [myAvatar]() -> QString { return myAvatar->getDisplayName(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getDisplayName(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDisplayName(value); }; auto preference = new EditPreference(AVATAR_BASICS, "Avatar display name (optional)", getter, setter); preference->setPlaceholderText("Not showing a name"); @@ -40,7 +40,7 @@ void setupPreferences() { } { - auto getter = [myAvatar]() -> QString { return myAvatar->getCollisionSoundURL(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getCollisionSoundURL(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setCollisionSoundURL(value); }; auto preference = new EditPreference(AVATAR_BASICS, "Avatar collision sound URL (optional)", getter, setter); preference->setPlaceholderText("Enter the URL of a sound to play when you bump into something"); @@ -48,7 +48,7 @@ void setupPreferences() { } { - auto getter = [myAvatar]() -> QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); }; auto setter = [myAvatar](const QString& value) { myAvatar->useFullAvatarURL(value, ""); qApp->clearAvatarOverrideUrl(); }; auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance", getter, setter); preferences->addPreference(preference); @@ -71,7 +71,7 @@ void setupPreferences() { wodSlider->setStep(0.25f); preferences->addPreference(wodSlider); - auto getterShadow = []() -> bool { + auto getterShadow = []()->bool { auto menu = Menu::getInstance(); return menu->isOptionChecked(MenuOption::Shadows); }; @@ -83,15 +83,14 @@ void setupPreferences() { } { - auto getter = []() -> QString { + auto getter = []()->QString { RefreshRateManager::RefreshRateProfile refreshRateProfile = qApp->getRefreshRateManager().getRefreshRateProfile(); return QString::fromStdString(RefreshRateManager::refreshRateProfileToString(refreshRateProfile)); }; auto setter = [](QString value) { std::string profileName = value.toStdString(); - RefreshRateManager::RefreshRateProfile refreshRateProfile = - RefreshRateManager::refreshRateProfileFromString(profileName); + RefreshRateManager::RefreshRateProfile refreshRateProfile = RefreshRateManager::refreshRateProfileFromString(profileName); qApp->getRefreshRateManager().setRefreshRateProfile(refreshRateProfile); }; @@ -108,19 +107,19 @@ void setupPreferences() { // UI static const QString UI_CATEGORY{ "User Interface" }; { - auto getter = []() -> bool { return qApp->getSettingConstrainToolbarPosition(); }; + auto getter = []()->bool { return qApp->getSettingConstrainToolbarPosition(); }; auto setter = [](bool value) { qApp->setSettingConstrainToolbarPosition(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Constrain Toolbar Position to Horizontal Center", getter, setter)); } { - auto getter = []() -> bool { return qApp->getAwayStateWhenFocusLostInVREnabled(); }; + auto getter = []()->bool { return qApp->getAwayStateWhenFocusLostInVREnabled(); }; auto setter = [](bool value) { qApp->setAwayStateWhenFocusLostInVREnabled(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Go into away state when interface window loses focus in VR", getter, setter)); } { - auto getter = []() -> float { return qApp->getDesktopTabletScale(); }; + 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); @@ -129,7 +128,7 @@ void setupPreferences() { } { - auto getter = []() -> float { return qApp->getHMDTabletScale(); }; + auto getter = []()->float { return qApp->getHMDTabletScale(); }; auto setter = [](float value) { qApp->setHMDTabletScale(value); }; auto preference = new SpinnerPreference(UI_CATEGORY, "VR Tablet Scale %", getter, setter); preference->setMin(20); @@ -139,25 +138,25 @@ void setupPreferences() { { static const QString RETICLE_ICON_NAME = { Cursor::Manager::getIconName(Cursor::Icon::RETICLE) }; - auto getter = []() -> bool { return qApp->getPreferredCursor() == RETICLE_ICON_NAME; }; + auto getter = []()->bool { return qApp->getPreferredCursor() == RETICLE_ICON_NAME; }; auto setter = [](bool value) { qApp->setPreferredCursor(value ? RETICLE_ICON_NAME : QString()); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use reticle cursor instead of arrow", getter, setter)); } { - auto getter = []() -> bool { return qApp->getMiniTabletEnabled(); }; + auto getter = []()->bool { return qApp->getMiniTabletEnabled(); }; auto setter = [](bool value) { qApp->setMiniTabletEnabled(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use mini tablet", getter, setter)); } { - auto getter = []() -> int { return DependencyManager::get()->getUse3DKeyboard(); }; + auto getter = []()->int { return DependencyManager::get()->getUse3DKeyboard(); }; auto setter = [](int value) { DependencyManager::get()->setUse3DKeyboard(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use Virtual Keyboard", getter, setter)); } { - auto getter = []() -> bool { return DependencyManager::get()->getPreferMalletsOverLasers() ? 1 : 0; }; + auto getter = []()->bool { return DependencyManager::get()->getPreferMalletsOverLasers() ? 1 : 0; }; auto setter = [](bool value) { return DependencyManager::get()->setPreferMalletsOverLasers((bool)value); }; auto preference = new RadioButtonsPreference(UI_CATEGORY, "Keyboard laser / mallets", getter, setter); QStringList items; @@ -169,7 +168,7 @@ void setupPreferences() { { - auto getter = []() -> int { return qApp->getPreferStylusOverLaser() ? 1 : 0; }; + auto getter = []()->int { return qApp->getPreferStylusOverLaser() ? 1 : 0; }; auto setter = [](int value) { qApp->setPreferStylusOverLaser((bool)value); }; auto preference = new RadioButtonsPreference(UI_CATEGORY, "Tablet stylys / laser", getter, setter); QStringList items; @@ -181,7 +180,7 @@ void setupPreferences() { static const QString VIEW_CATEGORY{ "View" }; { - auto getter = [myAvatar]() -> float { return myAvatar->getRealWorldFieldOfView(); }; + auto getter = [myAvatar]()->float { return myAvatar->getRealWorldFieldOfView(); }; auto setter = [myAvatar](float value) { myAvatar->setRealWorldFieldOfView(value); }; auto preference = new SpinnerPreference(VIEW_CATEGORY, "Real world vertical field of view (angular size of monitor)", getter, setter); preference->setMin(1); @@ -189,7 +188,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = []() -> float { return qApp->getFieldOfView(); }; + auto getter = []()->float { return qApp->getFieldOfView(); }; auto setter = [](float value) { qApp->setFieldOfView(value); }; auto preference = new SpinnerPreference(VIEW_CATEGORY, "Vertical field of view", getter, setter); preference->setMin(1); @@ -209,13 +208,13 @@ void setupPreferences() { // Snapshots static const QString SNAPSHOTS{ "Snapshots" }; { - auto getter = []() -> QString { return DependencyManager::get()->_snapshotsLocation.get(); }; + auto getter = []()->QString { return DependencyManager::get()->_snapshotsLocation.get(); }; auto setter = [](const QString& value) { DependencyManager::get()->_snapshotsLocation.set(value); emit DependencyManager::get()->snapshotLocationSet(value); }; auto preference = new BrowsePreference(SNAPSHOTS, "Put my snapshots here", getter, setter); preferences->addPreference(preference); } { - auto getter = []() -> float { return SnapshotAnimated::snapshotAnimatedDuration.get(); }; + auto getter = []()->float { return SnapshotAnimated::snapshotAnimatedDuration.get(); }; auto setter = [](float value) { SnapshotAnimated::snapshotAnimatedDuration.set(value); }; auto preference = new SpinnerPreference(SNAPSHOTS, "Animated Snapshot Duration", getter, setter); preference->setMin(1); @@ -225,7 +224,7 @@ void setupPreferences() { } { - 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); }; 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, " @@ -233,14 +232,14 @@ void setupPreferences() { "this information you are helping to improve the product. ", getter, setter)); } - static const QString AVATAR_TUNING{ "Avatar Tuning" }; + static const QString AVATAR_TUNING { "Avatar Tuning" }; { - auto getter = [myAvatar]() -> QString { return myAvatar->getDominantHand(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getDominantHand(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDominantHand(value); }; preferences->addPreference(new PrimaryHandPreference(AVATAR_TUNING, "Dominant Hand", getter, setter)); } { - auto getter = [myAvatar]() -> float { return myAvatar->getTargetScale(); }; + auto getter = [myAvatar]()->float { return myAvatar->getTargetScale(); }; auto setter = [myAvatar](float value) { myAvatar->setTargetScale(value); }; auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter); preference->setMin(0.25); @@ -256,7 +255,7 @@ void setupPreferences() { } { - auto getter = [myAvatar]() -> QString { return myAvatar->getAnimGraphOverrideUrl().toString(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getAnimGraphOverrideUrl().toString(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setAnimGraphOverrideUrl(QUrl(value)); }; auto preference = new EditPreference(AVATAR_TUNING, "Avatar animation JSON", getter, setter); preference->setPlaceholderText("default"); @@ -264,7 +263,7 @@ void setupPreferences() { } { - auto getter = [myAvatar]() -> bool { return myAvatar->getCollisionsEnabled(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getCollisionsEnabled(); }; auto setter = [myAvatar](bool value) { myAvatar->setCollisionsEnabled(value); }; auto preference = new CheckPreference(AVATAR_TUNING, "Enable Avatar collisions", getter, setter); preferences->addPreference(preference); @@ -273,7 +272,7 @@ void setupPreferences() { static const QString FACE_TRACKING{ "Face Tracking" }; { #ifdef HAVE_DDE - auto getter = []() -> float { return DependencyManager::get()->getEyeClosingThreshold(); }; + auto getter = []()->float { return DependencyManager::get()->getEyeClosingThreshold(); }; auto setter = [](float value) { DependencyManager::get()->setEyeClosingThreshold(value); }; preferences->addPreference(new SliderPreference(FACE_TRACKING, "Eye Closing Threshold", getter, setter)); #endif @@ -281,44 +280,44 @@ void setupPreferences() { { - auto getter = []() -> float { return FaceTracker::getEyeDeflection(); }; + auto getter = []()->float { return FaceTracker::getEyeDeflection(); }; auto setter = [](float value) { FaceTracker::setEyeDeflection(value); }; preferences->addPreference(new SliderPreference(FACE_TRACKING, "Eye Deflection", getter, setter)); } static const QString VR_MOVEMENT{ "VR Movement" }; { - auto getter = [myAvatar]() -> bool { return myAvatar->getAllowTeleporting(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getAllowTeleporting(); }; auto setter = [myAvatar](bool value) { myAvatar->setAllowTeleporting(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Teleporting", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> bool { return myAvatar->useAdvancedMovementControls(); }; + auto getter = [myAvatar]()->bool { return myAvatar->useAdvancedMovementControls(); }; auto setter = [myAvatar](bool value) { myAvatar->setUseAdvancedMovementControls(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Walking", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> bool { return myAvatar->getStrafeEnabled(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getStrafeEnabled(); }; auto setter = [myAvatar](bool value) { myAvatar->setStrafeEnabled(value); }; preferences->addPreference(new CheckPreference(VR_MOVEMENT, "Strafing", getter, setter)); } { - auto getter = [myAvatar]() -> bool { return myAvatar->getFlyingHMDPref(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getFlyingHMDPref(); }; auto setter = [myAvatar](bool value) { myAvatar->setFlyingHMDPref(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Jumping and flying", getter, setter); preference->setIndented(true); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> bool { return myAvatar->hoverWhenUnsupported(); }; + auto getter = [myAvatar]()->bool { return myAvatar->hoverWhenUnsupported(); }; auto setter = [myAvatar](bool value) { myAvatar->setHoverWhenUnsupported(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Hover When Unsupported", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> int { return myAvatar->getMovementReference(); }; + auto getter = [myAvatar]()->int { return myAvatar->getMovementReference(); }; auto setter = [myAvatar](int value) { myAvatar->setMovementReference(value); }; //auto preference = new CheckPreference(VR_MOVEMENT, "Hand-Relative Movement", getter, setter); auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Movement Direction", getter, setter); @@ -329,12 +328,12 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> QString { return myAvatar->getDominantHand(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getDominantHand(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDominantHand(value); }; preferences->addPreference(new PrimaryHandPreference(VR_MOVEMENT, "Dominant Hand", getter, setter)); } { - auto getter = [myAvatar]() -> int { return myAvatar->getSnapTurn() ? 0 : 1; }; + auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; }; auto setter = [myAvatar](int value) { myAvatar->setSnapTurn(value == 0); }; auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Snap turn / Smooth turn", getter, setter); QStringList items; @@ -344,7 +343,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> int { return myAvatar->getControlScheme(); }; + auto getter = [myAvatar]()->int { return myAvatar->getControlScheme(); }; auto setter = [myAvatar](int index) { myAvatar->setControlScheme(index); }; auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Control Scheme", getter, setter); QStringList items; @@ -354,7 +353,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> float { return myAvatar->getAnalogPlusWalkSpeed(); }; + auto getter = [myAvatar]()->float { return myAvatar->getAnalogPlusWalkSpeed(); }; auto setter = [myAvatar](float value) { myAvatar->setAnalogPlusWalkSpeed(value); }; auto preference = new SpinnerSliderPreference(VR_MOVEMENT, "Analog++ Walk Speed", getter, setter); preference->setMin(6.0f); @@ -364,16 +363,16 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> bool { return myAvatar->getShowPlayArea(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getShowPlayArea(); }; auto setter = [myAvatar](bool value) { myAvatar->setShowPlayArea(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Show room boundaries while teleporting", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> int { + auto getter = [myAvatar]()->int { switch (myAvatar->getUserRecenterModel()) { case MyAvatar::SitStandModelType::Auto: - default: + default: return 0; case MyAvatar::SitStandModelType::ForceSit: return 1; @@ -408,7 +407,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [=]() -> float { return myAvatar->getUserHeight(); }; + auto getter = [=]()->float { return myAvatar->getUserHeight(); }; auto setter = [=](float value) { myAvatar->setUserHeight(value); }; auto preference = new SpinnerPreference(VR_MOVEMENT, "User real-world height (meters)", getter, setter); preference->setMin(1.0f); @@ -420,7 +419,7 @@ void setupPreferences() { static const QString AVATAR_CAMERA{ "Mouse Sensitivity" }; { - auto getter = [myAvatar]() -> float { return myAvatar->getPitchSpeed(); }; + auto getter = [myAvatar]()->float { return myAvatar->getPitchSpeed(); }; auto setter = [myAvatar](float value) { myAvatar->setPitchSpeed(value); }; auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "Y input:", getter, setter); preference->setMin(1.0f); @@ -430,7 +429,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> float { return myAvatar->getYawSpeed(); }; + auto getter = [myAvatar]()->float { return myAvatar->getYawSpeed(); }; auto setter = [myAvatar](float value) { myAvatar->setYawSpeed(value); }; auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "X input:", getter, setter); preference->setMin(1.0f); @@ -457,13 +456,13 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = []() -> bool { return !DependencyManager::get()->getOutputStarveDetectionEnabled(); }; + auto getter = []()->bool { return !DependencyManager::get()->getOutputStarveDetectionEnabled(); }; auto setter = [](bool value) { DependencyManager::get()->setOutputStarveDetectionEnabled(!value); }; auto preference = new CheckPreference(AUDIO_BUFFERS, "Disable output starve detection", getter, setter); preferences->addPreference(preference); } { - auto getter = []() -> float { return DependencyManager::get()->getOutputBufferSize(); }; + auto getter = []()->float { return DependencyManager::get()->getOutputBufferSize(); }; auto setter = [](float value) { DependencyManager::get()->setOutputBufferSize(value); }; auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Output buffer initial frames", getter, setter); preference->setMin(AudioClient::MIN_BUFFER_FRAMES); @@ -473,13 +472,13 @@ void setupPreferences() { } #if DEV_BUILD || PR_BUILD { - auto getter = []() -> bool { return DependencyManager::get()->isSimulatingJitter(); }; + auto getter = []()->bool { return DependencyManager::get()->isSimulatingJitter(); }; auto setter = [](bool value) { return DependencyManager::get()->setIsSimulatingJitter(value); }; auto preference = new CheckPreference(AUDIO_BUFFERS, "Packet jitter simulator", getter, setter); preferences->addPreference(preference); } { - auto getter = []() -> float { return DependencyManager::get()->getGateThreshold(); }; + auto getter = []()->float { return DependencyManager::get()->getGateThreshold(); }; auto setter = [](float value) { return DependencyManager::get()->setGateThreshold(value); }; auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Packet throttle threshold", getter, setter); preference->setMin(1); @@ -494,8 +493,8 @@ void setupPreferences() { QWeakPointer nodeListWeak = DependencyManager::get(); { - static const int MIN_PORT_NUMBER{ 0 }; - static const int MAX_PORT_NUMBER{ 65535 }; + static const int MIN_PORT_NUMBER { 0 }; + static const int MAX_PORT_NUMBER { 65535 }; auto getter = [nodeListWeak] { auto nodeList = nodeListWeak.lock(); if (nodeList) { @@ -517,7 +516,7 @@ void setupPreferences() { } { - auto getter = []() -> float { return qApp->getMaxOctreePacketsPerSecond(); }; + 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);