X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-impl.cpp;h=3d8e79ee148fdd14dcd1c3b43d868e6581105079;hb=78aefd7d5d192070894e0044581a7eec18b715c9;hp=960a9fd46072ed3f6c53fdd614689fc0c1adf9e4;hpb=1d8f7098414663609c454617858bb9ea97a8a858;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 960a9fd..3d8e79e 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) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 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. @@ -23,9 +23,11 @@ #include #include #include +#include #include //INTERNAL HEARDER +#include #include #include #include @@ -60,8 +62,8 @@ DALI_ENUM_TO_STRING_TABLE_BEGIN(VISUAL_FITTING_MODE) DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FILL) DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, OVER_FIT_KEEP_ASPECT_RATIO) DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, CENTER) - DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_WIDTH) DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_HEIGHT) + DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_WIDTH) DALI_ENUM_TO_STRING_TABLE_END(VISUAL_FITTING_MODE) /** @@ -114,6 +116,43 @@ static bool IsTypeAvailableForBorderline(Toolkit::Visual::Type type) } } +struct StringProperty +{ + const char* const name; + Property::Index index; +}; +StringProperty PROPERTY_NAME_INDEX_TABLE[] = + { + {CUSTOM_SHADER, Toolkit::Visual::Property::SHADER}, + {TRANSFORM, Toolkit::Visual::Property::TRANSFORM}, + {PREMULTIPLIED_ALPHA, Toolkit::Visual::Property::PREMULTIPLIED_ALPHA}, + {MIX_COLOR, Toolkit::Visual::Property::MIX_COLOR}, + {OPACITY, Toolkit::Visual::Property::OPACITY}, + {VISUAL_FITTING_MODE, Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE}, + {BORDERLINE_WIDTH, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH}, + {BORDERLINE_COLOR, Toolkit::DevelVisual::Property::BORDERLINE_COLOR}, + {BORDERLINE_OFFSET, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET}, + {CORNER_RADIUS, Toolkit::DevelVisual::Property::CORNER_RADIUS}, + {CORNER_RADIUS_POLICY, Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY}, +}; +const uint16_t PROPERTY_NAME_INDEX_TABLE_COUNT = sizeof(PROPERTY_NAME_INDEX_TABLE) / sizeof(PROPERTY_NAME_INDEX_TABLE[0]); + +Property::Index GetVisualPropertyIndex(Property::Key key) +{ + if(key.type == Property::Key::STRING) + { + for(auto tableId = 0u; tableId < PROPERTY_NAME_INDEX_TABLE_COUNT; ++tableId) + { + if(key == PROPERTY_NAME_INDEX_TABLE[tableId].name) + { + return PROPERTY_NAME_INDEX_TABLE[tableId].index; + break; + } + } + } + return key.indexKey; +} + } // namespace Visual::Base::Base(VisualFactoryCache& factoryCache, FittingMode fittingMode, Toolkit::Visual::Type type) @@ -135,22 +174,16 @@ void Visual::Base::Initialize() if(mImpl->mRenderer) { RegisterMixColor(); + RegisterDecoration(); - if(IsRoundedCornerRequired()) - { - 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); } + else if(IsRoundedCornerRequired()) + { + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON); + } } } @@ -178,56 +211,7 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) const Property::Key& key = pair.first; const Property::Value& value = pair.second; - Property::Key matchKey = key; - if(matchKey.type == Property::Key::STRING) - { - if(matchKey == CUSTOM_SHADER) - { - matchKey = Property::Key(Toolkit::Visual::Property::SHADER); - } - else if(matchKey == TRANSFORM) - { - matchKey = Property::Key(Toolkit::Visual::Property::TRANSFORM); - } - else if(matchKey == PREMULTIPLIED_ALPHA) - { - matchKey = Property::Key(Toolkit::Visual::Property::PREMULTIPLIED_ALPHA); - } - else if(matchKey == MIX_COLOR) - { - matchKey = Property::Key(Toolkit::Visual::Property::MIX_COLOR); - } - else if(matchKey == OPACITY) - { - matchKey = Property::Key(Toolkit::Visual::Property::OPACITY); - } - else if(matchKey == VISUAL_FITTING_MODE) - { - 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); - } - else if(matchKey == CORNER_RADIUS_POLICY) - { - matchKey = Property::Key(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY); - } - } - - switch(matchKey.indexKey) + switch(GetVisualPropertyIndex(key)) { case Toolkit::Visual::Property::SHADER: { @@ -295,62 +279,69 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) case Toolkit::DevelVisual::Property::BORDERLINE_WIDTH: { float width; - if(value.Get(width)) + if(value.Get(width) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(width))) { - mImpl->mBorderlineWidth = width; + mImpl->SetBorderlineWidth(width); } - if(mImpl->mBorderlineWidthIndex != Property::INVALID_INDEX) - { - mImpl->mRenderer.SetProperty(mImpl->mBorderlineWidthIndex, mImpl->mBorderlineWidth); - } - else if(DALI_UNLIKELY(mImpl->mRenderer && IsBorderlineRequired())) + if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType))) { // Unusual case. SetProperty called after OnInitialize(). // Assume that DoAction call UPDATE_PROPERTY. - // We must regist properies into renderer, and update shader. + DownCast(mImpl->mRenderer).RegisterBorderlineUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth()); - // 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); + // Check whether we must update shader. + if(!mImpl->mAlwaysUsingBorderline && IsBorderlineRequired()) + { + // Required to change shader mean, we didn't setup BORDERLINE_COLOR and BORDERLINE_OFFSET into mRenderer before. Set property now. + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor()); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset()); - // Make Blend mode ON_WITHOUT_CULL for transparent mix color. - mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL); + // 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 the shader must not be occured many times. we always have to use borderline feature. + mImpl->mAlwaysUsingBorderline = true; - // Change shader - needUpdateShader = true; + // Change shader + if(!mImpl->mCustomShader) + { + needUpdateShader = true; + } + } } break; } case Toolkit::DevelVisual::Property::BORDERLINE_COLOR: { Vector4 color; - if(value.Get(color)) + if(value.Get(color) && (mImpl->mDecorationData != nullptr || color != Vector4::ZERO)) { - mImpl->mBorderlineColor = color; + mImpl->SetBorderlineColor(color); } - if(mImpl->mBorderlineColorIndex != Property::INVALID_INDEX) + if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType))) { - mImpl->mRenderer.SetProperty(mImpl->mBorderlineColorIndex, mImpl->mBorderlineColor); + // Unusual case. SetProperty called after OnInitialize(). + // Assume that DoAction call UPDATE_PROPERTY. + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor()); } break; } case Toolkit::DevelVisual::Property::BORDERLINE_OFFSET: { float offset; - if(value.Get(offset)) + if(value.Get(offset) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(offset))) { - mImpl->mBorderlineOffset = offset; + mImpl->SetBorderlineOffset(offset); } - if(mImpl->mBorderlineOffsetIndex != Property::INVALID_INDEX) + if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType))) { - mImpl->mRenderer.SetProperty(mImpl->mBorderlineOffsetIndex, mImpl->mBorderlineOffset); + // Unusual case. SetProperty called after OnInitialize(). + // Assume that DoAction call UPDATE_PROPERTY. + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset()); } break; } @@ -362,9 +353,9 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) // Each values mean the radius of // (top-left, top-right, bottom-right, bottom-left) Vector4 radius; - if(value.Get(radius)) + if(value.Get(radius) && (mImpl->mDecorationData != nullptr || radius != Vector4::ZERO)) { - mImpl->mCornerRadius = radius; + mImpl->SetCornerRadius(radius); } } else @@ -372,38 +363,42 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) // If CORNER_RADIUS Property is float, // Every corner radius have same value float radius; - if(value.Get(radius)) + if(value.Get(radius) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(radius))) { - mImpl->mCornerRadius = Vector4(radius, radius, radius, radius); + mImpl->SetCornerRadius(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())) + if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForCornerRadius(mImpl->mType))) { // Unusual case. SetProperty called after OnInitialize(). // Assume that DoAction call UPDATE_PROPERTY. - // We must regist properies into renderer, and update shader. + DownCast(mImpl->mRenderer).RegisterCornerRadiusUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius()); - // 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); + // Check whether we must update shader. + if(!mImpl->mAlwaysUsingCornerRadius && IsRoundedCornerRequired()) + { + // Required to change shader mean, we didn't setup CORNER_RADIUS_POLICY into mRenderer before. Set property now. + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast(mImpl->GetCornerRadiusPolicy())); - // Change the shader must not be occured many times. we always have to use corner radius feature. - mImpl->mAlwaysUsingCornerRadius = true; + // 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); - } + 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; + // Change shader + if(!mImpl->mCustomShader) + { + needUpdateShader = true; + } + } } + break; } case Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY: @@ -416,15 +411,12 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) case Toolkit::Visual::Transform::Policy::RELATIVE: case Toolkit::Visual::Transform::Policy::ABSOLUTE: { - mImpl->mCornerRadiusPolicy = policy; - if(DALI_UNLIKELY(mImpl->mRenderer && mImpl->mCornerRadiusIndex != Property::INVALID_INDEX)) + mImpl->SetCornerRadiusPolicy(policy); + if(DALI_UNLIKELY(mImpl->mRenderer)) { // 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); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast(mImpl->GetCornerRadiusPolicy())); } break; } @@ -477,7 +469,7 @@ float Visual::Base::GetHeightForWidth(float width) float aspectCorrectedHeight = 0.f; Vector2 naturalSize; GetNaturalSize(naturalSize); - if(naturalSize.width) + if(naturalSize.width > 0.0f) { aspectCorrectedHeight = naturalSize.height * width / naturalSize.width; } @@ -520,6 +512,11 @@ void Visual::Base::DoAction(const Property::Index actionId, const Property::Valu } } +void Visual::Base::DoActionExtension(const Dali::Property::Index actionId, const Dali::Any attributes) +{ + OnDoActionExtension(actionId, attributes); +} + void Visual::Base::SetDepthIndex(int index) { mImpl->mDepthIndex = index; @@ -572,21 +569,15 @@ void Visual::Base::CreatePropertyMap(Property::Map& map) const mImpl->mTransform.mOffset = mImpl->mRenderer.GetProperty(VisualRenderer::Property::TRANSFORM_OFFSET); mImpl->mTransform.mSize = mImpl->mRenderer.GetProperty(VisualRenderer::Property::TRANSFORM_SIZE); - if(mImpl->mCornerRadiusIndex != Property::INVALID_INDEX) - { - 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) + if(IsRoundedCornerRequired()) { - mImpl->mBorderlineColor = mImpl->mRenderer.GetProperty(mImpl->mBorderlineColorIndex); + mImpl->SetCornerRadius(mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS)); } - if(mImpl->mBorderlineOffsetIndex != Property::INVALID_INDEX) + if(IsBorderlineRequired()) { - mImpl->mBorderlineOffset = mImpl->mRenderer.GetProperty(mImpl->mBorderlineOffsetIndex); + mImpl->SetBorderlineWidth(mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH)); + mImpl->SetBorderlineColor(mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR)); + mImpl->SetBorderlineOffset(mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET)); } } @@ -615,15 +606,15 @@ void Visual::Base::CreatePropertyMap(Property::Map& map) const if(IsTypeAvailableForBorderline(mImpl->mType)) { - 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::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth()); + map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor()); + map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset()); } if(IsTypeAvailableForCornerRadius(mImpl->mType)) { - map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, mImpl->mCornerRadius); - map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, static_cast(mImpl->mCornerRadiusPolicy)); + map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, mImpl->GetCornerRadius()); + map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, mImpl->GetCornerRadiusPolicy()); } } @@ -675,12 +666,21 @@ bool Visual::Base::IsRoundedCornerRequired() const // If VisualType doesn't support rounded corner, always return false. if(IsTypeAvailableForCornerRadius(mImpl->mType)) { - if(mImpl->mRenderer && mImpl->mCornerRadiusIndex != Property::INVALID_INDEX) + if(mImpl->mRenderer) { // Update values from Renderer - mImpl->mCornerRadius = mImpl->mRenderer.GetProperty(mImpl->mCornerRadiusIndex); + Property::Value value = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS); + + Vector4 retValue = Vector4::ZERO; + if(value.Get(retValue)) + { + if(mImpl->mDecorationData != nullptr || retValue != Vector4::ZERO) + { + mImpl->SetCornerRadius(retValue); + } + } } - return !(mImpl->mCornerRadius == Vector4::ZERO) || mImpl->mAlwaysUsingCornerRadius; + return mImpl->mAlwaysUsingCornerRadius || !(mImpl->GetCornerRadius() == Vector4::ZERO); } return false; } @@ -690,12 +690,21 @@ 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) + if(mImpl->mRenderer) { // Update values from Renderer - mImpl->mBorderlineWidth = mImpl->mRenderer.GetProperty(mImpl->mBorderlineWidthIndex); + Property::Value value = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH); + + float retValue = 0.0f; + if(value.Get(retValue)) + { + if(mImpl->mDecorationData != nullptr || !Dali::EqualsZero(retValue)) + { + mImpl->SetBorderlineWidth(retValue); + } + } } - return !EqualsZero(mImpl->mBorderlineWidth) || mImpl->mAlwaysUsingBorderline; + return mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->GetBorderlineWidth()); } return false; } @@ -705,6 +714,11 @@ void Visual::Base::OnDoAction(const Property::Index actionId, const Property::Va // May be overriden by derived class } +void Visual::Base::OnDoActionExtension(const Property::Index actionId, const Dali::Any attributes) +{ + // May be overriden by derived class +} + void Visual::Base::RegisterMixColor() { if(mImpl->mRenderer) @@ -722,6 +736,32 @@ void Visual::Base::RegisterMixColor() } } +void Visual::Base::RegisterDecoration() +{ + if(mImpl->mRenderer) + { + if(IsTypeAvailableForCornerRadius(mImpl->mType)) + { + if(mImpl->mAlwaysUsingCornerRadius || !(mImpl->GetCornerRadius() == Vector4::ZERO)) + { + DownCast(mImpl->mRenderer).RegisterCornerRadiusUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius()); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast(mImpl->GetCornerRadiusPolicy())); + } + } + if(IsTypeAvailableForBorderline(mImpl->mType)) + { + if(mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->GetBorderlineWidth())) + { + DownCast(mImpl->mRenderer).RegisterBorderlineUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth()); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor()); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset()); + } + } + } +} + void Visual::Base::SetMixColor(const Vector4& color) { mImpl->mMixColor = color; @@ -920,6 +960,22 @@ Property::Index Visual::Base::GetPropertyIndex(Property::Key key) { return VisualRenderer::Property::VISUAL_PRE_MULTIPLIED_ALPHA; } + case Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS: + { + return DecoratedVisualRenderer::Property::CORNER_RADIUS; + } + case Dali::Toolkit::DevelVisual::Property::BORDERLINE_WIDTH: + { + return DecoratedVisualRenderer::Property::BORDERLINE_WIDTH; + } + case Dali::Toolkit::DevelVisual::Property::BORDERLINE_COLOR: + { + return DecoratedVisualRenderer::Property::BORDERLINE_COLOR; + } + case Dali::Toolkit::DevelVisual::Property::BORDERLINE_OFFSET: + { + return DecoratedVisualRenderer::Property::BORDERLINE_OFFSET; + } } Property::Index index = mImpl->mRenderer.GetPropertyIndex(key); @@ -996,6 +1052,7 @@ void Visual::Base::AnimateProperty( Internal::TransitionData::Animator& animator) { #if defined(DEBUG_ENABLED) + if(gVisualBaseLogFilter->IsEnabledFor(Debug::General)) { std::ostringstream oss; oss << "Visual::Base::AnimateProperty(Visual:" << mImpl->mName << " Property:" << animator.propertyKey << " Target: " << animator.targetValue << std::endl; @@ -1121,9 +1178,9 @@ Dali::Property Visual::Base::GetPropertyObject(Dali::Property::Key key) return Dali::Property(handle, Property::INVALID_INDEX); } - // Default animatable properties from VisualRenderer switch(GetIntKey(key)) { + // Default animatable properties from VisualRenderer case Toolkit::Visual::Property::MIX_COLOR: { return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR); @@ -1140,85 +1197,95 @@ Dali::Property Visual::Base::GetPropertyObject(Dali::Property::Key key) { return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::TRANSFORM_SIZE); } - default: + + // Default animatable properties from DecoratedVisualRenderer + case Toolkit::DevelVisual::Property::CORNER_RADIUS: { - if(key.type == Property::Key::INDEX && - ((mImpl->mType == Toolkit::Visual::COLOR && key.indexKey == ColorVisual::Property::MIX_COLOR) || - (mImpl->mType == Toolkit::Visual::PRIMITIVE && key.indexKey == PrimitiveVisual::Property::MIX_COLOR))) + if(IsTypeAvailableForCornerRadius(mImpl->mType)) { - return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR); + const bool updateShader = !mImpl->mCustomShader && !IsRoundedCornerRequired(); + + // CornerRadius is animated now. we always have to use corner radius feature. + mImpl->mAlwaysUsingCornerRadius = true; + + if(updateShader) + { + // Update each values to renderer + DownCast(mImpl->mRenderer).RegisterCornerRadiusUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius()); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast(mImpl->GetCornerRadiusPolicy())); + + // Change shader + UpdateShader(); + } + 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); + } + return Dali::Property(mImpl->mRenderer, DecoratedVisualRenderer::Property::CORNER_RADIUS); } + break; } - } - - // Other cases - Property::Index index = GetPropertyIndex(key); - if(index == Property::INVALID_INDEX) - { - 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))) + case Toolkit::DevelVisual::Property::BORDERLINE_WIDTH: + case Toolkit::DevelVisual::Property::BORDERLINE_COLOR: + case Toolkit::DevelVisual::Property::BORDERLINE_OFFSET: { - mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL); + if(IsTypeAvailableForBorderline(mImpl->mType)) + { + const bool updateShader = !mImpl->mCustomShader && !IsBorderlineRequired(); - // 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; - // Borderline is animated now. we always have to use borderline feature. - mImpl->mAlwaysUsingBorderline = true; + if(updateShader) + { + // Update each values to renderer + DownCast(mImpl->mRenderer).RegisterBorderlineUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth()); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor()); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset()); - index = mImpl->mRenderer.GetPropertyIndex(key); + // Change shader + UpdateShader(); + } + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL); - // Change shader - UpdateShader(); + return Dali::Property(mImpl->mRenderer, GetPropertyIndex(key)); + } + break; } - 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))) + default: { - // Register CORNER_RADIUS property - mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterUniqueProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius); - mImpl->mRenderer.RegisterUniqueProperty(CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy); - - // CornerRadius is animated now. we always have to use corner radius feature. - mImpl->mAlwaysUsingCornerRadius = true; - - if(!IsBorderlineRequired()) + // Special case for MIX_COLOR + if(key.type == Property::Key::INDEX && + ((mImpl->mType == Toolkit::Visual::COLOR && key.indexKey == ColorVisual::Property::MIX_COLOR) || + (mImpl->mType == Toolkit::Visual::PRIMITIVE && key.indexKey == PrimitiveVisual::Property::MIX_COLOR))) { - // 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); + return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR); } - index = mImpl->mCornerRadiusIndex; - - // Change shader - UpdateShader(); - } - else - { - // We can't find the property in the base class. - // Request to child class - return OnGetPropertyObject(key); + // Special case for BLUR_RADIUS + if(mImpl->mType == Toolkit::Visual::COLOR && + ((key.type == Property::Key::INDEX && key.indexKey == DevelColorVisual::Property::BLUR_RADIUS) || + (key.type == Property::Key::STRING && key.stringKey == BLUR_RADIUS_NAME))) + { + // Request to color-visual class + return OnGetPropertyObject(key); + } } } - else + + // If it is not VisualRenderer property, check registered Renderer and Shader property. + Property::Index index = GetPropertyIndex(key); + if(index != Property::INVALID_INDEX) { - if(index == mImpl->mBorderlineWidthIndex || - index == mImpl->mBorderlineColorIndex || - index == mImpl->mBorderlineOffsetIndex) - { - // Borderline is animated now. we always have to use borderline feature. - mImpl->mAlwaysUsingBorderline = true; - } - if(index == mImpl->mCornerRadiusIndex) - { - // CornerRadius is animated now. we always have to use corner radius feature. - mImpl->mAlwaysUsingCornerRadius = true; - } + return Dali::Property(mImpl->mRenderer, index); } - return Dali::Property(mImpl->mRenderer, index); + // We can't find the property in the base class. + // Request to child class + return OnGetPropertyObject(key); } } // namespace Internal