X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-scroller.cpp;h=d908d33733e03cabf8210985d19f2a27cd181b78;hp=b1096617cacd2e911e52dfefe5ccdf9ecd1c8aeb;hb=0e96d3c3debf43ce2c02883bc269f087f8286528;hpb=4d305b893731daafafc293b92dc4fa25a896e929 diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp old mode 100644 new mode 100755 index b109661..d908d33 --- a/dali-toolkit/internal/text/text-scroller.cpp +++ b/dali-toolkit/internal/text/text-scroller.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,11 +19,11 @@ #include // EXTERNAL INCLUDES -#include #include // INTERNAL INCLUDES #include +#include namespace Dali { @@ -40,88 +40,29 @@ namespace const int MINIMUM_SCROLL_SPEED = 1; // Speed should be set by Property system. -const char* VERTEX_SHADER_SCROLL = DALI_COMPOSE_SHADER( - attribute mediump vec2 aPosition;\n - varying highp vec2 vTexCoord;\n - varying highp float vRatio;\n - uniform mediump vec3 uSize;\n - uniform mediump float uDelta;\n - uniform mediump vec2 uTextureSize;\n - uniform mediump float uGap;\n - uniform mediump float uHorizontalAlign;\n - uniform mediump float uVerticalAlign;\n - \n - uniform mediump mat4 uModelMatrix;\n - uniform mediump mat4 uViewMatrix;\n - uniform mediump mat4 uProjection;\n - \n - //Visual size and offset - uniform mediump vec2 offset;\n - uniform mediump vec2 size;\n - uniform mediump vec4 offsetSizeMode;\n - uniform mediump vec2 origin;\n - uniform mediump vec2 anchorPoint;\n - - void main()\n - {\n - 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 smallTextPadding = max( visualSize.x - uTextureSize.x, 0. );\n - mediump float gap = max( uGap, smallTextPadding );\n - mediump float delta = floor ( uDelta ) + 0.5;\n - vTexCoord.x = ( delta + uHorizontalAlign * ( uTextureSize.x - visualSize.x ) + floor( aPosition.x * visualSize.x ) + 0.5 - gap * 0.5 ) / ( uTextureSize.x + gap ) + 0.5;\n - vTexCoord.y = ( uVerticalAlign * ( uTextureSize.y - visualSize.y ) + floor( aPosition.y * visualSize.y ) + 0.5 ) / ( uTextureSize.y ) + 0.5;\n - vRatio = uTextureSize.x / ( uTextureSize.x + gap );\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 - }\n -); - -const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( - varying highp vec2 vTexCoord;\n - varying highp float vRatio;\n - uniform sampler2D sTexture;\n - \n - void main()\n - {\n - highp vec2 texCoord;\n - texCoord.y = vTexCoord.y;\n - texCoord.x = fract( vTexCoord.x ) / vRatio;\n - if ( texCoord.x > 1.0 || texCoord.y > 1.0 )\n - discard;\n - \n - gl_FragColor = texture2D( sTexture, texCoord );\n - }\n -); - /** * @brief How the text should be aligned horizontally when scrolling the text. * * -0.5f aligns the text to the left, 0.0f aligns the text to the center, 0.5f aligns the text to the right. * The final alignment depends on two factors: - * 1) The alignment value of the text label (Use Text::Layout::HorizontalAlignment enumerations). + * 1) The alignment value of the text label (Use Text::HorizontalAlignment enumerations). * 2) The text direction, i.e. whether it's LTR or RTL (0 = LTR, 1 = RTL). */ -const float HORIZONTAL_ALIGNMENT_TABLE[ Text::Layout::HORIZONTAL_ALIGN_COUNT ][ 2 ] = +const float HORIZONTAL_ALIGNMENT_TABLE[ Text::HorizontalAlignment::END+1 ][ 2 ] = { - // HORIZONTAL_ALIGN_BEGIN + // HorizontalAlignment::BEGIN { -0.5f, // LTR 0.5f // RTL }, - // HORIZONTAL_ALIGN_CENTER + // HorizontalAlignment::CENTER { 0.0f, // LTR 0.0f // RTL }, - // HORIZONTAL_ALIGN_END + // HorizontalAlignment::END { 0.5f, // LTR -0.5f // RTL @@ -132,13 +73,13 @@ const float HORIZONTAL_ALIGNMENT_TABLE[ Text::Layout::HORIZONTAL_ALIGN_COUNT ][ * @brief How the text should be aligned vertically when scrolling the text. * * -0.5f aligns the text to the top, 0.0f aligns the text to the center, 0.5f aligns the text to the bottom. - * The alignment depends on the alignment value of the text label (Use Text::Layout::VerticalAlignment enumerations). + * The alignment depends on the alignment value of the text label (Use Text::VerticalAlignment enumerations). */ -const float VERTICAL_ALIGNMENT_TABLE[ Text::Layout::VERTICAL_ALIGN_COUNT ] = +const float VERTICAL_ALIGNMENT_TABLE[ Text::VerticalAlignment::BOTTOM+1 ] = { - -0.5f, // VERTICAL_ALIGN_TOP - 0.0f, // VERTICAL_ALIGN_CENTER - 0.5f // VERTICAL_ALIGN_BOTTOM + -0.5f, // VerticalAlignment::TOP + 0.0f, // VerticalAlignment::CENTER + 0.5f // VerticalAlignment::BOTTOM }; } // namespace @@ -200,9 +141,9 @@ float TextScroller::GetLoopDelay() const return mLoopDelay; } -void TextScroller::SetStopMode( DevelTextLabel::AutoScrollStopMode::Type stopMode ) +void TextScroller::SetStopMode( TextLabel::AutoScrollStopMode::Type stopMode ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetAutoScrollStopMode [%s]\n",(stopMode == DevelTextLabel::AutoScrollStopMode::IMMEDIATE)?"IMMEDIATE":"FINISH_LOOP" ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetAutoScrollStopMode [%s]\n",(stopMode == TextLabel::AutoScrollStopMode::IMMEDIATE)?"IMMEDIATE":"FINISH_LOOP" ); mStopMode = stopMode; } @@ -212,13 +153,13 @@ void TextScroller::StopScrolling() { switch( mStopMode ) { - case DevelTextLabel::AutoScrollStopMode::IMMEDIATE: + case TextLabel::AutoScrollStopMode::IMMEDIATE: { mScrollAnimation.Stop(); mScrollerInterface.ScrollingFinished(); break; } - case DevelTextLabel::AutoScrollStopMode::FINISH_LOOP: + case TextLabel::AutoScrollStopMode::FINISH_LOOP: { mScrollAnimation.SetLoopCount( 1 ); // As animation already playing this allows the current animation to finish instead of trying to stop mid-way break; @@ -229,9 +170,13 @@ void TextScroller::StopScrolling() } } } + else + { + mScrollerInterface.ScrollingFinished(); + } } -DevelTextLabel::AutoScrollStopMode::Type TextScroller::GetStopMode() const +TextLabel::AutoScrollStopMode::Type TextScroller::GetStopMode() const { return mStopMode; } @@ -243,7 +188,7 @@ TextScroller::TextScroller( ScrollerInterface& scrollerInterface ) mLoopCount( 1 ), mLoopDelay( 0.0f ), mWrapGap( 0.0f ), - mStopMode( DevelTextLabel::AutoScrollStopMode::FINISH_LOOP ) + mStopMode( TextLabel::AutoScrollStopMode::FINISH_LOOP ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller Default Constructor\n" ); } @@ -252,10 +197,10 @@ TextScroller::~TextScroller() { } -void TextScroller::SetParameters( Actor scrollingTextActor, Renderer renderer, TextureSet textureSet, const Size& controlSize, const Size& textNaturalSize, CharacterDirection direction, Layout::HorizontalAlignment horizontalAlignment, Layout::VerticalAlignment verticalAlignment ) +void TextScroller::SetParameters( Actor scrollingTextActor, Renderer renderer, TextureSet textureSet, const Size& controlSize, const Size& textureSize, const float wrapGap, CharacterDirection direction, HorizontalAlignment::Type horizontalAlignment, VerticalAlignment::Type verticalAlignment ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters controlSize[%f,%f] offscreenSize[%f,%f] direction[%d]\n", - controlSize.x, controlSize.y, textNaturalSize.x, textNaturalSize.y, direction ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters controlSize[%f,%f] textureSize[%f,%f] direction[%d]\n", + controlSize.x, controlSize.y, textureSize.x, textureSize.y, direction ); mRenderer = renderer; @@ -277,30 +222,45 @@ void TextScroller::SetParameters( Actor scrollingTextActor, Renderer renderer, T // Reset to the original shader and texture before scrolling mRenderer.SetShader(mShader); - mRenderer.SetTextures( mTextureSet ); + if( mTextureSet ) + { + mRenderer.SetTextures( mTextureSet ); + } } mShader = mRenderer.GetShader(); mTextureSet = mRenderer.GetTextures(); // Set the shader and texture for scrolling - Shader shader = Shader::New( VERTEX_SHADER_SCROLL, FRAGMENT_SHADER, Shader::Hint::NONE ); + Shader shader = Shader::New( SHADER_TEXT_SCROLLER_SHADER_VERT, SHADER_TEXT_SCROLLER_SHADER_FRAG, Shader::Hint::NONE ); mRenderer.SetShader( shader ); mRenderer.SetTextures( textureSet ); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters mWrapGap[%f]\n", mWrapGap ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters wrapGap[%f]\n", wrapGap ); + + float horizontalAlign; + + if( textureSize.x > controlSize.x ) + { + // if Text is elided, scroll should start at the begin of text. + horizontalAlign = HORIZONTAL_ALIGNMENT_TABLE[HorizontalAlignment::BEGIN][ direction ]; + } + else + { + horizontalAlign = HORIZONTAL_ALIGNMENT_TABLE[ horizontalAlignment ][ direction ]; + } - const float horizontalAlign = HORIZONTAL_ALIGNMENT_TABLE[ horizontalAlignment ][ direction ]; const float verticalAlign = VERTICAL_ALIGNMENT_TABLE[ verticalAlignment ]; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters horizontalAlign[%f], verticalAlign[%f]\n", horizontalAlign, verticalAlign ); - scrollingTextActor.RegisterProperty( "uTextureSize", textNaturalSize ); - scrollingTextActor.RegisterProperty( "uHorizontalAlign", horizontalAlign ); - scrollingTextActor.RegisterProperty( "uVerticalAlign", verticalAlign ); - scrollingTextActor.RegisterProperty( "uGap", mWrapGap ); - mScrollDeltaIndex = scrollingTextActor.RegisterProperty( "uDelta", 0.0f ); + shader.RegisterProperty( "uTextureSize", textureSize ); + shader.RegisterProperty( "uHorizontalAlign", horizontalAlign ); + shader.RegisterProperty( "uVerticalAlign", verticalAlign ); + shader.RegisterProperty( "uGap", wrapGap ); + mScrollDeltaIndex = shader.RegisterProperty( "uDelta", 0.0f ); - float scrollAmount = std::max( textNaturalSize.width + mWrapGap, controlSize.width ); + float scrollAmount = std::max( textureSize.width, controlSize.width ); float scrollDuration = scrollAmount / mScrollSpeed; if ( direction ) @@ -329,9 +289,10 @@ void TextScroller::StartScrolling( Actor scrollingTextActor, float scrollAmount, { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::StartScrolling scrollAmount[%f] scrollDuration[%f], loop[%d] speed[%d]\n", scrollAmount, scrollDuration, loopCount, mScrollSpeed ); + Shader shader = mRenderer.GetShader(); mScrollAnimation = Animation::New( scrollDuration ); - mScrollAnimation.AnimateTo( Property( scrollingTextActor, mScrollDeltaIndex ), scrollAmount, TimePeriod( mLoopDelay, scrollDuration ) ); - mScrollAnimation.SetEndAction( Animation::Discard ); + mScrollAnimation.AnimateTo( Property( shader, mScrollDeltaIndex ), scrollAmount, TimePeriod( mLoopDelay, scrollDuration ) ); + mScrollAnimation.SetEndAction( Animation::DISCARD ); mScrollAnimation.SetLoopCount( loopCount ); mScrollAnimation.FinishedSignal().Connect( this, &TextScroller::AutoScrollAnimationFinished ); mScrollAnimation.Play();