summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-05-24 10:34:34 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-05-24 10:48:43 +0200
commit2c75e669689107687183e0ba34b00c22056867a0 (patch)
tree2ec31b759e33ebdbe2904203e74c48f244f1f862
parent609d16263ff303c1c2dd1691e90b6731ea03e7c4 (diff)
map strings correctly to 3d objects
Change-Id: I21b62a869b89c23ddba75eb8c33c30a73160098b
-rw-r--r--chart2/source/view/main/GL3DRenderer.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index b2db1e7bbf6b..b75ec0792f72 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1385,21 +1385,21 @@ void OpenGL3DRenderer::CreateTextTexture(const BitmapEx& rBitmapEx, glm::vec3 vT
TextInfo aTextInfo;
aTextInfo.id = getColorAsVector(nUniqueId);
- aTextInfo.vertex[0] = vBottomRight.x;
- aTextInfo.vertex[1] = vBottomRight.y;
- aTextInfo.vertex[2] = vBottomRight.z * m_fHeightWeight;
+ aTextInfo.vertex[0] = vTopLeft.x;
+ aTextInfo.vertex[1] = vTopLeft.y;
+ aTextInfo.vertex[2] = vTopLeft.z * m_fHeightWeight;
aTextInfo.vertex[3] = vTopRight.x;
aTextInfo.vertex[4] = vTopRight.y;
- aTextInfo.vertex[5] = aTextInfo.vertex[2] + (vTopRight.z - vBottomRight.z);
+ aTextInfo.vertex[5] = vTopRight.z * m_fHeightWeight;
aTextInfo.vertex[9] = vBottomLeft.x;
aTextInfo.vertex[10] = vBottomLeft.y;
aTextInfo.vertex[11] = vBottomLeft.z * m_fHeightWeight;
- aTextInfo.vertex[6] = vTopLeft.x;
- aTextInfo.vertex[7] = vTopLeft.y;
- aTextInfo.vertex[8] = aTextInfo.vertex[11] + (vTopLeft.z - vBottomLeft.z);
+ aTextInfo.vertex[6] = vBottomRight.x;
+ aTextInfo.vertex[7] = vBottomRight.y;
+ aTextInfo.vertex[8] = vBottomRight.z * m_fHeightWeight;
CHECK_GL_ERROR();
glGenTextures(1, &aTextInfo.texture);