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

Implement gravity options and ui (#117)

Browse Source
This commit is contained in:
Kung-vr
2019-03-17 19:29:10 -05:00
committed by ykeara
parent 921aa4ef57
commit 925d67cf38
12 changed files with 416 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/motion_page/MotionPage.qml
+7 -4
View File
@@ -3,9 +3,10 @@ import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3
import ovras.advsettings 1.0
import "../common"
import "universe_drag"
import "universe_turn"
import "space_drag"
import "space_turn"
import "height_toggle"
import "gravity"
MyStackViewPage {
headerText: "Motion Settings"
@@ -13,12 +14,14 @@ MyStackViewPage {
content: ColumnLayout {
spacing: 18
UniverseDragGroupBox { id: universeDragGroupBox }
SpaceDragGroupBox { id: spaceDragGroupBox }
UniverseTurnGroupBox { id: universeTurnGroupBox }
SpaceTurnGroupBox { id: spaceTurnGroupBox }
HeightToggleGroupBox { id: heightToggleGroupBox }
GravityGroupBox { id: gravityGroupBox }
Item {
Layout.fillHeight: true
}
src/res/qml/motion_page/gravity/GravityGroupBox.qml
+172
View File
@@ -0,0 +1,172 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3
import ovras.advsettings 1.0
import "../../common"
GroupBox {
id: gravityGroupBox
Layout.fillWidth: true
label: MyText {
leftPadding: 10
text: "Gravity Settings"
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 {
Layout.fillWidth: true
MyToggleButton {
id: gravityToggleButton
text: "On"
onCheckedChanged: {
MoveCenterTabController.gravityActive = this.checked
}
}
Item {
Layout.fillWidth: true
}
MyText {
text: "Gravity Strength (+ is down):"
horizontalAlignment: Text.AlignRight
Layout.rightMargin: 10
}
MyTextField {
id: gravityStrengthText
text: "9.80"
keyBoardUID: 152
Layout.preferredWidth: 120
Layout.leftMargin: 10
Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) {
var val = parseFloat(input)
if (!isNaN(val)) {
MoveCenterTabController.gravityStrength = val.toFixed(2)
text = MoveCenterTabController.gravityStrength.toFixed(2)
} else {
text = MoveCenterTabController.gravityStrengtht.toFixed(2)
}
}
}
MyPushButton {
id: gravityMoonButton
Layout.preferredWidth: 110
text:"Moon"
onClicked: {
MoveCenterTabController.gravityStrength = 1.62
}
}
MyPushButton {
id: gravityMarsButton
Layout.preferredWidth: 110
text:"Mars"
onClicked: {
MoveCenterTabController.gravityStrength = 3.71
}
}
MyPushButton {
id: gravityEarthButton
Layout.preferredWidth: 110
text:"Earth"
onClicked: {
MoveCenterTabController.gravityStrength = 9.80
}
}
MyPushButton {
id: gravityJupiterButton
Layout.preferredWidth: 110
text:"Jupiter"
onClicked: {
MoveCenterTabController.gravityStrength = 24.79
}
}
}
RowLayout {
Layout.fillWidth: true
MyToggleButton {
id: momentumToggleButton
text: "Save Momentum"
onCheckedChanged: {
MoveCenterTabController.momentumSave = this.checked
}
}
Item {
Layout.fillWidth: true
}
MyText {
text: "Fling Strength"
horizontalAlignment: Text.AlignRight
Layout.rightMargin: 10
}
MyTextField {
id: flingStrengthText
text: "1.00"
keyBoardUID: 153
Layout.preferredWidth: 120
Layout.leftMargin: 10
Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) {
var val = parseFloat(input)
if (!isNaN(val)) {
MoveCenterTabController.flingStrength = val.toFixed(2)
text = MoveCenterTabController.flingStrength.toFixed(2)
} else {
text = MoveCenterTabController.flingStrength.toFixed(2)
}
}
}
}
}
Component.onCompleted: {
gravityToggleButton.checked = MoveCenterTabController.gravityActive
gravityStrengthText.text = MoveCenterTabController.gravityStrength.toFixed(2)
momentumToggleButton.checked = MoveCenterTabController.momentumSave
flingStrengthText.text = MoveCenterTabController.flingStrength.toFixed(2)
}
Connections {
target: MoveCenterTabController
onGravityActiveChanged: {
gravityToggleButton.checked = MoveCenterTabController.gravityActive
}
onGravityStrengthChanged: {
gravityStrengthText.text = MoveCenterTabController.gravityStrength.toFixed(2)
}
onMomentumSaveChanged: {
momentumToggleButton.checked = MoveCenterTabController.momentumSave
}
onFlingStrengthChanged: {
flingStrengthText.text = MoveCenterTabController.flingStrength.toFixed(2)
}
}
}
src/res/qml/motion_page/universe_drag/UniverseDragGroupBox.qml → src/res/qml/motion_page/space_drag/SpaceDragGroupBox.qml
+2 -2
View File
@@ -5,12 +5,12 @@ import ovras.advsettings 1.0
import "../../common"
GroupBox {
id: universeDragGroupBox
id: spaceDragGroupBox
Layout.fillWidth: true
label: MyText {
leftPadding: 10
text: "Universe Drag"
text: "Space Drag"
bottomPadding: -10
}
background: Rectangle {
src/res/qml/motion_page/universe_turn/UniverseTurnGroupBox.qml → src/res/qml/motion_page/space_turn/SpaceTurnGroupBox.qml
+2 -2
View File
@@ -5,12 +5,12 @@ import ovras.advsettings 1.0
import "../../common"
GroupBox {
id: universeTurnGroupBox
id: spaceTurnGroupBox
Layout.fillWidth: true
label: MyText {
leftPadding: 10
text: "Universe Turn"
text: "Space Turn"
bottomPadding: -10
}
background: Rectangle {