Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed the dropdown from the avatar app, because it is in settings controls now

Browse source
This commit is contained in:
amantley 2018-10-22 22:31:26 -07:00
parent 8cb09c37ee
commit 3e8663f8e9
3 changed files with 7 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/AvatarApp.qml
View file

@ -252,7 +252,6 @@ Rectangle {
var avatarSettings = {
dominantHand : settings.dominantHandIsLeft ? 'left' : 'right',
collisionsEnabled : settings.avatarCollisionsOn,
userRecenterModel : settings.avatarRecenterModelOn,
animGraphOverrideUrl : settings.avatarAnimationOverrideJSON,
collisionSoundUrl : settings.avatarCollisionSoundUrl
};

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

@ -20,7 +20,6 @@ Rectangle {
property real scaleValue: scaleSlider.value / 10
property alias dominantHandIsLeft: leftHandRadioButton.checked
property alias avatarCollisionsOn: collisionsEnabledRadiobutton.checked
property alias avatarRecenterModelOn: userModelComboBox.currentIndex
property alias avatarAnimationOverrideJSON: avatarAnimationUrlInputText.text
property alias avatarAnimationJSON: avatarAnimationUrlInputText.placeholderText
property alias avatarCollisionSoundUrl: avatarCollisionSoundUrlInputText.text
@ -49,7 +48,6 @@ Rectangle {
avatarAnimationJSON = settings.animGraphUrl;
avatarAnimationOverrideJSON = settings.animGraphOverrideUrl;
avatarCollisionSoundUrl = settings.collisionSoundUrl;
avatarRecenterModelOn = settings.userRecenterModel;
visible = true;
}
@ -191,7 +189,7 @@ Rectangle {
anchors.left: parent.left
anchors.right: parent.right
rows: 3
rows: 2
rowSpacing: 25
columns: 3
@ -214,7 +212,7 @@ Rectangle {
Layout.row: 0
Layout.column: 1
Layout.leftMargin: 20
Layout.leftMargin: -40
ButtonGroup.group: leftRight
checked: true
@ -231,7 +229,7 @@ Rectangle {
Layout.row: 0
Layout.column: 2
Layout.rightMargin: -20
Layout.rightMargin: 20
ButtonGroup.group: leftRight
@ -260,7 +258,7 @@ Rectangle {
Layout.row: 1
Layout.column: 1
Layout.leftMargin: 20
Layout.leftMargin: -40
ButtonGroup.group: onOff
colorScheme: hifi.colorSchemes.light
@ -281,7 +279,7 @@ Rectangle {
Layout.row: 1
Layout.column: 2
Layout.rightMargin: -20
Layout.rightMargin: 20
ButtonGroup.group: onOff
colorScheme: hifi.colorSchemes.light
@ -291,34 +289,6 @@ Rectangle {
text: "OFF"
boxSize: 20
}
// TextStyle9
RalewaySemiBold {
size: 17;
Layout.row: 2
Layout.column: 0
text: "User Model:"
}
// sit stand combo box
HifiControlsUit.ComboBox {
Layout.row: 2
Layout.column: 1
id: userModelComboBox
comboBox.textRole: "text"
currentIndex: 2
model: ListModel {
id: cbItems
ListElement { text: "Force Sitting"; color: "Yellow" }
ListElement { text: "Force Standing"; color: "Green" }
ListElement { text: "Auto Mode"; color: "Brown" }
ListElement { text: "Disable Recentering"; color: "Red" }
}
width: 200
}
}
ColumnLayout {

14
scripts/system/avatarapp.js
View file

@ -64,7 +64,6 @@ function getMyAvatarSettings() {
return {
dominantHand: MyAvatar.getDominantHand(),
collisionsEnabled : MyAvatar.getCollisionsEnabled(),
userRecenterModel: MyAvatar.userRecenterModel,
collisionSoundUrl : MyAvatar.collisionSoundURL,
animGraphUrl: MyAvatar.getAnimGraphUrl(),
animGraphOverrideUrl : MyAvatar.getAnimGraphOverrideUrl(),
@ -137,14 +136,6 @@ function onCollisionsEnabledChanged(enabled) {
}
}
function onUserRecenterModelChanged(modelName) {
if (currentAvatarSettings.userRecenterModel !== modelName) {
currentAvatarSettings.userRecenterModel = modelName;
print("emit user recenter model changed");
sendToQml({ 'method': 'settingChanged', 'name': 'userRecenterModel', 'value': modelName })
}
}
function onNewCollisionSoundUrl(url) {
if(currentAvatarSettings.collisionSoundUrl !== url) {
currentAvatarSettings.collisionSoundUrl = url;
@ -320,11 +311,12 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
case 'saveSettings':
MyAvatar.setAvatarScale(message.avatarScale);
currentAvatar.avatarScale = message.avatarScale;
MyAvatar.setDominantHand(message.settings.dominantHand);
MyAvatar.setCollisionsEnabled(message.settings.collisionsEnabled);
MyAvatar.userRecenterModel = message.settings.userRecenterModel;
MyAvatar.collisionSoundURL = message.settings.collisionSoundUrl;
MyAvatar.setAnimGraphOverrideUrl(message.settings.animGraphOverrideUrl);
settings = getMyAvatarSettings();
break;
default:
@ -497,7 +489,6 @@ function off() {
MyAvatar.skeletonModelURLChanged.disconnect(onSkeletonModelURLChanged);
MyAvatar.dominantHandChanged.disconnect(onDominantHandChanged);
MyAvatar.collisionsEnabledChanged.disconnect(onCollisionsEnabledChanged);
MyAvatar.userRecenterModelChanged.disconnect(onUserRecenterModelChanged);
MyAvatar.newCollisionSoundURL.disconnect(onNewCollisionSoundUrl);
MyAvatar.animGraphUrlChanged.disconnect(onAnimGraphUrlChanged);
MyAvatar.targetScaleChanged.disconnect(onTargetScaleChanged);
@ -512,7 +503,6 @@ function on() {
MyAvatar.skeletonModelURLChanged.connect(onSkeletonModelURLChanged);
MyAvatar.dominantHandChanged.connect(onDominantHandChanged);
MyAvatar.collisionsEnabledChanged.connect(onCollisionsEnabledChanged);
MyAvatar.userRecenterModelChanged.connect(onUserRecenterModelChanged);
MyAvatar.newCollisionSoundURL.connect(onNewCollisionSoundUrl);
MyAvatar.animGraphUrlChanged.connect(onAnimGraphUrlChanged);
MyAvatar.targetScaleChanged.connect(onTargetScaleChanged);