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

Settings Tab new options for seated motion and recentering

Browse Source
This commit is contained in:
Kung-vr
2019-10-02 12:40:01 +09:00
parent b4dbbe8857
commit d3b4d30807
5 changed files with 214 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/FixFloorPage.qml
+45
View File
@@ -25,6 +25,17 @@ MyStackViewPage {
Layout.fillWidth: true
}
MyText {
text: "(Disabled in 'Seated' Universe Type)"
id: seatedWarningText
visible: false
wrapMode: Text.WordWrap
font.pointSize: 28
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
Layout.fillWidth: true
}
Item {
Layout.fillHeight: true
Layout.fillWidth: true
@@ -94,6 +105,14 @@ MyStackViewPage {
statusMessageText.text = ""
//undoFixButton.enabled = FixFloorTabController.canUndo
fixButton.enabled = true
if (MoveCenterTabController.trackingUniverse === 0) {
fixButton.enabled = false
recenterButton.enabled = false
zeroSpaceButton.enabled = false
undoFixButton.enabled = false
seatedWarningText.visible = true
}
}
Timer {
@@ -129,6 +148,32 @@ MyStackViewPage {
}
}
Connections {
target: MoveCenterTabController
onTrackingUniverseChanged: {
if (MoveCenterTabController.trackingUniverse === 0) {
fixButton.enabled = false
recenterButton.enabled = false
zeroSpaceButton.enabled = false
undoFixButton.enabled = false
seatedWarningText.visible = true
} else if (MoveCenterTabController.trackingUniverse === 1) {
fixButton.enabled = true
recenterButton.enabled = true
zeroSpaceButton.enabled = true
// undoFixButton.enabled = true
// TODO Fix Undo Feature -^
seatedWarningText.visible = false
} else {
fixButton.enabled = false
recenterButton.enabled = false
zeroSpaceButton.enabled = false
undoFixButton.enabled = false
seatedWarningText.visible = false
}
}
}
}
}
src/res/qml/PlayspacePage.qml
+47
View File
@@ -23,8 +23,16 @@ MyStackViewPage {
}
}
MyText {
id: seatedDisableWarningText
visible: false
text: "Settings Tab: 'Disable Motion in Seated Mode' checked"
}
GroupBox {
Layout.fillWidth: true
id: offsetsGroupBox
visible: true
label: MyText {
leftPadding: 10
@@ -220,6 +228,8 @@ MyStackViewPage {
GroupBox {
Layout.fillWidth: true
id: rotationGroupBox
visible: true
label: MyText {
leftPadding: 10
@@ -322,6 +332,8 @@ MyStackViewPage {
ColumnLayout {
RowLayout {
Layout.fillWidth: true
id: resetButtonRow
visible: true
MyPushButton {
id: spaceResetButton
@@ -385,11 +397,24 @@ MyStackViewPage {
if (MoveCenterTabController.trackingUniverse === 0) {
spaceModeText.text = "Sitting"
spaceSeatedRecenter.visible = true
offsetsGroupBox.visible = !MoveCenterTabController.disableSeatedMotion
rotationGroupBox.visible = !MoveCenterTabController.disableSeatedMotion
resetButtonRow.visible = !MoveCenterTabController.disableSeatedMotion
seatedDisableWarningText.visible = MoveCenterTabController.disableSeatedMotion
} else if (MoveCenterTabController.trackingUniverse === 1) {
spaceModeText.text = "Standing"
spaceSeatedRecenter.visible = false
offsetsGroupBox.visible = true
rotationGroupBox.visible = true
resetButtonRow.visible = true
seatedDisableWarningText.visible = false
} else {
spaceModeText.text = "Unknown(" + MoveCenterTabController.trackingUniverse + ")"
offsetsGroupBox.visible = false
rotationGroupBox.visible = false
resetButtonRow.visible = false
seatedDisableWarningText.visible = false
}
}
@@ -423,15 +448,37 @@ MyStackViewPage {
onLockZToggleChanged: {
lockZToggle.checked = MoveCenterTabController.lockZToggle
}
onDisableSeatedMotionChanged: {
if (MoveCenterTabController.trackingUniverse === 0) {
spaceModeText.text = "Sitting"
spaceSeatedRecenter.visible = true
offsetsGroupBox.visible = !MoveCenterTabController.disableSeatedMotion
rotationGroupBox.visible = !MoveCenterTabController.disableSeatedMotion
resetButtonRow.visible = !MoveCenterTabController.disableSeatedMotion
seatedDisableWarningText.visible = MoveCenterTabController.disableSeatedMotion
}
}
onTrackingUniverseChanged: {
if (MoveCenterTabController.trackingUniverse === 0) {
spaceModeText.text = "Sitting"
spaceSeatedRecenter.visible = true
offsetsGroupBox.visible = !MoveCenterTabController.disableSeatedMotion
rotationGroupBox.visible = !MoveCenterTabController.disableSeatedMotion
resetButtonRow.visible = !MoveCenterTabController.disableSeatedMotion
seatedDisableWarningText.visible = MoveCenterTabController.disableSeatedMotion
} else if (MoveCenterTabController.trackingUniverse === 1) {
spaceModeText.text = "Standing"
spaceSeatedRecenter.visible = false
offsetsGroupBox.visible = true
rotationGroupBox.visible = true
resetButtonRow.visible = true
seatedDisableWarningText.visible = false
} else {
spaceModeText.text = "Unknown(" + MoveCenterTabController.trackingUniverse + ")"
offsetsGroupBox.visible = false
rotationGroupBox.visible = false
resetButtonRow.visible = false
seatedDisableWarningText.visible = false
}
}
}
src/res/qml/SettingsPage.qml
+24
View File
@@ -42,6 +42,22 @@ MyStackViewPage {
}
}
MyToggleButton {
id: enableSeatedOffsetsRecenterToggle
text: "Enable Auto-set Seated Offsets During Seated Recenter"
onCheckedChanged: {
MoveCenterTabController.setEnableSeatedOffsetsRecenter(checked, true)
}
}
MyToggleButton {
id: disableSeatedMotionToggle
text: "Disable All Motion Features When in Seated Mode"
onCheckedChanged: {
MoveCenterTabController.setDisableSeatedMotion(checked, true)
}
}
RowLayout {
Layout.fillWidth: true
@@ -107,6 +123,8 @@ MyStackViewPage {
allowExternalEditsToggle.checked = MoveCenterTabController.allowExternalEdits
oldStyleMotionToggle.checked = MoveCenterTabController.oldStyleMotion
universeCenteredRotationToggle.checked = MoveCenterTabController.universeCenteredRotation
enableSeatedOffsetsRecenterToggle.checked = MoveCenterTabController.enableSeatedOffsetsRecenter
disableSeatedMotionToggle.checked = MoveCenterTabController.disableSeatedMotion
customTickRateText.text = OverlayController.customTickRateMs
vsyncDisabledToggle.checked = OverlayController.vsyncDisabled
@@ -133,6 +151,12 @@ MyStackViewPage {
onUniverseCenteredRotationChanged: {
universeCenteredRotationToggle.checked = MoveCenterTabController.universeCenteredRotation
}
onEnableSeatedOffsetsRecenterChanged: {
enableSeatedOffsetsRecenterToggle.checked = MoveCenterTabController.enableSeatedOffsetsRecenter
}
onDisableSeatedMotionChanged: {
disableSeatedMotionToggle.checked = MoveCenterTabController.disableSeatedMotion
}
}
Connections {