From ca67502fc50decb59e247a0aca4a70328ccc540e Mon Sep 17 00:00:00 2001 From: username223 Date: Sun, 3 Feb 2019 19:33:43 +0100 Subject: [PATCH] Remove the Accessibility Tab completely from the app (#79) See https://github.com/OpenVR-Advanced-Settings/OpenVR-AdvancedSettings/issues/27 The Accessibility tab was made redundant with the implementation of the new playspace/room/universe tab in https://github.com/OpenVR-Advanced-Settings/OpenVR-AdvancedSettings/issues/60 The tab inherited from the PttController class, which required changes in order to work with the new IVRInput system. See https://github.com/OpenVR-Advanced-Settings/OpenVR-AdvancedSettings/issues/51 for more about the IVRInput system. Removing the page now at an early state is going to make it easier to refactor the PttController since only one class is inheriting it, instead of two. Since the Accessibility tab is going to be removed anyway, it makes sense to remove it now. --- Readme.md | 7 - advancedSettings.pro | 3 - docs/screenshots/AccessibilityPage.png | Bin 20598 -> 0 bytes src/overlaycontroller.cpp | 14 -- src/overlaycontroller.h | 3 - src/res/qml/AccessibilityPage.qml | 187 ------------------ src/res/qml/RootPage.qml | 11 -- src/res/qml/common/mainwidget.qml | 5 - .../AccessibilityTabController.cpp | 136 ------------- .../AccessibilityTabController.h | 54 ----- 10 files changed, 420 deletions(-) delete mode 100644 docs/screenshots/AccessibilityPage.png delete mode 100644 src/res/qml/AccessibilityPage.qml delete mode 100644 src/tabcontrollers/AccessibilityTabController.cpp delete mode 100644 src/tabcontrollers/AccessibilityTabController.h diff --git a/Readme.md b/Readme.md index 5588017..827331d 100644 --- a/Readme.md +++ b/Readme.md @@ -22,7 +22,6 @@ > * [Audio Page](#audio_page) > * [Revive Page](#revive_page) > * [Utilities Page](#utilities_page) - > * [Accessibility Page](#accessibility_page) > * [Statistics Page](#statistics_page) > * [Settings Page](#settings_page) > * [How To Compile](#how_to_compile) @@ -260,12 +259,6 @@ Any changes to controller settings are immediately applied by Revive (Requires R - **Steam Desktop Overlay Width:** Allows to increase the size of the Steam desktop overlay. Useful for multi-monitor setups. - **Media Control Keys:** Allows controlling a media player through the media keys. This is the same as having a keyboard with media keys and then pressing them. Should support most common media players. - -## - Accessibility Page: - -![Accessibility Page](docs/screenshots/AccessibilityPage.png) - -- **Adjust Player Height:** Offsets the player height to allows short or wheelchair-bound players to fully interact with height-limited applications by both boosting their height and being able to touch the in-game floor when necessary by pressing a configurable motion controller button. ## - Statistics Page: diff --git a/advancedSettings.pro b/advancedSettings.pro index 8296354..1e54896 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -66,7 +66,6 @@ SOURCES += src/main.cpp\ src/tabcontrollers/ReviveTabController.cpp \ src/tabcontrollers/UtilitiesTabController.cpp \ src/tabcontrollers/PttController.cpp \ - src/tabcontrollers/AccessibilityTabController.cpp \ src/utils/ChaperoneUtils.cpp \ src/tabcontrollers/audiomanager/AudioManagerDummy.cpp \ src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp \ @@ -85,7 +84,6 @@ HEADERS += src/overlaycontroller.h \ src/tabcontrollers/UtilitiesTabController.h \ src/tabcontrollers/AudioManager.h \ src/tabcontrollers/PttController.h \ - src/tabcontrollers/AccessibilityTabController.h \ src/tabcontrollers/KeyboardInput.h \ src/utils/Matrix.h \ src/utils/ChaperoneUtils.h \ @@ -123,7 +121,6 @@ DISTFILES += \ src/res/img/battery/* \ src/res/img/icons/* \ src/res/qml/qmldir \ - src/res/qml/AccessibilityPage.qml \ src/res/qml/audio_page/* \ src/res/qml/ChaperonePage.qml \ src/res/qml/ChaperoneWarningsPage.qml \ diff --git a/docs/screenshots/AccessibilityPage.png b/docs/screenshots/AccessibilityPage.png deleted file mode 100644 index 489d54808b00bffccc4c10ccf6c49f48fabd5243..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20598 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 diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp index f75fa09..fbbf18f 100644 --- a/src/overlaycontroller.cpp +++ b/src/overlaycontroller.cpp @@ -129,7 +129,6 @@ OverlayController::OverlayController( bool desktopMode, m_reviveTabController.initStage1( m_settingsTabController.forceRevivePage() ); m_utilitiesTabController.initStage1(); - m_accessibilityTabController.initStage1(); // Set qml context qmlEngine.rootContext()->setContextProperty( "applicationVersion", @@ -248,16 +247,6 @@ OverlayController::OverlayController( bool desktopMode, QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); return obj; } ); - qmlRegisterSingletonType( - "matzman666.advsettings", - 1, - 0, - "AccessibilityTabController", - []( QQmlEngine*, QJSEngine* ) { - QObject* obj = &( objectAddress->m_accessibilityTabController ); - QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); - return obj; - } ); } OverlayController::~OverlayController() @@ -406,7 +395,6 @@ void OverlayController::SetWidget( QQuickItem* quickItem, m_settingsTabController.initStage2( this, m_pWindow.get() ); m_reviveTabController.initStage2( this, m_pWindow.get() ); m_utilitiesTabController.initStage2( this, m_pWindow.get() ); - m_accessibilityTabController.initStage2( this, m_pWindow.get() ); } void OverlayController::OnRenderRequest() @@ -750,8 +738,6 @@ void OverlayController::mainEventLoop() m_settingsTabController.eventLoopTick(); m_reviveTabController.eventLoopTick(); m_audioTabController.eventLoopTick(); - m_accessibilityTabController.eventLoopTick( - vr::VRCompositor()->GetTrackingSpace() ); if ( m_ulOverlayThumbnailHandle != vr::k_ulOverlayHandleInvalid ) { diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h index 8c1b6d4..d06a097 100644 --- a/src/overlaycontroller.h +++ b/src/overlaycontroller.h @@ -37,7 +37,6 @@ #include "tabcontrollers/SettingsTabController.h" #include "tabcontrollers/ReviveTabController.h" #include "tabcontrollers/UtilitiesTabController.h" -#include "tabcontrollers/AccessibilityTabController.h" #include "ivrinput/ivrinput.h" @@ -50,7 +49,6 @@ namespace advsettings // Actual rates of updates are counter * vsync (~11ms) // Values chosen based on update speed priority // Avoid setting values to the same numbers. -constexpr int k_accessibilitySettingsUpdateCounter = 151; constexpr int k_audioSettingsUpdateCounter = 89; constexpr int k_chaperoneSettingsUpdateCounter = 101; constexpr int k_moveCenterSettingsUpdateCounter = 149; @@ -121,7 +119,6 @@ public: // I know it's an ugly hack to make them public to enable external SettingsTabController m_settingsTabController; ReviveTabController m_reviveTabController; UtilitiesTabController m_utilitiesTabController; - AccessibilityTabController m_accessibilityTabController; private: QPoint getMousePositionForEvent( vr::VREvent_Mouse_t mouse ); diff --git a/src/res/qml/AccessibilityPage.qml b/src/res/qml/AccessibilityPage.qml deleted file mode 100644 index 0a458eb..0000000 --- a/src/res/qml/AccessibilityPage.qml +++ /dev/null @@ -1,187 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.3 -import matzman666.advsettings 1.0 -import "common" - - -MyStackViewPage { - headerText: "Accessibility Tools" - - PttControllerConfigDialog { - id: pttControllerConfigDialog - pttControllerConfigClass: AccessibilityTabController - } - - content: ColumnLayout { - spacing: 92 - - GroupBox { - Layout.fillWidth: true - - label: MyText { - leftPadding: 10 - text: "Adjust Player Height" - bottomPadding: -10 - } - background: Rectangle { - color: "transparent" - border.color: "#ffffff" - radius: 8 - } - - ColumnLayout { - anchors.fill: parent - - Rectangle { - color: "#ffffff" - height: 1 - Layout.fillWidth: true - Layout.bottomMargin: 5 - } - - RowLayout { - MyPushButton2 { - Layout.preferredWidth: 40 - text: "-" - onClicked: { - accessibilityMoveYSlider.value -= 0.05 - } - } - - MySlider { - id: accessibilityMoveYSlider - from: 0 - to: 1.5 - stepSize: 0.01 - value: 0.0 - Layout.fillWidth: true - onPositionChanged: { - var val = this.from + ( this.position * (this.to - this.from)) - accessibilityMoveYText.text = val.toFixed(2) - } - onValueChanged: { - AccessibilityTabController.heightOffset = this.value.toFixed(2) - } - } - - MyPushButton2 { - Layout.preferredWidth: 40 - text: "+" - onClicked: { - accessibilityMoveYSlider.value += 0.05 - } - } - - MyTextField { - id: accessibilityMoveYText - text: "0.00" - keyBoardUID: 700 - Layout.preferredWidth: 140 - Layout.leftMargin: 10 - Layout.rightMargin: 10 - horizontalAlignment: Text.AlignHCenter - function onInputEvent(input) { - var val = parseFloat(input) - if (!isNaN(val)) { - if (val >= accessibilityMoveYSlider.from && val <= accessibilityMoveYSlider.to) { - accessibilityMoveYSlider.value = val.toFixed(2); - } else { - AccessibilityTabController.setHeightOffset(val.toFixed(2), false); - } - } - text = AccessibilityTabController.heightOffset.toFixed(2) - } - } - } - - RowLayout { - MyToggleButton { - id: heightOffsetPttEnabledToggle - Layout.preferredWidth: 260 - text: "Push-to-Toggle:" - onClicked: { - AccessibilityTabController.pttEnabled = checked - } - } - MyToggleButton { - id: heightOffsetPttLeftControllerToggle - text: "Left Controller" - onClicked: { - AccessibilityTabController.setPttLeftControllerEnabled(checked, false) - } - } - MyPushButton { - text: "Configure" - onClicked: { - pttControllerConfigDialog.openPopup(0) - } - } - Item { - Layout.fillWidth: true - } - MyToggleButton { - id: heightOffsetPttRightControllerToggle - text: "Right Controller" - onClicked: { - AccessibilityTabController.setPttRightControllerEnabled(checked, false) - } - } - MyPushButton { - text: "Configure" - onClicked: { - pttControllerConfigDialog.openPopup(1) - } - } - } - } - } - - Item { Layout.fillHeight: true; Layout.fillWidth: true} - - MyPushButton { - id: accessibilityResetButton - Layout.preferredWidth: 250 - text: "Reset" - onClicked: { - AccessibilityTabController.reset() - } - } - - Component.onCompleted: { - var heightOffsetFormatted = AccessibilityTabController.heightOffset.toFixed(2) - if (heightOffsetFormatted >= accessibilityMoveYSlider.from && heightOffsetFormatted <= accessibilityMoveYSlider.to) { - accessibilityMoveYSlider.value = heightOffsetFormatted - } - accessibilityMoveYText.text = heightOffsetFormatted - heightOffsetPttEnabledToggle.checked = AccessibilityTabController.pttEnabled - heightOffsetPttLeftControllerToggle.checked = AccessibilityTabController.pttLeftControllerEnabled - heightOffsetPttRightControllerToggle.checked = AccessibilityTabController.pttRightControllerEnabled - } - - Connections { - target: AccessibilityTabController - onHeightOffsetChanged: { - var heightOffsetFormatted = AccessibilityTabController.heightOffset.toFixed(2) - if (heightOffsetFormatted >= accessibilityMoveYSlider.from && heightOffsetFormatted <= accessibilityMoveYSlider.to) { - accessibilityMoveYSlider.value = heightOffsetFormatted - } - accessibilityMoveYText.text = heightOffsetFormatted - } - onPttEnabledChanged: { - heightOffsetPttEnabledToggle.checked = AccessibilityTabController.pttEnabled - } - onPttActiveChanged: { - - } - onPttLeftControllerEnabledChanged: { - heightOffsetPttLeftControllerToggle.checked = AccessibilityTabController.pttLeftControllerEnabled - } - onPttRightControllerEnabledChanged: { - heightOffsetPttRightControllerToggle.checked = AccessibilityTabController.pttRightControllerEnabled - } - } - - } - -} diff --git a/src/res/qml/RootPage.qml b/src/res/qml/RootPage.qml index 8f59a1b..bfb9bae 100644 --- a/src/res/qml/RootPage.qml +++ b/src/res/qml/RootPage.qml @@ -103,17 +103,6 @@ MyStackViewPage { } } - MyPushButton { - id: accessibilityButton - activationSoundEnabled: false - text: "Accessibility" - Layout.fillWidth: true - onClicked: { - MyResources.playFocusChangedSound() - mainView.push(accessibilityPage) - } - } - MyPushButton { id: statisticsButton activationSoundEnabled: false diff --git a/src/res/qml/common/mainwidget.qml b/src/res/qml/common/mainwidget.qml index 3853a84..7c763f5 100644 --- a/src/res/qml/common/mainwidget.qml +++ b/src/res/qml/common/mainwidget.qml @@ -65,11 +65,6 @@ Rectangle { visible: false } - property AccessibilityPage accessibilityPage: AccessibilityPage { - stackView: mainView - visible: false - } - StackView { id: mainView anchors.fill: parent diff --git a/src/tabcontrollers/AccessibilityTabController.cpp b/src/tabcontrollers/AccessibilityTabController.cpp deleted file mode 100644 index d135fee..0000000 --- a/src/tabcontrollers/AccessibilityTabController.cpp +++ /dev/null @@ -1,136 +0,0 @@ -#include "AccessibilityTabController.h" -#include -#include "../overlaycontroller.h" - -// application namespace -namespace advsettings -{ -void AccessibilityTabController::initStage1() -{ - setTrackingUniverse( vr::VRCompositor()->GetTrackingSpace() ); - auto settings = OverlayController::appSettings(); - settings->beginGroup( getSettingsName() ); - auto value = settings->value( "heightOffset", m_heightOffset ); - settings->endGroup(); - if ( value.isValid() && !value.isNull() ) - { - m_heightOffset = value.toFloat(); - emit heightOffsetChanged( m_heightOffset ); - } - - reloadPttConfig(); -} - -void AccessibilityTabController::initStage2( OverlayController* var_parent, - QQuickWindow* var_widget ) -{ - this->parent = var_parent; - this->widget = var_widget; -} - -void AccessibilityTabController::setTrackingUniverse( int value ) -{ - if ( m_trackingUniverse != value ) - { - reset(); - m_trackingUniverse = value; - } -} - -float AccessibilityTabController::heightOffset() const -{ - return m_heightOffset; -} - -void AccessibilityTabController::setHeightOffset( float value, bool notify ) -{ - if ( std::abs( m_heightOffset - value ) > 0.001 ) - { - modHeightOffset( value - m_heightOffset, notify ); - } -} - -void AccessibilityTabController::modHeightOffset( float value, bool notify ) -{ - parent->AddOffsetToUniverseCenter( - ( vr::TrackingUniverseOrigin ) m_trackingUniverse, 1, -value, false ); - m_heightOffset += value; - auto settings = OverlayController::appSettings(); - settings->beginGroup( getSettingsName() ); - settings->setValue( "heightOffset", m_heightOffset ); - settings->endGroup(); - settings->sync(); - if ( notify ) - { - emit heightOffsetChanged( m_heightOffset ); - } -} - -void AccessibilityTabController::onPttStart() -{ - m_toggleHeightOffset = m_heightOffset; - parent->AddOffsetToUniverseCenter( - ( vr::TrackingUniverseOrigin ) m_trackingUniverse, - 1, - m_toggleHeightOffset, - false ); -} - -void AccessibilityTabController::onPttStop() -{ - parent->AddOffsetToUniverseCenter( - ( vr::TrackingUniverseOrigin ) m_trackingUniverse, - 1, - -m_toggleHeightOffset, - false ); -} - -void AccessibilityTabController::onPttDisabled() -{ - if ( pttActive() ) - { - stopPtt(); - } - m_toggleHeightOffset = 0; -} - -void AccessibilityTabController::reset() -{ - std::lock_guard lock( eventLoopMutex ); - vr::VRChaperoneSetup()->RevertWorkingCopy(); - parent->AddOffsetToUniverseCenter( - ( vr::TrackingUniverseOrigin ) m_trackingUniverse, - 1, - m_heightOffset, - false, - false ); - vr::VRChaperoneSetup()->CommitWorkingCopy( vr::EChaperoneConfigFile_Live ); - m_heightOffset = 0.0f; - emit heightOffsetChanged( m_heightOffset ); -} - -void AccessibilityTabController::eventLoopTick( - vr::ETrackingUniverseOrigin universe ) -{ - if ( !eventLoopMutex.try_lock() ) - { - return; - } - - if ( settingsUpdateCounter >= k_accessibilitySettingsUpdateCounter ) - { - if ( parent->isDashboardVisible() ) - { - setTrackingUniverse( ( int ) universe ); - } - settingsUpdateCounter = 0; - } - else - { - settingsUpdateCounter++; - } - checkPttStatus(); - eventLoopMutex.unlock(); -} - -} // namespace advsettings diff --git a/src/tabcontrollers/AccessibilityTabController.h b/src/tabcontrollers/AccessibilityTabController.h deleted file mode 100644 index 65de4d2..0000000 --- a/src/tabcontrollers/AccessibilityTabController.h +++ /dev/null @@ -1,54 +0,0 @@ - -#pragma once - -#include "PttController.h" - -class QQuickWindow; -// application namespace -namespace advsettings -{ -// forward declaration -class OverlayController; - -class AccessibilityTabController : public PttController -{ - Q_OBJECT - Q_PROPERTY( float heightOffset READ heightOffset WRITE setHeightOffset - NOTIFY heightOffsetChanged ) - -private: - OverlayController* parent; - QQuickWindow* widget; - - int m_trackingUniverse = ( int ) vr::TrackingUniverseStanding; - float m_heightOffset = 0.0f; - float m_toggleHeightOffset = 0.0f; - - unsigned settingsUpdateCounter = 0; - - QString getSettingsName() override - { - return "accessibilitySettings"; - } - void onPttStart() override; - void onPttStop() override; - void onPttDisabled() override; - -public: - void initStage1(); - void initStage2( OverlayController* parent, QQuickWindow* widget ); - void eventLoopTick( vr::ETrackingUniverseOrigin universe ); - - float heightOffset() const; - -public slots: - void setTrackingUniverse( int value ); - void setHeightOffset( float value, bool notify = true ); - void modHeightOffset( float value, bool notify = true ); - void reset(); - -signals: - void heightOffsetChanged( float value ); -}; - -} // namespace advsettings