X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fgraphics%2Fshaders%2Ftext-scroller-shader.vert;h=c152b5e3be9704691ef535c9817806c0f15299b8;hp=6ea160a26f97a8809b5761350ac90025e41ae8c3;hb=16561908a5e0e9bbef2aa11c9cdc3a27aeb1bd54;hpb=e70007fa5b0de4fcaa1960c52a2f1dc582d1d44d diff --git a/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert b/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert index 6ea160a..c152b5e 100644 --- a/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert +++ b/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert @@ -18,13 +18,13 @@ uniform mediump vec2 anchorPoint; void main() { - highp vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy ); - highp vec2 visualSize = mix( uSize.xy * size, size, offsetSizeMode.zw ); + highp vec2 visualSize = mix(size * uSize.xy, size, offsetSizeMode.zw); + highp vec2 visualOffset = mix(offset * uSize.xy, offset, offsetSizeMode.xy); vTexCoord.x = ( uDelta + uHorizontalAlign * ( uTextureSize.x - visualSize.x - uGap ) + aPosition.x * visualSize.x - uGap * 0.5 ) / uTextureSize.x + 0.5; vTexCoord.y = ( uVerticalAlign * ( uTextureSize.y - visualSize.y ) + aPosition.y * visualSize.y ) / ( uTextureSize.y ) + 0.5; - highp vec4 vertexPosition = vec4( ( aPosition + anchorPoint ) * visualSize + ( visualOffset + origin ) * uSize.xy, 0.0, 1.0 ); + highp vec4 vertexPosition = vec4( ( aPosition + anchorPoint ) * visualSize + visualOffset + origin * uSize.xy, 0.0, 1.0 ); gl_Position = uMvpMatrix * vertexPosition; } \ No newline at end of file