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=aca317eb64b203e73dc1b1c144fd1216fad0f1c3;hp=b03a5ef3c7d174dc9dd94037bc560b3dec692cc1;hb=453a02269ec66b61d23debab49fd2e7afed7d9e1;hpb=2ffc3a77b8aa6f8ccdbaaef41c0fa14034853582 diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index b03a5ef..aca317e 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 ) { } @@ -125,6 +128,10 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap ) { 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 ) @@ -201,6 +208,28 @@ void Visual::Base::SetProperties( const Property::Map& propertyMap ) } 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; + } } } @@ -280,13 +309,13 @@ 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 ) { @@ -295,25 +324,26 @@ void Visual::Base::SetOnStage( Actor& actor ) 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->mCornerRadiusIndex = Property::INVALID_INDEX; - mImpl->mFlags &= ~Impl::IS_ON_STAGE; + mImpl->mFlags &= ~Impl::IS_ON_SCENE; } } @@ -337,13 +367,13 @@ void Visual::Base::CreatePropertyMap( Property::Map& map ) const // which is ok, because they have a different key value range. map.Insert( Toolkit::Visual::Property::MIX_COLOR, mImpl->mMixColor ); // vec4 map.Insert( Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a ); - map.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, IsSynchronousLoadingRequired() ); 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 @@ -383,15 +413,15 @@ bool Visual::Base::IsPreMultipliedAlphaEnabled() const return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA; } -void Visual::Base::DoSetOffStage( Actor& actor ) +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_STAGE; + return mImpl->mFlags & Impl::IS_ON_SCENE; } bool Visual::Base::IsRoundedCornerRequired() const @@ -410,18 +440,12 @@ 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 ) - { - mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); - } - mImpl->mRenderer.SetProperty( DevelRenderer::Property::OPACITY, mImpl->mMixColor.a ); float preMultipliedAlpha = 0.0f; @@ -440,10 +464,6 @@ 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 ) - { - mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); - } } } @@ -498,6 +518,11 @@ 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; @@ -520,13 +545,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 @@ -544,7 +569,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; @@ -632,14 +657,6 @@ void Visual::Base::AnimateOpacityProperty( Dali::Animation& transition, Internal::TransitionData::Animator& animator ) { - bool isOpaque = mImpl->mMixColor.a >= 1.0f; - - float initialOpacity; - if( animator.initialValue.Get( initialOpacity ) ) - { - isOpaque = (initialOpacity >= 1.0f); - } - float targetOpacity; if( animator.targetValue.Get( targetOpacity ) ) { @@ -647,7 +664,6 @@ void Visual::Base::AnimateOpacityProperty( } SetupTransition( transition, animator, DevelRenderer::Property::OPACITY, animator.initialValue, animator.targetValue ); - SetupBlendMode( transition, isOpaque, animator.animate ); } void Visual::Base::AnimateRendererProperty( @@ -684,7 +700,6 @@ void Visual::Base::AnimateMixColorProperty( { Property::Index index = mImpl->mMixColorIndex; bool animateOpacity = false; - bool isOpaque = true; Property::Value initialOpacity; Property::Value targetOpacity; @@ -699,7 +714,6 @@ void Visual::Base::AnimateMixColorProperty( if( animator.initialValue.GetType() == Property::VECTOR4 ) { // if there is an initial color specifying alpha, test it - isOpaque = initialColor.a >= 1.0f; initialOpacity = initialColor.a; } initialMixColor = Vector3( initialColor ); @@ -727,47 +741,10 @@ void Visual::Base::AnimateMixColorProperty( if( animateOpacity ) { SetupTransition( transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity ); - SetupBlendMode( transition, isOpaque, animator.animate ); - } - } -} - -void Visual::Base::SetupBlendMode( Animation& transition, bool isInitialOpaque, bool animating ) -{ - // 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( mImpl->mRenderer ) - { - mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); - - if( animating == true && mImpl->mMixColor.a >= 1.0f ) - { - // When it becomes opaque, set the blend mode back to automatically - if( ! mImpl->mBlendSlotDelegate ) - { - mImpl->mBlendSlotDelegate = new SlotDelegate(this); - } - transition.FinishedSignal().Connect( *(mImpl->mBlendSlotDelegate), - &Visual::Base::OnMixColorFinished ); - } } } } -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 ); - } - delete mImpl->mBlendSlotDelegate; - mImpl->mBlendSlotDelegate = NULL; -} - } // namespace Internal } // namespace Toolkit