From cc06ca1ff697d568fde8de7a4d147fb9d9442fbc Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Wed, 20 Dec 2017 11:21:47 +0000 Subject: [PATCH] Disable pixel alignment while scrolling the text Change-Id: I8980a4ae249d6b67868e1b0beb21f2d98e39e25e --- dali-toolkit/internal/text/text-scroller.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp index f8089a2..be83736 100644 --- a/dali-toolkit/internal/text/text-scroller.cpp +++ b/dali-toolkit/internal/text/text-scroller.cpp @@ -66,15 +66,12 @@ const char* VERTEX_SHADER_SCROLL = DALI_COMPOSE_SHADER( mediump vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy );\n mediump vec2 visualSize = mix( uSize.xy * size, size, offsetSizeMode.zw );\n \n - mediump float delta = floor ( uDelta ) + 0.5;\n - vTexCoord.x = ( delta + uHorizontalAlign * ( uTextureSize.x - visualSize.x - uGap ) + floor( aPosition.x * visualSize.x ) + 0.5 - uGap * 0.5 ) / uTextureSize.x + 0.5;\n + vTexCoord.x = ( uDelta + uHorizontalAlign * ( uTextureSize.x - visualSize.x - uGap ) + floor( aPosition.x * visualSize.x ) + 0.5 - uGap * 0.5 ) / uTextureSize.x + 0.5;\n vTexCoord.y = ( uVerticalAlign * ( uTextureSize.y - visualSize.y ) + floor( aPosition.y * visualSize.y ) + 0.5 ) / ( uTextureSize.y ) + 0.5;\n \n mediump vec4 vertexPosition = vec4( floor( ( aPosition + anchorPoint ) * visualSize + ( visualOffset + origin ) * uSize.xy ), 0.0, 1.0 );\n - mediump vec4 nonAlignedVertex = uViewMatrix * uModelMatrix * vertexPosition;\n - mediump vec4 pixelAlignedVertex = vec4 ( floor( nonAlignedVertex.xyz ), 1.0 );\n \n - gl_Position = uProjection * pixelAlignedVertex;\n + gl_Position = uProjection * uViewMatrix * uModelMatrix * vertexPosition;\n }\n ); -- 2.7.4