Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 23:33:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13897 from ElderOrb/filter_out_hands_from_joints

Browse source 
filter out left/right hands from joints list in avatarapp
This commit is contained in:
Brad Hefta-Gaub 2018-09-11 09:34:48 -07:00 committed by GitHub
commit 299e9d0d38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ Rectangle {
}
}
property var jointNames;
property var jointNames: []
property var currentAvatarSettings;
function fetchAvatarModelName(marketId, avatar) {

30
interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
View file

@ -25,7 +25,17 @@ Rectangle {
modified = false;
}
property var jointNames;
property var jointNames: []
onJointNamesChanged: {
jointsModel.clear();
for (var i = 0; i < jointNames.length; ++i) {
var jointName = jointNames[i];
if (jointName !== 'LeftHand' && jointName !== 'RightHand') {
jointsModel.append({'text' : jointName, 'jointIndex' : i});
}
}
}
property string avatarName: ''
property var wearablesModel;
@ -268,20 +278,30 @@ Rectangle {
anchors.right: parent.right
enabled: getCurrentWearable() !== null && !isSoft.checked
comboBox.displayText: isSoft.checked ? 'Hips' : comboBox.currentText
comboBox.textRole: "text"
model: jointNames
model: ListModel {
id: jointsModel
}
property bool notify: false
function set(jointIndex) {
notify = false;
currentIndex = jointIndex;
for (var i = 0; i < jointsModel.count; ++i) {
if (jointsModel.get(i).jointIndex === jointIndex) {
currentIndex = i;
break;
}
}
notify = true;
}
function notifyJointChanged() {
modified = true;
var jointIndex = jointsModel.get(jointsCombobox.currentIndex).jointIndex;
var properties = {
parentJointIndex: currentIndex,
parentJointIndex: jointIndex,
localPosition: {
x: positionVector.xvalue,
y: positionVector.yvalue,
@ -294,7 +314,7 @@ Rectangle {
}
};
wearableUpdated(getCurrentWearable().id, wearablesCombobox.currentIndex, properties);
wearableUpdated(getCurrentWearable().id, jointIndex, properties);
}
onCurrentIndexChanged: {