SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add bindings page and apply autosave chaperone on offset clamp

Browse Source
This commit is contained in:
Kung-vr
2019-10-27 00:39:01 +09:00
parent 1a67b80ef3
commit d0c2520b64
7 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_scripts/qt/resources.pri
+1
View File
@@ -54,5 +54,6 @@ DISTFILES += \
src/res/qml/desktop_overlay_page/translation_left_right/SteamDesktopTranslationLeftRight.qml \
src/res/qml/desktop_overlay_page/translation_back_forwards/SteamDesktopTranslationBackForwards.qml \
src/res/qml/desktop_overlay_page/translation_up_down/SteamDesktopTranslationUpDown.qml \
src/res/qml/BindingsPage.qml \
win32:RC_ICONS += src/res/img/icons/advicon256px.ico
src/res/img/bindings/bindings.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 294 KiB

src/res/qml/BindingsPage.qml
+18
View File
@@ -0,0 +1,18 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3
import ovras.advsettings 1.0
import "common"
MyStackViewPage {
headerText: "Bindings Guide"
content: ColumnLayout {
Image {
source: "qrc:/bindings/bindings"
sourceSize.width: 1120
sourceSize.height: 659
anchors.fill: parent
}
}
}
src/res/qml/RootPage.qml
+11
View File
@@ -141,6 +141,17 @@ MyStackViewPage {
Layout.fillWidth: true
}
MyPushButton {
id: bindingsButton
activationSoundEnabled: false
text: "Bindings"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
mainView.push(bindingsPage)
}
}
MyPushButton {
id: settingsButton
activationSoundEnabled: false
src/res/qml/common/mainwidget.qml
+5
View File
@@ -80,6 +80,11 @@ Rectangle {
visible: false
}
property BindingsPage bindingsPage: BindingsPage {
stackView: mainView
visible: false
}
StackView {
id: mainView
anchors.fill: parent
src/res/resources.qrc
+3
View File
@@ -17,4 +17,7 @@
<file alias="previous">img/audio/media_keys/outline_skip_previous_white_24dp.svg</file>
<file alias="stop">img/audio/media_keys/outline_stop_white_24dp.svg</file>
</qresource>
<qresource prefix="/bindings">
<file alias="bindings">img/bindings/bindings.png</file>
</qresource>
</RCC>
src/tabcontrollers/MoveCenterTabController.cpp
+12 -6
View File
@@ -2876,7 +2876,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
outputLogHmdMatrix( standingZero );
reset();
LOG( INFO ) << "-Resetting offsets-";
parent->m_chaperoneTabController.applyAutosavedProfile();
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
return;
}
if ( abs( offsetUniverseCenterXyz[1] ) > k_maxOpenvrWorkingSetOffest
@@ -2892,7 +2893,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
outputLogHmdMatrix( standingZero );
reset();
LOG( INFO ) << "-Resetting offsets-";
parent->m_chaperoneTabController.applyAutosavedProfile();
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
return;
}
if ( abs( offsetUniverseCenterXyz[2] ) > k_maxOpenvrWorkingSetOffest
@@ -2908,7 +2910,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
outputLogHmdMatrix( standingZero );
reset();
LOG( INFO ) << "-Resetting offsets-";
parent->m_chaperoneTabController.applyAutosavedProfile();
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
return;
}
@@ -3022,7 +3025,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
outputLogHmdMatrix( standingZero );
reset();
LOG( INFO ) << "-Resetting offsets-";
parent->m_chaperoneTabController.applyAutosavedProfile();
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
return;
}
if ( abs( offsetUniverseCenterXyz[1] ) > k_maxOpenvrCommitOffset )
@@ -3036,7 +3040,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
outputLogHmdMatrix( standingZero );
reset();
LOG( INFO ) << "-Resetting offsets-";
parent->m_chaperoneTabController.applyAutosavedProfile();
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
return;
}
if ( abs( offsetUniverseCenterXyz[2] ) > k_maxOpenvrCommitOffset )
@@ -3050,7 +3055,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
outputLogHmdMatrix( standingZero );
reset();
LOG( INFO ) << "-Resetting offsets-";
parent->m_chaperoneTabController.applyAutosavedProfile();
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
return;
}
vr::VRChaperoneSetup()->CommitWorkingCopy(