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

repairs to key-framed URL sending through avatar-mixer

Browse source
This commit is contained in:
Stephen Birarda 2014-02-04 15:28:27 -08:00
parent 7e3442cbd0
commit adaa36a51d
4 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,9 @@ void broadcastIdentityPacket() {
} }
// send out the final packet // send out the final packet
nodeList->broadcastToNodes(avatarIdentityPacket, NodeSet() << NodeType::Agent); if (avatarIdentityPacket.size() > numPacketHeaderBytes) {
nodeList->broadcastToNodes(avatarIdentityPacket, NodeSet() << NodeType::Agent);
}
} }
void AvatarMixer::nodeKilled(SharedNodePointer killedNode) { void AvatarMixer::nodeKilled(SharedNodePointer killedNode) {
@ -170,7 +172,11 @@ void AvatarMixer::processDatagram(const QByteArray& dataByteArray, const HifiSoc
&& !nodeData->hasSentIdentityBetweenKeyFrames()) { && !nodeData->hasSentIdentityBetweenKeyFrames()) {
// this avatar changed their identity in some way and we haven't sent a packet in this keyframe // this avatar changed their identity in some way and we haven't sent a packet in this keyframe
QByteArray identityPacket = byteArrayWithPopluatedHeader(PacketTypeAvatarIdentity); QByteArray identityPacket = byteArrayWithPopluatedHeader(PacketTypeAvatarIdentity);
identityPacket.append(nodeData->identityByteArray());
QByteArray individualByteArray = nodeData->identityByteArray();
individualByteArray.replace(0, NUM_BYTES_RFC4122_UUID, nodeUUID.toRfc4122());
identityPacket.append(individualByteArray);
nodeData->setHasSentIdentityBetweenKeyFrames(true); nodeData->setHasSentIdentityBetweenKeyFrames(true);
nodeList->broadcastToNodes(identityPacket, NodeSet() << NodeType::Agent); nodeList->broadcastToNodes(identityPacket, NodeSet() << NodeType::Agent);

2
interface/src/Application.cpp
View file

@ -247,7 +247,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
// send the identity packet for our avatar each second to our avatar mixer // send the identity packet for our avatar each second to our avatar mixer
QTimer* identityPacketTimer = new QTimer(); QTimer* identityPacketTimer = new QTimer();
connect(identityPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendIdentityPacket); connect(identityPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendIdentityPacket);
silentNodeTimer->start(1000); identityPacketTimer->start(1000);
QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation); QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);

16
interface/src/avatar/AvatarManager.cpp
View file

@ -179,6 +179,7 @@ void AvatarManager::processAvatarDataPacket(const QByteArray &datagram, const QW
} }
void AvatarManager::processAvatarIdentityPacket(const QByteArray &packet) { void AvatarManager::processAvatarIdentityPacket(const QByteArray &packet) {
qDebug() << "Processing an avatar identity packet";
// setup a data stream to parse the packet // setup a data stream to parse the packet
QDataStream identityStream(packet); QDataStream identityStream(packet);
identityStream.skipRawData(numBytesForPacketHeader(packet)); identityStream.skipRawData(numBytesForPacketHeader(packet));
@ -186,28 +187,27 @@ void AvatarManager::processAvatarIdentityPacket(const QByteArray &packet) {
QUuid nodeUUID; QUuid nodeUUID;
while (!identityStream.atEnd()) { while (!identityStream.atEnd()) {
identityStream >> nodeUUID;
QUrl faceMeshURL, skeletonURL;
identityStream >> nodeUUID >> faceMeshURL >> skeletonURL;
// mesh URL for a UUID, find avatar in our list // mesh URL for a UUID, find avatar in our list
AvatarSharedPointer matchingAvatar = _avatarHash.value(nodeUUID); AvatarSharedPointer matchingAvatar = _avatarHash.value(nodeUUID);
if (matchingAvatar) { if (matchingAvatar) {
QUrl faceMeshURL, skeletonURL;
identityStream >> faceMeshURL >> skeletonURL;
Avatar* avatar = static_cast<Avatar*>(matchingAvatar.data()); Avatar* avatar = static_cast<Avatar*>(matchingAvatar.data());
if (avatar->getHead().getFaceModel().getURL() != faceMeshURL) { if (avatar->getFaceModelURL() != faceMeshURL) {
qDebug() << "Changing mesh to" << faceMeshURL.toString() << "for avatar with UUID" qDebug() << "Changing mesh to" << faceMeshURL.toString() << "for avatar with UUID"
<< uuidStringWithoutCurlyBraces(nodeUUID); << uuidStringWithoutCurlyBraces(nodeUUID);
avatar->getHead().getFaceModel().setURL(faceMeshURL); avatar->setFaceModelURL(faceMeshURL);
} }
if (avatar->getSkeletonModel().getURL() != skeletonURL) { if (avatar->getFaceModelURL() != skeletonURL) {
qDebug() << "Changing skeleton to" << skeletonURL << "for avatar with UUID" qDebug() << "Changing skeleton to" << skeletonURL << "for avatar with UUID"
<< uuidStringWithoutCurlyBraces(nodeUUID); << uuidStringWithoutCurlyBraces(nodeUUID);
avatar->getSkeletonModel().setURL(skeletonURL); avatar->setFaceModelURL(skeletonURL);
} }
} }
} }

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

@ -280,6 +280,8 @@ bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray &packet) {
bool hasIdentityChanged = false; bool hasIdentityChanged = false;
qDebug() << faceModelURL;
if (faceModelURL != _faceModelURL) { if (faceModelURL != _faceModelURL) {
setFaceModelURL(faceModelURL); setFaceModelURL(faceModelURL);
hasIdentityChanged = true; hasIdentityChanged = true;