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

Use process function for overrides

Browse source
This commit is contained in:
Clement 2019-03-20 17:04:22 -07:00
parent 3221e1dbd5
commit 88a19f26e2
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/avatars/src/AvatarTraits.h
View file

@ -30,7 +30,6 @@ namespace AvatarTraits {
// Simple traits // Simple traits
SkeletonModelURL = 0, SkeletonModelURL = 0,
// Instanced traits // Instanced traits
FirstInstancedTrait, FirstInstancedTrait,
AvatarEntity = FirstInstancedTrait, AvatarEntity = FirstInstancedTrait,

4
libraries/avatars/src/ClientTraitsHandler.cpp
View file

@ -165,11 +165,11 @@ void ClientTraitsHandler::processTraitOverride(QSharedPointer<ReceivedMessage> m
// override the skeleton URL but do not mark the trait as having changed // override the skeleton URL but do not mark the trait as having changed
// so that we don't unecessarily send a new trait packet to the mixer with the overriden URL // so that we don't unecessarily send a new trait packet to the mixer with the overriden URL
auto encodedSkeletonURL = QUrl::fromEncoded(message->readWithoutCopy(traitBinarySize));
auto hasChangesBefore = _hasChangedTraits; auto hasChangesBefore = _hasChangedTraits;
_owningAvatar->setSkeletonModelURL(encodedSkeletonURL); auto traitBinaryData = message->readWithoutCopy(traitBinarySize);
_owningAvatar->processTrait(traitType, traitBinaryData);
// setSkeletonModelURL will flag us for changes to the SkeletonModelURL so we reset some state here to // setSkeletonModelURL will flag us for changes to the SkeletonModelURL so we reset some state here to
// avoid unnecessarily sending the overriden skeleton model URL back to the mixer // avoid unnecessarily sending the overriden skeleton model URL back to the mixer