diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp index 99224f7dce..5ac89f5a7e 100644 --- a/libraries/animation/src/AnimationCache.cpp +++ b/libraries/animation/src/AnimationCache.cpp @@ -43,28 +43,27 @@ Animation::Animation(const QUrl& url) : Resource(url) {} class AnimationReader : public QRunnable { public: - AnimationReader(const QWeakPointer& animation, QNetworkReply* reply); + AnimationReader(const QWeakPointer& animation, QByteArray data); virtual void run(); private: QWeakPointer _animation; - QNetworkReply* _reply; + QByteArray _data; }; -AnimationReader::AnimationReader(const QWeakPointer& animation, QNetworkReply* reply) : +AnimationReader::AnimationReader(const QWeakPointer& animation, QByteArray data) : _animation(animation), - _reply(reply) { + _data(data) { } void AnimationReader::run() { QSharedPointer animation = _animation.toStrongRef(); if (!animation.isNull()) { QMetaObject::invokeMethod(animation.data(), "setGeometry", - Q_ARG(const FBXGeometry&, readFBX(_reply->readAll(), QVariantHash()))); + Q_ARG(const FBXGeometry&, readFBX(QByteArray(_data), QVariantHash()))); } - _reply->deleteLater(); } QStringList Animation::getJointNames() const { @@ -96,9 +95,9 @@ void Animation::setGeometry(const FBXGeometry& geometry) { finishedLoading(true); } -void Animation::downloadFinished(QNetworkReply* reply) { +void Animation::downloadFinished(const QByteArray& data) { // send the reader off to the thread pool - QThreadPool::globalInstance()->start(new AnimationReader(_self, reply)); + QThreadPool::globalInstance()->start(new AnimationReader(_self, data)); } diff --git a/libraries/animation/src/AnimationCache.h b/libraries/animation/src/AnimationCache.h index c90c4c9225..2509585fb0 100644 --- a/libraries/animation/src/AnimationCache.h +++ b/libraries/animation/src/AnimationCache.h @@ -62,7 +62,7 @@ protected: Q_INVOKABLE void setGeometry(const FBXGeometry& geometry); - virtual void downloadFinished(QNetworkReply* reply); + virtual void downloadFinished(const QByteArray& data) override; private: