Add bindings page and apply autosave chaperone on offset clamp
This commit is contained in:
@@ -54,5 +54,6 @@ DISTFILES += \
|
|||||||
src/res/qml/desktop_overlay_page/translation_left_right/SteamDesktopTranslationLeftRight.qml \
|
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_back_forwards/SteamDesktopTranslationBackForwards.qml \
|
||||||
src/res/qml/desktop_overlay_page/translation_up_down/SteamDesktopTranslationUpDown.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
|
win32:RC_ICONS += src/res/img/icons/advicon256px.ico
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 294 KiB |
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -141,6 +141,17 @@ MyStackViewPage {
|
|||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MyPushButton {
|
||||||
|
id: bindingsButton
|
||||||
|
activationSoundEnabled: false
|
||||||
|
text: "Bindings"
|
||||||
|
Layout.fillWidth: true
|
||||||
|
onClicked: {
|
||||||
|
MyResources.playFocusChangedSound()
|
||||||
|
mainView.push(bindingsPage)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
MyPushButton {
|
MyPushButton {
|
||||||
id: settingsButton
|
id: settingsButton
|
||||||
activationSoundEnabled: false
|
activationSoundEnabled: false
|
||||||
|
|||||||
@@ -80,6 +80,11 @@ Rectangle {
|
|||||||
visible: false
|
visible: false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
property BindingsPage bindingsPage: BindingsPage {
|
||||||
|
stackView: mainView
|
||||||
|
visible: false
|
||||||
|
}
|
||||||
|
|
||||||
StackView {
|
StackView {
|
||||||
id: mainView
|
id: mainView
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|||||||
@@ -17,4 +17,7 @@
|
|||||||
<file alias="previous">img/audio/media_keys/outline_skip_previous_white_24dp.svg</file>
|
<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>
|
<file alias="stop">img/audio/media_keys/outline_stop_white_24dp.svg</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
|
<qresource prefix="/bindings">
|
||||||
|
<file alias="bindings">img/bindings/bindings.png</file>
|
||||||
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
@@ -2876,7 +2876,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
|
|||||||
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
||||||
outputLogHmdMatrix( standingZero );
|
outputLogHmdMatrix( standingZero );
|
||||||
reset();
|
reset();
|
||||||
LOG( INFO ) << "-Resetting offsets-";
|
parent->m_chaperoneTabController.applyAutosavedProfile();
|
||||||
|
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ( abs( offsetUniverseCenterXyz[1] ) > k_maxOpenvrWorkingSetOffest
|
if ( abs( offsetUniverseCenterXyz[1] ) > k_maxOpenvrWorkingSetOffest
|
||||||
@@ -2892,7 +2893,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
|
|||||||
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
||||||
outputLogHmdMatrix( standingZero );
|
outputLogHmdMatrix( standingZero );
|
||||||
reset();
|
reset();
|
||||||
LOG( INFO ) << "-Resetting offsets-";
|
parent->m_chaperoneTabController.applyAutosavedProfile();
|
||||||
|
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ( abs( offsetUniverseCenterXyz[2] ) > k_maxOpenvrWorkingSetOffest
|
if ( abs( offsetUniverseCenterXyz[2] ) > k_maxOpenvrWorkingSetOffest
|
||||||
@@ -2908,7 +2910,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
|
|||||||
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
||||||
outputLogHmdMatrix( standingZero );
|
outputLogHmdMatrix( standingZero );
|
||||||
reset();
|
reset();
|
||||||
LOG( INFO ) << "-Resetting offsets-";
|
parent->m_chaperoneTabController.applyAutosavedProfile();
|
||||||
|
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3022,7 +3025,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
|
|||||||
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
||||||
outputLogHmdMatrix( standingZero );
|
outputLogHmdMatrix( standingZero );
|
||||||
reset();
|
reset();
|
||||||
LOG( INFO ) << "-Resetting offsets-";
|
parent->m_chaperoneTabController.applyAutosavedProfile();
|
||||||
|
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ( abs( offsetUniverseCenterXyz[1] ) > k_maxOpenvrCommitOffset )
|
if ( abs( offsetUniverseCenterXyz[1] ) > k_maxOpenvrCommitOffset )
|
||||||
@@ -3036,7 +3040,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
|
|||||||
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
||||||
outputLogHmdMatrix( standingZero );
|
outputLogHmdMatrix( standingZero );
|
||||||
reset();
|
reset();
|
||||||
LOG( INFO ) << "-Resetting offsets-";
|
parent->m_chaperoneTabController.applyAutosavedProfile();
|
||||||
|
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ( abs( offsetUniverseCenterXyz[2] ) > k_maxOpenvrCommitOffset )
|
if ( abs( offsetUniverseCenterXyz[2] ) > k_maxOpenvrCommitOffset )
|
||||||
@@ -3050,7 +3055,8 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
|
|||||||
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
LOG( INFO ) << "GetWorkingStandingZeroPoseToRawTrackingPose";
|
||||||
outputLogHmdMatrix( standingZero );
|
outputLogHmdMatrix( standingZero );
|
||||||
reset();
|
reset();
|
||||||
LOG( INFO ) << "-Resetting offsets-";
|
parent->m_chaperoneTabController.applyAutosavedProfile();
|
||||||
|
LOG( INFO ) << "-Resetting to autosaved chaperone profile-";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
vr::VRChaperoneSetup()->CommitWorkingCopy(
|
vr::VRChaperoneSetup()->CommitWorkingCopy(
|
||||||
|
|||||||
Reference in New Issue
Block a user