X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.cpp;h=cf6abd3ff11aa83dfb26dccf516441a4f12e55fd;hp=492f20330a4f5eef68bbd2ae7a1853eaed849bf8;hb=4c4f959f023cf5541feeef5c834cfe7e43fa05b2;hpb=70510385d88cfbd5c232117d8436ca74c523e172 diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp index 492f203..cf6abd3 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,33 +19,31 @@ #include "color-visual.h" // EXTERNAL INCLUDES -#include #include +#include //INTERNAL INCLUDES -#include -#include -#include #include -#include +#include +#include +#include #include +#include #include -#include -#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - -ColorVisualPtr ColorVisual::New( VisualFactoryCache& factoryCache, const Property::Map& properties ) +ColorVisualPtr ColorVisual::New(VisualFactoryCache& factoryCache, const Property::Map& properties) { - ColorVisualPtr colorVisualPtr( new ColorVisual( factoryCache ) ); - colorVisualPtr->SetProperties( properties ); + ColorVisualPtr colorVisualPtr(new ColorVisual(factoryCache)); + colorVisualPtr->SetProperties(properties); + colorVisualPtr->Initialize(); return colorVisualPtr; } @@ -53,7 +51,6 @@ ColorVisual::ColorVisual(VisualFactoryCache& factoryCache) : Visual::Base(factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::COLOR), mBlurRadius(0.0f), mBlurRadiusIndex(Property::INVALID_INDEX), - mRenderIfTransparent(false), mNeedBlurRadius(false) { } @@ -62,25 +59,25 @@ ColorVisual::~ColorVisual() { } -void ColorVisual::DoSetProperties( const Property::Map& propertyMap ) +void ColorVisual::DoSetProperties(const Property::Map& propertyMap) { // By virtue of DoSetProperties being called last, this will override // anything set by Toolkit::Visual::Property::MIX_COLOR - Property::Value* colorValue = propertyMap.Find( Toolkit::ColorVisual::Property::MIX_COLOR, MIX_COLOR ); - if( colorValue ) + Property::Value* colorValue = propertyMap.Find(Toolkit::ColorVisual::Property::MIX_COLOR, MIX_COLOR); + if(colorValue) { Vector4 color; - if( colorValue->Get( color ) ) + if(colorValue->Get(color)) { Property::Type type = colorValue->GetType(); - if( type == Property::VECTOR4 ) + if(type == Property::VECTOR4) { - SetMixColor( color ); + SetMixColor(color); } - else if( type == Property::VECTOR3 ) + else if(type == Property::VECTOR3) { Vector3 color3(color); - SetMixColor( color3 ); + SetMixColor(color3); } } else @@ -89,59 +86,34 @@ void ColorVisual::DoSetProperties( const Property::Map& propertyMap ) } } - Property::Value* renderIfTransparentValue = propertyMap.Find( Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT, RENDER_IF_TRANSPARENT_NAME ); - if( renderIfTransparentValue ) - { - if( ! renderIfTransparentValue->Get( mRenderIfTransparent ) ) - { - DALI_LOG_ERROR( "ColorVisual: renderIfTransparent property has incorrect type: %d\n", renderIfTransparentValue->GetType() ); - } - } - - Property::Value* blurRadiusValue = propertyMap.Find( Toolkit::DevelColorVisual::Property::BLUR_RADIUS, BLUR_RADIUS_NAME ); - if( blurRadiusValue ) + Property::Value* blurRadiusValue = propertyMap.Find(Toolkit::DevelColorVisual::Property::BLUR_RADIUS, BLUR_RADIUS_NAME); + if(blurRadiusValue) { - if( !blurRadiusValue->Get( mBlurRadius ) ) + if(!blurRadiusValue->Get(mBlurRadius)) { - DALI_LOG_ERROR( "ColorVisual:DoSetProperties:: BLUR_RADIUS property has incorrect type: %d\n", blurRadiusValue->GetType() ); + DALI_LOG_ERROR("ColorVisual:DoSetProperties:: BLUR_RADIUS property has incorrect type: %d\n", blurRadiusValue->GetType()); } } } -void ColorVisual::DoSetOnScene( Actor& actor ) +void ColorVisual::DoSetOnScene(Actor& actor) { - InitializeRenderer(); - - // Only add the renderer if it's not fully transparent - // We cannot avoid creating a renderer as it's used in the base class - if( mRenderIfTransparent || mImpl->mMixColor.a > 0.0f ) - { - actor.AddRenderer( mImpl->mRenderer ); - } + actor.AddRenderer(mImpl->mRenderer); // Color Visual generated and ready to display - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + ResourceReady(Toolkit::Visual::ResourceStatus::READY); } void ColorVisual::DoSetOffScene(Actor& actor) { - if(mImpl->mRenderer && mBlurRadiusIndex != Property::INVALID_INDEX) - { - // Update values from Renderer - mBlurRadius = mImpl->mRenderer.GetProperty(mBlurRadiusIndex); - } - actor.RemoveRenderer(mImpl->mRenderer); - mImpl->mRenderer.Reset(); - mBlurRadiusIndex = Property::INVALID_INDEX; } -void ColorVisual::DoCreatePropertyMap( Property::Map& map ) const +void ColorVisual::DoCreatePropertyMap(Property::Map& map) const { map.Clear(); - map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR ); - map.Insert( Toolkit::ColorVisual::Property::MIX_COLOR, mImpl->mMixColor ); - map.Insert( Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT, mRenderIfTransparent ); + map.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR); + map.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, mImpl->mMixColor); if(mImpl->mRenderer && mBlurRadiusIndex != Property::INVALID_INDEX) { @@ -155,30 +127,30 @@ void ColorVisual::DoCreatePropertyMap( Property::Map& map ) const } } -void ColorVisual::DoCreateInstancePropertyMap( Property::Map& map ) const +void ColorVisual::DoCreateInstancePropertyMap(Property::Map& map) const { // Do nothing } void ColorVisual::OnSetTransform() { - if( mImpl->mRenderer ) + if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); + mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } } -void ColorVisual::OnDoAction( const Property::Index actionId, const Property::Value& attributes ) +void ColorVisual::OnDoAction(const Property::Index actionId, const Property::Value& attributes) { // Check if action is valid for this visual type and perform action if possible - switch( actionId ) + switch(actionId) { case DevelColorVisual::Action::UPDATE_PROPERTY: { const Property::Map* map = attributes.GetMap(); - if( map ) + if(map) { - DoSetProperties( *map ); + DoSetProperties(*map); } break; } @@ -194,9 +166,9 @@ void ColorVisual::UpdateShader() } } -void ColorVisual::InitializeRenderer() +void ColorVisual::OnInitialize() { - Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); + Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); Shader shader = GetShader(); @@ -222,29 +194,29 @@ Shader ColorVisual::GetShader() Shader shader; if(!EqualsZero(mBlurRadius) || mNeedBlurRadius) { - shader = mFactoryCache.GetShader( VisualFactoryCache::COLOR_SHADER_BLUR_EDGE ); - if( !shader ) + shader = mFactoryCache.GetShader(VisualFactoryCache::COLOR_SHADER_BLUR_EDGE); + if(!shader) { - shader = Shader::New( Dali::Shader::GetVertexShaderPrefix() + SHADER_COLOR_VISUAL_BLUR_EDGE_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_COLOR_VISUAL_BLUR_EDGE_SHADER_FRAG.data() ); - mFactoryCache.SaveShader( VisualFactoryCache::COLOR_SHADER_BLUR_EDGE, shader ); + shader = Shader::New(Dali::Shader::GetVertexShaderPrefix() + SHADER_COLOR_VISUAL_BLUR_EDGE_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_COLOR_VISUAL_BLUR_EDGE_SHADER_FRAG.data()); + mFactoryCache.SaveShader(VisualFactoryCache::COLOR_SHADER_BLUR_EDGE, shader); } } - else if( !IsRoundedCornerRequired() ) + else if(!IsRoundedCornerRequired()) { - shader = mFactoryCache.GetShader( VisualFactoryCache::COLOR_SHADER ); - if( !shader ) + shader = mFactoryCache.GetShader(VisualFactoryCache::COLOR_SHADER); + if(!shader) { - shader = Shader::New( Dali::Shader::GetVertexShaderPrefix() + SHADER_COLOR_VISUAL_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_COLOR_VISUAL_SHADER_FRAG.data() ); - mFactoryCache.SaveShader( VisualFactoryCache::COLOR_SHADER, shader ); + shader = Shader::New(Dali::Shader::GetVertexShaderPrefix() + SHADER_COLOR_VISUAL_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_COLOR_VISUAL_SHADER_FRAG.data()); + mFactoryCache.SaveShader(VisualFactoryCache::COLOR_SHADER, shader); } } else { - shader = mFactoryCache.GetShader( VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER ); - if( !shader ) + shader = mFactoryCache.GetShader(VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER); + if(!shader) { - shader = Shader::New( Dali::Shader::GetVertexShaderPrefix() + SHADER_COLOR_VISUAL_ROUNDED_CORNER_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_COLOR_VISUAL_ROUNDED_CORNER_SHADER_FRAG.data() ); - mFactoryCache.SaveShader( VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER, shader ); + shader = Shader::New(Dali::Shader::GetVertexShaderPrefix() + SHADER_COLOR_VISUAL_ROUNDED_CORNER_SHADER_VERT.data(), Dali::Shader::GetFragmentShaderPrefix() + SHADER_COLOR_VISUAL_ROUNDED_CORNER_SHADER_FRAG.data()); + mFactoryCache.SaveShader(VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER, shader); } }