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
Loop count support for animated GIF
[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
old mode 100644
(file)
new mode 100755
(executable)
index
7add024
..
e4f12c8
--- a/
dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.cpp
@@
-26,7
+26,7
@@
//INTERNAL HEARDER
#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
#include <dali-toolkit/public-api/visuals/primitive-visual-properties.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/
devel-api/visuals/visual-properties-devel
.h>
+#include <dali-toolkit/
public-api/visuals/visual-properties
.h>
#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
@@
-35,6
+35,8
@@
namespace
#if defined(DEBUG_ENABLED)
Debug::Filter* gVisualBaseLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VISUAL_BASE" );
#endif
#if defined(DEBUG_ENABLED)
Debug::Filter* gVisualBaseLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VISUAL_BASE" );
#endif
+
+const char * const PRE_MULTIPLIED_ALPHA_PROPERTY( "preMultipliedAlpha" );
}
namespace Dali
}
namespace Dali
@@
-82,29
+84,29
@@
void Visual::Base::SetProperties( const Property::Map& propertyMap )
{
if( matchKey == CUSTOM_SHADER )
{
{
if( matchKey == CUSTOM_SHADER )
{
- matchKey = Property::Key(
Devel
Visual::Property::SHADER );
+ matchKey = Property::Key(
Toolkit::
Visual::Property::SHADER );
}
else if( matchKey == TRANSFORM )
{
}
else if( matchKey == TRANSFORM )
{
- matchKey = Property::Key(
Devel
Visual::Property::TRANSFORM );
+ matchKey = Property::Key(
Toolkit::
Visual::Property::TRANSFORM );
}
else if( matchKey == PREMULTIPLIED_ALPHA )
{
}
else if( matchKey == PREMULTIPLIED_ALPHA )
{
- matchKey = Property::Key(
Devel
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(
Devel
Visual::Property::MIX_COLOR );
+ matchKey = Property::Key(
Toolkit::
Visual::Property::MIX_COLOR );
}
else if( matchKey == OPACITY )
{
}
else if( matchKey == OPACITY )
{
- matchKey = Property::Key(
Devel
Visual::Property::OPACITY );
+ matchKey = Property::Key(
Toolkit::
Visual::Property::OPACITY );
}
}
switch( matchKey.indexKey )
{
}
}
switch( matchKey.indexKey )
{
- case
Devel
Visual::Property::SHADER:
+ case
Toolkit::
Visual::Property::SHADER:
{
Property::Map shaderMap;
if( value.Get( shaderMap ) )
{
Property::Map shaderMap;
if( value.Get( shaderMap ) )
@@
-114,7
+116,7
@@
void Visual::Base::SetProperties( const Property::Map& propertyMap )
break;
}
break;
}
- case
Devel
Visual::Property::TRANSFORM:
+ case
Toolkit::
Visual::Property::TRANSFORM:
{
Property::Map map;
if( value.Get( map ) )
{
Property::Map map;
if( value.Get( map ) )
@@
-124,7
+126,7
@@
void Visual::Base::SetProperties( const Property::Map& propertyMap )
break;
}
break;
}
- case
Devel
Visual::Property::PREMULTIPLIED_ALPHA:
+ case
Toolkit::
Visual::Property::PREMULTIPLIED_ALPHA:
{
bool premultipliedAlpha = false;
if( value.Get( premultipliedAlpha ) )
{
bool premultipliedAlpha = false;
if( value.Get( premultipliedAlpha ) )
@@
-134,7
+136,7
@@
void Visual::Base::SetProperties( const Property::Map& propertyMap )
break;
}
break;
}
- case
Devel
Visual::Property::MIX_COLOR:
+ case
Toolkit::
Visual::Property::MIX_COLOR:
{
Vector4 mixColor;
if( value.Get( mixColor ) )
{
Vector4 mixColor;
if( value.Get( mixColor ) )
@@
-151,7
+153,7
@@
void Visual::Base::SetProperties( const Property::Map& propertyMap )
}
break;
}
}
break;
}
- case
Devel
Visual::Property::OPACITY:
+ case
Toolkit::
Visual::Property::OPACITY:
{
float opacity;
if( value.Get( opacity ) )
{
float opacity;
if( value.Get( opacity ) )
@@
-221,6
+223,11
@@
void Visual::Base::GetNaturalSize( Vector2& naturalSize )
naturalSize = Vector2::ZERO;
}
naturalSize = Vector2::ZERO;
}
+void Visual::Base::DoAction( const Property::Index actionId, const Property::Value attributes )
+{
+ OnDoAction( actionId, attributes );
+}
+
void Visual::Base::SetDepthIndex( int index )
{
mImpl->mDepthIndex = index;
void Visual::Base::SetDepthIndex( int index )
{
mImpl->mDepthIndex = index;
@@
-276,15
+283,15
@@
void Visual::Base::CreatePropertyMap( Property::Map& map ) const
Property::Map transform;
mImpl->mTransform.GetPropertyMap( transform );
Property::Map transform;
mImpl->mTransform.GetPropertyMap( transform );
- map.Insert(
Devel
Visual::Property::TRANSFORM, transform );
+ map.Insert(
Toolkit::
Visual::Property::TRANSFORM, transform );
bool premultipliedAlpha( IsPreMultipliedAlphaEnabled() );
bool premultipliedAlpha( IsPreMultipliedAlphaEnabled() );
- map.Insert(
Devel
Visual::Property::PREMULTIPLIED_ALPHA, premultipliedAlpha );
+ 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.
// 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(
Devel
Visual::Property::MIX_COLOR, mImpl->mMixColor ); // vec4
- map.Insert(
Devel
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 );
}
void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const
}
void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const
@@
-296,14
+303,14
@@
void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const
mImpl->mCustomShader->CreatePropertyMap( map );
}
mImpl->mCustomShader->CreatePropertyMap( map );
}
- //map.Insert(
Devel
Visual::Property::DEPTH_INDEX, mImpl->mDepthIndex );
- //map.Insert(
Devel
Visual::Property::ENABLED, (bool) mImpl->mRenderer );
+ //map.Insert(
Toolkit::
Visual::Property::DEPTH_INDEX, mImpl->mDepthIndex );
+ //map.Insert(
Toolkit::
Visual::Property::ENABLED, (bool) mImpl->mRenderer );
}
}
-void Visual::Base::EnablePreMultipliedAlpha( bool preMultipled )
+void Visual::Base::EnablePreMultipliedAlpha( bool preMultipl
i
ed )
{
{
- if( preMultipled )
+ if( preMultipl
i
ed )
{
mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
}
{
mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
}
@@
-314,7
+321,8
@@
void Visual::Base::EnablePreMultipliedAlpha( bool preMultipled )
if( mImpl->mRenderer )
{
if( mImpl->mRenderer )
{
- mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, preMultipled);
+ mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, preMultiplied);
+ mImpl->mRenderer.RegisterProperty( PRE_MULTIPLIED_ALPHA_PROPERTY, static_cast<float>( preMultiplied ) );
}
}
}
}
@@
-334,6
+342,11
@@
bool Visual::Base::IsOnStage() const
return mImpl->mFlags & Impl::IS_ON_STAGE;
}
return mImpl->mFlags & Impl::IS_ON_STAGE;
}
+void Visual::Base::OnDoAction( const Property::Index actionId, const Property::Value& attributes )
+{
+ // May be overriden by derived class
+}
+
void Visual::Base::RegisterMixColor()
{
// Only register if not already registered.
void Visual::Base::RegisterMixColor()
{
// Only register if not already registered.
@@
-342,7
+355,7
@@
void Visual::Base::RegisterMixColor()
{
mImpl->mMixColorIndex = DevelHandle::RegisterProperty(
mImpl->mRenderer,
{
mImpl->mMixColorIndex = DevelHandle::RegisterProperty(
mImpl->mRenderer,
- Toolkit::
Devel
Visual::Property::MIX_COLOR,
+ Toolkit::Visual::Property::MIX_COLOR,
MIX_COLOR,
Vector3(mImpl->mMixColor) );
}
MIX_COLOR,
Vector3(mImpl->mMixColor) );
}
@@
-356,7
+369,7
@@
void Visual::Base::RegisterMixColor()
{
mImpl->mOpacityIndex = DevelHandle::RegisterProperty(
mImpl->mRenderer,
{
mImpl->mOpacityIndex = DevelHandle::RegisterProperty(
mImpl->mRenderer,
- Toolkit::
Devel
Visual::Property::OPACITY,
+ Toolkit::Visual::Property::OPACITY,
OPACITY,
mImpl->mMixColor.a );
}
OPACITY,
mImpl->mMixColor.a );
}
@@
-366,7
+379,7
@@
void Visual::Base::RegisterMixColor()
{
preMultipliedAlpha = 1.0f;
}
{
preMultipliedAlpha = 1.0f;
}
- mImpl->mRenderer.RegisterProperty(
"preMultipliedAlpha"
, preMultipliedAlpha );
+ mImpl->mRenderer.RegisterProperty(
PRE_MULTIPLIED_ALPHA_PROPERTY
, preMultipliedAlpha );
}
void Visual::Base::SetMixColor( const Vector4& color )
}
void Visual::Base::SetMixColor( const Vector4& color )
@@
-411,25
+424,28
@@
void Visual::Base::RemoveResourceObserver( Visual::ResourceObserver& observer )
mImpl->mResourceObserver = NULL;
}
mImpl->mResourceObserver = NULL;
}
-void Visual::Base::ResourceReady()
+void Visual::Base::ResourceReady(
Toolkit::Visual::ResourceStatus resourceStatus
)
{
{
- if( mImpl->mResource
Ready
)
+ if( mImpl->mResource
Status != resourceStatus
)
{
{
- // only inform the observer the first time the resource is ready
- return;
- }
- mImpl->mResourceReady = true;
+ mImpl->mResourceStatus = resourceStatus;
- if( mImpl->mResourceObserver )
- {
- // observer is currently a control impl
- mImpl->mResourceObserver->ResourceReady( *this );
+ if( mImpl->mResourceObserver )
+ {
+ // observer is currently a control impl
+ mImpl->mResourceObserver->ResourceReady( *this );
+ }
}
}
bool Visual::Base::IsResourceReady() const
{
}
}
bool Visual::Base::IsResourceReady() const
{
- return mImpl->mResourceReady;
+ return ( mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY );
+}
+
+Toolkit::Visual::ResourceStatus Visual::Base::GetResourceStatus() const
+{
+ return mImpl->mResourceStatus;
}
Renderer Visual::Base::GetRenderer()
}
Renderer Visual::Base::GetRenderer()
@@
-520,14
+536,14
@@
void Visual::Base::AnimateProperty(
Property::Map map;
DoCreatePropertyMap( map );
Property::Map map;
DoCreatePropertyMap( map );
- Property::Value* valuePtr = map.Find( Toolkit::
Devel
Visual::Property::TYPE );
+ Property::Value* valuePtr = map.Find( Toolkit::Visual::Property::TYPE );
int visualType = -1;
if( valuePtr )
{
valuePtr->Get( visualType );
}
int visualType = -1;
if( valuePtr )
{
valuePtr->Get( visualType );
}
- if( animator.propertyKey == Toolkit::
Devel
Visual::Property::MIX_COLOR ||
+ if( animator.propertyKey == Toolkit::Visual::Property::MIX_COLOR ||
animator.propertyKey == MIX_COLOR ||
( visualType == Toolkit::Visual::COLOR &&
animator.propertyKey == ColorVisual::Property::MIX_COLOR ) ||
animator.propertyKey == MIX_COLOR ||
( visualType == Toolkit::Visual::COLOR &&
animator.propertyKey == ColorVisual::Property::MIX_COLOR ) ||
@@
-536,7
+552,7
@@
void Visual::Base::AnimateProperty(
{
AnimateMixColorProperty( transition, animator );
}
{
AnimateMixColorProperty( transition, animator );
}
- else if(animator.propertyKey == Toolkit::
Devel
Visual::Property::OPACITY ||
+ else if(animator.propertyKey == Toolkit::Visual::Property::OPACITY ||
animator.propertyKey == OPACITY )
{
AnimateOpacityProperty( transition, animator );
animator.propertyKey == OPACITY )
{
AnimateOpacityProperty( transition, animator );