// EXTERNAL HEADER
#include <dali-toolkit/public-api/dali-toolkit-common.h>
-#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/integration-api/debug.h>
//INTERNAL HEARDER
-#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
-#include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/internal/helpers/property-helper.h>
#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
namespace
{
#if defined(DEBUG_ENABLED)
-Debug::Filter* gVisualBaseLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VISUAL_BASE" );
+Debug::Filter* gVisualBaseLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VISUAL_BASE");
#endif
-const char * const PRE_MULTIPLIED_ALPHA_PROPERTY( "preMultipliedAlpha" );
+const char* const PRE_MULTIPLIED_ALPHA_PROPERTY("preMultipliedAlpha");
} // namespace
namespace Dali
{
-
namespace Toolkit
{
-
namespace Internal
{
-
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 )
+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, Toolkit::Visual::Type type )
-: mImpl( new Impl( fittingMode, type ) ),
- mFactoryCache( factoryCache )
+Visual::Base::Base(VisualFactoryCache& factoryCache, FittingMode fittingMode, Toolkit::Visual::Type type)
+: mImpl(new Impl(fittingMode, type)),
+ mFactoryCache(factoryCache)
{
}
}
}
-void Visual::Base::SetCustomShader( const Property::Map& shaderMap )
+void Visual::Base::SetCustomShader(const Property::Map& shaderMap)
{
- if( mImpl->mCustomShader )
+ if(mImpl->mCustomShader)
{
- mImpl->mCustomShader->SetPropertyMap( shaderMap );
+ mImpl->mCustomShader->SetPropertyMap(shaderMap);
}
else
{
- mImpl->mCustomShader = new Impl::CustomShader( shaderMap );
+ mImpl->mCustomShader = new Impl::CustomShader(shaderMap);
}
// Let derived class know
UpdateShader();
}
-void Visual::Base::SetProperties( const Property::Map& propertyMap )
+void Visual::Base::SetProperties(const Property::Map& propertyMap)
{
- for( size_t i = 0; i < propertyMap.Count(); ++i )
+ for(size_t i = 0; i < propertyMap.Count(); ++i)
{
- const KeyValuePair& pair = propertyMap.GetKeyValue( i );
- const Property::Key& key = pair.first;
+ const KeyValuePair& pair = propertyMap.GetKeyValue(i);
+ const Property::Key& key = pair.first;
const Property::Value& value = pair.second;
Property::Key matchKey = key;
- if( matchKey.type == Property::Key::STRING )
+ if(matchKey.type == Property::Key::STRING)
{
- if( matchKey == CUSTOM_SHADER )
+ if(matchKey == CUSTOM_SHADER)
{
- matchKey = Property::Key( Toolkit::Visual::Property::SHADER );
+ matchKey = Property::Key(Toolkit::Visual::Property::SHADER);
}
- else if( matchKey == TRANSFORM )
+ else if(matchKey == TRANSFORM)
{
- matchKey = Property::Key( Toolkit::Visual::Property::TRANSFORM );
+ matchKey = Property::Key(Toolkit::Visual::Property::TRANSFORM);
}
- else if( matchKey == PREMULTIPLIED_ALPHA )
+ else if(matchKey == PREMULTIPLIED_ALPHA)
{
- matchKey = Property::Key( Toolkit::Visual::Property::PREMULTIPLIED_ALPHA );
+ matchKey = Property::Key(Toolkit::Visual::Property::PREMULTIPLIED_ALPHA);
}
- else if( matchKey == MIX_COLOR )
+ else if(matchKey == MIX_COLOR)
{
- matchKey = Property::Key( Toolkit::Visual::Property::MIX_COLOR );
+ matchKey = Property::Key(Toolkit::Visual::Property::MIX_COLOR);
}
- else if( matchKey == OPACITY )
+ else if(matchKey == OPACITY)
{
- matchKey = Property::Key( Toolkit::Visual::Property::OPACITY );
+ matchKey = Property::Key(Toolkit::Visual::Property::OPACITY);
}
- else if( matchKey == VISUAL_FITTING_MODE )
+ else if(matchKey == VISUAL_FITTING_MODE)
{
- matchKey = Property::Key( Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE );
+ matchKey = Property::Key(Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE);
}
- else if( matchKey == CORNER_RADIUS )
+ else if(matchKey == CORNER_RADIUS)
{
- matchKey = Property::Key( Toolkit::DevelVisual::Property::CORNER_RADIUS );
+ matchKey = Property::Key(Toolkit::DevelVisual::Property::CORNER_RADIUS);
}
- else if( matchKey == CORNER_RADIUS_POLICY )
+ else if(matchKey == CORNER_RADIUS_POLICY)
{
- matchKey = Property::Key( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY );
+ matchKey = Property::Key(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY);
}
}
- switch( matchKey.indexKey )
+ switch(matchKey.indexKey)
{
case Toolkit::Visual::Property::SHADER:
{
Property::Map shaderMap;
- if( value.Get( shaderMap ) )
+ if(value.Get(shaderMap))
{
- SetCustomShader( shaderMap );
+ SetCustomShader(shaderMap);
}
break;
}
case Toolkit::Visual::Property::TRANSFORM:
{
Property::Map map;
- if( value.Get( map ) )
+ if(value.Get(map))
{
- mImpl->mTransform.SetPropertyMap( map );
+ mImpl->mTransform.SetPropertyMap(map);
}
break;
}
case Toolkit::Visual::Property::PREMULTIPLIED_ALPHA:
{
bool premultipliedAlpha = false;
- if( value.Get( premultipliedAlpha ) )
+ if(value.Get(premultipliedAlpha))
{
- EnablePreMultipliedAlpha( premultipliedAlpha );
+ EnablePreMultipliedAlpha(premultipliedAlpha);
}
break;
}
case Toolkit::Visual::Property::MIX_COLOR:
{
Vector4 mixColor;
- if( value.Get( mixColor ) )
+ if(value.Get(mixColor))
{
- if( value.GetType() == Property::VECTOR4 )
+ if(value.GetType() == Property::VECTOR4)
{
- SetMixColor( mixColor );
+ SetMixColor(mixColor);
}
else
{
Vector3 mixColor3(mixColor);
- SetMixColor( mixColor3 );
+ SetMixColor(mixColor3);
}
}
break;
case Toolkit::Visual::Property::OPACITY:
{
float opacity;
- if( value.Get( opacity ) )
+ if(value.Get(opacity))
{
mImpl->mMixColor.a = opacity;
- SetMixColor( mImpl->mMixColor );
+ SetMixColor(mImpl->mMixColor);
}
break;
}
case Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE:
{
- Scripting::GetEnumerationProperty< Visual::FittingMode >(
- value, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT, mImpl->mFittingMode );
+ Scripting::GetEnumerationProperty<Visual::FittingMode>(
+ 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 ) )
+ if(value.Get(radius))
{
mImpl->mCornerRadius = radius;
}
case Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY:
{
int policy;
- if( value.Get( policy ) )
+ if(value.Get(policy))
{
- switch( policy )
+ switch(policy)
{
case Toolkit::Visual::Transform::Policy::RELATIVE:
case Toolkit::Visual::Transform::Policy::ABSOLUTE:
}
default:
{
- DALI_LOG_ERROR( "Unsupported policy: %d\n", policy );
+ DALI_LOG_ERROR("Unsupported policy: %d\n", policy);
break;
}
}
}
}
- DoSetProperties( propertyMap );
+ DoSetProperties(propertyMap);
}
-void Visual::Base::SetTransformAndSize( const Property::Map& transform, Size controlSize )
+void Visual::Base::SetTransformAndSize(const Property::Map& transform, Size controlSize)
{
mImpl->mControlSize = controlSize;
- mImpl->mTransform.UpdatePropertyMap( transform );
+ mImpl->mTransform.UpdatePropertyMap(transform);
#if defined(DEBUG_ENABLED)
std::ostringstream oss;
oss << transform;
- DALI_LOG_INFO( gVisualBaseLogFilter, Debug::General, "Visual::Base::SetTransformAndSize(%s) - [\e[1;32mtransform: %s controlSize: (%3.1f, %3.1f)]\e[0m\n",
- GetName().c_str(), oss.str().c_str(), controlSize.x, controlSize.y );
+ DALI_LOG_INFO(gVisualBaseLogFilter, Debug::General, "Visual::Base::SetTransformAndSize(%s) - [\e[1;32mtransform: %s controlSize: (%3.1f, %3.1f)]\e[0m\n", GetName().c_str(), oss.str().c_str(), controlSize.x, controlSize.y);
#endif
OnSetTransform();
}
-void Visual::Base::SetName( const std::string& name )
+void Visual::Base::SetName(const std::string& name)
{
mImpl->mName = name;
}
return mImpl->mName;
}
-float Visual::Base::GetHeightForWidth( float width )
+float Visual::Base::GetHeightForWidth(float width)
{
- float aspectCorrectedHeight = 0.f;
+ float aspectCorrectedHeight = 0.f;
Vector2 naturalSize;
- GetNaturalSize( naturalSize );
- if( naturalSize.width )
+ GetNaturalSize(naturalSize);
+ if(naturalSize.width)
{
aspectCorrectedHeight = naturalSize.height * width / naturalSize.width;
}
return aspectCorrectedHeight;
}
-float Visual::Base::GetWidthForHeight( float height )
+float Visual::Base::GetWidthForHeight(float height)
{
- float aspectCorrectedWidth = 0.f;
+ float aspectCorrectedWidth = 0.f;
Vector2 naturalSize;
- GetNaturalSize( naturalSize );
- if( naturalSize.height > 0.0f )
+ GetNaturalSize(naturalSize);
+ if(naturalSize.height > 0.0f)
{
aspectCorrectedWidth = naturalSize.width * height / naturalSize.height;
}
return aspectCorrectedWidth;
}
-void Visual::Base::GetNaturalSize( Vector2& naturalSize )
+void Visual::Base::GetNaturalSize(Vector2& naturalSize)
{
naturalSize = Vector2::ZERO;
}
-void Visual::Base::DoAction( const Property::Index actionId, const Property::Value attributes )
+void Visual::Base::DoAction(const Property::Index actionId, const Property::Value attributes)
{
- OnDoAction( actionId, attributes );
+ OnDoAction(actionId, attributes);
}
-void Visual::Base::SetDepthIndex( int index )
+void Visual::Base::SetDepthIndex(int index)
{
mImpl->mDepthIndex = index;
- if( mImpl->mRenderer )
+ if(mImpl->mRenderer)
{
- mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex );
+ mImpl->mRenderer.SetProperty(Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex);
}
}
return mImpl->mDepthIndex;
}
-void Visual::Base::SetOnScene( Actor& actor )
+void Visual::Base::SetOnScene(Actor& actor)
{
- if( !IsOnScene() )
+ 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.
- DoSetOnScene( actor );
+ DoSetOnScene(actor);
if(mImpl->mRenderer)
{
}
}
-void Visual::Base::SetOffScene( Actor& actor )
+void Visual::Base::SetOffScene(Actor& actor)
{
- if( IsOnScene() )
+ if(IsOnScene())
{
- DoSetOffScene( actor );
+ DoSetOffScene(actor);
mImpl->mFlags &= ~Impl::IS_ON_SCENE;
}
}
-void Visual::Base::CreatePropertyMap( Property::Map& map ) const
+void Visual::Base::CreatePropertyMap(Property::Map& map) const
{
if(mImpl->mRenderer)
{
}
Property::Map transform;
- mImpl->mTransform.GetPropertyMap( transform );
- map.Insert( Toolkit::Visual::Property::TRANSFORM, transform );
+ mImpl->mTransform.GetPropertyMap(transform);
+ map.Insert(Toolkit::Visual::Property::TRANSFORM, transform);
- bool premultipliedAlpha( IsPreMultipliedAlphaEnabled() );
- map.Insert( Toolkit::Visual::Property::PREMULTIPLIED_ALPHA, premultipliedAlpha );
+ bool premultipliedAlpha(IsPreMultipliedAlphaEnabled());
+ map.Insert(Toolkit::Visual::Property::PREMULTIPLIED_ALPHA, premultipliedAlpha);
// Note, Color and Primitive will also insert their own mix color into the map
// 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::Visual::Property::MIX_COLOR, mImpl->mMixColor); // vec4
+ map.Insert(Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a);
- 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 );
+ 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 ) );
+ 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
+void Visual::Base::CreateInstancePropertyMap(Property::Map& map) const
{
- DoCreateInstancePropertyMap( map );
+ DoCreateInstancePropertyMap(map);
- if( mImpl->mCustomShader )
+ if(mImpl->mCustomShader)
{
- mImpl->mCustomShader->CreatePropertyMap( map );
+ mImpl->mCustomShader->CreatePropertyMap(map);
}
}
-
-void Visual::Base::EnablePreMultipliedAlpha( bool preMultiplied )
+void Visual::Base::EnablePreMultipliedAlpha(bool preMultiplied)
{
- if( preMultiplied )
+ if(preMultiplied)
{
mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
}
mImpl->mFlags &= ~Impl::IS_PREMULTIPLIED_ALPHA;
}
- if( mImpl->mRenderer )
+ if(mImpl->mRenderer)
{
mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, preMultiplied);
- mImpl->mRenderer.RegisterProperty( PRE_MULTIPLIED_ALPHA_PROPERTY, static_cast<float>( preMultiplied ) );
+ mImpl->mRenderer.RegisterProperty(PRE_MULTIPLIED_ALPHA_PROPERTY, static_cast<float>(preMultiplied));
}
}
return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA;
}
-void Visual::Base::DoSetOffScene( Actor& actor )
+void Visual::Base::DoSetOffScene(Actor& actor)
{
- actor.RemoveRenderer( mImpl->mRenderer );
+ actor.RemoveRenderer(mImpl->mRenderer);
}
bool Visual::Base::IsOnScene() const
return !EqualsZero(mImpl->mCornerRadius) || mImpl->mNeedCornerRadius;
}
-void Visual::Base::OnDoAction( const Property::Index actionId, const Property::Value& attributes )
+void Visual::Base::OnDoAction(const Property::Index actionId, const Property::Value& attributes)
{
// May be overriden by derived class
}
{
// Only register if not already registered.
// (Color and Primitive visuals will register their own and save to this index)
- if( mImpl->mMixColorIndex == Property::INVALID_INDEX )
+ if(mImpl->mMixColorIndex == Property::INVALID_INDEX)
{
mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty(
Toolkit::Visual::Property::MIX_COLOR,
MIX_COLOR,
- Vector3(mImpl->mMixColor) );
+ Vector3(mImpl->mMixColor));
}
- mImpl->mRenderer.SetProperty( DevelRenderer::Property::OPACITY, mImpl->mMixColor.a );
+ mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, mImpl->mMixColor.a);
float preMultipliedAlpha = 0.0f;
- if( IsPreMultipliedAlphaEnabled() )
+ if(IsPreMultipliedAlphaEnabled())
{
preMultipliedAlpha = 1.0f;
}
- mImpl->mRenderer.RegisterProperty( PRE_MULTIPLIED_ALPHA_PROPERTY, preMultipliedAlpha );
+ mImpl->mRenderer.RegisterProperty(PRE_MULTIPLIED_ALPHA_PROPERTY, preMultipliedAlpha);
}
-void Visual::Base::SetMixColor( const Vector4& color )
+void Visual::Base::SetMixColor(const Vector4& color)
{
mImpl->mMixColor = color;
- if( mImpl->mRenderer )
+ if(mImpl->mRenderer)
{
- mImpl->mRenderer.SetProperty( mImpl->mMixColorIndex, Vector3(color) );
- mImpl->mRenderer.SetProperty( DevelRenderer::Property::OPACITY, color.a );
+ mImpl->mRenderer.SetProperty(mImpl->mMixColorIndex, Vector3(color));
+ mImpl->mRenderer.SetProperty(DevelRenderer::Property::OPACITY, color.a);
}
}
-void Visual::Base::SetMixColor( const Vector3& color )
+void Visual::Base::SetMixColor(const Vector3& color)
{
mImpl->mMixColor.r = color.r;
mImpl->mMixColor.g = color.g;
mImpl->mMixColor.b = color.b;
- if( mImpl->mRenderer )
+ if(mImpl->mRenderer)
{
- mImpl->mRenderer.SetProperty( mImpl->mMixColorIndex, color );
+ mImpl->mRenderer.SetProperty(mImpl->mMixColorIndex, color);
}
}
-void Visual::Base::AddEventObserver( Visual::EventObserver& observer)
+void Visual::Base::AddEventObserver(Visual::EventObserver& observer)
{
mImpl->mEventObserver = &observer;
}
-void Visual::Base::RemoveEventObserver( Visual::EventObserver& observer )
+void Visual::Base::RemoveEventObserver(Visual::EventObserver& observer)
{
mImpl->mEventObserver = NULL;
}
void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus)
{
- if( mImpl->mResourceStatus != resourceStatus )
+ if(mImpl->mResourceStatus != resourceStatus)
{
mImpl->mResourceStatus = resourceStatus;
- if( mImpl->mEventObserver )
+ if(mImpl->mEventObserver)
{
// observer is currently a control impl
- mImpl->mEventObserver->ResourceReady( *this );
+ mImpl->mEventObserver->ResourceReady(*this);
}
}
}
bool Visual::Base::IsResourceReady() const
{
- return ( mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY );
+ return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY);
}
bool Visual::Base::IsSynchronousLoadingRequired() const
{
- return ( mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING );
+ return (mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING);
}
Toolkit::Visual::Type Visual::Base::GetType() const
return mImpl->mRenderer;
}
-Property::Index Visual::Base::GetPropertyIndex( Property::Key key )
+Property::Index Visual::Base::GetPropertyIndex(Property::Key key)
{
- Property::Index index = mImpl->mRenderer.GetPropertyIndex( key );
+ Property::Index index = mImpl->mRenderer.GetPropertyIndex(key);
- if( index == Property::INVALID_INDEX )
+ if(index == Property::INVALID_INDEX)
{
// Is it a shader property?
Shader shader = mImpl->mRenderer.GetShader();
- index = shader.GetPropertyIndex( key );
- if( index != Property::INVALID_INDEX )
+ index = shader.GetPropertyIndex(key);
+ if(index != Property::INVALID_INDEX)
{
// Yes - we should register it in the Renderer so it can be set / animated
// independently, as shaders are shared across multiple renderers.
- std::string keyName;
- Property::Index keyIndex( Property::INVALID_KEY );
- if( key.type == Property::Key::INDEX )
+ std::string keyName;
+ Property::Index keyIndex(Property::INVALID_KEY);
+ if(key.type == Property::Key::INDEX)
{
- keyName = shader.GetPropertyName( index );
+ keyName = shader.GetPropertyName(index);
keyIndex = key.indexKey;
}
else
keyName = key.stringKey;
// 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 );
+ Property::Value value = shader.GetProperty(index);
+ index = mImpl->mRenderer.RegisterProperty(keyIndex, keyName, value);
}
}
return index;
}
void Visual::Base::SetupTransition(
- Dali::Animation& transition,
+ Dali::Animation& transition,
Internal::TransitionData::Animator& animator,
- Property::Index index,
- Property::Value& initialValue,
- Property::Value& targetValue )
+ Property::Index index,
+ Property::Value& initialValue,
+ Property::Value& targetValue)
{
- if( index != Property::INVALID_INDEX )
+ if(index != Property::INVALID_INDEX)
{
- if( mImpl->mRenderer )
+ if(mImpl->mRenderer)
{
- if( animator.animate == false )
+ if(animator.animate == false)
{
- mImpl->mRenderer.SetProperty( index, targetValue );
+ mImpl->mRenderer.SetProperty(index, targetValue);
}
else
{
- if( animator.initialValue.GetType() != Property::NONE )
+ if(animator.initialValue.GetType() != Property::NONE)
{
- mImpl->mRenderer.SetProperty( index, initialValue );
+ mImpl->mRenderer.SetProperty(index, initialValue);
}
- if( ! transition )
+ if(!transition)
{
- transition = Dali::Animation::New( 0.1f );
+ transition = Dali::Animation::New(0.1f);
}
- transition.AnimateTo( Property( mImpl->mRenderer, index ),
- targetValue,
- animator.alphaFunction,
- TimePeriod( animator.timePeriodDelay,
- animator.timePeriodDuration ) );
+ transition.AnimateTo(Property(mImpl->mRenderer, index),
+ targetValue,
+ animator.alphaFunction,
+ TimePeriod(animator.timePeriodDelay,
+ animator.timePeriodDuration));
}
}
}
}
void Visual::Base::AnimateProperty(
- Dali::Animation& transition,
- Internal::TransitionData::Animator& animator )
+ Dali::Animation& transition,
+ Internal::TransitionData::Animator& animator)
{
#if defined(DEBUG_ENABLED)
{
std::ostringstream oss;
oss << "Visual::Base::AnimateProperty(Visual:" << mImpl->mName << " Property:" << animator.propertyKey << " Target: " << animator.targetValue << std::endl;
- DALI_LOG_INFO( gVisualBaseLogFilter, Debug::General, oss.str().c_str() );
+ DALI_LOG_INFO(gVisualBaseLogFilter, Debug::General, oss.str().c_str());
}
#endif
(mImpl->mType == Toolkit::Visual::PRIMITIVE &&
animator.propertyKey == PrimitiveVisual::Property::MIX_COLOR))
{
- AnimateMixColorProperty( transition, animator );
+ AnimateMixColorProperty(transition, animator);
}
else if(animator.propertyKey == Toolkit::Visual::Property::OPACITY ||
- animator.propertyKey == OPACITY )
+ animator.propertyKey == OPACITY)
{
- AnimateOpacityProperty( transition, animator );
+ AnimateOpacityProperty(transition, animator);
}
- else if( mImpl->mRenderer )
+ else if(mImpl->mRenderer)
{
- AnimateRendererProperty( transition, animator );
+ AnimateRendererProperty(transition, animator);
}
}
void Visual::Base::AnimateOpacityProperty(
- Dali::Animation& transition,
- Internal::TransitionData::Animator& animator )
+ Dali::Animation& transition,
+ Internal::TransitionData::Animator& animator)
{
float targetOpacity;
- if( animator.targetValue.Get( targetOpacity ) )
+ if(animator.targetValue.Get(targetOpacity))
{
mImpl->mMixColor.a = targetOpacity;
}
- SetupTransition( transition, animator, DevelRenderer::Property::OPACITY, animator.initialValue, animator.targetValue );
+ SetupTransition(transition, animator, DevelRenderer::Property::OPACITY, animator.initialValue, animator.targetValue);
}
void Visual::Base::AnimateRendererProperty(
- Dali::Animation& transition,
- Internal::TransitionData::Animator& animator )
+ Dali::Animation& transition,
+ Internal::TransitionData::Animator& animator)
{
- Property::Index index = GetPropertyIndex( animator.propertyKey );
- if( index != Property::INVALID_INDEX )
+ Property::Index index = GetPropertyIndex(animator.propertyKey);
+ if(index != Property::INVALID_INDEX)
{
- if( animator.targetValue.GetType() != Property::NONE )
+ if(animator.targetValue.GetType() != Property::NONE)
{
// Try writing target value into transform property map
// if it's not a valid key, then it won't alter mTransform
Property::Map map;
- if( animator.propertyKey.type == Property::Key::INDEX )
+ if(animator.propertyKey.type == Property::Key::INDEX)
{
- map.Add( animator.propertyKey.indexKey, animator.targetValue );
+ map.Add(animator.propertyKey.indexKey, animator.targetValue);
}
else
{
- map.Add( animator.propertyKey.stringKey, animator.targetValue );
+ map.Add(animator.propertyKey.stringKey, animator.targetValue);
}
- mImpl->mTransform.UpdatePropertyMap( map );
+ mImpl->mTransform.UpdatePropertyMap(map);
}
- SetupTransition( transition, animator, index, animator.initialValue, animator.targetValue );
+ SetupTransition(transition, animator, index, animator.initialValue, animator.targetValue);
}
}
void Visual::Base::AnimateMixColorProperty(
- Dali::Animation& transition,
- Internal::TransitionData::Animator& animator )
+ Dali::Animation& transition,
+ Internal::TransitionData::Animator& animator)
{
- Property::Index index = mImpl->mMixColorIndex;
- bool animateOpacity = false;
+ Property::Index index = mImpl->mMixColorIndex;
+ bool animateOpacity = false;
Property::Value initialOpacity;
Property::Value targetOpacity;
Property::Value initialMixColor;
Property::Value targetMixColor;
- if( index != Property::INVALID_INDEX )
+ if(index != Property::INVALID_INDEX)
{
Vector4 initialColor;
- if( animator.initialValue.Get(initialColor) )
+ if(animator.initialValue.Get(initialColor))
{
- if( animator.initialValue.GetType() == Property::VECTOR4 )
+ if(animator.initialValue.GetType() == Property::VECTOR4)
{
// if there is an initial color specifying alpha, test it
initialOpacity = initialColor.a;
}
- initialMixColor = Vector3( initialColor );
+ initialMixColor = Vector3(initialColor);
}
// Set target value into data store
- if( animator.targetValue.GetType() != Property::NONE )
+ if(animator.targetValue.GetType() != Property::NONE)
{
Vector4 mixColor;
animator.targetValue.Get(mixColor);
- if( animator.targetValue.GetType() == Property::VECTOR4 )
+ if(animator.targetValue.GetType() == Property::VECTOR4)
{
mImpl->mMixColor.a = mixColor.a;
- targetOpacity = mixColor.a;
- animateOpacity = true;
+ targetOpacity = mixColor.a;
+ animateOpacity = true;
}
mImpl->mMixColor.r = mixColor.r;
mImpl->mMixColor.g = mixColor.g;
mImpl->mMixColor.b = mixColor.b;
- targetMixColor = Vector3(mixColor);
+ targetMixColor = Vector3(mixColor);
}
- SetupTransition( transition, animator, index, initialMixColor, targetMixColor );
- if( animateOpacity )
+ SetupTransition(transition, animator, index, initialMixColor, targetMixColor);
+ if(animateOpacity)
{
- SetupTransition( transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity );
+ SetupTransition(transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity);
}
}
}
mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON);
- index = mImpl->mCornerRadiusIndex;
+ index = mImpl->mCornerRadiusIndex;
mImpl->mNeedCornerRadius = true;
// Change shader
projects / platform / core / uifw / dali-toolkit.git / blobdiff