X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Frenderer-factory-impl.cpp;h=e1c75a2f46855f8f08f30375520142598daa50be;hp=0a25ffa3cfcaba6c782e18e85f5780ef568967be;hb=526ca8a3ad82b0a08c0f0580284f28f0d647098d;hpb=4c6d34154c81cf86b4c3662b81e1223f3326ceb5 diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp index 0a25ffa..e1c75a2 100644 --- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp +++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp @@ -15,36 +15,31 @@ */ // CLASS HEADER -#include "renderer-factory-impl.h" +#include // EXTERNAL INCLUDES #include #include #include #include -#include +#include -// Internal HEADER +// INTERNAL INCLUDES #include #include +#include #include #include #include +#include +#include +#include #include +#include #include namespace { -const char * const RENDERER_TYPE_NAME( "rendererType" ); - -const char * const COLOR_RENDERER("colorRenderer"); -const char * const BORDER_RENDERER("borderRenderer"); -const char * const GRADIENT_RENDERER("gradientRenderer"); -const char * const IMAGE_RENDERER("imageRenderer"); -const char * const N_PATCH_RENDERER("nPatchRenderer"); - -const std::string TEXTURE_UNIFORM_NAME = "sTexture"; - const char * const BROKEN_RENDERER_IMAGE_URL( DALI_IMAGE_DIR "broken.png"); } @@ -72,7 +67,8 @@ DALI_TYPE_REGISTRATION_END() } // namespace -RendererFactory::RendererFactory() +RendererFactory::RendererFactory( bool debugEnabled ) +:mDebugEnabled( debugEnabled ) { } @@ -80,115 +76,159 @@ RendererFactory::~RendererFactory() { } -Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Property::Map& propertyMap ) +RendererFactory::RendererType RendererFactory::GetRendererType( const Property::Map& propertyMap ) { - ControlRenderer* rendererPtr = NULL; + RendererType rendererType = UNDEFINED; - Property::Value* type = propertyMap.Find( RENDERER_TYPE_NAME ); + Property::Value* type = propertyMap.Find( RENDERER_TYPE ); std::string typeValue ; if( type && type->Get( typeValue )) { - if( !mFactoryCache ) + if( typeValue == COLOR_RENDERER ) { - mFactoryCache = new RendererFactoryCache(); + rendererType = COLOR; } - - if( typeValue == COLOR_RENDERER ) + else if( typeValue == BORDER_RENDERER ) { - rendererPtr = new ColorRenderer( *( mFactoryCache.Get() ) ); + rendererType = BORDER; } - else if( typeValue == GRADIENT_RENDERER ) + else if( typeValue == GRADIENT_RENDERER ) { - rendererPtr = new GradientRenderer( *( mFactoryCache.Get() ) ); + rendererType = GRADIENT; } - else if( typeValue == IMAGE_RENDERER ) + else if( typeValue == IMAGE_RENDERER ) { - CreateAtlasManager(); - rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + rendererType = IMAGE; } - else if( typeValue == N_PATCH_RENDERER ) + else if( typeValue == MESH_RENDERER ) { - rendererPtr = new NPatchRenderer( *( mFactoryCache.Get() ) ); + rendererType = MESH; } - else if( typeValue == BORDER_RENDERER ) + else if( typeValue == PRIMITIVE_RENDERER ) { - rendererPtr = new BorderRenderer( *( mFactoryCache.Get() ) ); + rendererType = PRIMITIVE; } } - if( rendererPtr ) - { - Actor actor; - rendererPtr->Initialize( actor, propertyMap ); - } - else + // check the url if exist, to decide the renderer type + if( rendererType == IMAGE || rendererType == UNDEFINED ) { - DALI_LOG_ERROR( "Renderer type unknown" ); + 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( SvgRenderer::IsSvgUrl( imageUrl ) ) + { + rendererType = SVG; + } + else + { + rendererType = IMAGE; + } + } } - return Toolkit::ControlRenderer( rendererPtr ); + return rendererType; } -Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Vector4& color ) +Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const Property::Map& propertyMap ) { - if( !mFactoryCache ) - { - mFactoryCache = new RendererFactoryCache(); - } - - ColorRenderer* rendererPtr = new ColorRenderer( *( mFactoryCache.Get() ) ); - rendererPtr->SetColor( color ); - - return Toolkit::ControlRenderer( rendererPtr ); -} + ControlRenderer* rendererPtr = NULL; -void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Vector4& color ) -{ - if( renderer ) + RendererType type = GetRendererType( propertyMap ); + if( type != UNDEFINED) { - ColorRenderer* rendererPtr = dynamic_cast< ColorRenderer* >( &GetImplementation( renderer ) ); - if( rendererPtr ) + if( !mFactoryCache ) { - rendererPtr->SetColor( color ); - return; + mFactoryCache = new RendererFactoryCache(); } - renderer.RemoveAndReset( actor ); + if( mDebugEnabled ) + { + return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) ); + } } - renderer = GetControlRenderer( color ); - if( actor && actor.OnStage() ) + switch( type ) { - renderer.SetOnStage( actor ); + case COLOR: + { + rendererPtr = new ColorRenderer( *( mFactoryCache.Get() ) ); + break; + } + case GRADIENT: + { + rendererPtr = new GradientRenderer( *( mFactoryCache.Get() ) ); + break; + } + case BORDER: + { + rendererPtr = new BorderRenderer( *( mFactoryCache.Get() ) ); + break; + } + case IMAGE: + { + CreateAtlasManager(); + rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + break; + } + case N_PATCH: + { + rendererPtr = new NPatchRenderer( *( mFactoryCache.Get() ) ); + break; + } + case SVG: + { + CreateAtlasManager(); + rendererPtr = new SvgRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + break; + } + case MESH: + { + rendererPtr = new MeshRenderer( *( mFactoryCache.Get() ) ); + break; + } + case PRIMITIVE: + { + rendererPtr = new PrimitiveRenderer( *( mFactoryCache.Get() ) ); + break; + } + case UNDEFINED: + default: + { + break; + } } -} -Toolkit::ControlRenderer RendererFactory::GetControlRenderer( float borderSize, const Vector4& borderColor ) -{ - if( !mFactoryCache ) + if( rendererPtr ) { - mFactoryCache = new RendererFactoryCache(); + Actor actor; + rendererPtr->Initialize( actor, propertyMap ); } - BorderRenderer* rendererPtr = new BorderRenderer( *mFactoryCache.Get() ); - - if( !mFactoryCache ) + else { - mFactoryCache = new RendererFactoryCache(); + DALI_LOG_ERROR( "Renderer type unknown" ); } - rendererPtr->SetBorderSize( borderSize ); - rendererPtr->SetBorderColor( borderColor ); - return Toolkit::ControlRenderer( rendererPtr ); } -Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Image& image ) +Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const Image& image ) { if( !mFactoryCache ) { mFactoryCache = new RendererFactoryCache(); } + if( mDebugEnabled ) + { + return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) ); + } + NinePatchImage npatchImage = NinePatchImage::DownCast( image ); if( npatchImage ) { @@ -208,45 +248,16 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Image& image } } -void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Image& image ) +Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const std::string& url, ImageDimensions size ) { - if( renderer ) - { - NinePatchImage npatchImage = NinePatchImage::DownCast( image ); - if( npatchImage ) - { - NPatchRenderer* rendererPtr = dynamic_cast< NPatchRenderer* >( &GetImplementation( renderer ) ); - if( rendererPtr ) - { - rendererPtr->SetImage( npatchImage ); - return; - } - } - else - { - ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) ); - if( rendererPtr ) - { - rendererPtr->SetImage( actor, image ); - return; - } - } - - renderer.RemoveAndReset( actor ); - } - - renderer = GetControlRenderer( image ); - if( actor && actor.OnStage() ) + if( !mFactoryCache ) { - renderer.SetOnStage( actor ); + mFactoryCache = new RendererFactoryCache(); } -} -Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string& url, ImageDimensions size ) -{ - if( !mFactoryCache ) + if( mDebugEnabled ) { - mFactoryCache = new RendererFactoryCache(); + return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) ); } if( NinePatchImage::IsNinePatchUrl( url ) ) @@ -256,6 +267,13 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string& return Toolkit::ControlRenderer( rendererPtr ); } + else if( SvgRenderer::IsSvgUrl( url ) ) + { + CreateAtlasManager(); + SvgRenderer* rendererPtr = new SvgRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + rendererPtr->SetImage( url, size ); + return Toolkit::ControlRenderer( rendererPtr ); + } else { CreateAtlasManager(); @@ -267,70 +285,6 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string& } } -void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const std::string& url, ImageDimensions size ) -{ - if( renderer ) - { - if( NinePatchImage::IsNinePatchUrl( url ) ) - { - NPatchRenderer* rendererPtr = dynamic_cast< NPatchRenderer* >( &GetImplementation( renderer ) ); - if( rendererPtr ) - { - rendererPtr->SetImage( url ); - return; - } - } - else - { - ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) ); - if( rendererPtr ) - { - rendererPtr->SetImage( actor, url, size ); - return; - } - } - - renderer.RemoveAndReset( actor ); - } - - renderer = GetControlRenderer( url, size ); - if( actor && actor.OnStage() ) - { - renderer.SetOnStage( actor ); - } -} - -void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Property::Map& propertyMap ) -{ - if( renderer ) - { - ControlRenderer& controlRenderer = GetImplementation( renderer ); - - Property::Value* type = propertyMap.Find( RENDERER_TYPE_NAME ); - std::string typeValue ; - - //If there's no renderer type specified or if there hasn't been a renderer type change then we can reuse the renderer - if( !type || !type->Get( typeValue ) || - ( typeValue == IMAGE_RENDERER && typeid( controlRenderer ) == typeid( ImageRenderer ) ) || - ( typeValue == N_PATCH_RENDERER && typeid( controlRenderer ) == typeid( NPatchRenderer ) ) || - ( typeValue == COLOR_RENDERER && typeid( controlRenderer ) == typeid( ColorRenderer ) )|| - ( typeValue == GRADIENT_RENDERER && typeid( controlRenderer ) == typeid( GradientRenderer ) ) || - ( typeValue == BORDER_RENDERER && typeid( controlRenderer ) == typeid( BorderRenderer ) ) ) - { - controlRenderer.Initialize( actor, propertyMap ); - return; - } - - renderer.RemoveAndReset( actor ); - } - - renderer = GetControlRenderer( propertyMap ); - if( actor && actor.OnStage() ) - { - renderer.SetOnStage( actor ); - } -} - Image RendererFactory::GetBrokenRendererImage() { return ResourceImage::New( BROKEN_RENDERER_IMAGE_URL ); @@ -341,7 +295,7 @@ void RendererFactory::CreateAtlasManager() if( !mAtlasManager ) { Shader shader = ImageRenderer::GetImageShader( *( mFactoryCache.Get() ) ); - mAtlasManager = new ImageAtlasManager(shader, TEXTURE_UNIFORM_NAME); + mAtlasManager = new ImageAtlasManager(); mAtlasManager->SetBrokenImage( BROKEN_RENDERER_IMAGE_URL ); } } @@ -351,4 +305,3 @@ void RendererFactory::CreateAtlasManager() } // namespace Toolkit } // namespace Dali -