X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=a4b0a0abc24eebb63332df3b1d7bf89a6465833c;hp=c368580ae44e9652759353e81bfebb101258e39f;hb=faef4e5740c0024bf3041182a799a2d2395c8787;hpb=e70f617e67183aae0301f1d6c71930cd98f9870e diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index c368580..a4b0a0a 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) 2017 Samsung Electronics Co., Ltd. +/* + * Copyright (c) 2022 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. @@ -18,45 +18,48 @@ #include // EXTERNAL INCLUDES +#include #include -#include #include -#include #include -#include +#include // INTERNAL INCLUDES +#include #include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include #include #include #include -#include -#include #include -#include #include +#include +#include +#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { +#if defined(DEBUG_ENABLED) +Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_CONTROL_VISUALS"); +#endif BaseHandle Create() { @@ -65,13 +68,18 @@ BaseHandle Create() return handle; } -DALI_TYPE_REGISTRATION_BEGIN_CREATE( Toolkit::VisualFactory, Dali::BaseHandle, Create, true ) +DALI_TYPE_REGISTRATION_BEGIN_CREATE(Toolkit::VisualFactory, Dali::BaseHandle, Create, true) DALI_TYPE_REGISTRATION_END() +const char* const BROKEN_IMAGE_FILE_NAME = "broken.png"; ///< The file name of the broken image. } // namespace -VisualFactory::VisualFactory( bool debugEnabled ) -:mDebugEnabled( debugEnabled ) +VisualFactory::VisualFactory(bool debugEnabled) +: mFactoryCache(), + mImageVisualShaderFactory(), + mSlotDelegate(this), + mDebugEnabled(debugEnabled), + mPreMultiplyOnLoad(true) { } @@ -79,75 +87,89 @@ VisualFactory::~VisualFactory() { } -Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap ) +void VisualFactory::OnStyleChangedSignal(Toolkit::StyleManager styleManager, StyleChange::Type type) { - // Create factory cache if it hasn't already been - if( !mFactoryCache ) + if(type == StyleChange::THEME_CHANGE) { - mFactoryCache = new VisualFactoryCache(); + SetBrokenImageUrl(styleManager); } +} +void VisualFactory::OnBrokenImageChangedSignal(Toolkit::StyleManager styleManager) +{ + SetBrokenImageUrl(styleManager); +} + +Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyMap) +{ Visual::BasePtr visualPtr; - Property::Value* typeValue = propertyMap.Find( Toolkit::Visual::Property::TYPE, VISUAL_TYPE ); + Property::Value* typeValue = propertyMap.Find(Toolkit::Visual::Property::TYPE, VISUAL_TYPE); Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type. - if( typeValue ) + if(typeValue) { - Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType ); + Scripting::GetEnumerationProperty(*typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType); } - switch( visualType ) + switch(visualType) { case Toolkit::Visual::BORDER: { - visualPtr = BorderVisual::New( *( mFactoryCache.Get() ), propertyMap ); + visualPtr = BorderVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::COLOR: { - visualPtr = ColorVisual::New( *( mFactoryCache.Get() ), propertyMap ); + visualPtr = ColorVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::GRADIENT: { - visualPtr = GradientVisual::New( *( mFactoryCache.Get() ), propertyMap ); + visualPtr = GradientVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::IMAGE: { - Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); - std::string imageUrl; - if( imageURLValue ) + Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME); + std::string imageUrl; + if(imageURLValue) { - if( imageURLValue->Get( imageUrl ) ) + if(imageURLValue->Get(imageUrl)) { - if( !imageUrl.empty() ) + if(!imageUrl.empty()) { - VisualUrl visualUrl( imageUrl ); + VisualUrl visualUrl(imageUrl); - switch( visualUrl.GetType() ) + switch(visualUrl.GetType()) { case VisualUrl::N_PATCH: { - visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); break; } + case VisualUrl::TVG: case VisualUrl::SVG: { - visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + 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 = AnimatedImageVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); break; } case VisualUrl::REGULAR_IMAGE: { - visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); break; } } @@ -156,9 +178,9 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property else { Property::Array* array = imageURLValue->GetArray(); - if( array ) + if(array && array->Count() > 0) { - visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), *array, propertyMap ); + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap); } } } @@ -167,66 +189,75 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property case Toolkit::Visual::MESH: { - visualPtr = MeshVisual::New( *( mFactoryCache.Get() ), propertyMap ); + visualPtr = MeshVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::PRIMITIVE: { - visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ), propertyMap ); + visualPtr = PrimitiveVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::WIREFRAME: { - visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), propertyMap ); + visualPtr = WireframeVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::TEXT: { - visualPtr = TextVisual::New( *( mFactoryCache.Get() ), propertyMap ); + visualPtr = TextVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::N_PATCH: { - Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); - std::string imageUrl; - if( imageURLValue && imageURLValue->Get( imageUrl ) ) + Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME); + std::string imageUrl; + if(imageURLValue && imageURLValue->Get(imageUrl)) { - visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap ); + if(!imageUrl.empty()) + { + visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); + } } break; } case Toolkit::Visual::SVG: { - Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); - std::string imageUrl; - if( imageURLValue && imageURLValue->Get( imageUrl ) ) + Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME); + std::string imageUrl; + if(imageURLValue && imageURLValue->Get(imageUrl)) { - visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap ); + if(!imageUrl.empty()) + { + 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 ) + Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME); + std::string imageUrl; + if(imageURLValue) { - if( imageURLValue->Get( imageUrl ) ) + if(imageURLValue->Get(imageUrl)) { - visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap ); + if(!imageUrl.empty()) + { + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); + } } else { Property::Array* array = imageURLValue->GetArray(); - if( array ) + if(array && array->Count() > 0) { - visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), *array, propertyMap ); + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap); } } } @@ -235,110 +266,164 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property case Toolkit::DevelVisual::ANIMATED_GRADIENT: { - visualPtr = AnimatedGradientVisual::New( *( mFactoryCache.Get() ), propertyMap ); + visualPtr = AnimatedGradientVisual::New(GetFactoryCache(), propertyMap); break; } - } - if( !visualPtr ) - { - DALI_LOG_ERROR( "Renderer type unknown\n" ); - } - - if( mDebugEnabled && visualType != Toolkit::DevelVisual::WIREFRAME ) - { - //Create a WireframeVisual if we have debug enabled - visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr, propertyMap ); - } - - return Toolkit::Visual::Base( visualPtr.Get() ); -} + case Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE: + { + Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME); + std::string imageUrl; + if(imageURLValue && imageURLValue->Get(imageUrl)) + { + if(!imageUrl.empty()) + { + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); + } + } + break; + } -Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) -{ - if( !mFactoryCache ) - { - mFactoryCache = new VisualFactoryCache(); + case Toolkit::DevelVisual::ARC: + { + visualPtr = ArcVisual::New(GetFactoryCache(), propertyMap); + break; + } } - Visual::BasePtr visualPtr; + DALI_LOG_INFO(gLogFilter, Debug::Concise, "VisualFactory::CreateVisual( VisualType:%s %s%s)\n", Scripting::GetEnumerationName(visualType, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT), (visualType == Toolkit::DevelVisual::IMAGE) ? "url:" : "", (visualType == Toolkit::DevelVisual::IMAGE) ? (([&]() { + // Return URL if present in PropertyMap else return "not found message" + Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME); + return (imageURLValue) ? imageURLValue->Get().c_str() : "url not found in PropertyMap"; + })()) + : ""); - if( image ) + if(!visualPtr) { - NinePatchImage npatchImage = NinePatchImage::DownCast( image ); - if( npatchImage ) - { - visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), npatchImage ); - } - else - { - visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), image ); - } + DALI_LOG_ERROR("VisualType unknown\n"); } - if( mDebugEnabled ) + if(mDebugEnabled && visualType != Toolkit::DevelVisual::WIREFRAME) { //Create a WireframeVisual if we have debug enabled - visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr ); + visualPtr = WireframeVisual::New(GetFactoryCache(), visualPtr, propertyMap); } - return Toolkit::Visual::Base( visualPtr.Get() ); + return Toolkit::Visual::Base(visualPtr.Get()); } -Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) +Toolkit::Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageDimensions size) { - if( !mFactoryCache ) - { - mFactoryCache = new VisualFactoryCache(); - } - Visual::BasePtr visualPtr; - if( !url.empty() ) + if(!url.empty()) { // first resolve url type to know which visual to create - VisualUrl visualUrl( url ); - switch( visualUrl.GetType() ) + VisualUrl visualUrl(url); + switch(visualUrl.GetType()) { case VisualUrl::N_PATCH: { - visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), visualUrl ); + visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); break; } + case VisualUrl::TVG: case VisualUrl::SVG: { - visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), visualUrl ); + visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); break; } case VisualUrl::GIF: + case VisualUrl::WEBP: + { + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); + break; + } + case VisualUrl::JSON: { - visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), visualUrl ); + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); break; } case VisualUrl::REGULAR_IMAGE: { - visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), visualUrl, size ); + visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size); break; } } } - if( mDebugEnabled ) + if(mDebugEnabled) { //Create a WireframeVisual if we have debug enabled - visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr ); + visualPtr = WireframeVisual::New(GetFactoryCache(), visualPtr); } - return Toolkit::Visual::Base( visualPtr.Get() ); + return Toolkit::Visual::Base(visualPtr.Get()); +} + +void VisualFactory::SetPreMultiplyOnLoad(bool preMultiply) +{ + if(mPreMultiplyOnLoad != preMultiply) + { + GetFactoryCache().SetPreMultiplyOnLoad(preMultiply); + } + mPreMultiplyOnLoad = preMultiply; +} + +bool VisualFactory::GetPreMultiplyOnLoad() const +{ + return mPreMultiplyOnLoad; } Internal::TextureManager& VisualFactory::GetTextureManager() { - if( !mFactoryCache ) + return GetFactoryCache().GetTextureManager(); +} + +void VisualFactory::SetBrokenImageUrl(Toolkit::StyleManager& styleManager) +{ + const std::string imageDirPath = AssetManager::GetDaliImagePath(); + std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME; + std::vector customBrokenImageUrlList; + + if(styleManager) + { + customBrokenImageUrlList = Toolkit::DevelStyleManager::GetBrokenImageUrlList(styleManager); + const Property::Map& config = Toolkit::DevelStyleManager::GetConfigurations(styleManager); + const auto brokenImageUrlValue = config.Find("brokenImageUrl", Property::Type::STRING); + if(brokenImageUrlValue) + { + brokenImageUrlValue->Get(brokenImageUrl); + } + } + + // Add default image + mFactoryCache->SetBrokenImageUrl(brokenImageUrl, customBrokenImageUrlList); +} + +Internal::VisualFactoryCache& VisualFactory::GetFactoryCache() +{ + if(!mFactoryCache) + { + mFactoryCache = std::unique_ptr(new VisualFactoryCache(mPreMultiplyOnLoad)); + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + if(styleManager) + { + styleManager.StyleChangedSignal().Connect(mSlotDelegate, &VisualFactory::OnStyleChangedSignal); + Toolkit::DevelStyleManager::BrokenImageChangedSignal(styleManager).Connect(mSlotDelegate, &VisualFactory::OnBrokenImageChangedSignal); + } + SetBrokenImageUrl(styleManager); + } + return *mFactoryCache; +} + +ImageVisualShaderFactory& VisualFactory::GetImageVisualShaderFactory() +{ + if(!mImageVisualShaderFactory) { - mFactoryCache = new VisualFactoryCache(); + mImageVisualShaderFactory = std::unique_ptr(new ImageVisualShaderFactory()); } - return mFactoryCache->GetTextureManager(); + return *mImageVisualShaderFactory; } } // namespace Internal