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

Switched BillboardOverlay to NetworkAccessManaqer

Browse source
This commit is contained in:
Atlante45 2014-07-01 17:44:38 -07:00
parent c5a997a567
commit ab15a1487e
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/ui/overlays/BillboardOverlay.cpp
View file

@ -14,8 +14,7 @@
#include "BillboardOverlay.h" #include "BillboardOverlay.h"
BillboardOverlay::BillboardOverlay() BillboardOverlay::BillboardOverlay()
: _manager(NULL), : _scale(1.0f),
_scale(1.0f),
_isFacingAvatar(true) { _isFacingAvatar(true) {
} }
@ -119,18 +118,13 @@ void BillboardOverlay::setProperties(const QScriptValue &properties) {
} }
} }
// TODO: handle setting image multiple times, how do we manage releasing the bound texture?
void BillboardOverlay::setBillboardURL(const QUrl url) { void BillboardOverlay::setBillboardURL(const QUrl url) {
// TODO: are we creating too many QNetworkAccessManager() when multiple calls to setImageURL are made? QNetworkReply* reply = NetworkAccessManager::getInstance().get(QNetworkRequest(url));
_manager->deleteLater(); connect(reply, &QNetworkReply::finished, this, &BillboardOverlay::replyFinished);
_manager = new QNetworkAccessManager();
connect(_manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*)));
_manager->get(QNetworkRequest(url));
} }
void BillboardOverlay::replyFinished(QNetworkReply* reply) { void BillboardOverlay::replyFinished() {
// replace our byte array with the downloaded data // replace our byte array with the downloaded data
QNetworkReply* reply = static_cast<QNetworkReply*>(sender());
_billboard = reply->readAll(); _billboard = reply->readAll();
_manager->deleteLater();
_manager = NULL;
} }

3
interface/src/ui/overlays/BillboardOverlay.h
View file

@ -27,12 +27,11 @@ public:
virtual void setProperties(const QScriptValue& properties); virtual void setProperties(const QScriptValue& properties);
private slots: private slots:
void replyFinished(QNetworkReply* reply); void replyFinished();
private: private:
void setBillboardURL(const QUrl url); void setBillboardURL(const QUrl url);
QNetworkAccessManager* _manager;
QUrl _url; QUrl _url;
QByteArray _billboard; QByteArray _billboard;
QSize _size; QSize _size;