Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:17:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16247 from MiladNazeri/DEV-148/add-mirror-mode-to-settings

Browse source 
Dev 148/add mirror mode to settings
This commit is contained in:
MiladNazeri 2019-09-25 12:08:09 -07:00 committed by GitHub
commit 7d7024f5eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml
View file

@ -699,8 +699,8 @@ Item {
spacing: controlsTableRoot.rowPadding spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
id: mirrorText id: selfieText
text: "Mirror Mode" text: "Selfie"
width: paintedWidth width: paintedWidth
height: parent.height height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
@ -710,8 +710,8 @@ Item {
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "See your own avatar" text: "Look at self"
width: parent.width - mirrorText.width - parent.spacing - controlsTableRoot.rowPadding width: parent.width - selfieText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

26
interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
View file

@ -234,9 +234,19 @@ Flickable {
SimplifiedControls.RadioButton { SimplifiedControls.RadioButton {
id: thirdPerson id: thirdPerson
text: "Third Person View" text: "Third Person View"
checked: Camera.mode === "third person" checked: Camera.mode === "look at"
onClicked: { onClicked: {
Camera.mode = "third person" Camera.mode = "look at"
}
}
SimplifiedControls.RadioButton {
id: selfie
text: "Selfie"
checked: Camera.mode === "selfie"
visible: true
onClicked: {
Camera.mode = "selfie"
} }
} }
@ -246,11 +256,21 @@ Flickable {
onModeUpdated: { onModeUpdated: {
if (Camera.mode === "first person") { if (Camera.mode === "first person") {
firstPerson.checked = true firstPerson.checked = true
} else if (Camera.mode === "third person") { } else if (Camera.mode === "look at") {
thirdPerson.checked = true thirdPerson.checked = true
} else if (Camera.mode === "selfie" && HMD.active) {
selfie.checked = true
} }
} }
} }
Connections {
target: HMD
onDisplayModeChanged: {
selfie.visible = isHMDMode ? false : true
}
}
} }
} }