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=8a5d24554913e9379874ebe1ee102918d7639cb8;hp=2ccc1d6d8d4e584ab0b83cc2eeca572b9b9bfb14;hb=003fe1b0cb2900bd60063649e46fbbbb6e7d997d;hpb=257a9991486e4e05335212b21ecc1f5a0aacbc63 diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 2ccc1d6..8a5d245 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) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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,25 +23,27 @@ #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 - -namespace -{ -const char * const BROKEN_RENDERER_IMAGE_URL( DALI_IMAGE_DIR "broken.png"); -} namespace Dali { @@ -76,228 +78,220 @@ VisualFactory::~VisualFactory() { } -VisualFactory::RendererType VisualFactory::GetRendererType( const Property::Map& propertyMap ) +Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap ) { - RendererType rendererType = UNDEFINED; + // Create factory cache if it hasn't already been + if( !mFactoryCache ) + { + mFactoryCache = new VisualFactoryCache(); + } - Property::Value* type = propertyMap.Find( RENDERER_TYPE ); - std::string typeValue ; - if( type && type->Get( typeValue )) + Visual::BasePtr visualPtr; + + Property::Value* typeValue = propertyMap.Find( Toolkit::DevelVisual::Property::TYPE, VISUAL_TYPE ); + Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type. + if( typeValue ) { - if( typeValue == COLOR_RENDERER ) - { - rendererType = COLOR; - } - else if( typeValue == BORDER_RENDERER ) - { - rendererType = BORDER; - } - else if( typeValue == GRADIENT_RENDERER ) - { - rendererType = GRADIENT; - } - else if( typeValue == IMAGE_RENDERER ) - { - rendererType = IMAGE; - } - else if( typeValue == MESH_RENDERER ) - { - rendererType = MESH; - } - else if( typeValue == PRIMITIVE_RENDERER ) - { - rendererType = PRIMITIVE; - } + Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType ); } - // check the url if exist, to decide the renderer type - if( rendererType == IMAGE || rendererType == UNDEFINED ) + switch( visualType ) { - Property::Value* imageURLValue = propertyMap.Find( IMAGE_URL_NAME ); - std::string imageUrl; - if( imageURLValue && imageURLValue->Get( imageUrl )) + case Toolkit::Visual::BORDER: { - if( NinePatchImage::IsNinePatchUrl( imageUrl ) ) - { - rendererType = N_PATCH; - } - else if( SvgVisual::IsSvgUrl( imageUrl ) ) - { - rendererType = SVG; - } - else - { - rendererType = IMAGE; - } + visualPtr = BorderVisual::New( *( mFactoryCache.Get() ), propertyMap ); + break; } - } - - return rendererType; -} - -Toolkit::Visual VisualFactory::CreateVisual( const Property::Map& propertyMap ) -{ - Visual* rendererPtr = NULL; - RendererType type = GetRendererType( propertyMap ); - if( type != UNDEFINED) - { - if( !mFactoryCache ) + case Toolkit::Visual::COLOR: { - mFactoryCache = new VisualFactoryCache(); + visualPtr = ColorVisual::New( *( mFactoryCache.Get() ), propertyMap ); + break; } - if( mDebugEnabled ) + case Toolkit::Visual::GRADIENT: { - return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) ); + visualPtr = GradientVisual::New( *( mFactoryCache.Get() ), propertyMap ); + break; } - } - switch( type ) - { - case COLOR: + case Toolkit::Visual::IMAGE: { - rendererPtr = new ColorVisual( *( mFactoryCache.Get() ) ); + Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); + std::string imageUrl; + if( imageURLValue && imageURLValue->Get( imageUrl ) ) + { + VisualUrl visualUrl( imageUrl ); + + switch( visualUrl.GetType() ) + { + case VisualUrl::N_PATCH: + { + visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + break; + } + case VisualUrl::SVG: + { + visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + break; + } + case VisualUrl::GIF: + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + break; + } + case VisualUrl::REGULAR_IMAGE: + { + visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + break; + } + } + } break; } - case GRADIENT: - { - rendererPtr = new GradientVisual( *( mFactoryCache.Get() ) ); - break; - } - case BORDER: + + case Toolkit::Visual::MESH: { - rendererPtr = new BorderVisual( *( mFactoryCache.Get() ) ); + visualPtr = MeshVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } - case IMAGE: + + case Toolkit::Visual::PRIMITIVE: { - CreateAtlasManager(); - rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } - case N_PATCH: + + case Toolkit::Visual::WIREFRAME: { - rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); + visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } - case SVG: + + case Toolkit::DevelVisual::TEXT: { - CreateAtlasManager(); - rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + visualPtr = TextVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } - case MESH: + + case Toolkit::DevelVisual::N_PATCH: { - rendererPtr = new MeshVisual( *( mFactoryCache.Get() ) ); + 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 ); + } break; } - case PRIMITIVE: + + case Toolkit::DevelVisual::SVG: { - rendererPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) ); + 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 ); + } break; } - case UNDEFINED: - default: + + case Toolkit::DevelVisual::ANIMATED_IMAGE: { + Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); + std::string imageUrl; + if( imageURLValue && imageURLValue->Get( imageUrl ) ) + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap ); + } break; } } - if( rendererPtr ) + if( !visualPtr ) { - Actor actor; - rendererPtr->Initialize( actor, propertyMap ); + DALI_LOG_ERROR( "Renderer type 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( *( mFactoryCache.Get() ), visualPtr, propertyMap ); } - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( visualPtr.Get() ); } -Toolkit::Visual VisualFactory::CreateVisual( const Image& image ) +Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) { if( !mFactoryCache ) { mFactoryCache = new VisualFactoryCache(); } - if( mDebugEnabled ) - { - return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) ); - } + Visual::BasePtr visualPtr; NinePatchImage npatchImage = NinePatchImage::DownCast( image ); if( npatchImage ) { - NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - rendererPtr->SetImage( npatchImage ); - - return Toolkit::Visual( rendererPtr ); + visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), npatchImage ); } else { - CreateAtlasManager(); - ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - Actor actor; - rendererPtr->SetImage( actor, image ); + visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), image ); + } - return Toolkit::Visual( rendererPtr ); + if( mDebugEnabled ) + { + //Create a WireframeVisual if we have debug enabled + visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr ); } + + return Toolkit::Visual::Base( visualPtr.Get() ); } -Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) +Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) { if( !mFactoryCache ) { mFactoryCache = new VisualFactoryCache(); } - if( mDebugEnabled ) - { - return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) ); - } - - if( NinePatchImage::IsNinePatchUrl( url ) ) - { - NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - rendererPtr->SetImage( url ); + Visual::BasePtr visualPtr; - return Toolkit::Visual( rendererPtr ); - } - else if( SvgVisual::IsSvgUrl( url ) ) - { - CreateAtlasManager(); - SvgVisual* rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - rendererPtr->SetImage( url, size ); - return Toolkit::Visual( rendererPtr ); - } - else + // first resolve url type to know which visual to create + VisualUrl visualUrl( url ); + switch( visualUrl.GetType() ) { - CreateAtlasManager(); - ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - Actor actor; - rendererPtr->SetImage( actor, url, size ); - - return Toolkit::Visual( rendererPtr ); + case VisualUrl::N_PATCH: + { + visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), visualUrl ); + break; + } + case VisualUrl::SVG: + { + visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), visualUrl ); + break; + } + case VisualUrl::GIF: + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), visualUrl ); + break; + } + case VisualUrl::REGULAR_IMAGE: + { + visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), visualUrl, size ); + break; + } } -} -Image VisualFactory::GetBrokenRendererImage() -{ - return ResourceImage::New( BROKEN_RENDERER_IMAGE_URL ); -} - -void VisualFactory::CreateAtlasManager() -{ - if( !mAtlasManager ) + if( mDebugEnabled ) { - Shader shader = ImageVisual::GetImageShader( *( mFactoryCache.Get() ) ); - mAtlasManager = new ImageAtlasManager(); - mAtlasManager->SetBrokenImage( BROKEN_RENDERER_IMAGE_URL ); + //Create a WireframeVisual if we have debug enabled + visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr ); } + + return Toolkit::Visual::Base( visualPtr.Get() ); } } // namespace Internal