diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2019-03-21 16:31:32 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-21 15:01:44 +0000 |
| commit | 92079605819c10de4d950ed4a5254da8546b140a (patch) | |
| tree | 59a82e32a3ceea5452b468eb960b992608015ddd /src/runtime/q3dsimagemanager_p.h | |
| parent | 78488c1aa32d9f61656969de387b0b1d17b781db (diff) | |
Fix IBL lighting mipmap calculationv2.3.0-rc2v2.3.0-rc
Change the IBL mipmap calculation to happen in the setSource instead of
load, because the load function might not have the information needed to
enable the calculation.
Task-number: QT3DS-3187
Change-Id: I7a765acc0fc8b02e59b5a2759de593aa29db76c6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/runtime/q3dsimagemanager_p.h')
| -rw-r--r-- | src/runtime/q3dsimagemanager_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/runtime/q3dsimagemanager_p.h b/src/runtime/q3dsimagemanager_p.h index 6281d63..1c89467 100644 --- a/src/runtime/q3dsimagemanager_p.h +++ b/src/runtime/q3dsimagemanager_p.h @@ -181,11 +181,13 @@ private: void loadImageData(const QUrl &source, bool async = true); void setSource(Qt3DRender::QAbstractTexture *tex, const QUrl &source); void textureLoaded(Qt3DRender::QAbstractTexture *tex, const QUrl &source); - QVector<Qt3DRender::QTextureImageDataPtr> load(const QUrl &source, ImageFlags flags); + QVector<Qt3DRender::QTextureImageDataPtr> load(const QUrl &source); int blockSizeForFormat(QOpenGLTexture::TextureFormat format); QByteArray generateIblMip(int w, int h, int prevW, int prevH, QOpenGLTexture::TextureFormat format, int blockSize, const QByteArray &prevLevelData); + QVector<Qt3DRender::QTextureImageDataPtr> generateIblForImageData( + QVector<Qt3DRender::QTextureImageDataPtr> result); struct TextureInfo { |