Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp

Browse source 
Change Avatar App design for avatar collisions
This commit is contained in:
Anthony Thibault 2019-01-17 16:06:17 -08:00 committed by GitHub
commit 0ab13f1e48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 77 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
interface/resources/qml/hifi/avatarapp/Settings.qml
View file

@ -35,8 +35,8 @@ Rectangle {
property real scaleValue: scaleSlider.value / 10 property real scaleValue: scaleSlider.value / 10
property alias dominantHandIsLeft: leftHandRadioButton.checked property alias dominantHandIsLeft: leftHandRadioButton.checked
property alias otherAvatarsCollisionsOn: otherAvatarsCollisionsEnabledCheckBox.checked property alias otherAvatarsCollisionsOn: otherAvatarsCollisionsEnabledRadiobutton.checked
property alias environmentCollisionsOn: environmentCollisionsEnabledCheckBox.checked property alias environmentCollisionsOn: environmentCollisionsEnabledRadiobutton.checked
property alias avatarAnimationOverrideJSON: avatarAnimationUrlInputText.text property alias avatarAnimationOverrideJSON: avatarAnimationUrlInputText.text
property alias avatarAnimationJSON: avatarAnimationUrlInputText.placeholderText property alias avatarAnimationJSON: avatarAnimationUrlInputText.placeholderText
property alias avatarCollisionSoundUrl: avatarCollisionSoundUrlInputText.text property alias avatarCollisionSoundUrl: avatarCollisionSoundUrlInputText.text
@ -56,10 +56,14 @@ Rectangle {
rightHandRadioButton.checked = true; rightHandRadioButton.checked = true;
} }
if (settings.otherAvatarsCollisionsEnabled) { if (settings.otherAvatarsCollisionsEnabled) {
otherAvatarsCollisionsEnabledCheckBox.checked = true; otherAvatarsCollisionsEnabledRadiobutton.checked = true;
} else {
otherAvatarsCollisionsDisabledRadiobutton.checked = true;
} }
if (settings.collisionsEnabled) { if (settings.collisionsEnabled) {
environmentCollisionsEnabledCheckBox.checked = true; environmentCollisionsEnabledRadiobutton.checked = true;
} else {
environmentCollisionsDisabledRadiobutton.checked = true;
} }
avatarAnimationJSON = settings.animGraphUrl; avatarAnimationJSON = settings.animGraphUrl;
@ -229,7 +233,7 @@ Rectangle {
Layout.row: 0 Layout.row: 0
Layout.column: 1 Layout.column: 1
Layout.leftMargin: -40 Layout.leftMargin: -20
ButtonGroup.group: leftRight ButtonGroup.group: leftRight
checked: true checked: true
@ -245,8 +249,8 @@ Rectangle {
id: rightHandRadioButton id: rightHandRadioButton
Layout.row: 0 Layout.row: 0
Layout.column: 2 Layout.column: 3
Layout.rightMargin: 20 Layout.rightMargin: -15
ButtonGroup.group: leftRight ButtonGroup.group: leftRight
@ -266,16 +270,43 @@ Rectangle {
size: 17; size: 17;
Layout.row: 1 Layout.row: 1
Layout.column: 0 Layout.column: 0
text: "Avatar collides with other avatars" text: "Avatar to avatar collision"
} }
HifiControlsUit.CheckBox { ButtonGroup {
id: otherAvatarsCollisionsEnabledCheckBox; id: otherAvatarsOnOff
boxSize: 20; }
HifiControlsUit.RadioButton {
id: otherAvatarsCollisionsEnabledRadiobutton
Layout.row: 1 Layout.row: 1
Layout.column: 2 Layout.column: 1
Layout.leftMargin: 60 Layout.leftMargin: -20
ButtonGroup.group: otherAvatarsOnOff
colorScheme: hifi.colorSchemes.light colorScheme: hifi.colorSchemes.light
fontSize: 17
letterSpacing: 1.4
text: "On"
boxSize: 20
}
HifiControlsUit.RadioButton {
id: otherAvatarsCollisionsDisabledRadiobutton
Layout.row: 1
Layout.column: 3
Layout.rightMargin: -15
ButtonGroup.group: otherAvatarsOnOff
colorScheme: hifi.colorSchemes.light
fontSize: 17
letterSpacing: 1.4
text: "Off"
boxSize: 20
} }
// TextStyle9 // TextStyle9
@ -283,16 +314,43 @@ Rectangle {
size: 17; size: 17;
Layout.row: 2 Layout.row: 2
Layout.column: 0 Layout.column: 0
text: "Avatar collides with environment" text: "Avatar to environment collision"
} }
HifiControlsUit.CheckBox { ButtonGroup {
id: environmentCollisionsEnabledCheckBox; id: worldOnOff
boxSize: 20; }
HifiControlsUit.RadioButton {
id: environmentCollisionsEnabledRadiobutton
Layout.row: 2 Layout.row: 2
Layout.column: 2 Layout.column: 1
Layout.leftMargin: 60 Layout.leftMargin: -20
ButtonGroup.group: worldOnOff
colorScheme: hifi.colorSchemes.light colorScheme: hifi.colorSchemes.light
fontSize: 17
letterSpacing: 1.4
text: "On"
boxSize: 20
}
HifiControlsUit.RadioButton {
id: environmentCollisionsDisabledRadiobutton
Layout.row: 2
Layout.column: 3
Layout.rightMargin: -15
ButtonGroup.group: worldOnOff
colorScheme: hifi.colorSchemes.light
fontSize: 17
letterSpacing: 1.4
text: "Off"
boxSize: 20
} }
} }