diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2014-01-13 14:51:10 +0200 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2014-01-13 15:25:18 +0200 |
| commit | 06dd7be52f2bcd23b9a622a17d3d0e8963a7dd17 (patch) | |
| tree | b825dfcfd969288a9642a737bcc7e39081718437 /src/datavisualization/engine/scatter3drenderer.cpp | |
| parent | 828a2579530ea8c9bc3a0c5ef2cc11da2c247417 (diff) | |
Direction for scatter items
Task-number: QTRD-2654
Change-Id: Ib21e6d75fa43de45387ad6225973aa8a11ffc0c9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/scatter3drenderer.cpp')
| -rw-r--r-- | src/datavisualization/engine/scatter3drenderer.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 6a08c934..9973069b 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -208,6 +208,7 @@ void Scatter3DRenderer::updateData() && (dotPos.z() >= minZ && dotPos.z() <= maxZ)) { m_renderingArrays[series][i].setPosition(dotPos); m_renderingArrays[series][i].setVisible(true); + m_renderingArrays[series][i].setRotation(dataArray.at(i).rotation()); calculateTranslation(m_renderingArrays[series][i]); } else { m_renderingArrays[series][i].setVisible(false); @@ -387,8 +388,10 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) QMatrix4x4 MVPMatrix; modelMatrix.translate(item.translation()); - if (!drawingPoints) + if (!drawingPoints) { + modelMatrix.rotate(item.rotation()); modelMatrix.scale(modelScaler); + } MVPMatrix = depthProjectionViewMatrix * modelMatrix; @@ -512,8 +515,10 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) QMatrix4x4 MVPMatrix; modelMatrix.translate(item.translation()); - if (!drawingPoints) + if (!drawingPoints) { + modelMatrix.rotate(item.rotation()); modelMatrix.scale(modelScaler); + } MVPMatrix = projectionViewMatrix * modelMatrix; @@ -682,8 +687,10 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) modelMatrix.translate(item.translation()); if (!drawingPoints) { + modelMatrix.rotate(item.rotation()); modelMatrix.scale(modelScaler); itModelMatrix.scale(modelScaler); + itModelMatrix.rotate(item.rotation()); } #ifdef SHOW_DEPTH_TEXTURE_SCENE MVPMatrix = depthProjectionViewMatrix * modelMatrix; @@ -714,6 +721,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) dotShader->setUniformValue(dotShader->nModel(), itModelMatrix.inverted().transposed()); } + dotShader->setUniformValue(dotShader->MVP(), MVPMatrix); if (useColor) { dotShader->setUniformValue(dotShader->color(), dotColor); |