Merge remote-tracking branch 'origin/develop'

Change-Id: Icbad3154dbc5d20961c6e6615fdc94d3c9753cc1

8 files changed, 18 insertions, 74 deletions

diff --git a/src/datavis3d/engine/bars3dcontroller.cpp b/src/datavis3d/engine/bars3dcontroller.cpp
index 3f5a31b2..86ceff72 100644
--- a/src/datavis3d/engine/bars3dcontroller.cpp
+++ b/src/datavis3d/engine/bars3dcontroller.cpp
@@ -48,7 +48,8 @@ Bars3dController::Bars3dController(QRect boundRect)
     setAxisY(new QValueAxis());
     setAxisZ(new QCategoryAxis());
 
-    setBarType(QDataVis::Bars, false); // default object type
+    // Default bar type; specific to bars
+    setBarType(QDataVis::Bars, false);
 
     setDataProxy(new QBarDataProxy);
 }
@@ -66,6 +67,7 @@ void Bars3dController::initializeOpenGL()
 
     m_renderer = new Bars3dRenderer(this);
     setRenderer(m_renderer);
+    synchDataToRenderer();
 }
 
 void Bars3dController::synchDataToRenderer()
diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavis3d/engine/bars3drenderer.cpp
index 908b7888..81bad91f 100644
--- a/src/datavis3d/engine/bars3drenderer.cpp
+++ b/src/datavis3d/engine/bars3drenderer.cpp
@@ -1568,7 +1568,7 @@ void Bars3dRenderer::updateBackgroundEnabled(bool enable)
 
 void Bars3dRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
 {
-    qDebug() << "Bars3dRenderer::setShadowQuality" << quality;
+    qDebug() << __FUNCTION__ << quality;
     m_cachedShadowQuality = quality;
     switch (quality) {
     case QDataVis::ShadowLow:
@@ -1584,42 +1584,12 @@ void Bars3dRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
         m_shadowQualityToShader = 0.0f;
         break;
     }
+
+    handleShadowQualityChange();
+
 #if !defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality > QDataVis::ShadowNone) {
-        // Re-init shaders
-        if (!m_cachedTheme.m_uniformColor) {
-            initShaders(QStringLiteral(":/shaders/vertexShadow"),
-                        QStringLiteral(":/shaders/fragmentShadowNoTexColorOnY"));
-        } else {
-            initShaders(QStringLiteral(":/shaders/vertexShadow"),
-                        QStringLiteral(":/shaders/fragmentShadowNoTex"));
-        }
-        initBackgroundShaders(QStringLiteral(":/shaders/vertexShadow"),
-                              QStringLiteral(":/shaders/fragmentShadowNoTex"));
-    } else {
-        // Re-init shaders
-        if (!m_cachedTheme.m_uniformColor) {
-            initShaders(QStringLiteral(":/shaders/vertex"),
-                        QStringLiteral(":/shaders/fragmentColorOnY"));
-        } else {
-            initShaders(QStringLiteral(":/shaders/vertex"),
-                        QStringLiteral(":/shaders/fragment"));
-        }
-        initBackgroundShaders(QStringLiteral(":/shaders/vertex"),
-                              QStringLiteral(":/shaders/fragment"));
-    }
     // Re-init depth buffer
     updateDepthBuffer();
-#else
-    if (!m_cachedTheme.m_uniformColor) {
-        initShaders(QStringLiteral(":/shaders/vertexES2"),
-                    QStringLiteral(":/shaders/fragmentColorOnYES2"));
-    } else {
-        initShaders(QStringLiteral(":/shaders/vertexES2"),
-                    QStringLiteral(":/shaders/fragmentES2"));
-    }
-    initBackgroundShaders(QStringLiteral(":/shaders/vertexES2"),
-                          QStringLiteral(":/shaders/fragmentES2"));
 #endif
 }
 
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index e46d5d14..bd9f9f09 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -83,7 +83,7 @@ Q3DBars::Q3DBars()
     : d_ptr(new Q3DBarsPrivate(this, geometry()))
 {
     d_ptr->m_shared->initializeOpenGL();
-    QObject::connect(d_ptr->m_shared, &Bars3dController::shadowQualityChanged, this,
+    QObject::connect(d_ptr->m_shared, &Abstract3DController::shadowQualityChanged, this,
                      &Q3DBars::handleShadowQualityUpdate);
 }
 
diff --git a/src/datavis3d/engine/q3dscatter.cpp b/src/datavis3d/engine/q3dscatter.cpp
index a9c4a1b0..73332bdd 100644
--- a/src/datavis3d/engine/q3dscatter.cpp
+++ b/src/datavis3d/engine/q3dscatter.cpp
@@ -83,7 +83,7 @@ Q3DScatter::Q3DScatter()
     : d_ptr(new Q3DScatterPrivate(this, geometry()))
 {
     d_ptr->m_shared->initializeOpenGL();
-    QObject::connect(d_ptr->m_shared, &Scatter3DController::shadowQualityChanged, this,
+    QObject::connect(d_ptr->m_shared, &Abstract3DController::shadowQualityChanged, this,
                      &Q3DScatter::handleShadowQualityUpdate);
 }
 
diff --git a/src/datavis3d/engine/scatter3dcontroller.cpp b/src/datavis3d/engine/scatter3dcontroller.cpp
index 0d93b06f..ef56fc23 100644
--- a/src/datavis3d/engine/scatter3dcontroller.cpp
+++ b/src/datavis3d/engine/scatter3dcontroller.cpp
@@ -42,7 +42,8 @@ Scatter3DController::Scatter3DController(QRect boundRect)
     setAxisY(new QValueAxis());
     setAxisZ(new QValueAxis());
 
-    setObjectType(QDataVis::Spheres, false); // default object type
+    // Default object type; specific to scatter
+    setObjectType(QDataVis::Spheres, false);
 
     setDataProxy(new QScatterDataProxy);
 }
@@ -60,6 +61,7 @@ void Scatter3DController::initializeOpenGL()
 
     m_renderer = new Scatter3DRenderer(this);
     setRenderer(m_renderer);
+    synchDataToRenderer();
 }
 
 void Scatter3DController::synchDataToRenderer()
