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=8c4b2f8d129a8fec8614eb9a4aa36d8baedd21b2;hp=598f73d870c00d82b7da5122c4a28a22aaa56821;hb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d;hpb=ab447436de92a2e8bc8cd1393f4807f19ef6b316 diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 598f73d..8c4b2f8 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -18,51 +18,47 @@ #include // EXTERNAL INCLUDES +#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 +#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"); +Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_CONTROL_VISUALS"); #endif BaseHandle Create() @@ -72,18 +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 ) +VisualFactory::VisualFactory(bool debugEnabled) : mFactoryCache(), mImageVisualShaderFactory(), mSlotDelegate(this), - mDebugEnabled( debugEnabled ), - mPreMultiplyOnLoad( true ) + mDebugEnabled(debugEnabled), + mPreMultiplyOnLoad(true) { } @@ -91,67 +87,67 @@ VisualFactory::~VisualFactory() { } -void VisualFactory::OnStyleChangedSignal( Toolkit::StyleManager styleManager, StyleChange::Type type) +void VisualFactory::OnStyleChangedSignal(Toolkit::StyleManager styleManager, StyleChange::Type type) { - if( type == StyleChange::THEME_CHANGE ) + if(type == StyleChange::THEME_CHANGE) { - const std::string imageDirPath = AssetManager::GetDaliImagePath(); - std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME; + 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 ); + Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager); + config["brokenImageUrl"].Get(brokenImageUrl); - if( mFactoryCache ) + if(mFactoryCache) { mFactoryCache->SetBrokenImageUrl(brokenImageUrl); } } } -Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap ) +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( GetFactoryCache(), propertyMap ); + visualPtr = BorderVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::COLOR: { - visualPtr = ColorVisual::New( GetFactoryCache(), propertyMap ); + visualPtr = ColorVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::GRADIENT: { - visualPtr = GradientVisual::New( GetFactoryCache(), 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: { @@ -160,23 +156,23 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property } case VisualUrl::SVG: { - visualPtr = SvgVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap ); + visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); break; } case VisualUrl::GIF: case VisualUrl::WEBP: { - visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap ); + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); break; } case VisualUrl::JSON: { - visualPtr = AnimatedVectorImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap ); + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); break; } case VisualUrl::REGULAR_IMAGE: { - visualPtr = ImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap ); + visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap); break; } } @@ -185,9 +181,9 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property else { Property::Array* array = imageURLValue->GetArray(); - if( array ) + if(array) { - visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap ); + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap); } } } @@ -196,33 +192,33 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property case Toolkit::Visual::MESH: { - visualPtr = MeshVisual::New( GetFactoryCache(), propertyMap ); + visualPtr = MeshVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::PRIMITIVE: { - visualPtr = PrimitiveVisual::New( GetFactoryCache(), propertyMap ); + visualPtr = PrimitiveVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::WIREFRAME: { - visualPtr = WireframeVisual::New( GetFactoryCache(), propertyMap ); + visualPtr = WireframeVisual::New(GetFactoryCache(), propertyMap); break; } case Toolkit::Visual::TEXT: { - visualPtr = TextVisual::New( GetFactoryCache(), 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(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); } @@ -231,31 +227,31 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property 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( GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap ); + 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( GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap ); + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); } else { Property::Array* array = imageURLValue->GetArray(); - if( array ) + if(array) { - visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap ); + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap); } } } @@ -264,65 +260,58 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property case Toolkit::DevelVisual::ANIMATED_GRADIENT: { - visualPtr = AnimatedGradientVisual::New( GetFactoryCache(), propertyMap ); + 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 ) ) + 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 ); + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap); } break; } case Toolkit::DevelVisual::ARC: { - visualPtr = ArcVisual::New( GetFactoryCache(), propertyMap ); + visualPtr = ArcVisual::New(GetFactoryCache(), propertyMap); break; } } - 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 ) + 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) { - DALI_LOG_ERROR( "VisualType unknown\n" ); + DALI_LOG_ERROR("VisualType unknown\n"); } - if( mDebugEnabled && visualType != Toolkit::DevelVisual::WIREFRAME ) + if(mDebugEnabled && visualType != Toolkit::DevelVisual::WIREFRAME) { //Create a WireframeVisual if we have debug enabled - visualPtr = WireframeVisual::New(GetFactoryCache(), visualPtr, propertyMap ); + 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) { 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: { @@ -331,42 +320,42 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image } case VisualUrl::SVG: { - visualPtr = SvgVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl ); + visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); break; } case VisualUrl::GIF: case VisualUrl::WEBP: { - visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl ); + visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); break; } case VisualUrl::JSON: { - visualPtr = AnimatedVectorImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl ); + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); break; } case VisualUrl::REGULAR_IMAGE: { - visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), 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( GetFactoryCache(), visualPtr ); + visualPtr = WireframeVisual::New(GetFactoryCache(), visualPtr); } - return Toolkit::Visual::Base( visualPtr.Get() ); + return Toolkit::Visual::Base(visualPtr.Get()); } -void VisualFactory::SetPreMultiplyOnLoad( bool preMultiply ) +void VisualFactory::SetPreMultiplyOnLoad(bool preMultiply) { - if( mPreMultiplyOnLoad != preMultiply ) + if(mPreMultiplyOnLoad != preMultiply) { - GetFactoryCache().SetPreMultiplyOnLoad( preMultiply ); + GetFactoryCache().SetPreMultiplyOnLoad(preMultiply); } mPreMultiplyOnLoad = preMultiply; } @@ -383,19 +372,19 @@ Internal::TextureManager& VisualFactory::GetTextureManager() Internal::VisualFactoryCache& VisualFactory::GetFactoryCache() { - if( !mFactoryCache ) + if(!mFactoryCache) { - mFactoryCache = std::unique_ptr( new VisualFactoryCache( mPreMultiplyOnLoad ) ); + mFactoryCache = std::unique_ptr(new VisualFactoryCache(mPreMultiplyOnLoad)); - const std::string imageDirPath = AssetManager::GetDaliImagePath(); - std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME; + const std::string imageDirPath = AssetManager::GetDaliImagePath(); + std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME; Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); - if( styleManager ) + if(styleManager) { - Property::Map config = Toolkit::DevelStyleManager::GetConfigurations( styleManager ); - config["brokenImageUrl"].Get( brokenImageUrl ); - styleManager.StyleChangedSignal().Connect( mSlotDelegate, &VisualFactory::OnStyleChangedSignal ); + Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager); + config["brokenImageUrl"].Get(brokenImageUrl); + styleManager.StyleChangedSignal().Connect(mSlotDelegate, &VisualFactory::OnStyleChangedSignal); } mFactoryCache->SetBrokenImageUrl(brokenImageUrl); @@ -405,9 +394,9 @@ Internal::VisualFactoryCache& VisualFactory::GetFactoryCache() ImageVisualShaderFactory& VisualFactory::GetImageVisualShaderFactory() { - if( !mImageVisualShaderFactory ) + if(!mImageVisualShaderFactory) { - mImageVisualShaderFactory = std::unique_ptr< ImageVisualShaderFactory >( new ImageVisualShaderFactory() ); + mImageVisualShaderFactory = std::unique_ptr(new ImageVisualShaderFactory()); } return *mImageVisualShaderFactory; }