diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-04-12 12:48:57 +0300 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2013-04-12 17:53:24 +0300 |
commit | bc6b83691901e4fa897e61182acf9b2ddaddc804 (patch) | |
tree | aef06ad48c1f9c16db4c363974dd177d7a7ae984 /src/datavis3d/utils/texturehelper.cpp | |
parent | 7dedf74c6be8c23bd1a5640cbe0c960a36c6b9db (diff) |
Improved label drawing and font size adjustment
Change-Id: I3421b6f6774b44b02aecef87afc1ceaafebc9fbe
Change-Id: I3421b6f6774b44b02aecef87afc1ceaafebc9fbe
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavis3d/utils/texturehelper.cpp')
-rw-r--r-- | src/datavis3d/utils/texturehelper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavis3d/utils/texturehelper.cpp b/src/datavis3d/utils/texturehelper.cpp index f6308ea6..0cccc5e7 100644 --- a/src/datavis3d/utils/texturehelper.cpp +++ b/src/datavis3d/utils/texturehelper.cpp @@ -87,8 +87,8 @@ GLuint TextureHelper::createCubeMapTexture(const QImage &image, bool useTrilinea glGenTextures(1, &textureId); glBindTexture(GL_TEXTURE_CUBE_MAP, textureId); QImage glTexture = convertToGLFormat(image); - glTexImage2D(GL_TEXTURE_CUBE_MAP, 0, GL_RGB, glTexture.width(), glTexture.height() - , 0, GL_RGB, GL_UNSIGNED_BYTE, glTexture.bits()); + glTexImage2D(GL_TEXTURE_CUBE_MAP, 0, GL_RGBA, glTexture.width(), glTexture.height() + , 0, GL_RGBA, GL_UNSIGNED_BYTE, glTexture.bits()); if (useTrilinearFiltering) { glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); |