/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/visual-factory/devel-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-string-constants.h>
namespace Dali
Internal::Visual::Base::Impl::Impl()
: mCustomShader( NULL ),
+ mBlendSlotDelegate( NULL ),
mTransform(),
+ mMixColor( Color::WHITE ),
mControlSize( Vector2::ZERO ),
mDepthIndex( 0.0f ),
+ mMixColorIndex( Property::INVALID_INDEX ),
+ mOpacityIndex( Property::INVALID_INDEX ),
mFlags( 0 )
{
}
Internal::Visual::Base::Impl::~Impl()
{
delete mCustomShader;
+ delete mBlendSlotDelegate;
}
Internal::Visual::Base::Impl::CustomShader::CustomShader( const Property::Map& map )
Property::Value* vertexShaderValue = shaderMap.Find( Toolkit::Visual::Shader::Property::VERTEX_SHADER, CUSTOM_VERTEX_SHADER );
if( vertexShaderValue )
{
- if( !vertexShaderValue->Get( mVertexShader ) )
+ if( ! GetStringFromProperty( *vertexShaderValue, mVertexShader ) )
{
DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string\n", CUSTOM_VERTEX_SHADER );
}
Property::Value* fragmentShaderValue = shaderMap.Find( Toolkit::Visual::Shader::Property::FRAGMENT_SHADER, CUSTOM_FRAGMENT_SHADER );
if( fragmentShaderValue )
{
- if( !fragmentShaderValue->Get( mFragmentShader ) )
+ if( ! GetStringFromProperty( *fragmentShaderValue, mFragmentShader ) )
{
DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string\n", CUSTOM_FRAGMENT_SHADER );
}
customShader.Insert( Toolkit::Visual::Shader::Property::HINTS, static_cast< int >( mHints ) );
}
- map.Insert( Toolkit::VisualProperty::SHADER, customShader );
+ map.Insert( Toolkit::DevelVisual::Property::SHADER, customShader );
}
}
Internal::Visual::Base::Impl::Transform::Transform()
-: mOffset(0.0f,0.0f),
- mSize(1.0f,1.0f),
- mOffsetSizeMode(0.0f,0.0f,0.0f,0.0f),
- mOrigin(Toolkit::Align::CENTER),
- mAnchorPoint(Toolkit::Align::CENTER)
+: mOffset( 0.0f,0.0f ),
+ mSize( 1.0f,1.0f ),
+ mOffsetSizeMode( 0.0f,0.0f,0.0f,0.0f ),
+ mOrigin( Toolkit::Align::CENTER ),
+ mAnchorPoint( Toolkit::Align::CENTER )
{
}
void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Map& map )
{
- //Set default values
- mOffset = Vector2(0.0f,0.0f);
- mSize = Vector2(1.0f,1.0f);
- mOffsetSizeMode = Vector4(0.0f,0.0f,0.0f,0.0f);
+ // Set default values
+ mOffset = Vector2( 0.0f,0.0f );
+ mSize = Vector2( 1.0f,1.0f );
+ mOffsetSizeMode = Vector4( 0.0f,0.0f,0.0f,0.0f );
mOrigin = Toolkit::Align::CENTER;
mAnchorPoint = Toolkit::Align::CENTER;
+ UpdatePropertyMap( map );
+}
+
+void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap( const Property::Map& map )
+{
for( Property::Map::SizeType i(0); i<map.Count(); ++i )
{
KeyValuePair keyValue = map.GetKeyValue( i );
- if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::OFFSET )
- {
- keyValue.second.Get( mOffset );
- }
- else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::SIZE )
+ if( keyValue.first.type == Property::Key::INDEX )
{
- keyValue.second.Get( mSize );
- }
- else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN )
- {
- Toolkit::Align::Type align(Toolkit::Align::CENTER);
- if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
+ switch( keyValue.first.indexKey )
{
- mOrigin = align;
+ case Toolkit::DevelVisual::Transform::Property::OFFSET:
+ {
+ keyValue.second.Get( mOffset );
+ break;
+ }
+ case Toolkit::DevelVisual::Transform::Property::SIZE:
+ {
+ keyValue.second.Get( mSize );
+ break;
+ }
+ case Toolkit::DevelVisual::Transform::Property::ORIGIN:
+ {
+ Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mOrigin );
+ break;
+ }
+ case Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT:
+ {
+ Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mAnchorPoint );
+ break;
+ }
+ case Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE:
+ {
+ keyValue.second.Get( mOffsetSizeMode );
+ break;
+ }
}
}
- else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT )
+ else // Key type is STRING
{
- Toolkit::Align::Type align(Toolkit::Align::CENTER);
- if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
+ if( keyValue.first == "offset" )
{
- mAnchorPoint = align;
+ keyValue.second.Get( mOffset );
+ }
+ else if( keyValue.first == "size" )
+ {
+ keyValue.second.Get( mSize );
+ }
+ else if( keyValue.first == "origin" )
+ {
+ Toolkit::Align::Type align(Toolkit::Align::CENTER);
+ if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
+ {
+ mOrigin = align;
+ }
+ }
+ else if( keyValue.first == "anchorPoint" )
+ {
+ Toolkit::Align::Type align(Toolkit::Align::CENTER);
+ if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
+ {
+ mAnchorPoint = align;
+ }
+ }
+ else if( keyValue.first == "offsetSizeMode" )
+ {
+ keyValue.second.Get( mOffsetSizeMode );
}
- }
- else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE )
- {
- keyValue.second.Get( mOffsetSizeMode );
}
}
}
void Internal::Visual::Base::Impl::Transform::GetPropertyMap( Property::Map& map ) const
{
map.Clear();
- map.Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, mOffset )
- .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, mSize )
- .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, mOrigin )
- .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, mAnchorPoint )
- .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, mOffsetSizeMode );
+ map.Add( Toolkit::DevelVisual::Transform::Property::OFFSET, mOffset )
+ .Add( Toolkit::DevelVisual::Transform::Property::SIZE, mSize )
+ .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, mOrigin )
+ .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, mAnchorPoint )
+ .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE, mOffsetSizeMode );
}
void Internal::Visual::Base::Impl::Transform::RegisterUniforms( Dali::Renderer renderer, Toolkit::Direction::Type direction )