From c80c034c712d607f9c9b748cecda02e2af67820a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 3 Jun 2014 06:56:24 +0300 Subject: Clean up renderers Task-number: QTRD-3149 Change-Id: I71b9b7533ad3730d0d203c3d07e66d824b690fbb Reviewed-by: Titta Heikkala Reviewed-by: Miikka Heikkinen --- src/datavisualization/engine/abstract3drenderer.cpp | 6 ------ src/datavisualization/engine/abstract3drenderer_p.h | 1 - src/datavisualization/engine/bars3drenderer.cpp | 9 --------- src/datavisualization/engine/bars3drenderer_p.h | 5 ----- src/datavisualization/engine/scatter3drenderer.cpp | 21 --------------------- src/datavisualization/engine/scatter3drenderer_p.h | 21 ++++++--------------- src/datavisualization/engine/surface3drenderer.cpp | 10 ---------- src/datavisualization/engine/surface3drenderer_p.h | 5 ----- 8 files changed, 6 insertions(+), 72 deletions(-) (limited to 'src/datavisualization') diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 9a063e0c..0d7aa3c3 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -17,15 +17,9 @@ ****************************************************************************/ #include "abstract3drenderer_p.h" -#include "qvalue3daxis.h" #include "texturehelper_p.h" -#include "utils_p.h" -#include "q3dscene_p.h" #include "q3dcamera_p.h" -#include "q3dlight_p.h" -#include "qabstract3dseries_p.h" #include "q3dtheme_p.h" -#include "objecthelper_p.h" #include "qvalue3daxisformatter_p.h" #include "shaderhelper_p.h" #include "qcustom3ditem_p.h" diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 664933bc..b8aad730 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -34,7 +34,6 @@ #include "datavisualizationglobal_p.h" #include "abstract3dcontroller_p.h" #include "axisrendercache_p.h" -#include "qabstractdataproxy.h" #include "seriesrendercache_p.h" #include "customrenderitem_p.h" diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 14523929..23e36c5b 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -17,21 +17,12 @@ ****************************************************************************/ #include "bars3drenderer_p.h" -#include "bars3dcontroller_p.h" #include "q3dcamera_p.h" #include "shaderhelper_p.h" -#include "objecthelper_p.h" #include "texturehelper_p.h" #include "utils_p.h" -#include "drawer_p.h" -#include "qbardataitem.h" -#include "q3dlight.h" -#include "qbar3dseries_p.h" #include "barseriesrendercache_p.h" -#include -#include -#include #include // You can verify that depth buffer drawing works correctly by uncommenting this. diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h index c4d25430..3a0ab3b8 100644 --- a/src/datavisualization/engine/bars3drenderer_p.h +++ b/src/datavisualization/engine/bars3drenderer_p.h @@ -32,17 +32,14 @@ #include "datavisualizationglobal_p.h" #include "bars3dcontroller_p.h" #include "abstract3drenderer_p.h" -#include "qbardataproxy.h" #include "barrenderitem_p.h" class QPoint; class QSizeF; -class QOpenGLShaderProgram; QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; -class ObjectHelper; class LabelItem; class Q3DScene; class BarSeriesRenderCache; @@ -172,8 +169,6 @@ private: inline void updateRenderItem(const QBarDataItem &dataItem, BarRenderItem &renderItem); Q_DISABLE_COPY(Bars3DRenderer) - - friend class BarRenderItem; }; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index bd1ba17d..f1508193 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -17,26 +17,14 @@ ****************************************************************************/ #include "scatter3drenderer_p.h" -#include "scatter3dcontroller_p.h" -#include "q3dcamera.h" #include "q3dcamera_p.h" #include "shaderhelper_p.h" -#include "objecthelper_p.h" #include "texturehelper_p.h" #include "utils_p.h" -#include "q3dlight.h" -#include "qscatter3dseries_p.h" #include "scatterseriesrendercache_p.h" -#include -#include -#include #include -// Commenting this draws the shadow map with perspective projection. Otherwise it's drawn in -// orthographic projection. -//#define USE_WIDER_SHADOWS - // You can verify that depth buffer drawing works correctly by uncommenting this. // You should see the scene from where the light is //#define SHOW_DEPTH_TEXTURE_SCENE @@ -393,16 +381,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) zeroVector, 0.0f, 2.5f / m_autoScaleAdjustment); depthViewMatrix.lookAt(depthLightPos, zeroVector, upVector); // Set the depth projection matrix -#ifndef USE_WIDER_SHADOWS - // Use this for perspective shadows depthProjectionMatrix.perspective(15.0f, viewPortRatio, 3.0f, 100.0f); -#else - // Use these for orthographic shadows - GLfloat testAspectRatio = viewPortRatio; - depthProjectionMatrix.ortho(-testAspectRatio * 2.0f, testAspectRatio * 2.0f, - -m_heightNormalizer * 2.0f, m_heightNormalizer * 2.0f, - 0.0f, 100.0f); -#endif depthProjectionViewMatrix = depthProjectionMatrix * depthViewMatrix; // Draw dots to depth buffer diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index 373e0f38..b6bafb3b 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -32,21 +32,16 @@ #include "datavisualizationglobal_p.h" #include "scatter3dcontroller_p.h" #include "abstract3drenderer_p.h" -#include "qscatterdataproxy.h" #include "scatterrenderitem_p.h" -class QPoint; class QSizeF; -class QOpenGLShaderProgram; QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; -class ObjectHelper; -class LabelItem; class Q3DScene; -class QAbstractAxisPrivate; class ScatterSeriesRenderCache; +class QScatterDataItem; class QT_DATAVISUALIZATION_EXPORT Scatter3DRenderer : public Abstract3DRenderer { @@ -79,7 +74,6 @@ private: ScatterSeriesRenderCache *m_selectedSeriesCache; QSizeF m_areaSize; GLfloat m_dotSizeScale; - QVector3D m_translationOffset; bool m_hasHeightAdjustmentChanged; ScatterRenderItem m_dummyRenderItem; GLfloat m_backgroundMargin; @@ -107,6 +101,9 @@ public: void render(GLuint defaultFboHandle); +public slots: + void updateSelectedItem(int index, QScatter3DSeries *series); + protected: virtual void initializeOpenGL(); @@ -135,17 +132,11 @@ private: void calculateTranslation(ScatterRenderItem &item); void calculateSceneScalingFactors(); - Q_DISABLE_COPY(Scatter3DRenderer) - - friend class ScatterRenderItem; - -public slots: - void updateSelectedItem(int index, QScatter3DSeries *series); - -private: void selectionColorToSeriesAndIndex(const QVector4D &color, int &index, QAbstract3DSeries *&series); inline void updateRenderItem(const QScatterDataItem &dataItem, ScatterRenderItem &renderItem); + + Q_DISABLE_COPY(Scatter3DRenderer) }; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index f703ed97..c7856834 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -16,22 +16,12 @@ ** ****************************************************************************/ -#include "surface3dcontroller_p.h" #include "surface3drenderer_p.h" -#include "q3dcamera.h" #include "q3dcamera_p.h" #include "shaderhelper_p.h" -#include "objecthelper_p.h" -#include "surfaceobject_p.h" #include "texturehelper_p.h" -#include "selectionpointer_p.h" #include "utils_p.h" -#include "drawer_p.h" -#include "q3dlight.h" -#include "qsurface3dseries_p.h" -#include -#include #include static const int ID_TO_RGBA_MASK = 0xff; diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index 0c286136..efa8ff7e 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -32,17 +32,12 @@ #include "datavisualizationglobal_p.h" #include "surface3dcontroller_p.h" #include "abstract3drenderer_p.h" -#include "scatterrenderitem_p.h" -#include "qsurfacedataproxy.h" #include "surfaceseriesrendercache_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; -class ObjectHelper; -class SurfaceObject; class Q3DScene; -class SelectionPointer; class QT_DATAVISUALIZATION_EXPORT Surface3DRenderer : public Abstract3DRenderer { -- cgit v1.2.3