Renderer cleanup

Change-Id: I4d318749830c2d14b998c00510794b71beb9627f
Change-Id: I4d318749830c2d14b998c00510794b71beb9627f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

5 files changed, 9 insertions, 73 deletions

diff --git a/src/datavis3d/engine/abstract3drenderer_p.h b/src/datavis3d/engine/abstract3drenderer_p.h
index 37271025..ec057298 100644
--- a/src/datavis3d/engine/abstract3drenderer_p.h
+++ b/src/datavis3d/engine/abstract3drenderer_p.h
@@ -31,12 +31,15 @@
 
 #include <QtGui/QOpenGLFunctions>
 #include <QtGui/QFont>
+#include <QTime>
 
 #include "datavis3dglobal_p.h"
 #include "abstract3dcontroller_p.h"
 #include "axisrendercache_p.h"
 #include "qabstractdataproxy.h"
 
+//#define DISPLAY_RENDER_SPEED
+
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
 class TextureHelper;
@@ -73,6 +76,12 @@ protected:
     AxisRenderCache m_axisCacheZ;
     TextureHelper *m_textureHelper;
 
+#ifdef DISPLAY_RENDER_SPEED
+    bool m_isFirstFrame;
+    QTime m_lastFrameTime;
+    GLint m_numFrames;
+#endif
+
     QString generateValueLabel(const QString &format, qreal value);
 
 public:
diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavis3d/engine/bars3drenderer.cpp
index 89d9df9b..17e1d098 100644
--- a/src/datavis3d/engine/bars3drenderer.cpp
+++ b/src/datavis3d/engine/bars3drenderer.cpp
@@ -41,10 +41,6 @@
 // You should see the scene from  where the light is
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
-#ifdef DISPLAY_RENDER_SPEED
-#include <QTime>
-#endif
-
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
 const GLfloat gridLineWidth = 0.005f;
diff --git a/src/datavis3d/engine/bars3drenderer_p.h b/src/datavis3d/engine/bars3drenderer_p.h
index 110bfea4..5426a5ae 100644
--- a/src/datavis3d/engine/bars3drenderer_p.h
+++ b/src/datavis3d/engine/bars3drenderer_p.h
@@ -29,22 +29,12 @@
 #ifndef Q3DBARSRENDERER_p_H
 #define Q3DBARSRENDERER_p_H
 
-#include <QtCore/QSize>
-#include <QtCore/QObject>
-#include <QtGui/QOpenGLFunctions>
-#include <QtGui/QFont>
-#include <QTime>
-#include <QWindow>
-#include <QMutex>
-
 #include "datavis3dglobal_p.h"
 #include "bars3dcontroller_p.h"
 #include "abstract3drenderer_p.h"
 #include "qbardataproxy.h"
 #include "barrenderitem_p.h"
 
-//#define DISPLAY_RENDER_SPEED
-
 class QPoint;
 class QSizeF;
 class QOpenGLShaderProgram;
@@ -116,12 +106,6 @@ private:
 
     BarRenderItemArray m_renderItemArray;
 
-#ifdef DISPLAY_RENDER_SPEED
-    bool m_isFirstFrame;
-    QTime m_lastFrameTime;
-    GLint m_numFrames;
-#endif
-
 public:
     explicit Bars3dRenderer(Bars3dController *controller);
     ~Bars3dRenderer();
diff --git a/src/datavis3d/engine/scatter3drenderer.cpp b/src/datavis3d/engine/scatter3drenderer.cpp
index f362de04..93e7cca1 100644
--- a/src/datavis3d/engine/scatter3drenderer.cpp
+++ b/src/datavis3d/engine/scatter3drenderer.cpp
@@ -38,10 +38,6 @@
 // You should see the scene from  where the light is
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
-#ifdef DISPLAY_RENDER_SPEED
-#include <QTime>
-#endif
-
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
 //#define USE_UNIFORM_SCALING // Scale x and z uniformly, or based on autoscaled values
