X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=9fab730503078601240b94c3947883ae16f0440f;hb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d;hp=5775130f7fbbf5358a9cc71c9374263770873934;hpb=146486a8c7410a2f2a20a6d670145fe855672b96;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 5775130..8c4b2f8 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) 2016 Samsung Electronics Co., Ltd. +/* + * Copyright (c) 2021 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,58 +18,48 @@ #include // EXTERNAL INCLUDES +#include #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 - -namespace -{ -const char * const BROKEN_VISUAL_IMAGE_URL( DALI_IMAGE_DIR "broken.png"); -} +#include +#include +#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { - -DALI_ENUM_TO_STRING_TABLE_BEGIN( VISUAL_TYPE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, BORDER ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, COLOR ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, GRADIENT ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, IMAGE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, MESH ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, PRIMITIVE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, DEBUG ) -DALI_ENUM_TO_STRING_TABLE_END( VISUAL_TYPE ) - -const char * const VISUAL_TYPE( "visualType" ); +#if defined(DEBUG_ENABLED) +Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_CONTROL_VISUALS"); +#endif BaseHandle Create() { @@ -78,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) { } @@ -92,197 +87,318 @@ 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(); - } + const std::string imageDirPath = AssetManager::GetDaliImagePath(); + std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME; - // Return a new DebugVisual if we have debug enabled - if( mDebugEnabled ) - { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); + Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager); + config["brokenImageUrl"].Get(brokenImageUrl); + + if(mFactoryCache) + { + mFactoryCache->SetBrokenImageUrl(brokenImageUrl); + } } +} - Visual::Base* visualPtr = NULL; +Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyMap) +{ + Visual::BasePtr visualPtr; - Property::Value* typeValue = propertyMap.Find( Toolkit::Visual::Property::TYPE, VISUAL_TYPE ); - Toolkit::Visual::Type visualType = Toolkit::Visual::IMAGE; // Default to IMAGE type - if( typeValue ) + Property::Value* typeValue = propertyMap.Find(Toolkit::Visual::Property::TYPE, VISUAL_TYPE); + Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type. + 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 = new BorderVisual( *( mFactoryCache.Get() ) ); + visualPtr = BorderVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::COLOR: { - visualPtr = new ColorVisual( *( mFactoryCache.Get() ) ); + visualPtr = ColorVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::GRADIENT: { - visualPtr = new GradientVisual( *( mFactoryCache.Get() ) ); + visualPtr = GradientVisual::New(GetFactoryCache(), propertyMap); break; } - default: // Default to Image type if unknown (check if there is a URL) case Toolkit::Visual::IMAGE: { - 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) { - if( NinePatchImage::IsNinePatchUrl( imageUrl ) ) + if(imageURLValue->Get(imageUrl)) { - visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); + if(!imageUrl.empty()) + { + VisualUrl visualUrl(imageUrl); + + switch(visualUrl.GetType()) + { + case VisualUrl::N_PATCH: + { + visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); + break; + } + 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::REGULAR_IMAGE: + { + visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); + break; + } + } + } } else { - CreateAtlasManager(); - - if( SvgVisual::IsSvgUrl( imageUrl ) ) - { - visualPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - } - else + Property::Array* array = imageURLValue->GetArray(); + if(array) { - visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap); } } } - else if( propertyMap.Find( Toolkit::Visual::Property::SHADER, CUSTOM_SHADER ) ) - { - // Create Image Visual if it has a shader - // TODO: This is required because of EffectsView which should be fixed - CreateAtlasManager(); - visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - } break; } case Toolkit::Visual::MESH: { - visualPtr = new MeshVisual( *( mFactoryCache.Get() ) ); + visualPtr = MeshVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::PRIMITIVE: { - visualPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) ); + visualPtr = PrimitiveVisual::New(GetFactoryCache(), propertyMap); + break; + } + + case Toolkit::Visual::WIREFRAME: + { + visualPtr = WireframeVisual::New(GetFactoryCache(), propertyMap); + break; + } + + case Toolkit::Visual::TEXT: + { + 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)) + { + 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)) + { + 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)) + { + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); + } + else + { + Property::Array* array = imageURLValue->GetArray(); + if(array) + { + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap); + } + } + } break; } - case Toolkit::Visual::DEBUG: + case Toolkit::DevelVisual::ANIMATED_GRADIENT: { - visualPtr = new DebugVisual( *( mFactoryCache.Get() ) ); + visualPtr = AnimatedGradientVisual::New(GetFactoryCache(), propertyMap); + break; + } + + 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)) + { + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); + } + break; + } + + case Toolkit::DevelVisual::ARC: + { + visualPtr = ArcVisual::New(GetFactoryCache(), propertyMap); break; } } - if( 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(!visualPtr) { - Actor actor; - visualPtr->Initialize( actor, propertyMap ); + DALI_LOG_ERROR("VisualType unknown\n"); } - else + + if(mDebugEnabled && visualType != Toolkit::DevelVisual::WIREFRAME) { - DALI_LOG_ERROR( "Renderer type unknown" ); + //Create a WireframeVisual if we have debug enabled + visualPtr = WireframeVisual::New(GetFactoryCache(), visualPtr, propertyMap); } - return Toolkit::Visual::Base( visualPtr ); + return Toolkit::Visual::Base(visualPtr.Get()); } -Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) +Toolkit::Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageDimensions size) { - if( !mFactoryCache ) - { - mFactoryCache = new VisualFactoryCache(); - } + Visual::BasePtr visualPtr; - if( mDebugEnabled ) + if(!url.empty()) { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); + // first resolve url type to know which visual to create + VisualUrl visualUrl(url); + switch(visualUrl.GetType()) + { + case VisualUrl::N_PATCH: + { + visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); + break; + } + case VisualUrl::SVG: + { + visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); + break; + } + case VisualUrl::GIF: + case VisualUrl::WEBP: + { + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); + break; + } + case VisualUrl::JSON: + { + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); + break; + } + case VisualUrl::REGULAR_IMAGE: + { + visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size); + break; + } + } } - NinePatchImage npatchImage = NinePatchImage::DownCast( image ); - if( npatchImage ) + if(mDebugEnabled) { - NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( npatchImage ); - - return Toolkit::Visual::Base( visualPtr ); + //Create a WireframeVisual if we have debug enabled + visualPtr = WireframeVisual::New(GetFactoryCache(), visualPtr); } - else - { - CreateAtlasManager(); - ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - Actor actor; - visualPtr->SetImage( actor, image ); - return Toolkit::Visual::Base( visualPtr ); - } + return Toolkit::Visual::Base(visualPtr.Get()); } -Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) +void VisualFactory::SetPreMultiplyOnLoad(bool preMultiply) { - if( !mFactoryCache ) + if(mPreMultiplyOnLoad != preMultiply) { - mFactoryCache = new VisualFactoryCache(); + GetFactoryCache().SetPreMultiplyOnLoad(preMultiply); } + mPreMultiplyOnLoad = preMultiply; +} - if( mDebugEnabled ) - { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); - } +bool VisualFactory::GetPreMultiplyOnLoad() const +{ + return mPreMultiplyOnLoad; +} - if( NinePatchImage::IsNinePatchUrl( url ) ) - { - NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( url ); +Internal::TextureManager& VisualFactory::GetTextureManager() +{ + return GetFactoryCache().GetTextureManager(); +} - return Toolkit::Visual::Base( visualPtr ); - } - else if( SvgVisual::IsSvgUrl( url ) ) - { - CreateAtlasManager(); - SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - visualPtr->SetImage( url, size ); - return Toolkit::Visual::Base( visualPtr ); - } - else +Internal::VisualFactoryCache& VisualFactory::GetFactoryCache() +{ + if(!mFactoryCache) { - CreateAtlasManager(); - ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - Actor actor; - visualPtr->SetImage( actor, url, size ); + mFactoryCache = std::unique_ptr(new VisualFactoryCache(mPreMultiplyOnLoad)); - return Toolkit::Visual::Base( visualPtr ); - } -} + const std::string imageDirPath = AssetManager::GetDaliImagePath(); + std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME; -Image VisualFactory::GetBrokenVisualImage() -{ - return ResourceImage::New( BROKEN_VISUAL_IMAGE_URL ); + 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); + } + + mFactoryCache->SetBrokenImageUrl(brokenImageUrl); + } + return *mFactoryCache; } -void VisualFactory::CreateAtlasManager() +ImageVisualShaderFactory& VisualFactory::GetImageVisualShaderFactory() { - if( !mAtlasManager ) + if(!mImageVisualShaderFactory) { - Shader shader = ImageVisual::GetImageShader( *( mFactoryCache.Get() ) ); - mAtlasManager = new ImageAtlasManager(); - mAtlasManager->SetBrokenImage( BROKEN_VISUAL_IMAGE_URL ); + mImageVisualShaderFactory = std::unique_ptr(new ImageVisualShaderFactory()); } + return *mImageVisualShaderFactory; } } // namespace Internal