Merge branch 'develop'

Change-Id: I0c507ac2c87de5b25a2f918523e1b12942264d8b

10 files changed, 40 insertions, 15 deletions

diff --git a/README b/README
index 0f9f25b2..7a4b9edb 100644
--- a/README
+++ b/README
@@ -60,12 +60,14 @@ The same as above applies, you will just have to add static to the CONFIG:
 
 Documentation
 =============
-Pregenerated documentation can be found from doc folder for both Qt Assistant
-(qtdatavisualization.qch) and in HTML format (qtdatavisualization subfolder).
 
-The documentation can also be generated with:
+The documentation can be generated with:
     make docs
 
+The documentation is generated into the doc folder under the build folder.
+Both Qt Assistant (qtdatavisualization.qch) and in HTML format
+(qtdatavisualization subfolder) documentation is generated.
+
 Please refer to the generated documentation for more information:
     doc/qtdatavisualization/index.html
 
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h
index 0d63615a..2b2be229 100644
--- a/src/datavisualization/axis/qabstract3daxis.h
+++ b/src/datavisualization/axis/qabstract3daxis.h
@@ -84,7 +84,7 @@ public:
 signals:
     void titleChanged(const QString &newTitle);
     void labelsChanged();
-    void orientationChanged(AxisOrientation orientation);
+    void orientationChanged(QAbstract3DAxis::AxisOrientation orientation);
     void minChanged(float value);
     void maxChanged(float value);
     void rangeChanged(float min, float max);
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index 9f82901d..bf56422f 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -122,7 +122,7 @@ public:
 signals:
     void itemLabelFormatChanged(const QString &format);
     void visibilityChanged(bool visible);
-    void meshChanged(Mesh mesh);
+    void meshChanged(QAbstract3DSeries::Mesh mesh);
     void meshSmoothChanged(bool enabled);
     void meshRotationChanged(const QQuaternion &rotation);
     void userDefinedMeshChanged(const QString &fileName);
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index 277035f4..e9ad6dd2 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -93,7 +93,7 @@ signals:
     void xRotationChanged(float rotation);
     void yRotationChanged(float rotation);
     void zoomLevelChanged(float zoomLevel);
-    void cameraPresetChanged(CameraPreset preset);
+    void cameraPresetChanged(Q3DCamera::CameraPreset preset);
     void wrapXRotationChanged(bool isEnabled);
     void wrapYRotationChanged(bool isEnabled);
 
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index f11bbd90..18eda7df 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -111,8 +111,8 @@ protected:
 signals:
     void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler);
     void activeThemeChanged(Q3DTheme *theme);
-    void selectionModeChanged(SelectionFlags mode);
-    void shadowQualityChanged(ShadowQuality quality);
+    void selectionModeChanged(QAbstract3DGraph::SelectionFlags mode);
+    void shadowQualityChanged(QAbstract3DGraph::ShadowQuality quality);
 
 private:
     Q_DISABLE_COPY(QAbstract3DGraph)
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index ffcdeb7a..41415393 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -55,6 +55,8 @@ Surface3DRenderer::Surface3DRenderer(Surface3DController *controller)
       m_surfaceFlatShader(0),
       m_surfaceSmoothShader(0),
       m_surfaceGridShader(0),
+      m_surfaceSliceFlatShader(0),
+      m_surfaceSliceSmoothShader(0),
       m_selectionShader(0),
       m_labelShader(0),
       m_heightNormalizer(0.0f),
@@ -126,6 +128,8 @@ Surface3DRenderer::~Surface3DRenderer()
     delete m_surfaceFlatShader;
     delete m_surfaceSmoothShader;
     delete m_surfaceGridShader;
+    delete m_surfaceSliceFlatShader;
+    delete m_surfaceSliceSmoothShader;
     delete m_labelShader;
 
     delete m_backgroundObj;
