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>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h
index ab45381e..3aad8788 100644
--- a/src/datavisualization/engine/scatter3drenderer_p.h
+++ b/src/datavisualization/engine/scatter3drenderer_p.h
@@ -104,6 +104,7 @@ public:
 
     void updateData();
     void updateSeries(const QList<QAbstract3DSeries *> &seriesList);
+    void updateCustomData(const QList<CustomDataItem *> &customItems);
     SeriesRenderCache *createNewCache(QAbstract3DSeries *series);
     void updateScene(Q3DScene *scene);
 
@@ -123,6 +124,9 @@ private:
     virtual void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh);
 
     void drawScene(GLuint defaultFboHandle);
+    void drawCustomItems(RenderingState state, ShaderHelper *shader, const Q3DCamera *activeCamera,
+                         const QMatrix4x4 &projectionMatrix,
+                         const QMatrix4x4 &depthProjectionMatrix);
     void drawLabels(bool drawSelection, const Q3DCamera *activeCamera,
                     const QMatrix4x4 &viewMatrix, const QMatrix4x4 &projectionMatrix);
 
@@ -142,6 +146,8 @@ private:
     void calculateTranslation(ScatterRenderItem &item);
     void calculateSceneScalingFactors();
 
+    void addCustomItem(CustomDataItem *item);
+
     Q_DISABLE_COPY(Scatter3DRenderer)
 
     friend class ScatterRenderItem;