X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fgradient%2Fgradient-visual.cpp;h=b86f9a7950d70586e20ac48446cd08ea8ef7b443;hp=462a6c07cb22f845333ad1d370d1f61b41e0e0fd;hb=798ef5fa1591aa78851e9e3d08fe37411192176a;hpb=f11be450471738b68f98fa4c552b3a22482ae4de diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp index 462a6c0..b86f9a7 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp @@ -25,6 +25,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -384,6 +385,15 @@ void GradientVisual::DoSetOnScene( Actor& actor ) ResourceReady( Toolkit::Visual::ResourceStatus::READY ); } +void GradientVisual::UpdateShader() +{ + if(mImpl->mRenderer) + { + Shader shader = GetShader(); + mImpl->mRenderer.SetShader(shader); + } +} + void GradientVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); @@ -435,16 +445,7 @@ void GradientVisual::DoCreateInstancePropertyMap( Property::Map& map ) const void GradientVisual::InitializeRenderer() { Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); - - Toolkit::GradientVisual::Units::Type gradientUnits = mGradient->GetGradientUnits(); - int roundedCorner = IsRoundedCornerRequired() ? 1 : 0; - VisualFactoryCache::ShaderType shaderType = SHADER_TYPE_TABLE[mGradientType][gradientUnits + roundedCorner * 2]; - Shader shader = mFactoryCache.GetShader( shaderType ); - if( !shader ) - { - shader = Shader::New( VERTEX_SHADER[gradientUnits + roundedCorner * 2], FRAGMENT_SHADER[ mGradientType + roundedCorner * 2 ] ); - mFactoryCache.SaveShader( shaderType, shader ); - } + Shader shader = GetShader(); //Set up the texture set TextureSet textureSet = TextureSet::New(); @@ -458,7 +459,7 @@ void GradientVisual::InitializeRenderer() mImpl->mRenderer = Renderer::New( geometry, shader ); mImpl->mRenderer.SetTextures( textureSet ); - // If opaque then no need to have blending + // If opaque and then no need to have blending if( mIsOpaque ) { mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF ); @@ -553,6 +554,21 @@ bool GradientVisual::NewGradient(Type gradientType, const Property::Map& propert return true; } +Shader GradientVisual::GetShader() +{ + Toolkit::GradientVisual::Units::Type gradientUnits = mGradient->GetGradientUnits(); + int roundedCorner = IsRoundedCornerRequired() ? 1 : 0; + VisualFactoryCache::ShaderType shaderType = SHADER_TYPE_TABLE[mGradientType][gradientUnits + roundedCorner * 2]; + Shader shader = mFactoryCache.GetShader(shaderType); + if(!shader) + { + shader = Shader::New(VERTEX_SHADER[gradientUnits + roundedCorner * 2], FRAGMENT_SHADER[mGradientType + roundedCorner * 2]); + mFactoryCache.SaveShader(shaderType, shader); + } + + return shader; +} + void GradientVisual::GetStopOffsets(const Property::Value* value, Vector& stopOffsets) {