@@ -795,7 +799,10 @@ void Surface3DRenderer::drawSlicedScene()
                 cache->setMVPMatrix(MVPMatrix);
 
                 if (cache->surfaceVisible()) {
-                    ShaderHelper *surfaceShader = m_surfaceFlatShader;
+                    ShaderHelper *surfaceShader = m_surfaceSliceSmoothShader;
+                    if (cache->isFlatShadingEnabled())
+                        surfaceShader = m_surfaceSliceFlatShader;
+
                     surfaceShader->bind();
 
                     GLuint colorTexture = cache->baseUniformTexture();;
@@ -2388,6 +2395,10 @@ void Surface3DRenderer::initShaders(const QString &vertexShader, const QString &
         delete m_surfaceFlatShader;
     if (m_surfaceSmoothShader)
         delete m_surfaceSmoothShader;
+    if (m_surfaceSliceFlatShader)
+        delete m_surfaceSliceFlatShader;
+    if (m_surfaceSliceSmoothShader)
+        delete m_surfaceSliceSmoothShader;
 
 #if !defined(QT_OPENGL_ES_2)
     if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
@@ -2404,14 +2415,24 @@ void Surface3DRenderer::initShaders(const QString &vertexShader, const QString &
         m_surfaceFlatShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertexSurfaceFlat"),
                                                QStringLiteral(":/shaders/fragmentSurfaceFlat"));
     }
+    m_surfaceSliceSmoothShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertex"),
+                                                  QStringLiteral(":/shaders/fragmentSurface"));
+    m_surfaceSliceFlatShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertexSurfaceFlat"),
+                                           QStringLiteral(":/shaders/fragmentSurfaceFlat"));
 #else
     m_surfaceSmoothShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertex"),
                                              QStringLiteral(":/shaders/fragmentSurfaceES2"));
     m_surfaceFlatShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertex"),
                                            QStringLiteral(":/shaders/fragmentSurfaceES2"));
+    m_surfaceSliceSmoothShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertex"),
+                                                  QStringLiteral(":/shaders/fragmentSurfaceES2"));
+    m_surfaceSliceFlatShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertex"),
+                                                QStringLiteral(":/shaders/fragmentSurfaceES2"));
 #endif
     m_surfaceSmoothShader->initialize();
     m_surfaceFlatShader->initialize();
+    m_surfaceSliceSmoothShader->initialize();
+    m_surfaceSliceFlatShader->initialize();
 }
 
 void Surface3DRenderer::initBackgroundShaders(const QString &vertexShader,
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index 7a4422e4..2c55d902 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -57,6 +57,8 @@ private:
     ShaderHelper *m_surfaceFlatShader;
     ShaderHelper *m_surfaceSmoothShader;
     ShaderHelper *m_surfaceGridShader;
+    ShaderHelper *m_surfaceSliceFlatShader;
+    ShaderHelper *m_surfaceSliceSmoothShader;
     ShaderHelper *m_selectionShader;
     ShaderHelper *m_labelShader;
     GLfloat m_heightNormalizer;
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 75ec8c1b..475b6928 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -70,7 +70,7 @@ public:
 
 signals:
     void positionChanged(const QPoint &position);
-    void inputViewChanged(InputView view);
+    void inputViewChanged(QAbstract3DInputHandler::InputView view);
     void sceneChanged(Q3DScene *scene);
 
 protected:
diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h
index 43278c79..3a82afea 100644
--- a/src/datavisualization/theme/q3dtheme.h
+++ b/src/datavisualization/theme/q3dtheme.h
@@ -148,7 +148,7 @@ public:
     ColorStyle colorStyle() const;
 
 signals:
-    void typeChanged(Theme themeType);
+    void typeChanged(Q3DTheme::Theme themeType);
     void baseColorsChanged(const QList<QColor> &colors);
     void backgroundColorChanged(const QColor &color);
     void windowColorChanged(const QColor &color);
@@ -169,7 +169,7 @@ signals:
     void backgroundEnabledChanged(bool enabled);
     void gridEnabledChanged(bool enabled);
     void labelBackgroundEnabledChanged(bool enabled);
-    void colorStyleChanged(ColorStyle style);
+    void colorStyleChanged(Q3DTheme::ColorStyle style);
 
 protected:
     explicit Q3DTheme(Q3DThemePrivate *d, Theme themeType, QObject *parent = 0);
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 0a18dc25..87b108db 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -159,14 +159,14 @@ protected:
     virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
 
 signals:
-    void selectionModeChanged(SelectionFlags mode);
-    void shadowQualityChanged(ShadowQuality quality);
+    void selectionModeChanged(AbstractDeclarative::SelectionFlags mode);
+    void shadowQualityChanged(AbstractDeclarative::ShadowQuality quality);
     void shadowsSupportedChanged(bool supported);
     void msaaSamplesChanged(int samples);
     void sceneChanged(Q3DScene *scene);
     void inputHandlerChanged(QAbstract3DInputHandler *inputHandler);
     void themeChanged(Q3DTheme *theme);
-    void renderingModeChanged(RenderingMode mode);
+    void renderingModeChanged(AbstractDeclarative::RenderingMode mode);
 
 private:
     QPointer<Abstract3DController> m_controller;