X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-impl.cpp;h=288ed34951a748a52392a6fd73b67ddbcb079134;hp=331eaf5661c26cac3a03413a8c81057119881e32;hb=1d71a8f7d7abd7729aa645ad062e530958097214;hpb=b8da2e53925b9abb9fa362560069e8ca4aa62f81 diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 331eaf5..288ed34 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -25,6 +25,7 @@ #include //INTERNAL HEARDER +#include #include #include #include @@ -60,6 +61,56 @@ DALI_ENUM_TO_STRING_TABLE_BEGIN(VISUAL_FITTING_MODE) DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_HEIGHT) DALI_ENUM_TO_STRING_TABLE_END(VISUAL_FITTING_MODE) +/** + * @brief Check whether this visual type can use corner radius feature or not. + * @param type VisualType that want to checkup + * @return true if type can use corner radius feature. + */ +static bool IsTypeAvailableForCornerRadius(Toolkit::Visual::Type type) +{ + switch(static_cast(type)) + { + case Toolkit::Visual::Type::COLOR: + case Toolkit::Visual::Type::GRADIENT: + case Toolkit::Visual::Type::IMAGE: + case Toolkit::Visual::Type::SVG: + case Toolkit::Visual::Type::ANIMATED_IMAGE: + case Toolkit::DevelVisual::Type::ANIMATED_VECTOR_IMAGE: + { + return true; + } + default: + { + return false; + } + } +} + +/** + * @brief Check whether this visual type can use borderline feature or not. + * @param type VisualType that want to checkup + * @return true if type can use borderline feature. + */ +static bool IsTypeAvailableForBorderline(Toolkit::Visual::Type type) +{ + switch(static_cast(type)) + { + case Toolkit::Visual::Type::COLOR: + case Toolkit::Visual::Type::GRADIENT: + case Toolkit::Visual::Type::IMAGE: + case Toolkit::Visual::Type::SVG: + case Toolkit::Visual::Type::ANIMATED_IMAGE: + case Toolkit::DevelVisual::Type::ANIMATED_VECTOR_IMAGE: + { + return true; + } + default: + { + return false; + } + } +} + } // namespace Visual::Base::Base(VisualFactoryCache& factoryCache, FittingMode fittingMode, Toolkit::Visual::Type type) @@ -84,11 +135,19 @@ void Visual::Base::Initialize() if(IsRoundedCornerRequired()) { - mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius); - mImpl->mRenderer.RegisterProperty(CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy); + mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius); + mImpl->mRenderer.RegisterUniqueProperty(CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy); mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON); } + if(IsBorderlineRequired()) + { + mImpl->mBorderlineWidthIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::BORDERLINE_WIDTH, BORDERLINE_WIDTH, mImpl->mBorderlineWidth); + mImpl->mBorderlineColorIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::BORDERLINE_COLOR, BORDERLINE_COLOR, mImpl->mBorderlineColor); + mImpl->mBorderlineOffsetIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::BORDERLINE_OFFSET, BORDERLINE_OFFSET, mImpl->mBorderlineOffset); + + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL); + } } } @@ -109,6 +168,7 @@ void Visual::Base::SetCustomShader(const Property::Map& shaderMap) void Visual::Base::SetProperties(const Property::Map& propertyMap) { + bool needUpdateShader = false; for(size_t i = 0; i < propertyMap.Count(); ++i) { const KeyValuePair& pair = propertyMap.GetKeyValue(i); @@ -142,6 +202,18 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) { matchKey = Property::Key(Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE); } + else if(matchKey == BORDERLINE_WIDTH) + { + matchKey = Property::Key(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH); + } + else if(matchKey == BORDERLINE_COLOR) + { + matchKey = Property::Key(Toolkit::DevelVisual::Property::BORDERLINE_COLOR); + } + else if(matchKey == BORDERLINE_OFFSET) + { + matchKey = Property::Key(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET); + } else if(matchKey == CORNER_RADIUS) { matchKey = Property::Key(Toolkit::DevelVisual::Property::CORNER_RADIUS); @@ -217,12 +289,117 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) value, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT, mImpl->mFittingMode); break; } + case Toolkit::DevelVisual::Property::BORDERLINE_WIDTH: + { + float width; + if(value.Get(width)) + { + mImpl->mBorderlineWidth = width; + } + + if(mImpl->mBorderlineWidthIndex != Property::INVALID_INDEX) + { + mImpl->mRenderer.SetProperty(mImpl->mBorderlineWidthIndex, mImpl->mBorderlineWidth); + } + else if(DALI_UNLIKELY(mImpl->mRenderer && IsBorderlineRequired())) + { + // Unusual case. SetProperty called after OnInitialize(). + // Assume that DoAction call UPDATE_PROPERTY. + // We must regist properies into renderer, and update shader. + + // Borderline added by this action. Register property to renderer. + mImpl->mBorderlineWidthIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::BORDERLINE_WIDTH, BORDERLINE_WIDTH, mImpl->mBorderlineWidth); + mImpl->mBorderlineColorIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::BORDERLINE_COLOR, BORDERLINE_COLOR, mImpl->mBorderlineColor); + mImpl->mBorderlineOffsetIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::BORDERLINE_OFFSET, BORDERLINE_OFFSET, mImpl->mBorderlineOffset); + + // Make Blend mode ON_WITHOUT_CULL for transparent mix color. + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL); + + // Change the shader must not be occured many times. we always have to use borderline feature. + mImpl->mAlwaysUsingBorderline = true; + + // Change shader + needUpdateShader = true; + } + break; + } + case Toolkit::DevelVisual::Property::BORDERLINE_COLOR: + { + Vector4 color; + if(value.Get(color)) + { + mImpl->mBorderlineColor = color; + } + + if(mImpl->mBorderlineColorIndex != Property::INVALID_INDEX) + { + mImpl->mRenderer.SetProperty(mImpl->mBorderlineColorIndex, mImpl->mBorderlineColor); + } + break; + } + case Toolkit::DevelVisual::Property::BORDERLINE_OFFSET: + { + float offset; + if(value.Get(offset)) + { + mImpl->mBorderlineOffset = offset; + } + + if(mImpl->mBorderlineOffsetIndex != Property::INVALID_INDEX) + { + mImpl->mRenderer.SetProperty(mImpl->mBorderlineOffsetIndex, mImpl->mBorderlineOffset); + } + break; + } case Toolkit::DevelVisual::Property::CORNER_RADIUS: { - float radius; - if(value.Get(radius)) + if(value.GetType() == Property::VECTOR4) + { + // If CORNER_RADIUS Property is Vector4, + // Each values mean the radius of + // (top-left, top-right, bottom-right, bottom-left) + Vector4 radius; + if(value.Get(radius)) + { + mImpl->mCornerRadius = radius; + } + } + else { - mImpl->mCornerRadius = radius; + // If CORNER_RADIUS Property is float, + // Every corner radius have same value + float radius; + if(value.Get(radius)) + { + mImpl->mCornerRadius = Vector4(radius, radius, radius, radius); + } + } + + if(mImpl->mCornerRadiusIndex != Property::INVALID_INDEX) + { + mImpl->mRenderer.SetProperty(mImpl->mCornerRadiusIndex, mImpl->mCornerRadius); + } + else if(DALI_UNLIKELY(mImpl->mRenderer && IsRoundedCornerRequired())) + { + // Unusual case. SetProperty called after OnInitialize(). + // Assume that DoAction call UPDATE_PROPERTY. + // We must regist properies into renderer, and update shader. + + // CornerRadius added by this action. Regist property to renderer. + mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius); + mImpl->mRenderer.RegisterUniqueProperty(CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy); + + // Change the shader must not be occured many times. we always have to use corner radius feature. + mImpl->mAlwaysUsingCornerRadius = true; + + if(!IsBorderlineRequired()) + { + // If IsBorderlineRequired is true, BLEND_MODE is already BlendMode::ON_WITHOUT_CULL. So we don't overwrite it. + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON); + } + + // Change shader + needUpdateShader = true; } break; } @@ -237,6 +414,15 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) case Toolkit::Visual::Transform::Policy::ABSOLUTE: { mImpl->mCornerRadiusPolicy = policy; + if(DALI_UNLIKELY(mImpl->mRenderer && mImpl->mCornerRadiusIndex != Property::INVALID_INDEX)) + { + // Unusual case. SetProperty called after OnInitialize(). + // Assume that DoAction call UPDATE_PROPERTY. + // We must update properies result into renderer + // Note : mImpl->mCornerRadiusIndex is not INVALID_INDEX. + // So CornerRadiusPolicy property is already registed. + mImpl->mRenderer.SetProperty(mImpl->mRenderer.GetPropertyIndex(CORNER_RADIUS_POLICY), mImpl->mCornerRadiusPolicy); + } break; } default: @@ -252,6 +438,11 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) } DoSetProperties(propertyMap); + + if(DALI_UNLIKELY(needUpdateShader)) + { + UpdateShader(); + } } void Visual::Base::SetTransformAndSize(const Property::Map& transform, Size controlSize) @@ -310,6 +501,20 @@ void Visual::Base::GetNaturalSize(Vector2& naturalSize) void Visual::Base::DoAction(const Property::Index actionId, const Property::Value attributes) { OnDoAction(actionId, attributes); + + // Check if action is valid for this visual type and perform action if possible + switch(actionId) + { + case DevelVisual::Action::UPDATE_PROPERTY: + { + const Property::Map* map = attributes.GetMap(); + if(map) + { + SetProperties(*map); + } + break; + } + } } void Visual::Base::SetDepthIndex(int index) @@ -370,7 +575,19 @@ void Visual::Base::CreatePropertyMap(Property::Map& map) const } if(mImpl->mCornerRadiusIndex != Property::INVALID_INDEX) { - mImpl->mCornerRadius = mImpl->mRenderer.GetProperty(mImpl->mCornerRadiusIndex); + mImpl->mCornerRadius = mImpl->mRenderer.GetProperty(mImpl->mCornerRadiusIndex); + } + if(mImpl->mBorderlineWidthIndex != Property::INVALID_INDEX) + { + mImpl->mBorderlineWidth = mImpl->mRenderer.GetProperty(mImpl->mBorderlineWidthIndex); + } + if(mImpl->mBorderlineColorIndex != Property::INVALID_INDEX) + { + mImpl->mBorderlineColor = mImpl->mRenderer.GetProperty(mImpl->mBorderlineColorIndex); + } + if(mImpl->mBorderlineOffsetIndex != Property::INVALID_INDEX) + { + mImpl->mBorderlineOffset = mImpl->mRenderer.GetProperty(mImpl->mBorderlineOffsetIndex); } } @@ -397,6 +614,10 @@ void Visual::Base::CreatePropertyMap(Property::Map& map) const mImpl->mFittingMode, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT); map.Insert(Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE, fittingModeString); + map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, mImpl->mBorderlineWidth); + map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, mImpl->mBorderlineColor); + map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, mImpl->mBorderlineOffset); + map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, mImpl->mCornerRadius); map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, static_cast(mImpl->mCornerRadiusPolicy)); } @@ -446,12 +667,32 @@ bool Visual::Base::IsOnScene() const bool Visual::Base::IsRoundedCornerRequired() const { - if(mImpl->mRenderer && mImpl->mCornerRadiusIndex != Property::INVALID_INDEX) + // If VisualType doesn't support rounded corner, always return false. + if(IsTypeAvailableForCornerRadius(mImpl->mType)) { - // Update values from Renderer - mImpl->mCornerRadius = mImpl->mRenderer.GetProperty(mImpl->mCornerRadiusIndex); + if(mImpl->mRenderer && mImpl->mCornerRadiusIndex != Property::INVALID_INDEX) + { + // Update values from Renderer + mImpl->mCornerRadius = mImpl->mRenderer.GetProperty(mImpl->mCornerRadiusIndex); + } + return !(mImpl->mCornerRadius == Vector4::ZERO) || mImpl->mAlwaysUsingCornerRadius; } - return !EqualsZero(mImpl->mCornerRadius) || mImpl->mNeedCornerRadius; + return false; +} + +bool Visual::Base::IsBorderlineRequired() const +{ + // If VisualType doesn't support borderline, always return false. + if(IsTypeAvailableForBorderline(mImpl->mType)) + { + if(mImpl->mRenderer && mImpl->mBorderlineWidthIndex != Property::INVALID_INDEX) + { + // Update values from Renderer + mImpl->mBorderlineWidth = mImpl->mRenderer.GetProperty(mImpl->mBorderlineWidthIndex); + } + return !EqualsZero(mImpl->mBorderlineWidth) || mImpl->mAlwaysUsingBorderline; + } + return false; } void Visual::Base::OnDoAction(const Property::Index actionId, const Property::Value& attributes) @@ -465,7 +706,7 @@ void Visual::Base::RegisterMixColor() // (Color and Primitive visuals will register their own and save to this index) if(mImpl->mMixColorIndex == Property::INVALID_INDEX) { - mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty( + mImpl->mMixColorIndex = mImpl->mRenderer.RegisterUniqueProperty( Toolkit::Visual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor)); @@ -589,7 +830,9 @@ Property::Index Visual::Base::GetPropertyIndex(Property::Key key) // Leave keyIndex as INVALID_KEY - it can still be registered against the string key. } Property::Value value = shader.GetProperty(index); - index = mImpl->mRenderer.RegisterProperty(keyIndex, keyName, value); + + // We already know that mRenderer didn't have property. So we can assume that it is unique. + index = mImpl->mRenderer.RegisterUniqueProperty(keyIndex, keyName, value); } } return index; @@ -808,16 +1051,42 @@ Dali::Property Visual::Base::GetPropertyObject(Dali::Property::Key key) Property::Index index = GetPropertyIndex(key); if(index == Property::INVALID_INDEX) { - if((key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::CORNER_RADIUS) || (key.type == Property::Key::STRING && key.stringKey == CORNER_RADIUS)) + if(IsTypeAvailableForBorderline(mImpl->mType) && + ((key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::BORDERLINE_WIDTH) || (key.type == Property::Key::STRING && key.stringKey == BORDERLINE_WIDTH) || + (key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::BORDERLINE_COLOR) || (key.type == Property::Key::STRING && key.stringKey == BORDERLINE_COLOR) || + (key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::BORDERLINE_OFFSET) || (key.type == Property::Key::STRING && key.stringKey == BORDERLINE_OFFSET))) + { + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL); + + // Register borderline properties + mImpl->mBorderlineWidthIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::BORDERLINE_WIDTH, BORDERLINE_WIDTH, mImpl->mBorderlineWidth); + mImpl->mBorderlineColorIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::BORDERLINE_COLOR, BORDERLINE_COLOR, mImpl->mBorderlineColor); + mImpl->mBorderlineOffsetIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::BORDERLINE_OFFSET, BORDERLINE_OFFSET, mImpl->mBorderlineOffset); + + // Borderline is animated now. we always have to use borderline feature. + mImpl->mAlwaysUsingBorderline = true; + + index = mImpl->mRenderer.GetPropertyIndex(key); + + // Change shader + UpdateShader(); + } + else if(IsTypeAvailableForCornerRadius(mImpl->mType) && ((key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::CORNER_RADIUS) || (key.type == Property::Key::STRING && key.stringKey == CORNER_RADIUS))) { // Register CORNER_RADIUS property - mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius); - mImpl->mRenderer.RegisterProperty(CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy); + mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius); + mImpl->mRenderer.RegisterUniqueProperty(CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy); - mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON); + // CornerRadius is animated now. we always have to use corner radius feature. + mImpl->mAlwaysUsingCornerRadius = true; + + if(!IsBorderlineRequired()) + { + // If IsBorderlineRequired is true, BLEND_MODE is already BlendMode::ON_WITHOUT_CULL. So we don't overwrite it. + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON); + } - index = mImpl->mCornerRadiusIndex; - mImpl->mNeedCornerRadius = true; + index = mImpl->mCornerRadiusIndex; // Change shader UpdateShader();