From 54df5fef0eeef9cdc964caac2c2c60b7703c397a Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Tue, 10 Jan 2017 13:37:00 +0300 Subject: [PATCH] Increased sharpness of non-sdf text. --- drape_frontend/text_shape.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp index 700d46721d..05d5476aa8 100644 --- a/drape_frontend/text_shape.cpp +++ b/drape_frontend/text_shape.cpp @@ -204,13 +204,17 @@ void TextShape::DrawSubStringPlain(StraightTextLayout const & layout, dp::FontDe layout.Cache(glsl::vec4(pt, m_params.m_depth, -m_params.m_posZ), baseOffset, color, staticBuffer, dynamicBuffer); - dp::GLState state(layout.GetFixedHeight() > 0 ? gpu::TEXT_FIXED_PROGRAM : gpu::TEXT_PROGRAM, dp::GLState::OverlayLayer); - state.SetProgram3dIndex(layout.GetFixedHeight() > 0 ? gpu::TEXT_FIXED_BILLBOARD_PROGRAM : gpu::TEXT_BILLBOARD_PROGRAM); + bool const isNonSdfText = layout.GetFixedHeight() > 0; + dp::GLState state(isNonSdfText ? gpu::TEXT_FIXED_PROGRAM : gpu::TEXT_PROGRAM, dp::GLState::OverlayLayer); + state.SetProgram3dIndex(isNonSdfText ? gpu::TEXT_FIXED_BILLBOARD_PROGRAM : gpu::TEXT_BILLBOARD_PROGRAM); ASSERT(color.GetTexture() == outline.GetTexture(), ()); state.SetColorTexture(color.GetTexture()); state.SetMaskTexture(layout.GetMaskTexture()); + if (isNonSdfText) + state.SetTextureFilter(gl_const::GLNearest); + gpu::TTextDynamicVertexBuffer initialDynBuffer(dynamicBuffer.size()); m2::PointU const & pixelSize = layout.GetPixelSize();