X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fborder%2Fborder-visual.cpp;h=b715cca4f5a2ec330d9794ee6f3ebb4f82f42c0c;hp=9e977fc889b0eef728a174a1b895022041329d4a;hb=6ebbbf8ac1bc813b1f34950e4f76d6f55b304495;hpb=177a529f5796ca4abe24fc5eafd7cddff423be3b diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp index 9e977fc..b715cca 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.cpp +++ b/dali-toolkit/internal/visuals/border/border-visual.cpp @@ -39,7 +39,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(7); // 5 transform properties + color,size +const int CUSTOM_PROPERTY_COUNT(2); // color,size const char* const POSITION_ATTRIBUTE_NAME("aPosition"); const char* const DRIFT_ATTRIBUTE_NAME("aDrift"); @@ -129,12 +129,18 @@ void BorderVisual::DoSetProperty(Dali::Property::Index index, void BorderVisual::DoSetOnScene(Actor& actor) { - mBorderColorIndex = mImpl->mRenderer.RegisterProperty(Toolkit::BorderVisual::Property::COLOR, COLOR_NAME, mBorderColor); + if(mBorderColorIndex == Property::INVALID_INDEX) + { + mBorderColorIndex = mImpl->mRenderer.RegisterUniqueProperty(Toolkit::BorderVisual::Property::COLOR, COLOR_NAME, mBorderColor); + } if(mBorderColor.a < 1.f || mAntiAliasing) { mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON); } - mBorderSizeIndex = mImpl->mRenderer.RegisterProperty(Toolkit::BorderVisual::Property::SIZE, SIZE_NAME, mBorderSize); + if(mBorderSizeIndex == Property::INVALID_INDEX) + { + mBorderSizeIndex = mImpl->mRenderer.RegisterUniqueProperty(Toolkit::BorderVisual::Property::SIZE, SIZE_NAME, mBorderSize); + } actor.AddRenderer(mImpl->mRenderer); @@ -160,7 +166,7 @@ void BorderVisual::OnSetTransform() { if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } @@ -174,11 +180,11 @@ void BorderVisual::OnInitialize() } Shader shader = GetBorderShader(); - mImpl->mRenderer = Renderer::New(geometry, shader); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } Shader BorderVisual::GetBorderShader()