From 3e2d3713a2c8d2a31955830a973d0ca15fc116af Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Tue, 5 Apr 2022 20:58:11 +0900 Subject: [PATCH] Fix NPatch Auxiliary UTC Change-Id: I8aa5907f50375933d4f8f54dd2fb3bdc71345283 Signed-off-by: Eunki, Hong --- .../internal/visuals/npatch/npatch-visual.cpp | 107 ++++++++++++++------- .../internal/visuals/npatch/npatch-visual.h | 22 +++-- 2 files changed, 86 insertions(+), 43 deletions(-) diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index 98d6d30..831d4b4 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -90,6 +90,12 @@ void NPatchVisual::LoadImages() // Load the auxiliary image auto preMultiplyOnLoading = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; mAuxiliaryPixelBuffer = textureManager.LoadPixelBuffer(mAuxiliaryUrl, Dali::ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, synchronousLoading, this, true, preMultiplyOnLoading); + + // If synchronousLoading is true, we can check the auxiliaryResource's statue now. + if(synchronousLoading) + { + mAuxiliaryResourceStatus = mAuxiliaryPixelBuffer ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED; + } } } @@ -202,7 +208,10 @@ void NPatchVisual::DoSetOnScene(Actor& actor) mImpl->mRenderer.SetShader(shader); mPlacementActor = actor; - if(data->GetLoadingState() != NPatchData::LoadingState::LOADING) + // If all reasources are already loaded, apply textures and uniforms now + // else, will be completed uploaded at LoadComplete function asynchronously. + if(data->GetLoadingState() != NPatchData::LoadingState::LOADING && + (!mAuxiliaryUrl.IsValid() || mAuxiliaryResourceStatus != Toolkit::Visual::ResourceStatus::PREPARING)) { if(RenderingAddOn::Get().IsValid()) { @@ -214,7 +223,15 @@ void NPatchVisual::DoSetOnScene(Actor& actor) mPlacementActor.Reset(); // npatch loaded and ready to display - ResourceReady(Toolkit::Visual::ResourceStatus::READY); + if(data->GetLoadingState() != NPatchData::LoadingState::LOAD_COMPLETE || + (mAuxiliaryUrl.IsValid() && mAuxiliaryResourceStatus != Toolkit::Visual::ResourceStatus::READY)) + { + ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); + } + else + { + ResourceReady(Toolkit::Visual::ResourceStatus::READY); + } } } } @@ -240,6 +257,12 @@ void NPatchVisual::OnSetTransform() } } +bool NPatchVisual::IsResourceReady() const +{ + return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY || + mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED); +} + void NPatchVisual::DoCreatePropertyMap(Property::Map& map) const { map.Clear(); @@ -275,6 +298,7 @@ NPatchVisual::NPatchVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFa mImageUrl(), mAuxiliaryUrl(), mId(NPatchData::INVALID_NPATCH_DATA_ID), + mAuxiliaryResourceStatus(Toolkit::Visual::ResourceStatus::PREPARING), mBorderOnly(false), mBorder(), mAuxiliaryImageAlpha(0.0f), @@ -471,7 +495,15 @@ void NPatchVisual::ApplyTextureAndUniforms() auxiliaryPixelData.GetWidth(), auxiliaryPixelData.GetHeight()); texture.Upload(auxiliaryPixelData); - textureSet.SetTexture(1, texture); + + // TODO : This code exist due to the texture cache manager hold TextureSet, not Texture. + // If we call textureSet.SetTexture(1, texture) directly, the cached TextureSet also be changed. + // We should make pass utc-Dali-VisualFactory.cpp UtcDaliNPatchVisualAuxiliaryImage02(). + TextureSet tempTextureSet = TextureSet::New(); + tempTextureSet.SetTexture(0, textureSet.GetTexture(0)); + tempTextureSet.SetTexture(1, texture); + textureSet = tempTextureSet; + mImpl->mRenderer.RegisterProperty(DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, AUXILIARY_IMAGE_ALPHA_NAME, mAuxiliaryImageAlpha); @@ -516,55 +548,60 @@ Geometry NPatchVisual::GetNinePatchGeometry(VisualFactoryCache::GeometryType sub void NPatchVisual::SetResource() { - const NPatchData* data; - if(mImpl->mRenderer && mLoader.GetNPatchData(mId, data)) - { - Geometry geometry = CreateGeometry(); - Shader shader = CreateShader(); + Geometry geometry = CreateGeometry(); + Shader shader = CreateShader(); - mImpl->mRenderer.SetGeometry(geometry); - mImpl->mRenderer.SetShader(shader); + mImpl->mRenderer.SetGeometry(geometry); + mImpl->mRenderer.SetShader(shader); - Actor actor = mPlacementActor.GetHandle(); - if(actor) - { - ApplyTextureAndUniforms(); - actor.AddRenderer(mImpl->mRenderer); - mPlacementActor.Reset(); - - // npatch loaded and ready to display - ResourceReady(Toolkit::Visual::ResourceStatus::READY); - } + Actor actor = mPlacementActor.GetHandle(); + if(actor) + { + ApplyTextureAndUniforms(); + actor.AddRenderer(mImpl->mRenderer); + mPlacementActor.Reset(); } } void NPatchVisual::LoadComplete(bool loadSuccess, TextureInformation textureInformation) { - if(textureInformation.returnType == TextureUploadObserver::ReturnType::TEXTURE) + if(textureInformation.returnType == TextureUploadObserver::ReturnType::TEXTURE) // For the Url. { - EnablePreMultipliedAlpha(textureInformation.preMultiplied); - if(!loadSuccess) + if(loadSuccess) { - // Image loaded and ready to display - ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); - } - - if(mAuxiliaryPixelBuffer || !mAuxiliaryUrl.IsValid()) - { - SetResource(); + EnablePreMultipliedAlpha(textureInformation.preMultiplied); } } - else // for the ReturnType::PIXEL_BUFFER + else // For the AuxiliaryUrl : ReturnType::PIXEL_BUFFER { if(loadSuccess && textureInformation.url == mAuxiliaryUrl.GetUrl()) { - mAuxiliaryPixelBuffer = textureInformation.pixelBuffer; - SetResource(); + mAuxiliaryPixelBuffer = textureInformation.pixelBuffer; + mAuxiliaryResourceStatus = Toolkit::Visual::ResourceStatus::READY; } else { - // Image loaded and ready to display - ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); + mAuxiliaryResourceStatus = Toolkit::Visual::ResourceStatus::FAILED; + } + } + // If auxiliaryUrl didn't set || auxiliaryUrl load done. + if(!mAuxiliaryUrl.IsValid() || mAuxiliaryResourceStatus != Toolkit::Visual::ResourceStatus::PREPARING) + { + const NPatchData* data; + // and.. If Url loading done. + if(mImpl->mRenderer && mLoader.GetNPatchData(mId, data) && data->GetLoadingState() != NPatchData::LoadingState::LOADING) + { + SetResource(); + // npatch loaded and ready to display + if(data->GetLoadingState() != NPatchData::LoadingState::LOAD_COMPLETE || + (mAuxiliaryUrl.IsValid() && mAuxiliaryResourceStatus != Toolkit::Visual::ResourceStatus::READY)) + { + ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); + } + else + { + ResourceReady(Toolkit::Visual::ResourceStatus::READY); + } } } } diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.h b/dali-toolkit/internal/visuals/npatch/npatch-visual.h index ac66c45..d537a37 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.h +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.h @@ -137,6 +137,11 @@ protected: */ void OnSetTransform() override; + /** + * @copydoc Visual::Base::IsResourceReady + */ + bool IsResourceReady() const override; + private: /** * Loads the NPatch image and the Auxiliary image if needed @@ -218,14 +223,15 @@ private: WeakHandle mPlacementActor; ///< Weakhandle to contain Actor during texture loading NPatchLoader& mLoader; ///< reference to N patch loader for fast access ImageVisualShaderFactory& mImageVisualShaderFactory; - VisualUrl mImageUrl; ///< The url to the N patch to load - VisualUrl mAuxiliaryUrl; ///< An auxiliary image that can be displayed on top of the N-Patch - NPatchData::NPatchDataId mId; ///< id of the N patch (from loader/cache) - Devel::PixelBuffer mAuxiliaryPixelBuffer; ///< pixel buffer of the auxiliary mask image - bool mBorderOnly; ///< if only border is desired - Rect mBorder; ///< The size of the border - float mAuxiliaryImageAlpha; ///< The alpha value for the auxiliary image only - Toolkit::ImageVisual::ReleasePolicy::Type mReleasePolicy; ///< The release policy to determine when an image should no longer be cached. + VisualUrl mImageUrl; ///< The url to the N patch to load + VisualUrl mAuxiliaryUrl; ///< An auxiliary image that can be displayed on top of the N-Patch + NPatchData::NPatchDataId mId; ///< id of the N patch (from loader/cache) + Devel::PixelBuffer mAuxiliaryPixelBuffer; ///< pixel buffer of the auxiliary mask image + Toolkit::Visual::ResourceStatus mAuxiliaryResourceStatus; ///< resource status for auxiliary mask image + bool mBorderOnly; ///< if only border is desired + Rect mBorder; ///< The size of the border + float mAuxiliaryImageAlpha; ///< The alpha value for the auxiliary image only + Toolkit::ImageVisual::ReleasePolicy::Type mReleasePolicy; ///< The release policy to determine when an image should no longer be cached. }; } // namespace Internal -- 2.7.4