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=530feb9835eb705dcd4f768e62d692f4d2a9405d;hp=2ccc1d6d8d4e584ab0b83cc2eeca572b9b9bfb14;hb=afe38927f068846eaa02c374430da05f6209a6f9;hpb=1972f043026a3e1bdcaad71c17859a8f324d1e6d diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 2ccc1d6..530feb9 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,8 +23,12 @@ #include #include #include +#include +#include // INTERNAL INCLUDES +#include +#include #include #include #include @@ -37,10 +41,11 @@ #include #include #include +#include namespace { -const char * const BROKEN_RENDERER_IMAGE_URL( DALI_IMAGE_DIR "broken.png"); +const char * const BROKEN_VISUAL_IMAGE_URL( DALI_IMAGE_DIR "broken.png"); } namespace Dali @@ -55,6 +60,18 @@ 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(); @@ -76,148 +93,130 @@ VisualFactory::~VisualFactory() { } -VisualFactory::RendererType VisualFactory::GetRendererType( const Property::Map& propertyMap ) +Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap ) { - RendererType rendererType = UNDEFINED; - - Property::Value* type = propertyMap.Find( RENDERER_TYPE ); - std::string typeValue ; - if( type && type->Get( typeValue )) + // Create factory cache if it hasn't already been + if( !mFactoryCache ) { - 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; - } + mFactoryCache = new VisualFactoryCache(); } - // check the url if exist, to decide the renderer type - if( rendererType == IMAGE || rendererType == UNDEFINED ) + // Return a new DebugVisual if we have debug enabled + if( mDebugEnabled ) { - Property::Value* imageURLValue = propertyMap.Find( IMAGE_URL_NAME ); - std::string imageUrl; - if( imageURLValue && imageURLValue->Get( imageUrl )) - { - if( NinePatchImage::IsNinePatchUrl( imageUrl ) ) - { - rendererType = N_PATCH; - } - else if( SvgVisual::IsSvgUrl( imageUrl ) ) - { - rendererType = SVG; - } - else - { - rendererType = IMAGE; - } - } + return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); } - return rendererType; -} - -Toolkit::Visual VisualFactory::CreateVisual( const Property::Map& propertyMap ) -{ - Visual* rendererPtr = NULL; + Visual::Base* visualPtr = NULL; - RendererType type = GetRendererType( propertyMap ); - if( type != UNDEFINED) + Property::Value* typeValue = propertyMap.Find( Toolkit::Visual::Property::TYPE, VISUAL_TYPE ); + Toolkit::Visual::Type visualType = Toolkit::Visual::IMAGE; // Default to IMAGE type. + if( typeValue ) { - if( !mFactoryCache ) - { - mFactoryCache = new VisualFactoryCache(); - } - - if( mDebugEnabled ) - { - return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) ); - } + Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType ); } - switch( type ) + switch( visualType ) { - case COLOR: - { - rendererPtr = new ColorVisual( *( mFactoryCache.Get() ) ); - break; - } - case GRADIENT: - { - rendererPtr = new GradientVisual( *( mFactoryCache.Get() ) ); - break; - } - case BORDER: + case Toolkit::Visual::BORDER: { - rendererPtr = new BorderVisual( *( mFactoryCache.Get() ) ); + visualPtr = new BorderVisual( *( mFactoryCache.Get() ) ); break; } - case IMAGE: + + case Toolkit::Visual::COLOR: { - CreateAtlasManager(); - rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + visualPtr = new ColorVisual( *( mFactoryCache.Get() ) ); break; } - case N_PATCH: + + case Toolkit::Visual::GRADIENT: { - rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); + visualPtr = new GradientVisual( *( mFactoryCache.Get() ) ); break; } - case SVG: + + default: // Default to Image type if unknown (check if there is a URL) + case Toolkit::Visual::IMAGE: { - CreateAtlasManager(); - rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); + std::string imageUrl; + if( imageURLValue && imageURLValue->Get( imageUrl ) ) + { + Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED ); + if( batchingEnabledValue ) + { + bool batchingEnabled( false ); + batchingEnabledValue->Get( batchingEnabled ); + if( batchingEnabled ) + { + CreateAtlasManager(); + visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + 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 + { + visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + } + } + } + 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 MESH: + + case Toolkit::Visual::MESH: { - rendererPtr = new MeshVisual( *( mFactoryCache.Get() ) ); + visualPtr = new MeshVisual( *( mFactoryCache.Get() ) ); break; } - case PRIMITIVE: + + case Toolkit::Visual::PRIMITIVE: { - rendererPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) ); + visualPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) ); break; } - case UNDEFINED: - default: + + case Toolkit::Visual::DEBUG: { + visualPtr = new DebugVisual( *( mFactoryCache.Get() ) ); break; } + } - if( rendererPtr ) + if( visualPtr ) { Actor actor; - rendererPtr->Initialize( actor, propertyMap ); + visualPtr->Initialize( actor, propertyMap ); } else { - DALI_LOG_ERROR( "Renderer type unknown" ); + DALI_LOG_ERROR( "Renderer type unknown\n" ); } - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( visualPtr ); } -Toolkit::Visual VisualFactory::CreateVisual( const Image& image ) +Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) { if( !mFactoryCache ) { @@ -226,29 +225,29 @@ Toolkit::Visual VisualFactory::CreateVisual( const Image& image ) if( mDebugEnabled ) { - return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) ); + return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); } NinePatchImage npatchImage = NinePatchImage::DownCast( image ); if( npatchImage ) { - NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - rendererPtr->SetImage( npatchImage ); + NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); + visualPtr->SetImage( npatchImage ); - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( visualPtr ); } else { CreateAtlasManager(); - ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); Actor actor; - rendererPtr->SetImage( actor, image ); + visualPtr->SetImage( actor, image ); - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( visualPtr ); } } -Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) +Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) { if( !mFactoryCache ) { @@ -257,37 +256,37 @@ Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimens if( mDebugEnabled ) { - return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) ); + return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); } if( NinePatchImage::IsNinePatchUrl( url ) ) { - NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - rendererPtr->SetImage( url ); + NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); + visualPtr->SetImage( url ); - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( visualPtr ); } else if( SvgVisual::IsSvgUrl( url ) ) { CreateAtlasManager(); - SvgVisual* rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - rendererPtr->SetImage( url, size ); - return Toolkit::Visual( rendererPtr ); + SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + visualPtr->SetImage( url, size ); + return Toolkit::Visual::Base( visualPtr ); } else { CreateAtlasManager(); - ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); Actor actor; - rendererPtr->SetImage( actor, url, size ); + visualPtr->SetImage( actor, url, size ); - return Toolkit::Visual( rendererPtr ); + return Toolkit::Visual::Base( visualPtr ); } } -Image VisualFactory::GetBrokenRendererImage() +Image VisualFactory::GetBrokenVisualImage() { - return ResourceImage::New( BROKEN_RENDERER_IMAGE_URL ); + return ResourceImage::New( BROKEN_VISUAL_IMAGE_URL ); } void VisualFactory::CreateAtlasManager() @@ -296,7 +295,7 @@ void VisualFactory::CreateAtlasManager() { Shader shader = ImageVisual::GetImageShader( *( mFactoryCache.Get() ) ); mAtlasManager = new ImageAtlasManager(); - mAtlasManager->SetBrokenImage( BROKEN_RENDERER_IMAGE_URL ); + mAtlasManager->SetBrokenImage( BROKEN_VISUAL_IMAGE_URL ); } }