Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 07:55:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7466 from zzmp/clean/image-reader

Browse source 
Clean image-reader to drop image sooner
This commit is contained in:
Brad Hefta-Gaub 2016-03-24 16:24:47 -07:00
commit 299103fc4f
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -320,13 +320,12 @@ void ImageReader::run() {
}
QMetaObject::invokeMethod(texture.data(), "setImage",
Q_ARG(const QImage&, image),
Q_ARG(void*, theTexture),
Q_ARG(int, originalWidth), Q_ARG(int, originalHeight));
QThread::currentThread()->setPriority(originalPriority);
}
void NetworkTexture::setImage(const QImage& image, void* voidTexture, int originalWidth,
void NetworkTexture::setImage(void* voidTexture, int originalWidth,
int originalHeight) {
_originalWidth = originalWidth;
_originalHeight = originalHeight;

2
libraries/model-networking/src/model-networking/TextureCache.h
View file

@ -136,7 +136,7 @@ protected:
Q_INVOKABLE void loadContent(const QByteArray& content);
// FIXME: This void* should be a gpu::Texture* but i cannot get it to work for now, moving on...
Q_INVOKABLE void setImage(const QImage& image, void* texture, int originalWidth, int originalHeight);
Q_INVOKABLE void setImage(void* texture, int originalWidth, int originalHeight);
private: