diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-24 06:26:41 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-24 08:08:54 +0300 |
| commit | fb7efe0169401e49a8bbf8e4b2b495d98f26046a (patch) | |
| tree | b56ca8a7e202d7b598b51bdb778d2c20978bcebc /src | |
| parent | 08997a9afdd8681d3bb28e99f1c8be4c4b47282c (diff) | |
Clarify variable naming more
Change-Id: I6ab7945c4b2a91f8aa86c5c32bc9deb2a8fa8b89
Change-Id: I6ab7945c4b2a91f8aa86c5c32bc9deb2a8fa8b89
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavis3d/engine/bars3drenderer.cpp | 10 | ||||
| -rw-r--r-- | src/datavis3d/engine/bars3drenderer_p.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavis3d/engine/bars3drenderer.cpp index e3b303fd..d9cb35d7 100644 --- a/src/datavis3d/engine/bars3drenderer.cpp +++ b/src/datavis3d/engine/bars3drenderer.cpp @@ -131,7 +131,7 @@ Bars3dRenderer::Bars3dRenderer(QRect rect, Bars3dController *controller) m_selectionDepthBuffer(0), m_shadowQualityToShader(33.3f), m_zoomLevel(100), - m_sliceZoomAdjustment(1.0f), + m_autoScaleAdjustment(1.0f), m_horizontalRotation(-45.0f), m_verticalRotation(15.0f), m_barThickness(QSizeF(0.75f, 0.75f)), @@ -345,7 +345,7 @@ void Bars3dRenderer::drawSlicedScene() // Calculate view matrix QMatrix4x4 viewMatrix = m_camera->calculateViewMatrix(m_mousePos, m_zoomLevel - * m_sliceZoomAdjustment, + * m_autoScaleAdjustment, m_sliceViewPort.width(), m_sliceViewPort.height()); @@ -362,7 +362,7 @@ void Bars3dRenderer::drawSlicedScene() QMatrix4x4 viewMatrix; // Adjust scaling (zoom rate based on aspect ratio) - GLfloat camPosZoomed = 5.0f / m_sliceZoomAdjustment + zComp; + GLfloat camPosZoomed = 5.0f / m_autoScaleAdjustment + zComp; viewMatrix.lookAt(QVector3D(0.0f, 0.0f, camPosZoomed), QVector3D(0.0f, 0.0f, zComp), @@ -560,7 +560,7 @@ void Bars3dRenderer::drawScene(const GLuint defaultFboHandle) // Calculate view matrix QMatrix4x4 viewMatrix = m_camera->calculateViewMatrix(m_mousePos, m_zoomLevel - * m_sliceZoomAdjustment, + * m_autoScaleAdjustment, m_mainViewPort.width(), m_mainViewPort.height(), m_hasNegativeValues); @@ -1716,7 +1716,7 @@ void Bars3dRenderer::resizeNotify() div = qMin(width(), height()); zoomAdjustment = defaultRatio * ((width() / div) / (height() / div)); //qDebug() << "zoom adjustment" << zoomAdjustment; - m_sliceZoomAdjustment = qMin(zoomAdjustment, 1.0f); // clamp to 1.0f + m_autoScaleAdjustment = qMin(zoomAdjustment, 1.0f); // clamp to 1.0f // Re-init selection buffer initSelectionBuffer(); diff --git a/src/datavis3d/engine/bars3drenderer_p.h b/src/datavis3d/engine/bars3drenderer_p.h index 6886d1c0..cc7fb0f1 100644 --- a/src/datavis3d/engine/bars3drenderer_p.h +++ b/src/datavis3d/engine/bars3drenderer_p.h @@ -169,7 +169,7 @@ private: GLuint m_selectionDepthBuffer; GLfloat m_shadowQualityToShader; GLint m_zoomLevel; - GLfloat m_sliceZoomAdjustment; + GLfloat m_autoScaleAdjustment; GLfloat m_horizontalRotation; GLfloat m_verticalRotation; QSizeF m_barThickness; |