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=4803e078ab5fe71f7d44eb34fa2b45a69c6e4543;hp=530feb9835eb705dcd4f768e62d692f4d2a9405d;hb=3bcb53e9e30f5c72741f583191e20b2f2bc0d5b9;hpb=afe38927f068846eaa02c374430da05f6209a6f9 diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 530feb9..4803e07 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) 2017 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. @@ -23,30 +23,28 @@ #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"); -} namespace Dali { @@ -60,18 +58,6 @@ 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" ); -const char * const BATCHING_ENABLED( "batchingEnabled" ); BaseHandle Create() { BaseHandle handle = Toolkit::VisualFactory::Get(); @@ -85,7 +71,9 @@ DALI_TYPE_REGISTRATION_END() } // namespace VisualFactory::VisualFactory( bool debugEnabled ) -:mDebugEnabled( debugEnabled ) +: mFactoryCache(), + mDebugEnabled( debugEnabled ), + mPreMultiplyOnLoad( true ) { } @@ -95,22 +83,10 @@ VisualFactory::~VisualFactory() Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap ) { - // Create factory cache if it hasn't already been - if( !mFactoryCache ) - { - mFactoryCache = new VisualFactoryCache(); - } - - // Return a new DebugVisual if we have debug enabled - if( mDebugEnabled ) - { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); - } - - Visual::Base* visualPtr = NULL; + 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. + Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type. if( typeValue ) { Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType ); @@ -120,183 +96,254 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property { 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 ) ) + if( imageURLValue ) { - Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED ); - if( batchingEnabledValue ) + if( imageURLValue->Get( imageUrl ) ) { - bool batchingEnabled( false ); - batchingEnabledValue->Get( batchingEnabled ); - if( batchingEnabled ) + if( !imageUrl.empty() ) { - CreateAtlasManager(); - visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - break; + VisualUrl visualUrl( imageUrl ); + + switch( visualUrl.GetType() ) + { + case VisualUrl::N_PATCH: + { + visualPtr = NPatchVisual::New( GetFactoryCache(), visualUrl, propertyMap ); + break; + } + case VisualUrl::SVG: + { + visualPtr = SvgVisual::New( GetFactoryCache(), visualUrl, propertyMap ); + break; + } + case VisualUrl::GIF: + { + visualPtr = AnimatedImageVisual::New( GetFactoryCache(), visualUrl, propertyMap ); + break; + } + case VisualUrl::REGULAR_IMAGE: + { + visualPtr = ImageVisual::New( GetFactoryCache(), visualUrl, propertyMap ); + break; + } + } } } - else if( NinePatchImage::IsNinePatchUrl( imageUrl ) ) - { - visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - } 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(), *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(), 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(), imageUrl, propertyMap ); + } break; } - case Toolkit::Visual::DEBUG: + case Toolkit::Visual::ANIMATED_IMAGE: { - visualPtr = new DebugVisual( *( mFactoryCache.Get() ) ); + 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(), imageUrl, propertyMap ); + } + else + { + Property::Array* array = imageURLValue->GetArray(); + if( array ) + { + visualPtr = AnimatedImageVisual::New( GetFactoryCache(), *array, propertyMap ); + } + } + } break; } + case Toolkit::DevelVisual::ANIMATED_GRADIENT: + { + visualPtr = AnimatedGradientVisual::New( GetFactoryCache(), propertyMap ); + break; + } } - if( visualPtr ) + if( !visualPtr ) { - Actor actor; - visualPtr->Initialize( actor, propertyMap ); + DALI_LOG_ERROR( "Renderer type unknown\n" ); } - else + + if( mDebugEnabled && visualType != Toolkit::DevelVisual::WIREFRAME ) { - DALI_LOG_ERROR( "Renderer type unknown\n" ); + //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 ) { - if( !mFactoryCache ) - { - mFactoryCache = new VisualFactoryCache(); - } + Visual::BasePtr visualPtr; - if( mDebugEnabled ) + if( image ) { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); + NinePatchImage npatchImage = NinePatchImage::DownCast( image ); + if( npatchImage ) + { + visualPtr = NPatchVisual::New( GetFactoryCache(), npatchImage ); + } + else + { + visualPtr = ImageVisual::New(GetFactoryCache(), image ); + } } - 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 ) { - if( !mFactoryCache ) + Visual::BasePtr visualPtr; + + if( !url.empty() ) { - mFactoryCache = new VisualFactoryCache(); + // first resolve url type to know which visual to create + VisualUrl visualUrl( url ); + switch( visualUrl.GetType() ) + { + case VisualUrl::N_PATCH: + { + visualPtr = NPatchVisual::New( GetFactoryCache(), visualUrl ); + break; + } + case VisualUrl::SVG: + { + visualPtr = SvgVisual::New( GetFactoryCache(), visualUrl ); + break; + } + case VisualUrl::GIF: + { + visualPtr = AnimatedImageVisual::New( GetFactoryCache(), visualUrl ); + break; + } + case VisualUrl::REGULAR_IMAGE: + { + visualPtr = ImageVisual::New(GetFactoryCache(), visualUrl, size ); + break; + } + } } if( mDebugEnabled ) { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); + //Create a WireframeVisual if we have debug enabled + visualPtr = WireframeVisual::New( GetFactoryCache(), visualPtr ); } - if( NinePatchImage::IsNinePatchUrl( url ) ) - { - NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( url ); + return Toolkit::Visual::Base( visualPtr.Get() ); +} - return Toolkit::Visual::Base( visualPtr ); - } - else if( SvgVisual::IsSvgUrl( url ) ) +void VisualFactory::SetPreMultiplyOnLoad( bool preMultiply ) +{ + if( mPreMultiplyOnLoad != preMultiply ) { - CreateAtlasManager(); - SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - visualPtr->SetImage( url, size ); - return Toolkit::Visual::Base( visualPtr ); + GetFactoryCache().SetPreMultiplyOnLoad( preMultiply ); } - else - { - CreateAtlasManager(); - ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - Actor actor; - visualPtr->SetImage( actor, url, size ); + mPreMultiplyOnLoad = preMultiply; +} - return Toolkit::Visual::Base( visualPtr ); - } +bool VisualFactory::GetPreMultiplyOnLoad() const +{ + return mPreMultiplyOnLoad; } -Image VisualFactory::GetBrokenVisualImage() +Internal::TextureManager& VisualFactory::GetTextureManager() { - return ResourceImage::New( BROKEN_VISUAL_IMAGE_URL ); + return GetFactoryCache().GetTextureManager(); } -void VisualFactory::CreateAtlasManager() +Internal::VisualFactoryCache& VisualFactory::GetFactoryCache() { - if( !mAtlasManager ) + if( !mFactoryCache ) { - Shader shader = ImageVisual::GetImageShader( *( mFactoryCache.Get() ) ); - mAtlasManager = new ImageAtlasManager(); - mAtlasManager->SetBrokenImage( BROKEN_VISUAL_IMAGE_URL ); + mFactoryCache = std::unique_ptr( new VisualFactoryCache( mPreMultiplyOnLoad ) ); } + return *mFactoryCache; } } // namespace Internal