X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fimage%2Fimage-renderer.cpp;h=058f2b90cb9bcc199470cb0ad75097f88463b74d;hb=24599f0aed006ccf0e2f20b92334b649f46c94d2;hp=c2bec8574a9f62e24a6a29893a76b0d6f8c8f0c1;hpb=eb52cb9cbb74e37ebdc1c18619af597e2b595b08;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 c2bec85..058f2b9 100644 --- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -22,9 +22,13 @@ #include // for strncasecmp #include #include +#include +#include +#include #include // INTERNAL HEADER +#include #include #include #include @@ -45,33 +49,29 @@ namespace const char HTTP_URL[] = "http://"; const char HTTPS_URL[] = "https://"; -const char * const RENDERER_TYPE("rendererType"); -const char * const RENDERER_TYPE_VALUE("image"); - // property names -const char * const IMAGE_URL_NAME( "imageUrl" ); -const char * const IMAGE_FITTING_MODE( "imageFittingMode" ); -const char * const IMAGE_SAMPLING_MODE( "imageSamplingMode" ); -const char * const IMAGE_DESIRED_WIDTH( "imageDesiredWidth" ); -const char * const IMAGE_DESIRED_HEIGHT( "imageDesiredHeight" ); +const char * const IMAGE_FITTING_MODE( "fittingMode" ); +const char * const IMAGE_SAMPLING_MODE( "samplingMode" ); +const char * const IMAGE_DESIRED_WIDTH( "desiredWidth" ); +const char * const IMAGE_DESIRED_HEIGHT( "desiredHeight" ); +const char * const SYNCHRONOUS_LOADING( "synchronousLoading" ); // fitting modes -const char * const SHRINK_TO_FIT("shrinkToFit"); -const char * const SCALE_TO_FILL("scaleToFill"); -const char * const FIT_WIDTH("fitWidth"); -const char * const FIT_HEIGHT("fitHeight"); -const char * const DEFAULT("default"); +const char * const SHRINK_TO_FIT("SHRINK_TO_FIT"); +const char * const SCALE_TO_FILL("SCALE_TO_FILL"); +const char * const FIT_WIDTH("FIT_WIDTH"); +const char * const FIT_HEIGHT("FIT_HEIGHT"); +const char * const DEFAULT("DEFAULT"); // sampling modes -const char * const BOX("box"); -const char * const NEAREST("nearest"); -const char * const LINEAR("linear"); -const char * const BOX_THEN_NEAREST("boxThenNearest"); -const char * const BOX_THEN_LINEAR("boxThenLinear"); -const char * const NO_FILTER("noFilter"); -const char * const DONT_CARE("dontCare"); - -const std::string ATLAS_RECT_UNIFORM_NAME = "uAtlasRect"; +const char * const BOX("BOX"); +const char * const NEAREST("NEAREST"); +const char * const LINEAR("LINEAR"); +const char * const BOX_THEN_NEAREST("BOX_THEN_NEAREST"); +const char * const BOX_THEN_LINEAR("BOX_THEN_LINEAR"); +const char * const NO_FILTER("NO_FILTER"); +const char * const DONT_CARE("DONT_CARE"); + const std::string PIXEL_AREA_UNIFORM_NAME = "pixelArea"; const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); @@ -252,6 +252,29 @@ void ImageRenderer::DoInitialize( Actor& actor, const Property::Map& propertyMap } mDesiredSize = ImageDimensions( desiredWidth, desiredHeight ); + + } + + Property::Value* syncLoading = propertyMap.Find( SYNCHRONOUS_LOADING ); + if( syncLoading ) + { + bool sync; + syncLoading->Get( sync ); + if( sync ) + { + mImpl->mFlags |= Impl::IS_SYNCHRONOUS_RESOURCE_LOADING; + } + else + { + mImpl->mFlags &= ~Impl::IS_SYNCHRONOUS_RESOURCE_LOADING; + } + } + + // if sync loading is required, the loading should start immediately when new image url is set or the actor is off stage + // ( for on-stage actor with image url unchanged, resource loading is already finished) + if( ( !mImpl->mRenderer || imageURLValue) && IsSynchronousResourceLoading() ) + { + DoSynchronousResourceLoading(); } // remove old renderer if exit @@ -358,10 +381,7 @@ Renderer ImageRenderer::CreateRenderer() const } } - TextureSet textureSet = TextureSet::New(); - Renderer renderer = Renderer::New( geometry, shader ); - renderer.SetTextures( textureSet ); return renderer; } @@ -382,20 +402,13 @@ Renderer ImageRenderer::CreateNativeImageRenderer() const else { geometry = CreateGeometry( mFactoryCache, mImpl->mCustomShader->mGridSize ); - if( mImpl->mCustomShader->mVertexShader.empty() && mImpl->mCustomShader->mFragmentShader.empty() ) + shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? VERTEX_SHADER : mImpl->mCustomShader->mVertexShader, + mNativeFragmentShaderCode, + mImpl->mCustomShader->mHints ); + if( mImpl->mCustomShader->mVertexShader.empty() ) { - shader = Shader::New( VERTEX_SHADER, mNativeFragmentShaderCode ); - } - else - { - shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? VERTEX_SHADER : mImpl->mCustomShader->mVertexShader, - mNativeFragmentShaderCode, - 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( ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT ); + shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); } } @@ -406,6 +419,82 @@ Renderer ImageRenderer::CreateNativeImageRenderer() const return renderer; } + +bool ImageRenderer::IsSynchronousResourceLoading() const +{ + return mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING; +} + +void ImageRenderer::DoSynchronousResourceLoading() +{ + if( !mImageUrl.empty() ) + { + BitmapLoader loader = BitmapLoader::New( mImageUrl, mDesiredSize, mFittingMode, mSamplingMode ); + loader.Load(); + mPixels = loader.GetPixelData(); + } +} + +Image ImageRenderer::LoadImage( const std::string& url, bool synchronousLoading ) +{ + if( synchronousLoading ) + { + if( !mPixels ) + { + // use broken image + return RendererFactory::GetBrokenRendererImage(); + } + Atlas image = Atlas::New( mPixels.GetWidth(), mPixels.GetHeight(), mPixels.GetPixelFormat() ); + image.Upload( mPixels, 0, 0 ); + return image; + } + else + { + ResourceImage resourceImage = Dali::ResourceImage::New( url, mDesiredSize, mFittingMode, mSamplingMode ); + resourceImage.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); + return resourceImage; + } +} + +TextureSet ImageRenderer::CreateTextureSet( Vector4& textureRect, const std::string& url, bool synchronousLoading ) +{ + TextureSet textureSet; + textureRect = FULL_TEXTURE_RECT; + if( synchronousLoading ) + { + if( !mPixels ) + { + // use broken image + textureSet = TextureSet::New(); + TextureSetImage( textureSet, 0u, RendererFactory::GetBrokenRendererImage() ); + } + else + { + textureSet = mAtlasManager.Add(textureRect, mPixels ); + if( !textureSet ) // big image, no atlasing + { + Atlas image = Atlas::New( mPixels.GetWidth(), mPixels.GetHeight(), mPixels.GetPixelFormat() ); + image.Upload( mPixels, 0, 0 ); + textureSet = TextureSet::New(); + TextureSetImage( textureSet, 0u, image ); + } + } + } + else + { + textureSet = mAtlasManager.Add(textureRect, url, mDesiredSize, mFittingMode, mSamplingMode ); + if( !textureSet ) // big image, no atlasing + { + ResourceImage resourceImage = Dali::ResourceImage::New( url, mDesiredSize, mFittingMode, mSamplingMode ); + resourceImage.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); + textureSet = TextureSet::New(); + TextureSetImage( textureSet, 0u, resourceImage ); + } + } + + return textureSet; +} + void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) { if( imageUrl.empty() ) @@ -424,25 +513,15 @@ void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) if( !mImpl->mRenderer ) { Vector4 atlasRect; - TextureSet textureSet = mAtlasManager.Add(atlasRect, imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); - if( textureSet ) + TextureSet textureSet = CreateTextureSet(atlasRect, imageUrl, IsSynchronousResourceLoading() ); + Geometry geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); + Shader shader( GetImageShader(mFactoryCache) ); + mImpl->mRenderer = Renderer::New( geometry, shader ); + mImpl->mRenderer.SetTextures( textureSet ); + if( atlasRect != FULL_TEXTURE_RECT ) { - Geometry geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); - Shader shader( GetImageShader(mFactoryCache) ); - mImpl->mRenderer = Renderer::New( geometry, shader ); - mImpl->mRenderer.SetTextures( textureSet ); mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect ); } - else // big image, atlasing is not applied - { - mImpl->mRenderer = CreateRenderer(); - - ResourceImage image = Dali::ResourceImage::New( imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); - image.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); - TextureSet textureSet = mImpl->mRenderer.GetTextures(); - textureSet.SetImage( 0u, image ); - } - mFactoryCache.SaveRenderer( imageUrl, mImpl->mRenderer ); } @@ -454,9 +533,8 @@ void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) 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 ); + Image image = LoadImage( imageUrl, IsSynchronousResourceLoading() ); + ApplyImageToSampler( image ); } } @@ -505,7 +583,10 @@ void ImageRenderer::DoSetOffStage( Actor& actor ) void ImageRenderer::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( RENDERER_TYPE, RENDERER_TYPE_VALUE ); + map.Insert( RENDERER_TYPE, IMAGE_RENDERER ); + + bool sync = IsSynchronousResourceLoading(); + map.Insert( SYNCHRONOUS_LOADING, sync ); if( !mImageUrl.empty() ) { map.Insert( IMAGE_URL_NAME, mImageUrl ); @@ -622,6 +703,11 @@ void ImageRenderer::SetImage( Actor& actor, const std::string& imageUrl, ImageDi mSamplingMode = samplingMode; mImage.Reset(); + if( IsSynchronousResourceLoading() ) + { + DoSynchronousResourceLoading(); + } + if( mImpl->mRenderer ) { if( GetIsFromCache() ) // if renderer is from cache, remove the old one @@ -645,8 +731,7 @@ void ImageRenderer::SetImage( Actor& actor, const std::string& imageUrl, ImageDi } 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 ); + Image image = LoadImage( imageUrl, IsSynchronousResourceLoading() ); ApplyImageToSampler( image ); } } @@ -737,10 +822,12 @@ void ImageRenderer::ApplyImageToSampler( const Image& image ) if( image ) { TextureSet textureSet = mImpl->mRenderer.GetTextures(); - if( textureSet ) + if( !textureSet ) { - textureSet.SetImage( 0u, image ); + textureSet = TextureSet::New(); + mImpl->mRenderer.SetTextures( textureSet ); } + TextureSetImage( textureSet, 0u, image ); } } @@ -799,7 +886,6 @@ void ImageRenderer::SetNativeFragmentShaderCode( Dali::NativeImage& nativeImage { mNativeFragmentShaderCode.replace( mNativeFragmentShaderCode.find( DEFAULT_SAMPLER_TYPENAME ), strlen( DEFAULT_SAMPLER_TYPENAME ), customSamplerTypename ); } - } } // namespace Internal