X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=9e5238da552759d0523b1fbeae427c88c383a7bb;hb=HEAD;hp=8c4b2f8d129a8fec8614eb9a4aa36d8baedd21b2;hpb=afa0235631971bfe859fc74dfd02bd61ca2723fb;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 8c4b2f8..b060d42 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 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. @@ -19,6 +19,7 @@ // EXTERNAL INCLUDES #include +#include #include #include #include @@ -26,7 +27,9 @@ // INTERNAL INCLUDES #include +#include #include +#include #include #include #include @@ -40,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -72,40 +76,66 @@ DALI_TYPE_REGISTRATION_BEGIN_CREATE(Toolkit::VisualFactory, Dali::BaseHandle, Cr DALI_TYPE_REGISTRATION_END() const char* const BROKEN_IMAGE_FILE_NAME = "broken.png"; ///< The file name of the broken image. +static constexpr auto SHADER_TYPE_COUNT = 2u; + +constexpr std::string_view VertexPredefines[SHADER_TYPE_COUNT]{ + "", //VisualFactoryCache::COLOR_SHADER + "#define IS_REQUIRED_ROUNDED_CORNER\n", //VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER +}; +constexpr std::string_view FragmentPredefines[SHADER_TYPE_COUNT]{ + "", //VisualFactoryCache::COLOR_SHADER + "#define IS_REQUIRED_ROUNDED_CORNER\n", //VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER +}; +constexpr VisualFactoryCache::ShaderType ShaderTypePredefines[SHADER_TYPE_COUNT]{ + VisualFactoryCache::ShaderType::COLOR_SHADER, + VisualFactoryCache::ShaderType::COLOR_SHADER_ROUNDED_CORNER, +}; + } // namespace VisualFactory::VisualFactory(bool debugEnabled) : mFactoryCache(), mImageVisualShaderFactory(), + mTextVisualShaderFactory(), mSlotDelegate(this), + mIdleCallback(nullptr), + mDefaultCreationOptions(Toolkit::VisualFactory::CreationOptions::NONE), mDebugEnabled(debugEnabled), - mPreMultiplyOnLoad(true) + mPreMultiplyOnLoad(true), + mPrecompiledShaderRequested(false) { } VisualFactory::~VisualFactory() { + if(mIdleCallback && Adaptor::IsAvailable()) + { + // Removes the callback from the callback manager in case the control is destroyed before the callback is executed. + Adaptor::Get().RemoveIdle(mIdleCallback); + mIdleCallback = nullptr; + } } void VisualFactory::OnStyleChangedSignal(Toolkit::StyleManager styleManager, StyleChange::Type type) { if(type == StyleChange::THEME_CHANGE) { - const std::string imageDirPath = AssetManager::GetDaliImagePath(); - std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME; - - Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager); - config["brokenImageUrl"].Get(brokenImageUrl); - - if(mFactoryCache) - { - mFactoryCache->SetBrokenImageUrl(brokenImageUrl); - } + SetBrokenImageUrl(styleManager); } } +void VisualFactory::OnBrokenImageChangedSignal(Toolkit::StyleManager styleManager) +{ + SetBrokenImageUrl(styleManager); +} + Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyMap) { + return CreateVisual(propertyMap, mDefaultCreationOptions); +} + +Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyMap, Toolkit::VisualFactory::CreationOptions creationOptions) +{ Visual::BasePtr visualPtr; Property::Value* typeValue = propertyMap.Find(Toolkit::Visual::Property::TYPE, VISUAL_TYPE); @@ -136,6 +166,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM } case Toolkit::Visual::IMAGE: + case Toolkit::Visual::ANIMATED_IMAGE: { Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME); std::string imageUrl; @@ -154,22 +185,27 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); break; } + case VisualUrl::TVG: case VisualUrl::SVG: { visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); break; } - case VisualUrl::GIF: - case VisualUrl::WEBP: - { - visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); - break; - } case VisualUrl::JSON: { visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); break; } + case VisualUrl::GIF: + case VisualUrl::WEBP: + { + if(visualType == Toolkit::DevelVisual::ANIMATED_IMAGE || !(creationOptions & Toolkit::VisualFactory::CreationOptions::IMAGE_VISUAL_LOAD_STATIC_IMAGES_ONLY)) + { + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); + break; + } + DALI_FALLTHROUGH; + } case VisualUrl::REGULAR_IMAGE: { visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); @@ -181,7 +217,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM else { Property::Array* array = imageURLValue->GetArray(); - if(array) + if(array && array->Count() > 0) { visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap); } @@ -210,7 +246,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM case Toolkit::Visual::TEXT: { - visualPtr = TextVisual::New(GetFactoryCache(), propertyMap); + visualPtr = TextVisual::New(GetFactoryCache(), GetTextVisualShaderFactory(), propertyMap); break; } @@ -220,7 +256,10 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM std::string imageUrl; if(imageURLValue && imageURLValue->Get(imageUrl)) { - visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); + if(!imageUrl.empty()) + { + visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); + } } break; } @@ -231,28 +270,9 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM std::string imageUrl; if(imageURLValue && imageURLValue->Get(imageUrl)) { - visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); - } - break; - } - - case Toolkit::Visual::ANIMATED_IMAGE: - { - Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME); - std::string imageUrl; - if(imageURLValue) - { - if(imageURLValue->Get(imageUrl)) + if(!imageUrl.empty()) { - visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); - } - else - { - Property::Array* array = imageURLValue->GetArray(); - if(array) - { - visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap); - } + visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); } } break; @@ -270,7 +290,10 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM std::string imageUrl; if(imageURLValue && imageURLValue->Get(imageUrl)) { - visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); + if(!imageUrl.empty()) + { + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); + } } break; } @@ -305,6 +328,11 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyM Toolkit::Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageDimensions size) { + return CreateVisual(url, size, mDefaultCreationOptions); +} + +Toolkit::Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageDimensions size, Toolkit::VisualFactory::CreationOptions creationOptions) +{ Visual::BasePtr visualPtr; if(!url.empty()) @@ -318,21 +346,26 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageD visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); break; } + case VisualUrl::TVG: case VisualUrl::SVG: { - visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); + visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size); break; } - case VisualUrl::GIF: - case VisualUrl::WEBP: + case VisualUrl::JSON: { - visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size); break; } - case VisualUrl::JSON: + case VisualUrl::GIF: + case VisualUrl::WEBP: { - visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); - break; + if(!(creationOptions & Toolkit::VisualFactory::CreationOptions::IMAGE_VISUAL_LOAD_STATIC_IMAGES_ONLY)) + { + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size); + break; + } + DALI_FALLTHROUGH; } case VisualUrl::REGULAR_IMAGE: { @@ -365,30 +398,115 @@ bool VisualFactory::GetPreMultiplyOnLoad() const return mPreMultiplyOnLoad; } +void VisualFactory::SetDefaultCreationOptions(Toolkit::VisualFactory::CreationOptions creationOptions) +{ + mDefaultCreationOptions = creationOptions; +} + +Toolkit::VisualFactory::CreationOptions VisualFactory::GetDefaultCreationOptions() const +{ + return mDefaultCreationOptions; +} + +void VisualFactory::DiscardVisual(Toolkit::Visual::Base visual) +{ + mDiscardedVisuals.emplace_back(visual); + + RegisterDiscardCallback(); +} + +void VisualFactory::UsePreCompiledShader() +{ + if(mPrecompiledShaderRequested) + { + return; + } + mPrecompiledShaderRequested = true; + + ShaderPreCompiler::Get().Enable(); + + // Get image shader + std::vector rawShaderList; + RawShaderData imageShaderData; + GetImageVisualShaderFactory().GetPreCompiledShader(imageShaderData); + rawShaderList.push_back(imageShaderData); + + // Get text shader + RawShaderData textShaderData; + GetTextVisualShaderFactory().GetPreCompiledShader(textShaderData); + rawShaderList.push_back(textShaderData); + + // Get color shader + RawShaderData colorShaderData; + GetPreCompiledShader(colorShaderData); + rawShaderList.push_back(colorShaderData); + + // Save all shader + ShaderPreCompiler::Get().SavePreCompileShaderList(rawShaderList); +} + Internal::TextureManager& VisualFactory::GetTextureManager() { return GetFactoryCache().GetTextureManager(); } -Internal::VisualFactoryCache& VisualFactory::GetFactoryCache() +void VisualFactory::SetBrokenImageUrl(Toolkit::StyleManager& styleManager) { - if(!mFactoryCache) + const std::string imageDirPath = AssetManager::GetDaliImagePath(); + std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME; + std::vector customBrokenImageUrlList; + + if(styleManager) { - mFactoryCache = std::unique_ptr(new VisualFactoryCache(mPreMultiplyOnLoad)); + customBrokenImageUrlList = Toolkit::DevelStyleManager::GetBrokenImageUrlList(styleManager); + const auto brokenImageUrlValue = Toolkit::DevelStyleManager::GetConfigurations(styleManager).Find("brokenImageUrl", Property::Type::STRING); + if(brokenImageUrlValue) + { + brokenImageUrlValue->Get(brokenImageUrl); + } + } - const std::string imageDirPath = AssetManager::GetDaliImagePath(); - std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME; + // Add default image + mFactoryCache->SetBrokenImageUrl(brokenImageUrl, customBrokenImageUrlList); +} +void VisualFactory::GetPreCompiledShader(RawShaderData& shaders) +{ + std::vector vertexPrefix; + std::vector fragmentPrefix; + std::vector shaderName; + int shaderCount = 0; + shaders.shaderCount = 0; + for(uint32_t i = 0u; i < SHADER_TYPE_COUNT; ++i) + { + vertexPrefix.push_back(VertexPredefines[i]); + fragmentPrefix.push_back(FragmentPredefines[i]); + shaderName.push_back(Scripting::GetLinearEnumerationName(ShaderTypePredefines[i], VISUAL_SHADER_TYPE_TABLE, VISUAL_SHADER_TYPE_TABLE_COUNT)); + shaderCount++; + } + + shaders.vertexPrefix = vertexPrefix; + shaders.fragmentPrefix = fragmentPrefix; + shaders.shaderName = shaderName; + shaders.vertexShader = SHADER_COLOR_VISUAL_SHADER_VERT; + shaders.fragmentShader = SHADER_COLOR_VISUAL_SHADER_FRAG; + shaders.shaderCount = shaderCount; +} + +Internal::VisualFactoryCache& VisualFactory::GetFactoryCache() +{ + if(!mFactoryCache) + { + mFactoryCache = std::unique_ptr(new VisualFactoryCache(mPreMultiplyOnLoad)); Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); if(styleManager) { - Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager); - config["brokenImageUrl"].Get(brokenImageUrl); styleManager.StyleChangedSignal().Connect(mSlotDelegate, &VisualFactory::OnStyleChangedSignal); + Toolkit::DevelStyleManager::BrokenImageChangedSignal(styleManager).Connect(mSlotDelegate, &VisualFactory::OnBrokenImageChangedSignal); } - - mFactoryCache->SetBrokenImageUrl(brokenImageUrl); + SetBrokenImageUrl(styleManager); } + return *mFactoryCache; } @@ -401,6 +519,40 @@ ImageVisualShaderFactory& VisualFactory::GetImageVisualShaderFactory() return *mImageVisualShaderFactory; } +TextVisualShaderFactory& VisualFactory::GetTextVisualShaderFactory() +{ + if(!mTextVisualShaderFactory) + { + mTextVisualShaderFactory = std::unique_ptr(new TextVisualShaderFactory()); + } + return *mTextVisualShaderFactory; +} + +void VisualFactory::OnDiscardCallback() +{ + mIdleCallback = nullptr; + + // Discard visual now. + mDiscardedVisuals.clear(); +} + +void VisualFactory::RegisterDiscardCallback() +{ + if(!mIdleCallback && Adaptor::IsAvailable()) + { + // The callback manager takes the ownership of the callback object. + mIdleCallback = MakeCallback(this, &VisualFactory::OnDiscardCallback); + + Adaptor& adaptor = Adaptor::Get(); + + if(DALI_UNLIKELY(!adaptor.AddIdle(mIdleCallback, false))) + { + DALI_LOG_ERROR("Fail to add idle callback for visual factory. Call it synchronously.\n"); + OnDiscardCallback(); + } + } +} + } // namespace Internal } // namespace Toolkit