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

interface/

Browse source
This commit is contained in:
ZappoMan 2017-04-26 11:29:42 -07:00
parent 65801cbb4d
commit 517bbc795f
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1532,11 +1532,22 @@ void AvatarData::processAvatarIdentity(const Identity& identity, bool& identityC
} }
QByteArray AvatarData::identityByteArray() const { QByteArray AvatarData::identityByteArray() const {
qDebug() << __FUNCTION__;
QByteArray identityData; QByteArray identityData;
QDataStream identityStream(&identityData, QIODevice::Append); QDataStream identityStream(&identityData, QIODevice::Append);
const QUrl& urlToSend = cannonicalSkeletonModelURL(emptyURL); // depends on _skeletonModelURL const QUrl& urlToSend = cannonicalSkeletonModelURL(emptyURL); // depends on _skeletonModelURL
_avatarEntitiesLock.withReadLock([&] { _avatarEntitiesLock.withReadLock([&] {
qDebug() << __FUNCTION__
<< "session:" << getSessionUUID()
<< "url:" << urlToSend
<< "displayName:" << _displayName
<< "sessionDisplayName:" << getSessionDisplayNameForTransport()
<< "identityUpdatedAt:" << _identityUpdatedAt;
identityStream << getSessionUUID() identityStream << getSessionUUID()
<< urlToSend << urlToSend
<< _attachmentData << _attachmentData
@ -1720,6 +1731,7 @@ void AvatarData::sendAvatarDataPacket() {
} }
void AvatarData::sendIdentityPacket() { void AvatarData::sendIdentityPacket() {
qDebug() << __FUNCTION__;
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
QByteArray identityData = identityByteArray(); QByteArray identityData = identityByteArray();
@ -1728,9 +1740,14 @@ void AvatarData::sendIdentityPacket() {
packetList->write(identityData); packetList->write(identityData);
nodeList->eachMatchingNode( nodeList->eachMatchingNode(
[&](const SharedNodePointer& node)->bool { [&](const SharedNodePointer& node)->bool {
if (node->getType() == NodeType::AvatarMixer) {
qDebug() << "AvatarData::sendIdentityPacket()... found mixer node, node->getActiveSocket():" << node->getActiveSocket();
}
return node->getType() == NodeType::AvatarMixer && node->getActiveSocket(); return node->getType() == NodeType::AvatarMixer && node->getActiveSocket();
}, },
[&](const SharedNodePointer& node) { [&](const SharedNodePointer& node) {
qDebug() << "AvatarData::sendIdentityPacket()... about to call.... nodeList->sendPacketList(std::move(packetList), *node);";
nodeList->sendPacketList(std::move(packetList), *node); nodeList->sendPacketList(std::move(packetList), *node);
}); });