diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-04-16 11:24:34 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-04-16 11:37:27 +0300 |
| commit | 30bb9a571d9bccba1fb45f07277a014b91ac043c (patch) | |
| tree | dde7607bd1c2be6b959f81723fe449ea158a440e /src/datavis3d/utils/texturehelper_p.h | |
| parent | b228ba755311b8cb28e0253d9dbd111ae95ae90b (diff) | |
Object drawing and label generation moved to their own class
Change-Id: I3721b201dd83b471cb6d55f0dd7def908c4ab0be
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/utils/texturehelper_p.h')
| -rw-r--r-- | src/datavis3d/utils/texturehelper_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/datavis3d/utils/texturehelper_p.h b/src/datavis3d/utils/texturehelper_p.h index 541c79ee..7fa0816b 100644 --- a/src/datavis3d/utils/texturehelper_p.h +++ b/src/datavis3d/utils/texturehelper_p.h @@ -60,16 +60,16 @@ QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE class TextureHelper: protected QOpenGLFunctions { -public: + public: TextureHelper(); ~TextureHelper(); // Ownership of created texture is transferred to caller - GLuint create2DTexture(const QImage &image, bool useTrilinearFiltering = false - , bool convert = true); + GLuint create2DTexture(const QImage &image, bool useTrilinearFiltering = false, + bool convert = true); GLuint createCubeMapTexture(const QImage &image, bool useTrilinearFiltering = false); -private: + private: QImage convertToGLFormat(const QImage &srcImage); void convertToGLFormatHelper(QImage &dstImage, const QImage &srcImage, GLenum texture_format); QRgb qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture_format); |