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=ab8f434d191f328fbcd534a0a151dd24cc4316a1;hp=960a9fd46072ed3f6c53fdd614689fc0c1adf9e4;hb=5a936aac073676657d48db5c42e5d2ad3f5cac9f;hpb=3b814735ce65594bfe644190ed83c381edb66c88 diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 960a9fd..ab8f434 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include //INTERNAL HEARDER @@ -135,22 +136,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); + } } } @@ -300,29 +295,28 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) mImpl->mBorderlineWidth = 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)) { // 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->mBorderlineWidth); - // 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); + // Check whether we must update shader. + if(!mImpl->mAlwaysUsingBorderline && IsBorderlineRequired()) + { + // 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; } @@ -334,9 +328,11 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) mImpl->mBorderlineColor = color; } - if(mImpl->mBorderlineColorIndex != Property::INVALID_INDEX) + if(DALI_UNLIKELY(mImpl->mRenderer)) { - 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->mBorderlineColor); } break; } @@ -348,9 +344,11 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) mImpl->mBorderlineOffset = offset; } - if(mImpl->mBorderlineOffsetIndex != Property::INVALID_INDEX) + if(DALI_UNLIKELY(mImpl->mRenderer)) { - 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->mBorderlineOffset); } break; } @@ -378,32 +376,33 @@ void Visual::Base::SetProperties(const Property::Map& propertyMap) } } - 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)) { // 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->mCornerRadius); - // 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()) + { + // 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 + if(!mImpl->mCustomShader) + { + needUpdateShader = true; + } } - - // Change shader - needUpdateShader = true; } + break; } case Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY: @@ -417,14 +416,11 @@ 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)) + 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, mImpl->mCornerRadiusPolicy); } break; } @@ -572,21 +568,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) + if(IsTypeAvailableForCornerRadius(mImpl->mType)) { - mImpl->mBorderlineWidth = mImpl->mRenderer.GetProperty(mImpl->mBorderlineWidthIndex); + mImpl->mCornerRadius = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS); } - if(mImpl->mBorderlineColorIndex != Property::INVALID_INDEX) + if(IsTypeAvailableForBorderline(mImpl->mType)) { - mImpl->mBorderlineColor = mImpl->mRenderer.GetProperty(mImpl->mBorderlineColorIndex); - } - if(mImpl->mBorderlineOffsetIndex != Property::INVALID_INDEX) - { - mImpl->mBorderlineOffset = mImpl->mRenderer.GetProperty(mImpl->mBorderlineOffsetIndex); + mImpl->mBorderlineWidth = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH); + mImpl->mBorderlineColor = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR); + mImpl->mBorderlineOffset = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET); } } @@ -675,12 +665,13 @@ 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); + value.Get(mImpl->mCornerRadius); } - return !(mImpl->mCornerRadius == Vector4::ZERO) || mImpl->mAlwaysUsingCornerRadius; + return mImpl->mAlwaysUsingCornerRadius || !(mImpl->mCornerRadius == Vector4::ZERO); } return false; } @@ -690,12 +681,13 @@ 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); + value.Get(mImpl->mBorderlineWidth); } - return !EqualsZero(mImpl->mBorderlineWidth) || mImpl->mAlwaysUsingBorderline; + return mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->mBorderlineWidth); } return false; } @@ -722,6 +714,32 @@ void Visual::Base::RegisterMixColor() } } +void Visual::Base::RegisterDecoration() +{ + if(mImpl->mRenderer) + { + if(IsTypeAvailableForCornerRadius(mImpl->mType)) + { + if(mImpl->mAlwaysUsingCornerRadius || !(mImpl->mCornerRadius == Vector4::ZERO)) + { + DownCast(mImpl->mRenderer).RegisterCornerRadiusUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->mCornerRadius); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy); + } + } + if(IsTypeAvailableForBorderline(mImpl->mType)) + { + if(mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->mBorderlineWidth)) + { + DownCast(mImpl->mRenderer).RegisterBorderlineUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->mBorderlineWidth); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->mBorderlineColor); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->mBorderlineOffset); + } + } + } +} + void Visual::Base::SetMixColor(const Vector4& color) { mImpl->mMixColor = color; @@ -920,6 +938,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); @@ -1121,9 +1155,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 +1174,79 @@ Dali::Property Visual::Base::GetPropertyObject(Dali::Property::Key key) { return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::TRANSFORM_SIZE); } - default: - { - 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))) - { - return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR); - } - } - } - // 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))) + // Default animatable properties from DecoratedVisualRenderer + case Toolkit::DevelVisual::Property::CORNER_RADIUS: { - 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); + if(IsTypeAvailableForCornerRadius(mImpl->mType)) + { + const bool updateShader = !mImpl->mCustomShader && !IsRoundedCornerRequired(); - // Borderline is animated now. we always have to use borderline feature. - mImpl->mAlwaysUsingBorderline = true; + // CornerRadius is animated now. we always have to use corner radius feature. + mImpl->mAlwaysUsingCornerRadius = true; - index = mImpl->mRenderer.GetPropertyIndex(key); + if(updateShader) + { + // Update each values to renderer + DownCast(mImpl->mRenderer).RegisterCornerRadiusUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->mCornerRadius); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy); - // Change shader - UpdateShader(); + // 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; } - 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))) + case Toolkit::DevelVisual::Property::BORDERLINE_WIDTH: + case Toolkit::DevelVisual::Property::BORDERLINE_COLOR: + case Toolkit::DevelVisual::Property::BORDERLINE_OFFSET: { - // 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); + if(IsTypeAvailableForBorderline(mImpl->mType)) + { + const bool updateShader = !mImpl->mCustomShader && !IsBorderlineRequired(); - // CornerRadius is animated now. we always have to use corner radius feature. - mImpl->mAlwaysUsingCornerRadius = true; + // Borderline is animated now. we always have to use borderline feature. + mImpl->mAlwaysUsingBorderline = 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(updateShader) + { + // Update each values to renderer + DownCast(mImpl->mRenderer).RegisterBorderlineUniform(); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->mBorderlineWidth); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->mBorderlineColor); + mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->mBorderlineOffset); - index = mImpl->mCornerRadiusIndex; + // Change shader + UpdateShader(); + } + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL); - // Change shader - UpdateShader(); - } - else - { - // We can't find the property in the base class. - // Request to child class - return OnGetPropertyObject(key); - } - } - else - { - if(index == mImpl->mBorderlineWidthIndex || - index == mImpl->mBorderlineColorIndex || - index == mImpl->mBorderlineOffsetIndex) - { - // Borderline is animated now. we always have to use borderline feature. - mImpl->mAlwaysUsingBorderline = true; + return Dali::Property(mImpl->mRenderer, GetPropertyIndex(key)); + } + break; } - if(index == mImpl->mCornerRadiusIndex) + // Special case for MIX_COLOR + default: { - // CornerRadius is animated now. we always have to use corner radius feature. - mImpl->mAlwaysUsingCornerRadius = true; + 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))) + { + return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR); + } } } - 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