X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fimage%2Fimage-renderer.cpp;h=8b13a4e5c7987e02eeb3afe7c86a072c9ba38efb;hb=62e7c0f3e8795fc597fbaa1a76abd42fb837e536;hp=e781e050571c463d0158e5a2944c0e4f7be8d876;hpb=16672f2f07559e9ce60dbbb3f8ce7bd184742317;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 e781e05..8b13a4e 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,17 @@ 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"; 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 +89,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 ); @@ -193,7 +199,6 @@ 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 ) @@ -393,6 +398,11 @@ 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 ); + } } } @@ -410,25 +420,26 @@ void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) 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 ); + 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 ); - SetTextureRectUniform(mTextureRect); + mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect ); } else // big image, atlasing is not applied { mImpl->mRenderer = CreateRenderer(); - mTextureRect = FULL_TEXTURE_RECT; - SetTextureRectUniform(mTextureRect); - ResourceImage image = Dali::ResourceImage::New( imageUrl ); + 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 ); @@ -436,27 +447,18 @@ void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) mFactoryCache.SaveRenderer( imageUrl, mImpl->mRenderer ); } - else - { - Property::Value textureRect = mImpl->mRenderer.GetProperty( mImpl->mRenderer.GetPropertyIndex(TEXTURE_RECT_UNIFORM_NAME) ); - textureRect.Get( mTextureRect ); - } + 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 resourceImage = Dali::ResourceImage::New( imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); resourceImage.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); ApplyImageToSampler( resourceImage ); - - // custom shader with the default image vertex shader - if( mImpl->mCustomShader->mVertexShader.empty() ) - { - mTextureRect = FULL_TEXTURE_RECT; - SetTextureRectUniform( mTextureRect ); - } } } @@ -464,19 +466,11 @@ void ImageRenderer::InitializeRenderer( const Image& image ) { mImpl->mFlags &= ~Impl::IS_FROM_CACHE; - if( !image ) - { - return; - } - mImpl->mRenderer = CreateRenderer(); - ApplyImageToSampler( image ); - // default shader or custom shader with the default image vertex shader - if( !mImpl->mCustomShader || mImpl->mCustomShader->mVertexShader.empty() ) + if( image ) { - mTextureRect = FULL_TEXTURE_RECT; - SetTextureRectUniform( mTextureRect ); + ApplyImageToSampler( image ); } } @@ -487,7 +481,7 @@ void ImageRenderer::DoSetOnStage( Actor& actor ) { InitializeRenderer( mImageUrl ); } - else if( mImage ) + else { InitializeRenderer( mImage ); } @@ -613,6 +607,8 @@ 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 ); } return shader; } @@ -731,22 +727,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 ); } }