X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fimage%2Fimage-renderer.cpp;h=7862d5326809420c683e4ddb66c12dff2ce1b684;hb=d43575da616e1370372b1331f47dce36dc4ac145;hp=f142d59a70f84ca3479d119bb442a9acab2ae9a8;hpb=aa6628427596ccd62e430347369c82e40a3b318c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp index f142d59..7862d53 100644 --- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp @@ -19,6 +19,7 @@ #include "image-renderer.h" // EXTERNAL HEADER +#include // for strncasecmp #include #include @@ -40,6 +41,9 @@ namespace Internal namespace { +const char HTTP_URL[] = "http://"; +const char HTTPS_URL[] = "https://"; + const char * const RENDERER_TYPE("rendererType"); const char * const RENDERER_TYPE_VALUE("imageRenderer"); @@ -67,15 +71,21 @@ const char * const NO_FILTER("noFilter"); const char * const DONT_CARE("dontCare"); const std::string TEXTURE_UNIFORM_NAME = "sTexture"; -const std::string TEXTURE_RECT_UNIFORM_NAME = "uTextureRect"; +const std::string ATLAS_RECT_UNIFORM_NAME = "uAtlasRect"; +const std::string PIXEL_AREA_UNIFORM_NAME = "pixelArea"; + +// Set this uniform to 1.0 for conventional alpha blending; if pre-multiplied alpha blending, set this uniform to 0.0 +const std::string ALPHA_BLENDING_UNIFORM_NAME = "uAlphaBlending"; + const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n - varying mediump vec2 vTexCoord;\n uniform mediump mat4 uMvpMatrix;\n uniform mediump vec3 uSize;\n - uniform mediump vec4 uTextureRect;\n + uniform mediump vec4 uAtlasRect;\n + uniform mediump vec4 pixelArea; + varying mediump vec2 vTexCoord;\n \n void main()\n {\n @@ -83,7 +93,7 @@ const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( vertexPosition.xyz *= uSize;\n vertexPosition = uMvpMatrix * vertexPosition;\n \n - vTexCoord = mix( uTextureRect.xy, uTextureRect.zw, aPosition + vec2(0.5));\n + vTexCoord = mix( uAtlasRect.xy, uAtlasRect.zw, pixelArea.xy+pixelArea.zw*(aPosition + vec2(0.5) ) );\n gl_Position = vertexPosition;\n }\n ); @@ -92,10 +102,11 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( varying mediump vec2 vTexCoord;\n uniform sampler2D sTexture;\n uniform lowp vec4 uColor;\n + uniform lowp float uAlphaBlending; // Set to 1.0 for conventional alpha blending; if pre-multiplied alpha blending, set to 0.0 \n void main()\n {\n - gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n + gl_FragColor = texture2D( sTexture, vTexCoord ) * vec4( uColor.rgb*max( uAlphaBlending, uColor.a ), uColor.a );\n }\n ); @@ -193,10 +204,10 @@ Geometry CreateGeometry( RendererFactoryCache& factoryCache, ImageDimensions gri ImageRenderer::ImageRenderer( RendererFactoryCache& factoryCache, ImageAtlasManager& atlasManager ) : ControlRenderer( factoryCache ), mAtlasManager( atlasManager ), - mTextureRect( FULL_TEXTURE_RECT ), mDesiredSize(), mFittingMode( FittingMode::DEFAULT ), - mSamplingMode( SamplingMode::DEFAULT ) + mSamplingMode( SamplingMode::DEFAULT ), + mIsAlphaPreMultiplied( false ) { } @@ -312,35 +323,23 @@ void ImageRenderer::DoInitialize( Actor& actor, const Property::Map& propertyMap mDesiredSize = ImageDimensions( desiredWidth, desiredHeight ); } + // remove old renderer if exit if( mImpl->mRenderer ) { - //remove old renderer - if( actor ) + if( actor ) //remove old renderer from actor { actor.RemoveRenderer( mImpl->mRenderer ); } - - //clean the cache - if( !oldImageUrl.empty() ) + if( !oldImageUrl.empty() ) //clean old renderer from cache { CleanCache( oldImageUrl ); } + } - //Initialize the renderer - if( !mImageUrl.empty() ) - { - InitializeRenderer( mImageUrl ); - } - else if( mImage ) - { - InitializeRenderer( mImage ); - } - - //add the new renderer to the actor - if( actor && mImpl->mRenderer ) - { - actor.AddRenderer( mImpl->mRenderer ); - } + // if actor is on stage, create new renderer and apply to actor + if( actor && actor.OnStage() ) + { + SetOnStage( actor ); } } @@ -405,6 +404,12 @@ Renderer ImageRenderer::CreateRenderer() const shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? VERTEX_SHADER : mImpl->mCustomShader->mVertexShader, mImpl->mCustomShader->mFragmentShader.empty() ? FRAGMENT_SHADER : mImpl->mCustomShader->mFragmentShader, mImpl->mCustomShader->mHints ); + if( mImpl->mCustomShader->mVertexShader.empty() ) + { + shader.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT ); + shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); + shader.RegisterProperty( ALPHA_BLENDING_UNIFORM_NAME, 1.f ); + } } } @@ -414,52 +419,53 @@ Renderer ImageRenderer::CreateRenderer() const void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) { - if( mImageUrl.empty() ) + if( imageUrl.empty() ) { - mImpl->mFlags &= ~Impl::IS_FROM_CACHE; return; } + mImageUrl = imageUrl; mImpl->mRenderer.Reset(); - if( !mImpl->mCustomShader ) + + if( !mImpl->mCustomShader && + ( strncasecmp( imageUrl.c_str(), HTTP_URL, sizeof(HTTP_URL) -1 ) != 0 ) && // ignore remote images + ( strncasecmp( imageUrl.c_str(), HTTPS_URL, sizeof(HTTPS_URL) -1 ) != 0 ) ) { mImpl->mRenderer = mFactoryCache.GetRenderer( imageUrl ); if( !mImpl->mRenderer ) { - Material material = mAtlasManager.Add(mTextureRect, imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); - if( material ) - { - Geometry geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); - mImpl->mRenderer = Renderer::New( geometry, material ); - SetTextureRectUniform(mTextureRect); - } - else // big image, atlasing is not applied - { - mImpl->mRenderer = CreateRenderer(); - SetTextureRectUniform(FULL_TEXTURE_RECT); + Vector4 atlasRect; + Material material = mAtlasManager.Add(atlasRect, imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); + if( material ) + { + Geometry geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); + mImpl->mRenderer = Renderer::New( geometry, material ); + mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect ); + } + else // big image, atlasing is not applied + { + mImpl->mRenderer = CreateRenderer(); - ResourceImage image = Dali::ResourceImage::New( imageUrl ); - image.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); - Material material = mImpl->mRenderer.GetMaterial(); - material.AddTexture( image, TEXTURE_UNIFORM_NAME ); - } + ResourceImage image = Dali::ResourceImage::New( imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); + image.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); + Material material = mImpl->mRenderer.GetMaterial(); + material.AddTexture( image, TEXTURE_UNIFORM_NAME ); + } - mFactoryCache.SaveRenderer( imageUrl, mImpl->mRenderer ); - } - else - { - Property::Value textureRect = mImpl->mRenderer.GetProperty( mImpl->mRenderer.GetPropertyIndex(TEXTURE_RECT_UNIFORM_NAME) ); - textureRect.Get( mTextureRect ); + mFactoryCache.SaveRenderer( imageUrl, mImpl->mRenderer ); } + mImpl->mFlags |= Impl::IS_FROM_CACHE; } else { + // for custom shader or remote image, renderer is not cached and atlas is not applied + mImpl->mFlags &= ~Impl::IS_FROM_CACHE; mImpl->mRenderer = CreateRenderer(); - ResourceImage image = Dali::ResourceImage::New( imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); - image.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); - ApplyImageToSampler( image ); + ResourceImage resourceImage = Dali::ResourceImage::New( imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); + resourceImage.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); + ApplyImageToSampler( resourceImage ); } } @@ -467,14 +473,12 @@ void ImageRenderer::InitializeRenderer( const Image& image ) { mImpl->mFlags &= ~Impl::IS_FROM_CACHE; - if( !image ) + mImpl->mRenderer = CreateRenderer(); + + if( image ) { - return; + ApplyImageToSampler( image ); } - - mImpl->mRenderer = CreateRenderer(); - ApplyImageToSampler( image ); - SetTextureRectUniform( FULL_TEXTURE_RECT ); } @@ -484,26 +488,12 @@ void ImageRenderer::DoSetOnStage( Actor& actor ) { InitializeRenderer( mImageUrl ); } - else if( mImage ) + else { InitializeRenderer( mImage ); } - if( !GetIsFromCache() ) - { - Image image = mImage; - if( !mImageUrl.empty() ) - { - ResourceImage resourceImage = Dali::ResourceImage::New( mImageUrl, mDesiredSize, mFittingMode, mSamplingMode ); - resourceImage.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); - image = resourceImage; - - // Set value to the uTextureRect uniform - SetTextureRectUniform( FULL_TEXTURE_RECT ); - } - - ApplyImageToSampler( image ); - } + EnablePreMultipliedAlpha( mIsAlphaPreMultiplied ); } void ImageRenderer::DoSetOffStage( Actor& actor ) @@ -626,21 +616,27 @@ Shader ImageRenderer::GetImageShader( RendererFactoryCache& factoryCache ) { shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); factoryCache.SaveShader( RendererFactoryCache::IMAGE_SHADER, shader ); + shader.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT ); + shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); + shader.RegisterProperty( ALPHA_BLENDING_UNIFORM_NAME, 1.f ); } return shader; } void ImageRenderer::SetImage( Actor& actor, const std::string& imageUrl, ImageDimensions size, Dali::FittingMode::Type fittingMode, Dali::SamplingMode::Type samplingMode ) { - mDesiredSize = size; - mFittingMode = fittingMode; - mSamplingMode = samplingMode; - if( mImageUrl != imageUrl ) { + std::string oldImageUrl = mImageUrl; + mImageUrl = imageUrl; + mDesiredSize = size; + mFittingMode = fittingMode; + mSamplingMode = samplingMode; + mImage.Reset(); + if( mImpl->mRenderer ) { - if( GetIsFromCache() ) + if( GetIsFromCache() ) // if renderer is from cache, remove the old one { //remove old renderer if( actor ) @@ -649,31 +645,23 @@ void ImageRenderer::SetImage( Actor& actor, const std::string& imageUrl, ImageDi } //clean the cache - if( !mImageUrl.empty() ) + if( !oldImageUrl.empty() ) { - CleanCache(mImageUrl); + CleanCache(oldImageUrl); } - //Initialize the renderer - InitializeRenderer( imageUrl ); - - //add the new renderer to the actor - if( actor && mImpl->mRenderer ) + if( actor && actor.OnStage() ) // if actor on stage, create a new renderer and apply to actor { - actor.AddRenderer( mImpl->mRenderer ); + SetOnStage(actor); } } - else + else // if renderer is not from cache, reuse the same renderer and only change the texture { ResourceImage image = Dali::ResourceImage::New( imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); image.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); ApplyImageToSampler( image ); } } - - mImageUrl = imageUrl; - - mImage.Reset(); } } @@ -681,9 +669,11 @@ void ImageRenderer::SetImage( Actor& actor, const Image& image ) { if( mImage != image ) { + mImage = image; + if( mImpl->mRenderer ) { - if( GetIsFromCache() ) + if( GetIsFromCache() ) // if renderer is from cache, remove the old one { //remove old renderer if( actor ) @@ -696,24 +686,19 @@ void ImageRenderer::SetImage( Actor& actor, const Image& image ) { CleanCache(mImageUrl); } + mImageUrl.clear(); - //Initialize the renderer - InitializeRenderer( image ); - - //add the new renderer to the actor - if( actor && mImpl->mRenderer ) + if( actor && actor.OnStage() ) // if actor on stage, create a new renderer and apply to actor { - actor.AddRenderer( mImpl->mRenderer ); + SetOnStage(actor); } } - else + else // if renderer is not from cache, reuse the same renderer and only change the texture { ApplyImageToSampler( image ); } } - SetTextureRectUniform( FULL_TEXTURE_RECT ); - mImage = image; mImageUrl.clear(); mDesiredSize = ImageDimensions(); mFittingMode = FittingMode::DEFAULT; @@ -721,6 +706,37 @@ void ImageRenderer::SetImage( Actor& actor, const Image& image ) } } +void ImageRenderer::EnablePreMultipliedAlpha( bool preMultipled ) +{ + mIsAlphaPreMultiplied = preMultipled; + if( mImpl->mRenderer ) + { + Material material = mImpl->mRenderer.GetMaterial(); + + if( preMultipled ) + { + material.SetBlendFunc( BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA, + BlendingFactor::ONE, BlendingFactor::ONE ); + if( !mImpl->mCustomShader || mImpl->mCustomShader->mVertexShader.empty()) + { + material.RegisterProperty( ALPHA_BLENDING_UNIFORM_NAME, 0.f ); + } + } + else + { + // using default blend func + material.SetBlendFunc( BlendingFactor::SRC_ALPHA, BlendingFactor::ONE_MINUS_SRC_ALPHA, + BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA ); + + Property::Index index = material.GetPropertyIndex( ALPHA_BLENDING_UNIFORM_NAME ); + if( index != Property::INVALID_INDEX ) // only set value when the property already exist on the Material + { + material.SetProperty( index, 1.f ); + } + } + } +} + void ImageRenderer::ApplyImageToSampler( const Image& image ) { if( image ) @@ -752,22 +768,22 @@ void ImageRenderer::OnImageLoaded( ResourceImage image ) } } -void ImageRenderer::SetTextureRectUniform( const Vector4& textureRect ) +void ImageRenderer::CleanCache(const std::string& url) { - if( mImpl->mRenderer ) + Material material = mImpl->mRenderer.GetMaterial(); + + Vector4 atlasRect( 0.f, 0.f, 1.f, 1.f ); + Property::Index index = mImpl->mRenderer.GetPropertyIndex( ATLAS_RECT_UNIFORM_NAME ); + if( index != Property::INVALID_INDEX ) { - // Register/Set property. - mImpl->mRenderer.RegisterProperty( TEXTURE_RECT_UNIFORM_NAME, textureRect ); + Property::Value atlasRectValue = mImpl->mRenderer.GetProperty( index ); + atlasRectValue.Get( atlasRect ); } -} -void ImageRenderer::CleanCache(const std::string& url) -{ - Material material = mImpl->mRenderer.GetMaterial(); mImpl->mRenderer.Reset(); - if( mFactoryCache.CleanRendererCache( url ) ) + if( mFactoryCache.CleanRendererCache( url ) && index != Property::INVALID_INDEX ) { - mAtlasManager.Remove( material, mTextureRect ); + mAtlasManager.Remove( material, atlasRect ); } }