diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-08-13 15:09:36 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-08-18 09:11:30 +0300 |
| commit | 169a4d638c6c1b6634ffcfd19c4fe3cb94cf27d5 (patch) | |
| tree | 454810f2e9cc418bae9f1c6716c51c3fae38a968 /src/datavisualization/utils/texturehelper_p.h | |
| parent | be7bdaa8930caf15fcc58a480d223e0c2b8af6ed (diff) | |
Implement volume rendering support
New subclass of QCustom3DItem, QCustom3DVolume is provided.
The documentation for the example will be done in a separate commit.
Change-Id: Idb3fdb0654c6bec7606ca012b75852a5a8412397
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/utils/texturehelper_p.h')
| -rw-r--r-- | src/datavisualization/utils/texturehelper_p.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h index c20f293c..c1dfe8c9 100644 --- a/src/datavisualization/utils/texturehelper_p.h +++ b/src/datavisualization/utils/texturehelper_p.h @@ -32,6 +32,10 @@ #include "datavisualizationglobal_p.h" #include <QtGui/QRgb> #include <QtGui/QLinearGradient> +#if !defined(QT_OPENGL_ES_2) +// 3D Textures are not supported by ES set +# include <QtGui/QOpenGLFunctions_2_1> +#endif QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -44,6 +48,10 @@ class TextureHelper : protected QOpenGLFunctions // Ownership of created texture is transferred to caller GLuint create2DTexture(const QImage &image, bool useTrilinearFiltering = false, bool convert = true, bool smoothScale = true, bool clampY = false); +#if !defined(QT_OPENGL_ES_2) + GLuint create3DTexture(const QVector<uchar> *data, int width, int height, int depth, + QImage::Format dataFormat); +#endif GLuint createCubeMapTexture(const QImage &image, bool useTrilinearFiltering = false); // Returns selection texture and inserts generated framebuffers to framebuffer parameters GLuint createSelectionTexture(const QSize &size, GLuint &frameBuffer, GLuint &depthBuffer); @@ -61,6 +69,9 @@ class TextureHelper : protected QOpenGLFunctions void convertToGLFormatHelper(QImage &dstImage, const QImage &srcImage, GLenum texture_format); QRgb qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture_format); +#if !defined(QT_OPENGL_ES_2) + QOpenGLFunctions_2_1 *m_openGlFunctions_2_1; +#endif friend class Bars3DRenderer; friend class Surface3DRenderer; friend class Scatter3DRenderer; |