#include <dali-toolkit/internal/controls/renderers/gradient/gradient-renderer.h>
#include <dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.h>
#include <dali-toolkit/internal/controls/renderers/image/image-renderer.h>
+#include <dali-toolkit/internal/controls/renderers/svg/svg-renderer.h>
#include <dali-toolkit/internal/controls/renderers/renderer-factory-cache.h>
#include <dali-toolkit/internal/controls/renderers/image-atlas-manager.h>
{
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 char * const COLOR_RENDERER("color");
+const char * const BORDER_RENDERER("border");
+const char * const GRADIENT_RENDERER("gradient");
+const char * const IMAGE_RENDERER("image");
+const char * const N_PATCH_RENDERER("nPatch");
+const char * const SVG_RENDERER("svg");
const std::string TEXTURE_UNIFORM_NAME = "sTexture";
const char * const BROKEN_RENDERER_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
+
}
namespace Dali
{
rendererPtr = new BorderRenderer( *( mFactoryCache.Get() ) );
}
+ else if( typeValue == SVG_RENDERER )
+ {
+ CreateAtlasManager();
+ rendererPtr = new SvgRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+ }
}
if( rendererPtr )
}
}
-Toolkit::ControlRenderer RendererFactory::GetControlRenderer( float borderSize, const Vector4& borderColor )
+Toolkit::ControlRenderer RendererFactory::GetControlRenderer( float borderSize, const Vector4& borderColor, bool antiAliasing )
{
if( !mFactoryCache )
{
rendererPtr->SetBorderSize( borderSize );
rendererPtr->SetBorderColor( borderColor );
+ rendererPtr->RequireAntiAliasing( antiAliasing );
return Toolkit::ControlRenderer( rendererPtr );
}
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();
return;
}
}
+ else if( SvgRenderer::IsSvgUrl( url ) )
+ {
+ SvgRenderer* rendererPtr = dynamic_cast< SvgRenderer* >( &GetImplementation( renderer ) );
+ if( rendererPtr )
+ {
+ rendererPtr->SetImage( url, size );
+ return;
+ }
+ }
else
{
ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) );
//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 ) ) )
+ ( 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 ) ) ||
+ ( typeValue == SVG_RENDERER && typeid( controlRenderer ) == typeid( SvgRenderer ) ) )
{
controlRenderer.Initialize( actor, propertyMap );
return;
}
renderer = GetControlRenderer( propertyMap );
- if( actor && actor.OnStage() )
+ if( renderer && actor && actor.OnStage() )
{
renderer.SetOnStage( actor );
}