From bf8ed99fb5a474aa6a56d61c9e3a1b5e44d6b6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 16 Apr 2014 12:25:14 +0300 Subject: Add custom item support, part 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2866 + Added custom item rendering Change-Id: If24400fed7c0467d8ebbd554d6e4df3ec5a205f3 Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/scatter3drenderer_p.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/datavisualization/engine/scatter3drenderer_p.h') diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index 3aad8788..172d0c46 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -104,10 +104,11 @@ public: void updateData(); void updateSeries(const QList &seriesList); - void updateCustomData(const QList &customItems); SeriesRenderCache *createNewCache(QAbstract3DSeries *series); void updateScene(Q3DScene *scene); + QVector3D convertPositionToTranslation(const QVector3D &position); + inline int clickedIndex() const { return m_clickedIndex; } void resetClickedStatus(); @@ -124,9 +125,6 @@ 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); @@ -146,8 +144,6 @@ private: void calculateTranslation(ScatterRenderItem &item); void calculateSceneScalingFactors(); - void addCustomItem(CustomDataItem *item); - Q_DISABLE_COPY(Scatter3DRenderer) friend class ScatterRenderItem; @@ -156,7 +152,6 @@ public slots: void updateSelectedItem(int index, QScatter3DSeries *series); private: - QVector4D indexToSelectionColor(GLint index); void selectionColorToSeriesAndIndex(const QVector4D &color, int &index, QAbstract3DSeries *&series); }; -- cgit v1.2.3