summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/abstract3drenderer.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-04-03 15:05:27 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-04-04 10:54:54 +0300
commit1b5d9a30adc0c9ca4f7929c375db008830586516 (patch)
treef6b2abaf94ad1f5761e93c3337202de198673e0f /src/datavisualization/engine/abstract3drenderer.cpp
parent1bb92e76313c691104869716a2078adecc38fa72 (diff)
Introduce fps measurement via properties
Task-number: QTRD-2134 Change-Id: I181ee6c784b998886c2292b7548e16ce75d86458 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer.cpp')
-rw-r--r--src/datavisualization/engine/abstract3drenderer.cpp29
1 files changed, 0 insertions, 29 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 38e81be6..0b8ac8d1 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -48,10 +48,6 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
m_clickedSeries(0),
m_clickedType(QAbstract3DGraph::ElementNone),
m_selectionLabelItem(0)
-#ifdef DISPLAY_RENDER_SPEED
- , m_isFirstFrame(true),
- m_numFrames(0)
-#endif
{
QObject::connect(m_drawer, &Drawer::drawerChanged, this, &Abstract3DRenderer::updateTextures);
@@ -97,23 +93,6 @@ void Abstract3DRenderer::initializeOpenGL()
void Abstract3DRenderer::render(const GLuint defaultFboHandle)
{
-#ifdef DISPLAY_RENDER_SPEED
- // For speed computation
- if (m_isFirstFrame) {
- m_lastFrameTime.start();
- m_isFirstFrame = false;
- }
-
- // Measure speed (as milliseconds per frame)
- m_numFrames++;
- if (m_lastFrameTime.elapsed() >= 1000) { // print only if last measurement was more than 1s ago
- qDebug() << float(m_lastFrameTime.elapsed()) / float(m_numFrames) << "ms/frame (="
- << float(m_numFrames) << "fps)";
- m_numFrames = 0;
- m_lastFrameTime.restart();
- }
-#endif
-
if (defaultFboHandle) {
glDepthMask(true);
glEnable(GL_DEPTH_TEST);
@@ -139,14 +118,6 @@ void Abstract3DRenderer::render(const GLuint defaultFboHandle)
glDisable(GL_SCISSOR_TEST);
}
-//QString Abstract3DRenderer::generateValueLabel(const QString &format, float value)
-//{
-// QString valueLabelFormat = format;
-// Utils::ParamType valueParamType = Utils::findFormatParamType(valueLabelFormat);
-// QByteArray valueFormatArray = valueLabelFormat.toUtf8();
-// return Utils::formatLabel(valueFormatArray, valueParamType, value);
-//}
-
void Abstract3DRenderer::updateSelectionState(SelectionState state)
{
m_selectionState = state;