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

FB18859 - Avatar App Bug when material entity is added as avatar entity

Browse source
This commit is contained in:
Alexander Ivash 2018-10-09 01:59:41 +03:00
parent 19c3f1516f
commit 7d470cf161
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,16 +49,32 @@ Rectangle {
refresh(avatar);
}
function extractTitleFromUrl(url) {
for (var j = (url.length - 1); j >= 0; --j) {
if (url[j] === '/') {
return url.substring(j + 1);
}
}
return url;
}
function refresh(avatar) {
wearablesCombobox.model.clear();
wearablesCombobox.currentIndex = -1;
for (var i = 0; i < avatar.wearables.count; ++i) {
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);
break;
if (wearable.modelURL) {
wearable.text = extractTitleFromUrl(wearable.modelURL);
} else if (wearable.materialURL) {
var materialUrlOrJson = '';
if (wearable.materialURL !== 'materialData') {
materialUrlOrJson = extractTitleFromUrl(wearable.materialURL);
} else if (wearable.materialData) {
materialUrlOrJson = JSON.stringify(JSON.parse(wearable.materialData))
}
if(materialUrlOrJson) {
wearable.text = 'Material: ' + materialUrlOrJson;
}
}
wearablesCombobox.model.append(wearable);