Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 14:38:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add possibility to change joints using combobox

Browse source
This commit is contained in:
Alexander Ivash 2018-08-08 21:41:10 +03:00
parent f8c1ba48ad
commit 550e39ac84
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ Rectangle {
var wearable = avatar.wearables.get(i).properties;
for(var j = (wearable.modelURL.length - 1); j >= 0; --j) {
if(wearable.modelURL[j] === '/') {
wearable.text = wearable.modelURL.substring(j + 1) + ' [%jointIndex%]'.replace('%jointIndex%', jointNames[wearable.parentJointIndex]);
wearable.text = wearable.modelURL.substring(j + 1);
break;
}
}
@ -50,6 +50,9 @@ Rectangle {
}
wearablesCombobox.currentIndex = 0;
if(wearablesCombobox.model.count !== 0) {
jointsCombobox.set(getCurrentWearable().parentJointIndex)
}
}
function refreshWearable(wearableID, wearableIndex, properties, updateUI) {
@ -172,6 +175,7 @@ Rectangle {
position.set(currentWearable.localPosition);
rotation.set(currentWearable.localRotationAngles);
scalespinner.set(currentWearable.dimensions.x / currentWearable.naturalDimensions.x)
jointsCombobox.set(currentWearable.parentJointIndex)
wearableSelected(currentWearable.id);
}
@ -193,9 +197,32 @@ Rectangle {
id: jointsCombobox
anchors.left: parent.left
anchors.right: parent.right
comboBox.textRole: "text"
model: ListModel {
model: jointNames
property bool notify: false
function set(jointIndex) {
notify = false;
currentIndex = jointIndex;
notify = true;
}
function notifyJointChanged() {
modified = true;
var properties = {
parentJointIndex: currentIndex,
localPosition: {
x: position.xvalue,
y: position.yvalue,
z: position.zvalue
}
};
wearableUpdated(getCurrentWearable().id, wearablesCombobox.currentIndex, properties);
}
onCurrentIndexChanged: {
if(notify) notifyJointChanged();
}
}
}