From 0cb5939f72288d175f2977d4c832ab7ff1edbf18 Mon Sep 17 00:00:00 2001
From: weigao <weigao@multicorewareinc.com>
Date: Sat, 9 Aug 2014 20:33:08 +0800
Subject: modify screen text color to blue

Change-Id: I80435a980550a2b74657442ef1b44ca8e3825a97
---
 chart2/opengl/screenTextFragmentShader.glsl | 3 ++-
 chart2/source/view/inc/GL3DRenderer.hxx     | 1 +
 chart2/source/view/main/GL3DRenderer.cxx    | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'chart2')

diff --git a/chart2/opengl/screenTextFragmentShader.glsl b/chart2/opengl/screenTextFragmentShader.glsl
index 7e2bd26e1069..1354bf17a129 100644
--- a/chart2/opengl/screenTextFragmentShader.glsl
+++ b/chart2/opengl/screenTextFragmentShader.glsl
@@ -9,10 +9,11 @@
 
 varying vec2 vTexCoord;
 uniform sampler2D TextTex;
+uniform vec4 textColor;
 void main()
 {
     vec3 color = texture2D(TextTex, vTexCoord).rgb;
-    gl_FragColor = vec4(color, 1.0 - color.r);
+    gl_FragColor = vec4(textColor.rgb, 1.0 - color.r);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 94ca99302247..1993a1991901 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -323,6 +323,7 @@ private:
         GLint m_ScreenTextVertexID;
         GLint m_ScreenTextTexCoordID;
         GLint m_ScreenTextTexID;
+        GLint m_ScreenTextColorID;
 
         // CommonProID
         GLint m_CommonProID;
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 60b9f774a058..d31e5d18f753 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -190,6 +190,7 @@ OpenGL3DRenderer::ShaderResources::ShaderResources()
     , m_ScreenTextVertexID(0)
     , m_ScreenTextTexCoordID(0)
     , m_ScreenTextTexID(0)
+    , m_ScreenTextColorID(0)
     , m_CommonProID(0)
     , m_2DVertexID(0)
     , m_2DColorID(0)
@@ -305,6 +306,7 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()
     m_ScreenTextVertexID = glGetAttribLocation(m_ScreenTextProID, "vPosition");
     m_ScreenTextTexCoordID = glGetAttribLocation(m_ScreenTextProID, "texCoord");
     m_ScreenTextTexID = glGetUniformLocation(m_ScreenTextProID, "TextTex");
+    m_ScreenTextColorID = glGetUniformLocation(m_ScreenTextProID, "textColor");
 
     m_CommonProID = OpenGLHelper::LoadShaders("commonVertexShader", "commonFragmentShader");
     m_MatrixID = glGetUniformLocation(m_CommonProID, "MVP");
@@ -1877,6 +1879,8 @@ void OpenGL3DRenderer::ReleaseScreenTextTexture()
 void OpenGL3DRenderer::RenderScreenTextShape()
 {
     glUseProgram(maResources.m_ScreenTextProID);
+    glm::vec4 textColor = glm::vec4(0.0, 0.0, 1.0, 1.0);
+    glUniform4fv(maResources.m_ScreenTextColorID, 1, &textColor[0]);
     CHECK_GL_ERROR();
     for (size_t i = 0; i < m_ScreenTextInfoList.size(); i++)
     {
-- 
cgit