projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "supports remote URL gif image" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-base-impl.cpp
b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index
1cf6da7
..
05a318b
100755
(executable)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.cpp
@@
-22,6
+22,7
@@
#include <dali/public-api/common/dali-common.h>
#include <dali/devel-api/object/handle-devel.h>
#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/public-api/common/dali-common.h>
#include <dali/devel-api/object/handle-devel.h>
#include <dali/devel-api/scripting/enum-helper.h>
+#include <dali/devel-api/rendering/renderer-devel.h>
#include <dali/integration-api/debug.h>
//INTERNAL HEARDER
#include <dali/integration-api/debug.h>
//INTERNAL HEARDER
@@
-55,10
+56,10
@@
namespace Internal
namespace
{
namespace
{
-DALI_ENUM_TO_STRING_TABLE_BEGIN( 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, FIT_KEEP_ASPECT_RATIO )
DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FILL )
-DALI_ENUM_TO_STRING_TABLE_END( FITTING_MODE )
+DALI_ENUM_TO_STRING_TABLE_END(
VISUAL_
FITTING_MODE )
} // namespace
} // namespace
@@
-116,9
+117,9
@@
void Visual::Base::SetProperties( const Property::Map& propertyMap )
{
matchKey = Property::Key( Toolkit::Visual::Property::OPACITY );
}
{
matchKey = Property::Key( Toolkit::Visual::Property::OPACITY );
}
- else if( matchKey == FITTING_MODE )
+ else if( matchKey ==
VISUAL_
FITTING_MODE )
{
{
- matchKey = Property::Key( Toolkit::DevelVisual::Property::FITTING_MODE );
+ matchKey = Property::Key( Toolkit::DevelVisual::Property::
VISUAL_
FITTING_MODE );
}
}
}
}
@@
-181,10
+182,10
@@
void Visual::Base::SetProperties( const Property::Map& propertyMap )
}
break;
}
}
break;
}
- case Toolkit::DevelVisual::Property::FITTING_MODE:
+ case Toolkit::DevelVisual::Property::
VISUAL_
FITTING_MODE:
{
Scripting::GetEnumerationProperty< Visual::FittingMode >(
{
Scripting::GetEnumerationProperty< Visual::FittingMode >(
- value,
FITTING_MODE_TABLE,
FITTING_MODE_TABLE_COUNT, mImpl->mFittingMode );
+ value,
VISUAL_FITTING_MODE_TABLE, VISUAL_
FITTING_MODE_TABLE_COUNT, mImpl->mFittingMode );
break;
}
}
break;
}
}
@@
-291,7
+292,6
@@
void Visual::Base::SetOffStage( Actor& actor )
{
DoSetOffStage( actor );
mImpl->mMixColorIndex = Property::INVALID_INDEX;
{
DoSetOffStage( actor );
mImpl->mMixColorIndex = Property::INVALID_INDEX;
- mImpl->mOpacityIndex = Property::INVALID_INDEX;
mImpl->mFlags &= ~Impl::IS_ON_STAGE;
}
}
mImpl->mFlags &= ~Impl::IS_ON_STAGE;
}
}
@@
-318,8
+318,8
@@
void Visual::Base::CreatePropertyMap( Property::Map& map ) const
map.Insert( Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a );
auto fittingModeString = Scripting::GetLinearEnumerationName< FittingMode >(
map.Insert( Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a );
auto fittingModeString = Scripting::GetLinearEnumerationName< FittingMode >(
- mImpl->mFittingMode,
FITTING_MODE_TABLE,
FITTING_MODE_TABLE_COUNT );
- map.Insert( Toolkit::DevelVisual::Property::FITTING_MODE, fittingModeString );
+ mImpl->mFittingMode,
VISUAL_FITTING_MODE_TABLE, VISUAL_
FITTING_MODE_TABLE_COUNT );
+ map.Insert( Toolkit::DevelVisual::Property::
VISUAL_
FITTING_MODE, fittingModeString );
}
void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const
}
void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const
@@
-393,14
+393,7
@@
void Visual::Base::RegisterMixColor()
mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
}
mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
}
- if( mImpl->mOpacityIndex == Property::INVALID_INDEX )
- {
- mImpl->mOpacityIndex = DevelHandle::RegisterProperty(
- mImpl->mRenderer,
- Toolkit::Visual::Property::OPACITY,
- OPACITY,
- mImpl->mMixColor.a );
- }
+ mImpl->mRenderer.SetProperty( DevelRenderer::Property::OPACITY, mImpl->mMixColor.a );
float preMultipliedAlpha = 0.0f;
if( IsPreMultipliedAlphaEnabled() )
float preMultipliedAlpha = 0.0f;
if( IsPreMultipliedAlphaEnabled() )
@@
-417,7
+410,7
@@
void Visual::Base::SetMixColor( const Vector4& color )
if( mImpl->mRenderer )
{
mImpl->mRenderer.SetProperty( mImpl->mMixColorIndex, Vector3(color) );
if( mImpl->mRenderer )
{
mImpl->mRenderer.SetProperty( mImpl->mMixColorIndex, Vector3(color) );
- mImpl->mRenderer.SetProperty(
mImpl->mOpacityIndex
, color.a );
+ mImpl->mRenderer.SetProperty(
DevelRenderer::Property::OPACITY
, color.a );
if( color.a < 1.f )
{
mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
if( color.a < 1.f )
{
mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
@@
-600,27
+593,22
@@
void Visual::Base::AnimateOpacityProperty(
Dali::Animation& transition,
Internal::TransitionData::Animator& animator )
{
Dali::Animation& transition,
Internal::TransitionData::Animator& animator )
{
- Property::Index index = mImpl->mOpacityIndex;
-
bool isOpaque = mImpl->mMixColor.a >= 1.0f;
bool isOpaque = mImpl->mMixColor.a >= 1.0f;
- if( index != Property::INVALID_INDEX )
+ float initialOpacity;
+ if( animator.initialValue.Get( initialOpacity ) )
{
{
- float initialOpacity;
- if( animator.initialValue.Get( initialOpacity ) )
- {
- isOpaque = (initialOpacity >= 1.0f);
- }
-
- float targetOpacity;
- if( animator.targetValue.Get( targetOpacity ) )
- {
- mImpl->mMixColor.a = targetOpacity;
- }
+ isOpaque = (initialOpacity >= 1.0f);
+ }
- SetupTransition( transition, animator, index, animator.initialValue, animator.targetValue );
- SetupBlendMode( transition, isOpaque, animator.animate );
+ float targetOpacity;
+ if( animator.targetValue.Get( targetOpacity ) )
+ {
+ mImpl->mMixColor.a = targetOpacity;
}
}
+
+ SetupTransition( transition, animator, DevelRenderer::Property::OPACITY, animator.initialValue, animator.targetValue );
+ SetupBlendMode( transition, isOpaque, animator.animate );
}
void Visual::Base::AnimateRendererProperty(
}
void Visual::Base::AnimateRendererProperty(
@@
-699,7
+687,7
@@
void Visual::Base::AnimateMixColorProperty(
SetupTransition( transition, animator, index, initialMixColor, targetMixColor );
if( animateOpacity )
{
SetupTransition( transition, animator, index, initialMixColor, targetMixColor );
if( animateOpacity )
{
- SetupTransition( transition, animator,
mImpl->mOpacityIndex
, initialOpacity, targetOpacity );
+ SetupTransition( transition, animator,
DevelRenderer::Property::OPACITY
, initialOpacity, targetOpacity );
SetupBlendMode( transition, isOpaque, animator.animate );
}
}
SetupBlendMode( transition, isOpaque, animator.animate );
}
}