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=748bcec94ff372942137fedc82180eb13a564874;hp=1ae64111516887991ae61806ee68a1d29d49db0a;hb=b86fa7f2bedebe580b0e9a20f9b42cf2d628fafa;hpb=8641983679bb074a9951c2df9fff7ac6cbf5f5f2 diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 1ae6411..748bcec 100755 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -20,7 +20,6 @@ // EXTERNAL HEADER #include -#include #include #include #include @@ -59,12 +58,16 @@ namespace DALI_ENUM_TO_STRING_TABLE_BEGIN( VISUAL_FITTING_MODE ) DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FIT_KEEP_ASPECT_RATIO ) 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_TABLE_END( VISUAL_FITTING_MODE ) } // namespace -Visual::Base::Base( VisualFactoryCache& factoryCache, FittingMode fittingMode ) -: mImpl( new Impl(fittingMode) ), +Visual::Base::Base( VisualFactoryCache& factoryCache, FittingMode fittingMode, Toolkit::Visual::Type type ) +: mImpl( new Impl( fittingMode, type ) ), mFactoryCache( factoryCache ) { } @@ -121,6 +124,14 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap ) { matchKey = Property::Key( Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE ); } + 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 ) @@ -188,6 +199,37 @@ 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::CORNER_RADIUS: + { + float radius; + if( value.Get( radius ) ) + { + mImpl->mCornerRadius = radius; + } + break; + } + case Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY: + { + int policy; + if( value.Get( policy ) ) + { + switch( policy ) + { + case Toolkit::Visual::Transform::Policy::RELATIVE: + case Toolkit::Visual::Transform::Policy::ABSOLUTE: + { + mImpl->mCornerRadiusPolicy = policy; + break; + } + default: + { + DALI_LOG_ERROR( "Unsupported policy: %d\n", policy ); + break; + } + } + } + break; + } } } @@ -267,32 +309,41 @@ int Visual::Base::GetDepthIndex() const return mImpl->mDepthIndex; } -void Visual::Base::SetOnStage( Actor& actor ) +void Visual::Base::SetOnScene( Actor& actor ) { - if( !IsOnStage() ) + if( !IsOnScene() ) { // To display the actor correctly, renderer should not be added to actor until all required resources are ready. // Thus the calling of actor.AddRenderer() should happen inside derived class as base class does not know the exact timing. - DoSetOnStage( actor ); + DoSetOnScene( actor ); if( mImpl->mRenderer ) { RegisterMixColor(); + if( IsRoundedCornerRequired() ) + { + mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterProperty( CORNER_RADIUS, mImpl->mCornerRadius ); + mImpl->mRenderer.RegisterProperty( CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy ); + + mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); + } + mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, IsPreMultipliedAlphaEnabled()); mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex ); - mImpl->mFlags |= Impl::IS_ON_STAGE; // Only sets the flag if renderer exists + mImpl->mFlags |= Impl::IS_ON_SCENE; // Only sets the flag if renderer exists } } } -void Visual::Base::SetOffStage( Actor& actor ) +void Visual::Base::SetOffScene( Actor& actor ) { - if( IsOnStage() ) + if( IsOnScene() ) { - DoSetOffStage( actor ); + DoSetOffScene( actor ); mImpl->mMixColorIndex = Property::INVALID_INDEX; - mImpl->mFlags &= ~Impl::IS_ON_STAGE; + mImpl->mCornerRadiusIndex = Property::INVALID_INDEX; + mImpl->mFlags &= ~Impl::IS_ON_SCENE; } } @@ -320,6 +371,9 @@ void Visual::Base::CreatePropertyMap( Property::Map& map ) const auto fittingModeString = Scripting::GetLinearEnumerationName< FittingMode >( 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::CORNER_RADIUS, mImpl->mCornerRadius ); + map.Insert( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, static_cast< int >( mImpl->mCornerRadiusPolicy ) ); } void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const @@ -359,15 +413,25 @@ bool Visual::Base::IsPreMultipliedAlphaEnabled() const return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA; } -void Visual::Base::DoSetOffStage( Actor& actor ) +bool Visual::Base::IsAdvancedBlendEquationApplied() const +{ + return IsPreMultipliedAlphaEnabled() && DevelRenderer::IsAdvancedBlendEquationApplied( mImpl->mRenderer ); +} + +void Visual::Base::DoSetOffScene( Actor& actor ) { actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); } -bool Visual::Base::IsOnStage() const +bool Visual::Base::IsOnScene() const +{ + return mImpl->mFlags & Impl::IS_ON_SCENE; +} + +bool Visual::Base::IsRoundedCornerRequired() const { - return mImpl->mFlags & Impl::IS_ON_STAGE; + return !EqualsZero( mImpl->mCornerRadius ); } void Visual::Base::OnDoAction( const Property::Index actionId, const Property::Value& attributes ) @@ -381,14 +445,13 @@ 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 = DevelHandle::RegisterProperty( - mImpl->mRenderer, + mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty( Toolkit::Visual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) ); } - if( mImpl->mMixColor.a < 1.f ) + if( mImpl->mMixColor.a < 1.f || IsAdvancedBlendEquationApplied() ) { mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); } @@ -411,7 +474,7 @@ void Visual::Base::SetMixColor( const Vector4& color ) { mImpl->mRenderer.SetProperty( mImpl->mMixColorIndex, Vector3(color) ); mImpl->mRenderer.SetProperty( DevelRenderer::Property::OPACITY, color.a ); - if( color.a < 1.f ) + if( color.a < 1.f || IsAdvancedBlendEquationApplied() ) { mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); } @@ -435,14 +498,14 @@ const Vector4& Visual::Base::GetMixColor() const return mImpl->mMixColor; } -void Visual::Base::AddResourceObserver( Visual::ResourceObserver& observer) +void Visual::Base::AddEventObserver( Visual::EventObserver& observer) { - mImpl->mResourceObserver = &observer; + mImpl->mEventObserver = &observer; } -void Visual::Base::RemoveResourceObserver( Visual::ResourceObserver& observer ) +void Visual::Base::RemoveEventObserver( Visual::EventObserver& observer ) { - mImpl->mResourceObserver = NULL; + mImpl->mEventObserver = NULL; } void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus) @@ -451,10 +514,10 @@ void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus) { mImpl->mResourceStatus = resourceStatus; - if( mImpl->mResourceObserver ) + if( mImpl->mEventObserver ) { // observer is currently a control impl - mImpl->mResourceObserver->ResourceReady( *this ); + mImpl->mEventObserver->ResourceReady( *this ); } } } @@ -464,6 +527,16 @@ bool Visual::Base::IsResourceReady() const return ( mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY ); } +bool Visual::Base::IsSynchronousLoadingRequired() const +{ + return ( mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING ); +} + +Toolkit::Visual::Type Visual::Base::GetType() const +{ + return mImpl->mType; +} + Toolkit::Visual::ResourceStatus Visual::Base::GetResourceStatus() const { return mImpl->mResourceStatus; @@ -486,13 +559,13 @@ Renderer Visual::Base::GetRenderer() Property::Index Visual::Base::GetPropertyIndex( Property::Key key ) { - Property::Index index = DevelHandle::GetPropertyIndex( mImpl->mRenderer, key ); + Property::Index index = mImpl->mRenderer.GetPropertyIndex( key ); if( index == Property::INVALID_INDEX ) { // Is it a shader property? Shader shader = mImpl->mRenderer.GetShader(); - index = DevelHandle::GetPropertyIndex( shader, key ); + index = shader.GetPropertyIndex( key ); if( index != Property::INVALID_INDEX ) { // Yes - we should register it in the Renderer so it can be set / animated @@ -510,7 +583,7 @@ 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 = DevelHandle::RegisterProperty( mImpl->mRenderer, keyIndex, keyName, value ); + index = mImpl->mRenderer.RegisterProperty( keyIndex, keyName, value ); } } return index; @@ -702,7 +775,8 @@ void Visual::Base::SetupBlendMode( Animation& transition, bool isInitialOpaque, { // Ensure the blend mode is turned on if we are animating opacity, and // turned off after the animation ends if the final value is opaque - if( ! isInitialOpaque || mImpl->mMixColor.a < 1.0f ) + if( ( ! isInitialOpaque || mImpl->mMixColor.a < 1.0f ) || + ( mImpl->mRenderer && IsAdvancedBlendEquationApplied() ) ) { if( mImpl->mRenderer ) { @@ -727,8 +801,16 @@ void Visual::Base::OnMixColorFinished( Animation& animation ) if( mImpl->mRenderer ) { DALI_LOG_INFO( gVisualBaseLogFilter, Debug::General, "Visual::Base::OnMixColorFinished()\n"); - mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, - ( mImpl->mMixColor.a < 1.0 ) ? BlendMode::ON : BlendMode::AUTO ); + + if( mImpl->mMixColor.a >= 1.f && + !IsAdvancedBlendEquationApplied() ) + { + mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::AUTO ); + } + else + { + mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); + } } delete mImpl->mBlendSlotDelegate; mImpl->mBlendSlotDelegate = NULL;