kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fixed text rendering

Browse source
This commit is contained in:
r.kuznetsov 2015-11-17 12:10:34 +03:00
parent d6a6fd0937
commit c3f5c7217f
5 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drape/shaders/text_fragment_shader.fsh
View file

@ -4,14 +4,13 @@ varying vec2 v_maskTexCoord;
uniform sampler2D u_colorTex;
uniform sampler2D u_maskTex;
uniform float u_opacity;
uniform float u_contrast;
uniform float u_gamma;
uniform vec2 u_contrastGamma;
void main (void)
{
vec4 glyphColor = texture2D(u_colorTex, v_colorTexCoord);
float dist = texture2D(u_maskTex, v_maskTexCoord).a;
float alpha = smoothstep(u_contrast - u_gamma, u_contrast + u_gamma, dist) * u_opacity;
float alpha = smoothstep(u_contrastGamma.x - u_contrastGamma.y, u_contrastGamma.x + u_contrastGamma.y, dist) * u_opacity;
glyphColor.a *= alpha;
gl_FragColor = glyphColor;
}

7
drape_frontend/gui/shape.cpp
View file

@ -26,11 +26,8 @@ bool Handle::Update(ScreenBase const & screen)
m_uniforms.SetFloatValue("u_opacity", 1.0);
auto const & params = df::VisualParams::Instance().GetGlyphVisualParams();
m_uniforms.SetFloatValue("u_outlineGlyphParams",
params.m_outlineMinStart, params.m_outlineMinEnd,
params.m_outlineMaxStart, params.m_outlineMaxEnd);
m_uniforms.SetFloatValue("u_glyphParams",
params.m_alphaGlyphMin, params.m_alphaGlyphMax);
m_uniforms.SetFloatValue("u_contrastGamma", params.m_contrast, params.m_gamma);
m_uniforms.SetFloatValue("u_isOutlinePass", 0.0f);
}
return true;

8
drape_frontend/render_group.cpp
View file

@ -69,16 +69,16 @@ void RenderGroup::Render(ScreenBase const & screen)
if (m_state.GetProgramIndex() == gpu::TEXT_PROGRAM)
{
m_uniforms.SetFloatValue("u_contrast", 0.05f);
m_uniforms.SetFloatValue("u_gamma", 0.01f);
auto const & params = df::VisualParams::Instance().GetGlyphVisualParams();
m_uniforms.SetFloatValue("u_contrastGamma", params.m_outlineContrast, params.m_outlineGamma);
m_uniforms.SetFloatValue("u_isOutlinePass", 1.0f);
dp::ApplyUniforms(m_uniforms, m_shader);
for(drape_ptr<dp::RenderBucket> & renderBucket : m_renderBuckets)
renderBucket->Render(screen);
m_uniforms.SetFloatValue("u_contrast", 0.5f);
m_uniforms.SetFloatValue("u_gamma", 0.05f);
m_uniforms.SetFloatValue("u_contrastGamma", params.m_contrast, params.m_gamma);
m_uniforms.SetFloatValue("u_isOutlinePass", 0.0f);
dp::ApplyUniforms(m_uniforms, m_shader);
for(drape_ptr<dp::RenderBucket> & renderBucket : m_renderBuckets)

4
drape_frontend/visual_params.cpp
View file

@ -42,9 +42,9 @@ void VisualParams::Init(double vs, uint32_t tileSize, vector<uint32_t> const & a
// Here we set up glyphs rendering parameters separately for high-res and low-res screens.
if (vs <= 1.0)
g_VizParams.m_glyphVisualParams = { 0.44, 0.6, 0.615, 0.95, 0.44, 0.6 };
g_VizParams.m_glyphVisualParams = { 0.48f, 0.08f, 0.05f, 0.01f };
else
g_VizParams.m_glyphVisualParams = { 0.41, 0.575, 0.58, 0.95, 0.41, 0.575 };
g_VizParams.m_glyphVisualParams = { 0.5f, 0.05f, 0.05f, 0.01f };
RISE_INITED;
}

10
drape_frontend/visual_params.hpp
View file

@ -34,12 +34,10 @@ public:
struct GlyphVisualParams
{
float m_outlineMinStart;
float m_outlineMinEnd;
float m_outlineMaxStart;
float m_outlineMaxEnd;
float m_alphaGlyphMin;
float m_alphaGlyphMax;
float m_contrast;
float m_gamma;
float m_outlineContrast;
float m_outlineGamma;
};
GlyphVisualParams const & GetGlyphVisualParams() const;