@@ -473,15 +469,6 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
             m_selection = Utils::getSelection(m_controller->mousePosition(),
                                               m_cachedBoundingRect.height());
 
-        QMutexLocker locker(&m_mutex);
-        if (m_isSelectionPointRequestActive) {
-            m_isSelectionPointRequestActive = false;
-            m_selection = Utils::getSelection(m_selectionPointRequest,
-                                              m_cachedBoundingRect.height());
-            emit selectionUpdated(m_selection);
-        }
-        locker.unlock();
-
         glBindFramebuffer(GL_FRAMEBUFFER, defaultFboHandle);
 
         // Release selection shader
@@ -1286,15 +1273,6 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
     m_labelShader->release();
 }
 
-void Scatter3DRenderer::requestSelectionAtPoint(const QPoint &point)
-{
-    //qDebug() << __FUNCTION__;
-    QMutexLocker locker(&m_mutex);
-    m_selectionPointRequest.setX(point.x());
-    m_selectionPointRequest.setY(point.y());
-    m_isSelectionPointRequestActive = true;
-}
-
 void Scatter3DRenderer::handleResize()
 {
     //qDebug() << __FUNCTION__;
diff --git a/src/datavis3d/engine/scatter3drenderer_p.h b/src/datavis3d/engine/scatter3drenderer_p.h
index a15c606f..2fb81855 100644
--- a/src/datavis3d/engine/scatter3drenderer_p.h
+++ b/src/datavis3d/engine/scatter3drenderer_p.h
@@ -29,22 +29,12 @@
 #ifndef Q3DSCATTERRENDERER_P_H
 #define Q3DSCATTERRENDERER_P_H
 
-#include <QtCore/QSize>
-#include <QtCore/QObject>
-#include <QtGui/QOpenGLFunctions>
-#include <QtGui/QFont>
-#include <QTime>
-#include <QWindow>
-#include <QMutex>
-
 #include "datavis3dglobal_p.h"
 #include "scatter3dcontroller_p.h"
 #include "abstract3drenderer_p.h"
 #include "qscatterdataproxy.h"
 #include "scatterrenderitem_p.h"
 
-//#define DISPLAY_RENDER_SPEED
-
 class QPoint;
 class QSizeF;
 class QOpenGLShaderProgram;
@@ -68,10 +58,6 @@ private:
 
     Scatter3DController *m_controller;
 
-    // Mutex for sharing resources between render and main threads.
-    // TODO: this mutex needs to go, too
-    QMutex m_mutex;
-
     // Internal state
     ScatterRenderItem *m_selectedItem; // points to renderitem array
     ScatterRenderItem *m_previouslySelectedItem; // points to renderitem array
@@ -102,20 +88,11 @@ private:
     QSizeF m_areaSize;
     GLfloat m_dotSizeScale;
 
-    QPoint m_selectionPointRequest;
-    bool m_isSelectionPointRequestActive;
-
     bool m_hasHeightAdjustmentChanged;
     ScatterRenderItem m_dummyRenderItem;
 
     ScatterRenderItemArray m_renderItemArray;
 
-#ifdef DISPLAY_RENDER_SPEED
-    bool m_isFirstFrame;
-    QTime m_lastFrameTime;
-    GLint m_numFrames;
-#endif
-
 public:
     explicit Scatter3DRenderer(Scatter3DController *controller);
     ~Scatter3DRenderer();
@@ -161,14 +138,6 @@ public slots:
 
     // Overloaded from abstract renderer
     virtual void updateAxisRange(QAbstractAxis::AxisOrientation orientation, qreal min, qreal max);
-
-    // Requests that upon next render pass the column and row under the given point is inspected for selection.
-    // Only one request can be queued per render pass at this point. New request will override any pending requests.
-    // After inspection the selectionUpdated signal is emitted.
-    virtual void requestSelectionAtPoint(const QPoint &point);
-
-signals:
-    void selectionUpdated(QVector3D selection);
 };