mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 13:49:12 +02:00
Switched AvatarData to NetworkAccessManager
This commit is contained in:
parent
ab15a1487e
commit
30644c750d
2 changed files with 13 additions and 22 deletions
|
@ -16,10 +16,10 @@
|
||||||
#include <QtCore/QDataStream>
|
#include <QtCore/QDataStream>
|
||||||
#include <QtCore/QThread>
|
#include <QtCore/QThread>
|
||||||
#include <QtCore/QUuid>
|
#include <QtCore/QUuid>
|
||||||
#include <QtNetwork/QNetworkAccessManager>
|
|
||||||
#include <QtNetwork/QNetworkReply>
|
#include <QtNetwork/QNetworkReply>
|
||||||
#include <QtNetwork/QNetworkRequest>
|
#include <QtNetwork/QNetworkRequest>
|
||||||
|
|
||||||
|
#include <NetworkAccessManager.h>
|
||||||
#include <NodeList.h>
|
#include <NodeList.h>
|
||||||
#include <PacketHeaders.h>
|
#include <PacketHeaders.h>
|
||||||
#include <SharedUtil.h>
|
#include <SharedUtil.h>
|
||||||
|
@ -33,8 +33,6 @@ quint64 DEFAULT_FILTERED_LOG_EXPIRY = 2 * USECS_PER_SECOND;
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
QNetworkAccessManager* AvatarData::networkAccessManager = NULL;
|
|
||||||
|
|
||||||
AvatarData::AvatarData() :
|
AvatarData::AvatarData() :
|
||||||
_sessionUUID(),
|
_sessionUUID(),
|
||||||
_handPosition(0,0,0),
|
_handPosition(0,0,0),
|
||||||
|
@ -751,18 +749,15 @@ void AvatarData::setBillboard(const QByteArray& billboard) {
|
||||||
void AvatarData::setBillboardFromURL(const QString &billboardURL) {
|
void AvatarData::setBillboardFromURL(const QString &billboardURL) {
|
||||||
_billboardURL = billboardURL;
|
_billboardURL = billboardURL;
|
||||||
|
|
||||||
if (AvatarData::networkAccessManager) {
|
|
||||||
qDebug() << "Changing billboard for avatar to PNG at" << qPrintable(billboardURL);
|
qDebug() << "Changing billboard for avatar to PNG at" << qPrintable(billboardURL);
|
||||||
|
|
||||||
QNetworkRequest billboardRequest;
|
QNetworkRequest billboardRequest;
|
||||||
billboardRequest.setUrl(QUrl(billboardURL));
|
billboardRequest.setUrl(QUrl(billboardURL));
|
||||||
|
|
||||||
QNetworkReply* networkReply = AvatarData::networkAccessManager->get(billboardRequest);
|
NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
|
||||||
connect(networkReply, SIGNAL(finished()), this, SLOT(setBillboardFromNetworkReply()));
|
QNetworkReply* networkReply = networkAccessManager.get(billboardRequest);
|
||||||
|
connect(networkReply, SIGNAL(finished()), this, SLOT(setBillboardFromNetworkReply()));
|
||||||
} else {
|
|
||||||
qDebug() << "Billboard PNG download requested but no network access manager is available.";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AvatarData::setBillboardFromNetworkReply() {
|
void AvatarData::setBillboardFromNetworkReply() {
|
||||||
|
@ -839,8 +834,9 @@ void AvatarData::updateJointMappings() {
|
||||||
_jointIndices.clear();
|
_jointIndices.clear();
|
||||||
_jointNames.clear();
|
_jointNames.clear();
|
||||||
|
|
||||||
if (networkAccessManager && _skeletonModelURL.fileName().toLower().endsWith(".fst")) {
|
if (_skeletonModelURL.fileName().toLower().endsWith(".fst")) {
|
||||||
QNetworkReply* networkReply = networkAccessManager->get(QNetworkRequest(_skeletonModelURL));
|
NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
|
||||||
|
QNetworkReply* networkReply = networkAccessManager.get(QNetworkRequest(_skeletonModelURL));
|
||||||
connect(networkReply, SIGNAL(finished()), this, SLOT(setJointMappingsFromNetworkReply()));
|
connect(networkReply, SIGNAL(finished()), this, SLOT(setJointMappingsFromNetworkReply()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,7 +102,6 @@ enum KeyState {
|
||||||
const glm::vec3 vec3Zero(0.0f);
|
const glm::vec3 vec3Zero(0.0f);
|
||||||
|
|
||||||
class QDataStream;
|
class QDataStream;
|
||||||
class QNetworkAccessManager;
|
|
||||||
|
|
||||||
class AttachmentData;
|
class AttachmentData;
|
||||||
class JointData;
|
class JointData;
|
||||||
|
@ -269,8 +268,6 @@ public:
|
||||||
QElapsedTimer& getLastUpdateTimer() { return _lastUpdateTimer; }
|
QElapsedTimer& getLastUpdateTimer() { return _lastUpdateTimer; }
|
||||||
|
|
||||||
virtual float getBoundingRadius() const { return 1.f; }
|
virtual float getBoundingRadius() const { return 1.f; }
|
||||||
|
|
||||||
static void setNetworkAccessManager(QNetworkAccessManager* sharedAccessManager) { networkAccessManager = sharedAccessManager; }
|
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void sendIdentityPacket();
|
void sendIdentityPacket();
|
||||||
|
@ -323,8 +320,6 @@ protected:
|
||||||
|
|
||||||
QHash<QString, int> _jointIndices; ///< 1-based, since zero is returned for missing keys
|
QHash<QString, int> _jointIndices; ///< 1-based, since zero is returned for missing keys
|
||||||
QStringList _jointNames; ///< in order of depth-first traversal
|
QStringList _jointNames; ///< in order of depth-first traversal
|
||||||
|
|
||||||
static QNetworkAccessManager* networkAccessManager;
|
|
||||||
|
|
||||||
quint64 _errorLogExpiry; ///< time in future when to log an error
|
quint64 _errorLogExpiry; ///< time in future when to log an error
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue