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

Merge branch 'master' into alpha-kung

Browse Source
This commit is contained in:
Kung-vr
2019-01-17 01:55:12 +09:00
parent 8a779b518f 5ee667a56b
commit 6fcf0b1a54
6 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/PlayspacePage.qml
+38
View File
@@ -249,11 +249,19 @@ MyStackViewPage {
Layout.preferredWidth: 40
text: "-"
onClicked: {
<<<<<<< HEAD
var val = ( MoveCenterTabController.tempRotation / 100 ) - 45
if (val < -180) {
val = val + 360;
}
MoveCenterTabController.tempRotation = val * 100
=======
var val = MoveCenterTabController.tempRotation - 45
if (val < -180) {
val = val + 360;
}
MoveCenterTabController.tempRotation = val
>>>>>>> master
}
}
@@ -266,10 +274,17 @@ MyStackViewPage {
Layout.fillWidth: true
onPositionChanged: {
var val = this.from + ( this.position * (this.to - this.from))
<<<<<<< HEAD
MoveCenterTabController.tempRotation = Math.round(val * 100)
}
onValueChanged: {
MoveCenterTabController.tempRotation = Math.round(playspaceRotationSlider.value * 100)
=======
MoveCenterTabController.tempRotation = Math.round(val)
}
onValueChanged: {
MoveCenterTabController.tempRotation = Math.round(playspaceRotationSlider.value)
>>>>>>> master
//playspaceRotationText.text = Math.round(playspaceRotationSlider.value) + "°"
}
}
@@ -279,11 +294,19 @@ MyStackViewPage {
Layout.preferredWidth: 40
text: "+"
onClicked: {
<<<<<<< HEAD
var val = ( MoveCenterTabController.tempRotation / 100 ) + 45
if (val > 180) {
val = val -360;
}
MoveCenterTabController.tempRotation = val * 100
=======
var val = MoveCenterTabController.tempRotation + 45
if (val > 180) {
val = val -360;
}
MoveCenterTabController.tempRotation = val
>>>>>>> master
}
}
@@ -298,10 +321,17 @@ MyStackViewPage {
var val = parseFloat(input)
if (!isNaN(val)) {
val = val % 180
<<<<<<< HEAD
MoveCenterTabController.tempRotation = Math.round(val * 100)
text = ( MoveCenterTabController.tempRotation / 100 ) + "°"
} else {
text = ( MoveCenterTabController.tempRotation / 100 ) + "°"
=======
MoveCenterTabController.tempRotation = val
text = MoveCenterTabController.tempRotation + "°"
} else {
text = MoveCenterTabController.tempRotation + "°"
>>>>>>> master
}
}
}
@@ -310,7 +340,11 @@ MyStackViewPage {
Layout.preferredWidth: 145
text:"Apply"
onClicked: {
<<<<<<< HEAD
MoveCenterTabController.rotation = MoveCenterTabController.tempRotation
=======
MoveCenterTabController.rotation = MoveCenterTabController.tempRotation
>>>>>>> master
}
}
}
@@ -452,6 +486,10 @@ MyStackViewPage {
playspaceRotationSlider.value = ( MoveCenterTabController.tempRotation / 100 )
playspaceRotationText.text = ( MoveCenterTabController.tempRotation / 100 ) + "°"
}
onTempRotationChanged: {
playspaceRotationSlider.value = MoveCenterTabController.tempRotation
playspaceRotationText.text = MoveCenterTabController.tempRotation + "°"
}
onAdjustChaperoneChanged: {
playspaceAdjustChaperoneToggle.checked = MoveCenterTabController.adjustChaperone
}