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

some cleanup

Browse source
This commit is contained in:
ZappoMan 2017-04-21 09:11:51 -07:00
parent 125b3d5f4e
commit c03182546b
3 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/avatar/Avatar.cpp
View file

@ -341,8 +341,6 @@ void Avatar::updateAvatarEntities() {
void Avatar::simulate(float deltaTime, bool inView) { void Avatar::simulate(float deltaTime, bool inView) {
PROFILE_RANGE(simulation, "simulate"); PROFILE_RANGE(simulation, "simulate");
//qDebug() << __FUNCTION__ << "skeleton download attempts:" << _skeletonModel->getResourceDownloadAttempts();
_simulationRate.increment(); _simulationRate.increment();
if (inView) { if (inView) {
_simulationInViewRate.increment(); _simulationInViewRate.increment();
@ -1114,15 +1112,17 @@ void Avatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
void Avatar::setModelURLFinished(bool success) { void Avatar::setModelURLFinished(bool success) {
if (!success && _skeletonModelURL != AvatarData::defaultFullAvatarModelUrl()) { if (!success && _skeletonModelURL != AvatarData::defaultFullAvatarModelUrl()) {
// FIXME -- const int MAX_SKELETON_DOWNLOAD_ATTEMPTS = 4; // NOTE: must be less than MAX_ATTEMPTS in ResourceCache.cpp
if (_skeletonModel->getResourceDownloadAttempts() > 4) { if (_skeletonModel->getResourceDownloadAttempts() > MAX_SKELETON_DOWNLOAD_ATTEMPTS) {
qCWarning(interfaceapp) << "Using default after failing to load Avatar model: " << _skeletonModelURL; qCWarning(interfaceapp) << "Using default after failing to load Avatar model: " << _skeletonModelURL;
// call _skeletonModel.setURL, but leave our copy of _skeletonModelURL alone. This is so that // call _skeletonModel.setURL, but leave our copy of _skeletonModelURL alone. This is so that
// we don't redo this every time we receive an identity packet from the avatar with the bad url. // we don't redo this every time we receive an identity packet from the avatar with the bad url.
QMetaObject::invokeMethod(_skeletonModel.get(), "setURL", QMetaObject::invokeMethod(_skeletonModel.get(), "setURL",
Qt::QueuedConnection, Q_ARG(QUrl, AvatarData::defaultFullAvatarModelUrl())); Qt::QueuedConnection, Q_ARG(QUrl, AvatarData::defaultFullAvatarModelUrl()));
} else { } else {
qCWarning(interfaceapp) << "Avatar model: " << _skeletonModelURL << "failed to load... attempts:" << _skeletonModel->getResourceDownloadAttempts(); qCWarning(interfaceapp) << "Avatar model: " << _skeletonModelURL
<< "failed to load... attempts:" << _skeletonModel->getResourceDownloadAttempts()
<< "out of:" << MAX_SKELETON_DOWNLOAD_ATTEMPTS;
} }
} }
} }

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

@ -1460,13 +1460,14 @@ void AvatarData::parseAvatarIdentityPacket(QSharedPointer<ReceivedMessage> messa
packetStream >> identityOut.uuid >> identityOut.skeletonModelURL >> identityOut.attachmentData >> identityOut.displayName >> identityOut.sessionDisplayName >> identityOut.avatarEntityData; packetStream >> identityOut.uuid >> identityOut.skeletonModelURL >> identityOut.attachmentData >> identityOut.displayName >> identityOut.sessionDisplayName >> identityOut.avatarEntityData;
qDebug() << __FUNCTION__ #ifdef WANT_DEBUG
qCDebug(avatars) << __FUNCTION__
<< "messageNumberOut:" << messageNumberOut << "messageNumberOut:" << messageNumberOut
<< "identityOut.uuid:" << identityOut.uuid << "identityOut.uuid:" << identityOut.uuid
<< "identityOut.skeletonModelURL:" << identityOut.skeletonModelURL << "identityOut.skeletonModelURL:" << identityOut.skeletonModelURL
<< "identityOut.displayName:" << identityOut.displayName << "identityOut.displayName:" << identityOut.displayName
<< "identityOut.sessionDisplayName:" << identityOut.sessionDisplayName << "identityOut.sessionDisplayName:" << identityOut.sessionDisplayName;
; #endif
} }
@ -1477,17 +1478,15 @@ QUrl AvatarData::cannonicalSkeletonModelURL(const QUrl& emptyURL) const {
} }
void AvatarData::processAvatarIdentity(const Identity& identity, bool& identityChanged, bool& displayNameChanged, quint64 messageNumber) { void AvatarData::processAvatarIdentity(const Identity& identity, bool& identityChanged, bool& displayNameChanged, quint64 messageNumber) {
qDebug() << __FUNCTION__ << "messageNumber:" << messageNumber << "_lastIdentityPacketMessageNumber:" << _lastIdentityPacketMessageNumber;
if (messageNumber < _lastIdentityPacketMessageNumber) { if (messageNumber < _lastIdentityPacketMessageNumber) {
qDebug() << "ignoring late identity packet for avatar " << getSessionUUID(); qCDebug(avatars) << "Ignoring late identity packet for avatar " << getSessionUUID()
<< "messageNumber:" << messageNumber << "_lastIdentityPacketMessageNumber:" << _lastIdentityPacketMessageNumber;
return; return;
} }
_lastIdentityPacketMessageNumber = messageNumber; _lastIdentityPacketMessageNumber = messageNumber;
if (_firstSkeletonCheck || (identity.skeletonModelURL != cannonicalSkeletonModelURL(emptyURL))) { if (_firstSkeletonCheck || (identity.skeletonModelURL != cannonicalSkeletonModelURL(emptyURL))) {
qDebug() << __FUNCTION__ << "about to call setSkeletonModelURL(identity.skeletonModelURL);... identity.skeletonModelURL:" << identity.skeletonModelURL;
setSkeletonModelURL(identity.skeletonModelURL); setSkeletonModelURL(identity.skeletonModelURL);
identityChanged = true; identityChanged = true;
if (_firstSkeletonCheck) { if (_firstSkeletonCheck) {
@ -1535,7 +1534,7 @@ QByteArray AvatarData::identityByteArray() const {
void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) { void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) {
if (skeletonModelURL.isEmpty()) { if (skeletonModelURL.isEmpty()) {
qDebug() << __FUNCTION__ << "caller called with empty URL."; qCDebug(avatars) << __FUNCTION__ << "caller called with empty URL.";
} }
const QUrl& expanded = skeletonModelURL.isEmpty() ? AvatarData::defaultFullAvatarModelUrl() : skeletonModelURL; const QUrl& expanded = skeletonModelURL.isEmpty() ? AvatarData::defaultFullAvatarModelUrl() : skeletonModelURL;

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

@ -126,10 +126,6 @@ AvatarSharedPointer AvatarHashMap::parseAvatarData(QSharedPointer<ReceivedMessag
} }
void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) { void AvatarHashMap::processAvatarIdentityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) {
qDebug() << __FUNCTION__ << "sendingNode:" << sendingNode << "message.failed():" << message->failed()
<< "isComplete:" << message->isComplete()
<< "messageNumber:" << message->getMessageNumber();
AvatarData::Identity identity; AvatarData::Identity identity;
quint64 messageNumber; quint64 messageNumber;
AvatarData::parseAvatarIdentityPacket(message, identity, messageNumber); AvatarData::parseAvatarIdentityPacket(message, identity, messageNumber);