summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/scatter3drenderer.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-08-26 07:24:06 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-08-26 08:57:48 +0300
commit43ecfbc2ca07428874df5497cead68c895dfb115 (patch)
tree6fa4e1bd2399af022fe3fb6b8483c48d5693df2b /src/datavis3d/engine/scatter3drenderer.cpp
parent774cd4c058cb08d213d236d4b1c10ac91999c2c9 (diff)
Renderer cleanup
Change-Id: I4d318749830c2d14b998c00510794b71beb9627f Change-Id: I4d318749830c2d14b998c00510794b71beb9627f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/engine/scatter3drenderer.cpp')
-rw-r--r--src/datavis3d/engine/scatter3drenderer.cpp22
1 files changed, 0 insertions, 22 deletions
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__;