From a30c0c304e55ffe30545ab0838e4dbe11a99b8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Tue, 15 Apr 2014 10:32:03 +0300
Subject: Add custom item support, part 1

Task-number: QTRD-2866

+ Added API for adding and removing custom items
+ Added custom data and custom render items
+ Added shaders for textured objects
+ Added custom item rendering draft to scatter
+ Fixed some shaders
- to be continued in part 2

Change-Id: I9735fd02fc9e86ae486cca4c06f6d7f2a4b0b7da
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
---
 src/datavisualization/engine/abstract3drenderer_p.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/datavisualization/engine/abstract3drenderer_p.h')

diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h
index ce21deff..884c0f39 100644
--- a/src/datavisualization/engine/abstract3drenderer_p.h
+++ b/src/datavisualization/engine/abstract3drenderer_p.h
@@ -36,6 +36,7 @@
 #include "axisrendercache_p.h"
 #include "qabstractdataproxy.h"
 #include "seriesrendercache_p.h"
+#include "customrenderitem_p.h"
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -55,13 +56,20 @@ protected:
         SelectOnSlice
     };
 
-//    QString generateValueLabel(const QString &format, float value);
+    enum RenderingState {
+        RenderingNormal = 0,
+        RenderingSelection,
+        RenderingDepth
+    };
+
+    //    QString generateValueLabel(const QString &format, float value);
 
 public:
     virtual ~Abstract3DRenderer();
 
     virtual void updateData() = 0;
     virtual void updateSeries(const QList<QAbstract3DSeries *> &seriesList);
+    virtual void updateCustomData(const QList<CustomDataItem *> &customItems) = 0;
     virtual SeriesRenderCache *createNewCache(QAbstract3DSeries *series);
     virtual void cleanCache(SeriesRenderCache *cache);
     virtual void render(GLuint defaultFboHandle);
@@ -82,6 +90,8 @@ public:
     virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader);
     virtual void initBackgroundShaders(const QString &vertexShader,
                                        const QString &fragmentShader) = 0;
+    virtual void initCustomItemShaders(const QString &vertexShader,
+                                       const QString &fragmentShader);
     virtual void updateAxisType(QAbstract3DAxis::AxisOrientation orientation,
                                 QAbstract3DAxis::AxisType type);
     virtual void updateAxisTitle(QAbstract3DAxis::AxisOrientation orientation,
@@ -150,6 +160,7 @@ protected:
     SelectionState m_selectionState;
     QPoint m_inputPosition;
     QHash<QAbstract3DSeries *, SeriesRenderCache *> m_renderCacheList;
+    CustomRenderItemArray m_customRenderCache;
     QRect m_primarySubViewport;
     QRect m_secondarySubViewport;
     float m_devicePixelRatio;
@@ -161,6 +172,8 @@ protected:
     QString m_selectionLabel;
     LabelItem *m_selectionLabelItem;
     int m_visibleSeriesCount;
+
+    ShaderHelper *m_customItemShader;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
-- 
cgit v1.2.3