Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 06:23:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update avatarapp on avatar switch

Browse source
This commit is contained in:
Alexander Ivash 2018-07-03 20:58:48 +03:00
parent aaa2e3f6a8
commit 67fb8af87c
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/avatarapp/AvatarsModel.qml
View file

@ -57,6 +57,7 @@ ListModel {
} }
function populate(bookmarks) { function populate(bookmarks) {
clear();
for(var avatarName in bookmarks) { for(var avatarName in bookmarks) {
var avatar = bookmarks[avatarName]; var avatar = bookmarks[avatarName];
var avatarEntry = makeAvatarObject(avatar, avatarName); var avatarEntry = makeAvatarObject(avatar, avatarName);

8
scripts/system/avatarapp.js
View file

@ -102,6 +102,12 @@ function onTargetScaleChanged() {
} }
} }
function onSkeletonModelURLChanged() {
if(currentAvatar || (currentAvatar.skeletonModelURL !== MyAvatar.skeletonModelURL)) {
fromQml({'method' : 'getAvatars'});
}
}
function onDominantHandChanged(dominantHand) { function onDominantHandChanged(dominantHand) {
if(currentAvatarSettings.dominantHand !== dominantHand) { if(currentAvatarSettings.dominantHand !== dominantHand) {
currentAvatarSettings.dominantHand = dominantHand; currentAvatarSettings.dominantHand = dominantHand;
@ -433,6 +439,7 @@ function off() {
AvatarBookmarks.bookmarkDeleted.disconnect(onBookmarkDeleted); AvatarBookmarks.bookmarkDeleted.disconnect(onBookmarkDeleted);
AvatarBookmarks.bookmarkAdded.disconnect(onBookmarkAdded); AvatarBookmarks.bookmarkAdded.disconnect(onBookmarkAdded);
MyAvatar.skeletonModelURLChanged.disconnect(onSkeletonModelURLChanged);
MyAvatar.dominantHandChanged.disconnect(onDominantHandChanged); MyAvatar.dominantHandChanged.disconnect(onDominantHandChanged);
MyAvatar.collisionsEnabledChanged.disconnect(onCollisionsEnabledChanged); MyAvatar.collisionsEnabledChanged.disconnect(onCollisionsEnabledChanged);
MyAvatar.newCollisionSoundURL.disconnect(onNewCollisionSoundUrl); MyAvatar.newCollisionSoundURL.disconnect(onNewCollisionSoundUrl);
@ -445,6 +452,7 @@ function on() {
AvatarBookmarks.bookmarkDeleted.connect(onBookmarkDeleted); AvatarBookmarks.bookmarkDeleted.connect(onBookmarkDeleted);
AvatarBookmarks.bookmarkAdded.connect(onBookmarkAdded); AvatarBookmarks.bookmarkAdded.connect(onBookmarkAdded);
MyAvatar.skeletonModelURLChanged.connect(onSkeletonModelURLChanged);
MyAvatar.dominantHandChanged.connect(onDominantHandChanged); MyAvatar.dominantHandChanged.connect(onDominantHandChanged);
MyAvatar.collisionsEnabledChanged.connect(onCollisionsEnabledChanged); MyAvatar.collisionsEnabledChanged.connect(onCollisionsEnabledChanged);
MyAvatar.newCollisionSoundURL.connect(onNewCollisionSoundUrl); MyAvatar.newCollisionSoundURL.connect(onNewCollisionSoundUrl);