diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-08-19 09:10:48 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-08-19 13:02:24 +0200 |
commit | 977863dd3e6a7a40f60db1f9777500d21762d404 (patch) | |
tree | d92528dc48b958b2d8640b125ec51fa41982aeeb /src/quick3d/quick3drenderer | |
parent | 4c1f45cc53acb85b687d656fd70af02119b88f0f (diff) |
Texture subclass of QNode
Change-Id: I0b6f3a6e4dfa75ce1cc29ee38bb709b8bad6a88f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer')
-rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dtexture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp index f5222a0e5..0301a2d0d 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp @@ -50,12 +50,12 @@ namespace Render { namespace Quick { - +// TO DO: This needs to be reworked to handle more than just 2D images Quick3DTexture::Quick3DTexture(QObject *parent) : QObject(parent) { parentTexture()->setTarget(Texture::Target2D); - parentTexture()->setInternalFormat(Texture::RGBA8_UNorm); + parentTexture()->setFormat(Texture::RGBA8_UNorm); } QUrl Quick3DTexture::source() const @@ -72,7 +72,7 @@ void Quick3DTexture::setSource(QUrl arg) QString source = m_source.toString().replace(QStringLiteral("qrc"), QStringLiteral("")); QImage img; if (img.load(source)) { - parentTexture()->setInternalFormat(img.hasAlphaChannel() ? + parentTexture()->setFormat(img.hasAlphaChannel() ? Texture::RGBA8_UNorm : Texture::RGB8_UNorm); parentTexture()->setFromQImage(img); |