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

hacking

Browse source
This commit is contained in:
ZappoMan 2017-04-25 18:21:09 -07:00
parent 90cdeb9582
commit 5164aa4056
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -5209,6 +5209,7 @@ void Application::nodeAdded(SharedNodePointer node) const {
// new avatar mixer, send off our identity packet right away // new avatar mixer, send off our identity packet right away
qDebug() << __FUNCTION__ << "about to call... getMyAvatar()->sendIdentityPacket();"; qDebug() << __FUNCTION__ << "about to call... getMyAvatar()->sendIdentityPacket();";
getMyAvatar()->markIdentityDataChanged();
getMyAvatar()->sendIdentityPacket(); getMyAvatar()->sendIdentityPacket();
getMyAvatar()->resetLastSent(); getMyAvatar()->resetLastSent();
} }

3
libraries/avatars/src/AvatarData.cpp
View file

@ -1489,6 +1489,9 @@ void AvatarData::processAvatarIdentity(const Identity& identity, bool& identityC
return; return;
} }
qCDebug(avatars) << __FUNCTION__ << "got identity packet for avatar " << getSessionUUID()
<< "identity.updatedAt:" << identity.updatedAt << "_identityUpdatedAt:" << _identityUpdatedAt;
if (_firstSkeletonCheck || (identity.skeletonModelURL != cannonicalSkeletonModelURL(emptyURL))) { if (_firstSkeletonCheck || (identity.skeletonModelURL != cannonicalSkeletonModelURL(emptyURL))) {
setSkeletonModelURL(identity.skeletonModelURL); setSkeletonModelURL(identity.skeletonModelURL);
identityChanged = true; identityChanged = true;

11
libraries/avatars/src/AvatarData.h
View file

@ -624,7 +624,10 @@ public:
static float _avatarSortCoefficientAge; static float _avatarSortCoefficientAge;
bool getIdentityDataChanged() const { return _identityDataChanged; } // has the identity data changed since the last time sendIdentityPacket() was called bool getIdentityDataChanged() const { return _identityDataChanged; } // has the identity data changed since the last time sendIdentityPacket() was called
void markIdentityDataChanged() {
_identityDataChanged = true;
_identityUpdatedAt = usecTimestampNow();
}
signals: signals:
void displayNameChanged(); void displayNameChanged();
@ -786,12 +789,6 @@ protected:
bool _identityDataChanged { false }; bool _identityDataChanged { false };
quint64 _identityUpdatedAt { 0 }; quint64 _identityUpdatedAt { 0 };
void markIdentityDataChanged() {
_identityDataChanged = true;
_identityUpdatedAt = usecTimestampNow();
}
private: private:
friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar); friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar);
static QUrl _defaultFullAvatarModelUrl; static QUrl _defaultFullAvatarModelUrl;