X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage%2Fimage-visual.cpp;h=9522618406c360b384e2e71abd7183a5f6d81e0a;hp=5dbd3cd0c244a3d081640f0cf1ec7b96c5f32c67;hb=93833d2c76d1cab9da6fce404739e95e093da911;hpb=18b2fbead069731d9deb5a634cf98c433d172bbe diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 5dbd3cd..9522618 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -32,8 +32,7 @@ // INTERNAL HEADERS #include -#include -#include +#include #include #include #include @@ -92,6 +91,19 @@ DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::WrapMode, REPEAT ) DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::WrapMode, MIRRORED_REPEAT ) DALI_ENUM_TO_STRING_TABLE_END( WRAP_MODE ) +// load policies +DALI_ENUM_TO_STRING_TABLE_BEGIN( LOAD_POLICY ) +DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::LoadPolicy, IMMEDIATE ) +DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::LoadPolicy, ATTACHED ) +DALI_ENUM_TO_STRING_TABLE_END( LOAD_POLICY ) + +// release policies +DALI_ENUM_TO_STRING_TABLE_BEGIN( RELEASE_POLICY ) +DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::ReleasePolicy, DETACHED ) +DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::ReleasePolicy, DESTROYED ) +DALI_ENUM_TO_STRING_WITH_SCOPE( DevelImageVisual::ReleasePolicy, NEVER ) +DALI_ENUM_TO_STRING_TABLE_END( RELEASE_POLICY ) + const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); const char* DEFAULT_SAMPLER_TYPENAME = "sampler2D"; @@ -268,8 +280,10 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, mSamplingMode( samplingMode ), mWrapModeU( WrapMode::DEFAULT ), mWrapModeV( WrapMode::DEFAULT ), + mLoadPolicy( DevelImageVisual::LoadPolicy::ATTACHED ), + mReleasePolicy( DevelImageVisual::ReleasePolicy::DETACHED ), mAttemptAtlasing( false ), - mLoadingStatus( false ) + mLoading( false ) { } @@ -286,22 +300,33 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, const Image& image ) mSamplingMode( SamplingMode::DEFAULT ), mWrapModeU( WrapMode::DEFAULT ), mWrapModeV( WrapMode::DEFAULT ), + mLoadPolicy( DevelImageVisual::LoadPolicy::ATTACHED ), + mReleasePolicy( DevelImageVisual::ReleasePolicy::DESTROYED ), mAttemptAtlasing( false ), - mLoadingStatus( false ) + mLoading( false ) { } ImageVisual::~ImageVisual() { - if( mMaskingData && Stage::IsInstalled() ) + if( Stage::IsInstalled() ) { - // TextureManager could have been deleted before the actor that contains this - // ImageVisual is destroyed (e.g. due to stage shutdown). Ensure the stage - // is still valid before accessing texture manager. - if( mMaskingData->mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID ) + if( mMaskingData ) { - TextureManager& textureManager = mFactoryCache.GetTextureManager(); - textureManager.Remove( mMaskingData->mAlphaMaskId ); + // TextureManager could have been deleted before the actor that contains this + // ImageVisual is destroyed (e.g. due to stage shutdown). Ensure the stage + // is still valid before accessing texture manager. + if( mMaskingData->mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID ) + { + TextureManager& textureManager = mFactoryCache.GetTextureManager(); + textureManager.Remove( mMaskingData->mAlphaMaskId ); + } + } + + // ImageVisual destroyed so remove texture unless ReleasePolicy is set to never release + if( ( mTextureId != TextureManager::INVALID_TEXTURE_ID ) && ( mReleasePolicy != DevelImageVisual::ReleasePolicy::NEVER ) ) + { + RemoveTexture(); } } } @@ -350,24 +375,39 @@ void ImageVisual::DoSetProperties( const Property::Map& propertyMap ) { DoSetProperty( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second ); } - else if ( keyValue.first == IMAGE_ATLASING ) + else if( keyValue.first == IMAGE_ATLASING ) { - DoSetProperty( Toolkit::DevelImageVisual::Property::ATLASING, keyValue.second ); + DoSetProperty( Toolkit::ImageVisual::Property::ATLASING, keyValue.second ); } - else if ( keyValue.first == ALPHA_MASK_URL ) + else if( keyValue.first == ALPHA_MASK_URL ) { - DoSetProperty( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, keyValue.second ); + DoSetProperty( Toolkit::ImageVisual::Property::ALPHA_MASK_URL, keyValue.second ); } - else if ( keyValue.first == MASK_CONTENT_SCALE_NAME ) + else if( keyValue.first == MASK_CONTENT_SCALE_NAME ) { - DoSetProperty( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, keyValue.second ); + DoSetProperty( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, keyValue.second ); } - else if ( keyValue.first == CROP_TO_MASK_NAME ) + else if( keyValue.first == CROP_TO_MASK_NAME ) { - DoSetProperty( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, keyValue.second ); + DoSetProperty( Toolkit::ImageVisual::Property::CROP_TO_MASK, keyValue.second ); + } + else if ( keyValue.first == LOAD_POLICY_NAME ) + { + DoSetProperty( Toolkit::DevelImageVisual::Property::LOAD_POLICY, keyValue.second ); + } + else if( keyValue.first == RELEASE_POLICY_NAME ) + { + DoSetProperty( Toolkit::DevelImageVisual::Property::RELEASE_POLICY, keyValue.second ); } } } + + // Load image immediately if LOAD_POLICY requires it + if ( mLoadPolicy == DevelImageVisual::LoadPolicy::IMMEDIATE ) + { + auto attemptAtlasing = mAttemptAtlasing; + LoadTexture( attemptAtlasing, mAtlasRect, mTextures ); + } } void ImageVisual::DoSetProperty( Property::Index index, const Property::Value& value ) @@ -461,14 +501,14 @@ void ImageVisual::DoSetProperty( Property::Index index, const Property::Value& v break; } - case Toolkit::DevelImageVisual::Property::ATLASING: + case Toolkit::ImageVisual::Property::ATLASING: { bool atlasing = false; mAttemptAtlasing = value.Get( atlasing ); break; } - case Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL: + case Toolkit::ImageVisual::Property::ALPHA_MASK_URL: { std::string alphaUrl; if( value.Get( alphaUrl ) ) @@ -482,7 +522,7 @@ void ImageVisual::DoSetProperty( Property::Index index, const Property::Value& v break; } - case Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE: + case Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE: { float scale; if( value.Get( scale ) ) @@ -493,7 +533,7 @@ void ImageVisual::DoSetProperty( Property::Index index, const Property::Value& v break; } - case Toolkit::DevelImageVisual::Property::CROP_TO_MASK: + case Toolkit::ImageVisual::Property::CROP_TO_MASK: { bool crop=false; if( value.Get( crop ) ) @@ -503,6 +543,21 @@ void ImageVisual::DoSetProperty( Property::Index index, const Property::Value& v } break; } + + case Toolkit::DevelImageVisual::Property::RELEASE_POLICY: + { + int releasePolicy; + Scripting::GetEnumerationProperty( value, RELEASE_POLICY_TABLE, RELEASE_POLICY_TABLE_COUNT, releasePolicy ); + mReleasePolicy = DevelImageVisual::ReleasePolicy::Type( releasePolicy ); + break; + } + + case Toolkit::DevelImageVisual::Property::LOAD_POLICY: + { + int loadPolicy; + Scripting::GetEnumerationProperty( value, LOAD_POLICY_TABLE, LOAD_POLICY_TABLE_COUNT, loadPolicy ); + mLoadPolicy = DevelImageVisual::LoadPolicy::Type( loadPolicy ); + } } } @@ -685,61 +740,62 @@ bool ImageVisual::IsSynchronousResourceLoading() const return mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING; } -/* -( VisualUrl& url, Dali::ImageDimensions desiredSize, Dali::FittingMode::Type fittingMode, Dali::SamplingMode::Type samplingMode, - ImageVisual::MaskingData* maskInfo, bool synchronousLoading, - TextureManager::TextureId textureId, Vector4& textureRect, bool& atlasingStatus, bool& loadingStatus - */ -void ImageVisual::InitializeRenderer() +void ImageVisual::LoadTexture( bool& atlasing, Vector4& atlasRect, TextureSet& textures ) { - mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED; - TextureManager& textureManager = mFactoryCache.GetTextureManager(); - if( ! mImpl->mCustomShader && mImageUrl.GetProtocolType() == VisualUrl::LOCAL ) + ImageAtlasManagerPtr atlasManager = nullptr; + AtlasUploadObserver* atlasUploadObserver = nullptr; + auto textureObserver = this; + + if( atlasing ) { - bool defaultWrapMode = mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE; + atlasManager = mFactoryCache.GetAtlasManager(); + atlasUploadObserver = this; + } - Vector4 atlasRect; + textures = textureManager.LoadTexture( mImageUrl, mDesiredSize, mFittingMode, mSamplingMode, + mMaskingData, IsSynchronousResourceLoading(), mTextureId, + atlasRect, atlasing, mLoading, mWrapModeU, + mWrapModeV, textureObserver, atlasUploadObserver, atlasManager ); +} - auto attemptAtlasing = mAttemptAtlasing; +void ImageVisual::InitializeRenderer() +{ + auto attemptAtlasing = ( ! mImpl->mCustomShader && mImageUrl.GetProtocolType() == VisualUrl::LOCAL && mAttemptAtlasing ); - // texture set has to be created first as we need to know if atlasing succeeded or not - // when selecting the shader - TextureSet textures = - textureManager.LoadTexture(mImageUrl, mDesiredSize, mFittingMode, mSamplingMode, - mMaskingData, IsSynchronousResourceLoading(), mTextureId, - atlasRect, attemptAtlasing, mLoadingStatus, mWrapModeU, - mWrapModeV, this, this, mFactoryCache.GetAtlasManager()); - if(attemptAtlasing) - { - mImpl->mFlags |= Impl::IS_ATLASING_APPLIED; - } - CreateRenderer( textures ); + // texture set has to be created first as we need to know if atlasing succeeded or not + // when selecting the shader - if( mImpl->mFlags & Impl::IS_ATLASING_APPLIED ) // the texture is packed inside atlas - { - mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect ); - if( !defaultWrapMode ) // custom wrap mode - { - Vector2 wrapMode(mWrapModeU-WrapMode::CLAMP_TO_EDGE, mWrapModeV-WrapMode::CLAMP_TO_EDGE); - wrapMode.Clamp( Vector2::ZERO, Vector2( 2.f, 2.f ) ); - mImpl->mRenderer.RegisterProperty( WRAP_MODE_UNIFORM_NAME, wrapMode ); - } - } + if( mTextureId == TextureManager::INVALID_TEXTURE_ID && ! mTextures ) // Only load the texture once + { + LoadTexture( attemptAtlasing, mAtlasRect, mTextures ); + } + + if( attemptAtlasing ) // Flag needs to be set before creating renderer + { + mImpl->mFlags |= Impl::IS_ATLASING_APPLIED; } else { - auto attemptAtlasing = false; - // for custom shader or remote image, atlas is not applied - Vector4 atlasRect; // ignored in this case - TextureSet textures = - textureManager.LoadTexture(mImageUrl, mDesiredSize, mFittingMode, mSamplingMode, - mMaskingData, IsSynchronousResourceLoading(), mTextureId, - atlasRect, attemptAtlasing, mLoadingStatus, mWrapModeU, mWrapModeV, this, - nullptr, nullptr); // no atlasing - DALI_ASSERT_DEBUG(attemptAtlasing == false); - CreateRenderer( textures ); + mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED; + } + + CreateRenderer( mTextures ); + mTextures.Reset(); // Visual should not keep a handle to the texture after this point. + + if( attemptAtlasing ) // the texture is packed inside atlas + { + mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, mAtlasRect ); + + bool defaultWrapMode = mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE; + + if( !defaultWrapMode ) // custom wrap mode + { + Vector2 wrapMode(mWrapModeU-WrapMode::CLAMP_TO_EDGE, mWrapModeV-WrapMode::CLAMP_TO_EDGE); + wrapMode.Clamp( Vector2::ZERO, Vector2( 2.f, 2.f ) ); + mImpl->mRenderer.RegisterProperty( WRAP_MODE_UNIFORM_NAME, wrapMode ); + } } } @@ -757,7 +813,7 @@ void ImageVisual::InitializeRenderer( const Image& image ) else { // reuse existing code for regular images - CreateRenderer( textures ); + CreateRenderer( textures ); // Textures will be retreived from Image } ApplyImageToSampler( image ); } @@ -768,12 +824,12 @@ void ImageVisual::DoSetOnStage( Actor& actor ) { InitializeRenderer(); } - else if ( mImage ) + else if( mImage ) { InitializeRenderer( mImage ); } - if ( !mImpl->mRenderer ) + if( !mImpl->mRenderer ) { return; } @@ -781,7 +837,7 @@ void ImageVisual::DoSetOnStage( Actor& actor ) mPlacementActor = actor; // Search the Actor tree to find if Layer UI behaviour set. Layer layer = actor.GetLayer(); - if ( layer && layer.GetBehavior() == Layer::LAYER_3D ) + if( layer && layer.GetBehavior() == Layer::LAYER_3D ) { // Layer 3D set, do not align pixels mImpl->mRenderer.RegisterProperty( PIXEL_ALIGNED_UNIFORM_NAME, PIXEL_ALIGN_OFF ); @@ -792,7 +848,7 @@ void ImageVisual::DoSetOnStage( Actor& actor ) mImpl->mRenderer.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, mPixelArea ); } - if( mLoadingStatus == false ) + if( mLoading == false ) { actor.AddRenderer( mImpl->mRenderer ); mPlacementActor.Reset(); @@ -806,14 +862,19 @@ void ImageVisual::DoSetOffStage( Actor& actor ) { // Visual::Base::SetOffStage only calls DoSetOffStage if mRenderer exists (is on onstage) - //If we own the image then make sure we release it when we go off stage + // Image release is dependent on the ReleasePolicy, renderer is destroyed. actor.RemoveRenderer( mImpl->mRenderer); + if( mReleasePolicy == DevelImageVisual::ReleasePolicy::DETACHED ) + { + RemoveTexture(); // If INVALID_TEXTURE_ID then removal will be attempted on atlas + } + if( mImageUrl.IsValid() ) { - RemoveTexture( mImageUrl.GetUrl() ); + // Legacy support for deprecated Dali::Image mImage.Reset(); } - mLoadingStatus = false; + mLoading = false; mImpl->mRenderer.Reset(); mPlacementActor.Reset(); } @@ -821,7 +882,7 @@ void ImageVisual::DoSetOffStage( Actor& actor ) void ImageVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::Visual::IMAGE ); + map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); bool sync = IsSynchronousResourceLoading(); map.Insert( SYNCHRONOUS_LOADING, sync ); @@ -850,19 +911,23 @@ void ImageVisual::DoCreatePropertyMap( Property::Map& map ) const map.Insert( Toolkit::ImageVisual::Property::WRAP_MODE_U, mWrapModeU ); map.Insert( Toolkit::ImageVisual::Property::WRAP_MODE_V, mWrapModeV ); - map.Insert( Toolkit::DevelImageVisual::Property::ATLASING, mAttemptAtlasing ); + map.Insert( Toolkit::ImageVisual::Property::ATLASING, mAttemptAtlasing ); if( mMaskingData != NULL ) { - map.Insert( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, mMaskingData->mAlphaMaskUrl.GetUrl() ); - map.Insert( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, mMaskingData->mContentScaleFactor ); - map.Insert( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, mMaskingData->mCropToMask ); + map.Insert( Toolkit::ImageVisual::Property::ALPHA_MASK_URL, mMaskingData->mAlphaMaskUrl.GetUrl() ); + map.Insert( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, mMaskingData->mContentScaleFactor ); + map.Insert( Toolkit::ImageVisual::Property::CROP_TO_MASK, mMaskingData->mCropToMask ); } + + map.Insert( Toolkit::DevelImageVisual::Property::LOAD_POLICY, mLoadPolicy ); + map.Insert( Toolkit::DevelImageVisual::Property::RELEASE_POLICY, mReleasePolicy ); + } void ImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::Visual::IMAGE ); + map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); if( mImageUrl.IsValid() ) { map.Insert( Toolkit::ImageVisual::Property::DESIRED_WIDTH, mDesiredSize.GetWidth() ); @@ -944,12 +1009,12 @@ void ImageVisual::UploadCompleted() Actor actor = mPlacementActor.GetHandle(); if( actor ) { + mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, mAtlasRect ); actor.AddRenderer( mImpl->mRenderer ); - // reset the weak handle so that the renderer only get added to actor once mPlacementActor.Reset(); } - mLoadingStatus = false; + mLoading = false; } // From Texture Manager @@ -960,10 +1025,14 @@ void ImageVisual::UploadComplete( bool loadingSuccess, int32_t textureId, Textur { if( mImpl->mRenderer ) { + if( usingAtlas ) + { + mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, mAtlasRect ); + } + actor.AddRenderer( mImpl->mRenderer ); // reset the weak handle so that the renderer only get added to actor once mPlacementActor.Reset(); - if( loadingSuccess ) { Sampler sampler = Sampler::New(); @@ -984,10 +1053,10 @@ void ImageVisual::UploadComplete( bool loadingSuccess, int32_t textureId, Textur ResourceReady(); } } - mLoadingStatus = false; + mLoading = false; } -void ImageVisual::RemoveTexture(const std::string& url) +void ImageVisual::RemoveTexture() { if( mTextureId != TextureManager::INVALID_TEXTURE_ID ) {