X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fborder%2Fborder-renderer.cpp;h=2192016eef1817b3c51816481024eda7eabaed17;hp=8e0d0948d7630ddddd9f18f73036765d04541831;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=8991dd870badfb20693aa0eb1acf0aedbe88f99f diff --git a/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp b/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp index 8e0d094..2192016 100644 --- a/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp @@ -37,12 +37,12 @@ namespace Internal namespace { -const char * const RENDERER_TYPE("renderer-type"); -const char * const RENDERER_TYPE_VALUE("border-renderer"); +const char * const RENDERER_TYPE("rendererType"); +const char * const RENDERER_TYPE_VALUE("borderRenderer"); -const char * const COLOR_NAME("border-color"); +const char * const COLOR_NAME("borderColor"); const char * const COLOR_UNIFORM_NAME("uBorderColor"); -const char * const SIZE_NAME("border-size"); +const char * const SIZE_NAME("borderSize"); const char * const SIZE_UNIFORM_NAME("uBorderSize"); const char * const POSITION_ATTRIBUTE_NAME("aPosition"); @@ -136,14 +136,14 @@ void BorderRenderer::InitializeRenderer() if( !geometry ) { geometry = CreateBorderGeometry(); - mFactoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry ); + mFactoryCache.SaveGeometry( RendererFactoryCache::BORDER_GEOMETRY, geometry ); } Shader shader = mFactoryCache.GetShader( RendererFactoryCache::BORDER_SHADER ); if( !shader ) { shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); - mFactoryCache.SaveShader( RendererFactoryCache::COLOR_SHADER, shader ); + mFactoryCache.SaveShader( RendererFactoryCache::BORDER_SHADER, shader ); } Material material = Material::New( shader );