diff --git a/src/datavis3d/engine/scatter3drenderer.cpp b/src/datavis3d/engine/scatter3drenderer.cpp
index d8d5da9a..a7657547 100644
--- a/src/datavis3d/engine/scatter3drenderer.cpp
+++ b/src/datavis3d/engine/scatter3drenderer.cpp
@@ -1376,7 +1376,7 @@ void Scatter3DRenderer::updateBackgroundEnabled(bool enable)
 
 void Scatter3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
 {
-    qDebug() << "Scatter3DRenderer::setShadowQuality" << quality;
+    qDebug() << __FUNCTION__ << quality;
     m_cachedShadowQuality = quality;
     switch (quality) {
     case QDataVis::ShadowLow:
@@ -1392,42 +1392,12 @@ void Scatter3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
         m_shadowQualityToShader = 0.0f;
         break;
     }
+
+    handleShadowQualityChange();
+
 #if !defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality > QDataVis::ShadowNone) {
-        // Re-init shaders
-        if (!m_cachedTheme.m_uniformColor) {
-            initShaders(QStringLiteral(":/shaders/vertexShadow"),
-                        QStringLiteral(":/shaders/fragmentShadowNoTexColorOnY"));
-        } else {
-            initShaders(QStringLiteral(":/shaders/vertexShadow"),
-                        QStringLiteral(":/shaders/fragmentShadowNoTex"));
-        }
-        initBackgroundShaders(QStringLiteral(":/shaders/vertexShadow"),
-                              QStringLiteral(":/shaders/fragmentShadowNoTex"));
-    } else {
-        // Re-init shaders
-        if (!m_cachedTheme.m_uniformColor) {
-            initShaders(QStringLiteral(":/shaders/vertex"),
-                        QStringLiteral(":/shaders/fragmentColorOnY"));
-        } else {
-            initShaders(QStringLiteral(":/shaders/vertex"),
-                        QStringLiteral(":/shaders/fragment"));
-        }
-        initBackgroundShaders(QStringLiteral(":/shaders/vertex"),
-                              QStringLiteral(":/shaders/fragment"));
-    }
     // Re-init depth buffer
     updateDepthBuffer();
-#else
-    if (!m_cachedTheme.m_uniformColor) {
-        initShaders(QStringLiteral(":/shaders/vertexES2"),
-                    QStringLiteral(":/shaders/fragmentColorOnYES2"));
-    } else {
-        initShaders(QStringLiteral(":/shaders/vertexES2"),
-                    QStringLiteral(":/shaders/fragmentES2"));
-    }
-    initBackgroundShaders(QStringLiteral(":/shaders/vertexES2"),
-                          QStringLiteral(":/shaders/fragmentES2"));
 #endif
 }
 
diff --git a/src/datavis3dqml2/declarativebars.cpp b/src/datavis3dqml2/declarativebars.cpp
index e7af7f8c..2e4dbf04 100644
--- a/src/datavis3dqml2/declarativebars.cpp
+++ b/src/datavis3dqml2/declarativebars.cpp
@@ -41,7 +41,7 @@ DeclarativeBars::DeclarativeBars(QQuickItem *parent)
 
     // Create the shared component on the main GUI thread.
     m_shared = new Bars3dController(boundingRect().toRect());
-    QObject::connect(m_shared, &Bars3dController::shadowQualityChanged, this,
+    QObject::connect(m_shared, &Abstract3DController::shadowQualityChanged, this,
                      &DeclarativeBars::handleShadowQualityUpdate);
 
     m_shared->setDataProxy(new QItemModelBarDataProxy);
diff --git a/src/datavis3dqml2/declarativescatter.cpp b/src/datavis3dqml2/declarativescatter.cpp
index 90daf0e3..6731035e 100644
--- a/src/datavis3dqml2/declarativescatter.cpp
+++ b/src/datavis3dqml2/declarativescatter.cpp
@@ -40,7 +40,7 @@ DeclarativeScatter::DeclarativeScatter(QQuickItem *parent)
 
     // Create the shared component on the main GUI thread.
     m_shared = new Scatter3DController(boundingRect().toRect());
-    QObject::connect(m_shared, &Scatter3DController::shadowQualityChanged, this,
+    QObject::connect(m_shared, &Abstract3DController::shadowQualityChanged, this,
                      &DeclarativeScatter::handleShadowQualityUpdate);
 
     m_shared->setDataProxy(new QItemModelScatterDataProxy);