diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-28 08:16:59 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-05-20 11:12:46 +0000 |
| commit | a2999182a07a94ee6124de8e970596002e5e9078 (patch) | |
| tree | 0c450ab34f1c42d783364134ec62bf02f4e27aa5 /src/render/texture/qabstracttexture_p.h | |
| parent | 99c70270a1f68dfb67c707ac996fb18e94cce1c8 (diff) | |
Make QTexture use QTextureSourceGenerator
Instead of using a QTextureImageDataGenerator which was confusing
Change-Id: Ibbda6b2e8ddf6a917e1d1c0b1e086596c8c30510
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/qabstracttexture_p.h')
| -rw-r--r-- | src/render/texture/qabstracttexture_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/render/texture/qabstracttexture_p.h b/src/render/texture/qabstracttexture_p.h index 3bc895e57..dca912611 100644 --- a/src/render/texture/qabstracttexture_p.h +++ b/src/render/texture/qabstracttexture_p.h @@ -55,6 +55,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DRender/qabstracttexture.h> #include <Qt3DRender/qtexturewrapmode.h> +#include <Qt3DRender/qtexturegenerator.h> QT_BEGIN_NAMESPACE @@ -84,7 +85,7 @@ public : QVector<QAbstractTextureImage *> m_textureImages; int m_layers; - QTextureImageDataGeneratorPtr m_dataFunctor; + QTextureGeneratorPtr m_dataFunctor; }; struct QAbstractTextureData @@ -105,7 +106,7 @@ struct QAbstractTextureData QAbstractTexture::ComparisonMode comparisonMode; Qt3DCore::QNodeIdVector textureImageIds; int layers; - QTextureImageDataGeneratorPtr dataFunctor; + QTextureGeneratorPtr dataFunctor; }; } // QT3D |