Tweak volume shaders.

Also fix custom object default texture.

Change-Id: Iba9ff6afb807d9f7a4e1f58b0e5fb4bca4c9c431
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

2 files changed, 13 insertions, 7 deletions

diff --git a/src/datavisualization/data/customrenderitem.cpp b/src/datavisualization/data/customrenderitem.cpp
index b96a4957..3eb68845 100644
--- a/src/datavisualization/data/customrenderitem.cpp
+++ b/src/datavisualization/data/customrenderitem.cpp
@@ -52,13 +52,17 @@ void CustomRenderItem::setMesh(const QString &meshFile)
 
 void CustomRenderItem::setColorTable(const QVector<QRgb> &colors)
 {
-    m_colorTable.resize(colors.size());
-    for (int i = 0; i < m_colorTable.size(); i++) {
-        const QRgb &rgb = colors.at(i);
-        m_colorTable[i] = QVector4D(float(qRed(rgb)) / 255.0f,
-                                    float(qGreen(rgb)) / 255.0f,
-                                    float(qBlue(rgb)) / 255.0f,
-                                    float(qAlpha(rgb)) / 255.0f);
+    m_colorTable.resize(256);
+    for (int i = 0; i < 256; i++) {
+        if (i < colors.size()) {
+            const QRgb &rgb = colors.at(i);
+            m_colorTable[i] = QVector4D(float(qRed(rgb)) / 255.0f,
+                                        float(qGreen(rgb)) / 255.0f,
+                                        float(qBlue(rgb)) / 255.0f,
+                                        float(qAlpha(rgb)) / 255.0f);
+        } else {
+            m_colorTable[i] = QVector4D(0.0f, 0.0f, 0.0f, 0.0f);
+        }
     }
 }
 
diff --git a/src/datavisualization/data/qcustom3ditem.cpp b/src/datavisualization/data/qcustom3ditem.cpp
index 1d419cee..cb843b62 100644
--- a/src/datavisualization/data/qcustom3ditem.cpp
+++ b/src/datavisualization/data/qcustom3ditem.cpp
@@ -367,6 +367,7 @@ QString QCustom3DItem::textureFile() const
 
 QCustom3DItemPrivate::QCustom3DItemPrivate(QCustom3DItem *q) :
     q_ptr(q),
+    m_textureImage(QImage(1, 1, QImage::Format_ARGB32)),
     m_position(QVector3D(0.0f, 0.0f, 0.0f)),
     m_positionAbsolute(false),
     m_scaling(QVector3D(0.1f, 0.1f, 0.1f)),
@@ -382,6 +383,7 @@ QCustom3DItemPrivate::QCustom3DItemPrivate(QCustom3DItem *q, const QString &mesh
                                            const QVector3D &position, const QVector3D &scaling,
                                            const QQuaternion &rotation) :
     q_ptr(q),
+    m_textureImage(QImage(1, 1, QImage::Format_ARGB32)),
     m_meshFile(meshFile),
     m_position(position),
     m_positionAbsolute(false),