Implement volume slice frames

Change-Id: I409f3c95892b26ca6097dd4509109fc9978b9900
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

2 files changed, 17 insertions, 0 deletions

diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index b6dc1621..aa43c2df 100644
--- a/src/datavisualization/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -103,6 +103,7 @@ void ShaderHelper::initialize()
     m_preserveOpacityUniform = m_program->uniformLocation("preserveOpacity");
     m_minBoundsUniform = m_program->uniformLocation("minBounds");
     m_maxBoundsUniform = m_program->uniformLocation("maxBounds");
+    m_sliceFrameWidthUniform = m_program->uniformLocation("sliceFrameWidth");
     m_initialized = true;
 }
 
@@ -135,6 +136,11 @@ void ShaderHelper::release()
     m_program->release();
 }
 
+void ShaderHelper::setUniformValue(GLuint uniform, const QVector2D &value)
+{
+    m_program->setUniformValue(uniform, value);
+}
+
 void ShaderHelper::setUniformValue(GLuint uniform, const QVector3D &value)
 {
     m_program->setUniformValue(uniform, value);
@@ -340,6 +346,14 @@ GLuint ShaderHelper::minBounds()
     return m_minBoundsUniform;
 }
 
+GLuint ShaderHelper::sliceFrameWidth()
+{
+
+    if (!m_initialized)
+        qFatal("Shader not initialized");
+    return m_sliceFrameWidthUniform;
+}
+
 GLuint ShaderHelper::posAtt()
 {
     if (!m_initialized)
diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h
index 853fcc8f..da010cbd 100644
--- a/src/datavisualization/utils/shaderhelper_p.h
+++ b/src/datavisualization/utils/shaderhelper_p.h
@@ -52,6 +52,7 @@ class ShaderHelper
     bool testCompile();
     void bind();
     void release();
+    void setUniformValue(GLuint uniform, const QVector2D &value);
     void setUniformValue(GLuint uniform, const QVector3D &value);
     void setUniformValue(GLuint uniform, const QVector4D &value);
     void setUniformValue(GLuint uniform, const QMatrix4x4 &value);
@@ -84,6 +85,7 @@ class ShaderHelper
     GLuint preserveOpacity();
     GLuint maxBounds();
     GLuint minBounds();
+    GLuint sliceFrameWidth();
 
     GLuint posAtt();
     GLuint uvAtt();
@@ -128,6 +130,7 @@ class ShaderHelper
     GLuint m_preserveOpacityUniform;
     GLuint m_minBoundsUniform;
     GLuint m_maxBoundsUniform;
+    GLuint m_sliceFrameWidthUniform;
 
     GLboolean m_initialized;
 };