Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 19:25:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add an alias for AvatarDataSequenceNumber

Browse source
This commit is contained in:
Stephen Birarda 2015-09-08 08:26:14 -07:00
parent 875d10575f
commit c49088846f
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -259,8 +259,8 @@ void AvatarMixer::broadcastAvatarData() {
return; return;
} }
uint16_t lastSeqToReceiver = nodeData->getLastBroadcastSequenceNumber(otherNode->getUUID()); AvatarDataSequenceNumber lastSeqToReceiver = nodeData->getLastBroadcastSequenceNumber(otherNode->getUUID());
uint16_t lastSeqFromSender = otherNodeData->getLastReceivedSequenceNumber(); AvatarDataSequenceNumber lastSeqFromSender = otherNodeData->getLastReceivedSequenceNumber();
if (lastSeqToReceiver > lastSeqFromSender) { if (lastSeqToReceiver > lastSeqFromSender) {
// Did we somehow get out of order packets from the sender? // Did we somehow get out of order packets from the sender?

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

@ -1098,7 +1098,7 @@ void AvatarData::sendAvatarDataPacket() {
QByteArray avatarByteArray = toByteArray(true, sendFullUpdate); QByteArray avatarByteArray = toByteArray(true, sendFullUpdate);
doneEncoding(true); doneEncoding(true);
static uint16_t sequenceNumber = 0; static AvatarDataSequenceNumber sequenceNumber = 0;
auto avatarPacket = NLPacket::create(PacketType::AvatarData, avatarByteArray.size() + sizeof(sequenceNumber)); auto avatarPacket = NLPacket::create(PacketType::AvatarData, avatarByteArray.size() + sizeof(sequenceNumber));
avatarPacket->writePrimitive(sequenceNumber++); avatarPacket->writePrimitive(sequenceNumber++);

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

@ -59,9 +59,11 @@ typedef unsigned long long quint64;
#include "Recorder.h" #include "Recorder.h"
#include "Referential.h" #include "Referential.h"
typedef std::shared_ptr<AvatarData> AvatarSharedPointer; using AvatarSharedPointer = std::shared_ptr<AvatarData>;
typedef std::weak_ptr<AvatarData> AvatarWeakPointer; using AvatarWeakPointer = std::weak_ptr<AvatarData>;
typedef QHash<QUuid, AvatarSharedPointer> AvatarHash; using AvatarHash = QHash<QUuid, AvatarSharedPointer>;
using AvatarDataSequenceNumber = uint16_t;
// avatar motion behaviors // avatar motion behaviors
const quint32 AVATAR_MOTION_KEYBOARD_MOTOR_ENABLED = 1U << 0; const quint32 AVATAR_MOTION_KEYBOARD_MOTOR_ENABLED = 1U << 0;