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 "Deprecate the public APIs taking Image as input" 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
9d0c964
..
8356de5
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.cpp
@@
-36,21
+36,18
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
-namespace Visual
-{
-
-Base::Base( VisualFactoryCache& factoryCache )
+Visual::Base::Base( VisualFactoryCache& factoryCache )
: mImpl( new Impl() ),
mFactoryCache( factoryCache )
{
}
: mImpl( new Impl() ),
mFactoryCache( factoryCache )
{
}
-Base::~Base()
+
Visual::
Base::~Base()
{
delete mImpl;
}
{
delete mImpl;
}
-void Base::SetCustomShader( const Property::Map& shaderMap )
+void
Visual::
Base::SetCustomShader( const Property::Map& shaderMap )
{
if( mImpl->mCustomShader )
{
{
if( mImpl->mCustomShader )
{
@@
-62,7
+59,7
@@
void Base::SetCustomShader( const Property::Map& shaderMap )
}
}
}
}
-void Base::Initialize( Actor& actor, const Property::Map& propertyMap )
+void
Visual::
Base::Initialize( Actor& actor, const Property::Map& propertyMap )
{
Property::Value* customShaderValue = propertyMap.Find( Toolkit::Visual::Property::SHADER, CUSTOM_SHADER );
if( customShaderValue )
{
Property::Value* customShaderValue = propertyMap.Find( Toolkit::Visual::Property::SHADER, CUSTOM_SHADER );
if( customShaderValue )
@@
-77,31
+74,22
@@
void Base::Initialize( Actor& actor, const Property::Map& propertyMap )
DoInitialize( actor, propertyMap );
}
DoInitialize( actor, propertyMap );
}
-void Base::SetSize( const Vector2& size )
+void
Visual::
Base::SetSize( const Vector2& size )
{
mImpl->mSize = size;
}
{
mImpl->mSize = size;
}
-const Vector2& Base::GetSize() const
+const Vector2&
Visual::
Base::GetSize() const
{
return mImpl->mSize;
}
{
return mImpl->mSize;
}
-void Base::GetNaturalSize( Vector2& naturalSize ) const
+void
Visual::
Base::GetNaturalSize( Vector2& naturalSize ) const
{
naturalSize = Vector2::ZERO;
}
{
naturalSize = Vector2::ZERO;
}
-void Base::SetClipRect( const Rect<int>& clipRect )
-{
-}
-
-void Base::SetOffset( const Vector2& offset )
-{
- mImpl->mOffset = offset;
-}
-
-void Base::SetDepthIndex( float index )
+void Visual::Base::SetDepthIndex( float index )
{
mImpl->mDepthIndex = index;
if( mImpl->mRenderer )
{
mImpl->mDepthIndex = index;
if( mImpl->mRenderer )
@@
-110,23
+98,23
@@
void Base::SetDepthIndex( float index )
}
}
}
}
-float Base::GetDepthIndex() const
+float
Visual::
Base::GetDepthIndex() const
{
return mImpl->mDepthIndex;
}
{
return mImpl->mDepthIndex;
}
-void Base::SetOnStage( Actor& actor )
+void
Visual::
Base::SetOnStage( Actor& actor )
{
{
+ // 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 );
mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, IsPreMultipliedAlphaEnabled());
mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex );
DoSetOnStage( actor );
mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, IsPreMultipliedAlphaEnabled());
mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex );
- actor.AddRenderer( mImpl->mRenderer );
-
mImpl->mFlags |= Impl::IS_ON_STAGE;
}
mImpl->mFlags |= Impl::IS_ON_STAGE;
}
-void Base::SetOffStage( Actor& actor )
+void
Visual::
Base::SetOffStage( Actor& actor )
{
if( GetIsOnStage() )
{
{
if( GetIsOnStage() )
{
@@
-136,7
+124,7
@@
void Base::SetOffStage( Actor& actor )
}
}
}
}
-void Base::EnablePreMultipliedAlpha( bool preMultipled )
+void
Visual::
Base::EnablePreMultipliedAlpha( bool preMultipled )
{
if(preMultipled)
{
{
if(preMultipled)
{
@@
-153,22
+141,18
@@
void Base::EnablePreMultipliedAlpha( bool preMultipled )
}
}
}
}
-bool Base::IsPreMultipliedAlphaEnabled() const
+bool
Visual::
Base::IsPreMultipliedAlphaEnabled() const
{
return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA;
}
{
return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA;
}
-void Base::DoSetOnStage( Actor& actor )
-{
-}
-
-void Base::DoSetOffStage( Actor& actor )
+void Visual::Base::DoSetOffStage( Actor& actor )
{
actor.RemoveRenderer( mImpl->mRenderer );
mImpl->mRenderer.Reset();
}
{
actor.RemoveRenderer( mImpl->mRenderer );
mImpl->mRenderer.Reset();
}
-void Base::CreatePropertyMap( Property::Map& map ) const
+void
Visual::
Base::CreatePropertyMap( Property::Map& map ) const
{
DoCreatePropertyMap( map );
{
DoCreatePropertyMap( map );
@@
-178,18
+162,16
@@
void Base::CreatePropertyMap( Property::Map& map ) const
}
}
}
}
-bool Base::GetIsOnStage() const
+bool
Visual::
Base::GetIsOnStage() const
{
return mImpl->mFlags & Impl::IS_ON_STAGE;
}
{
return mImpl->mFlags & Impl::IS_ON_STAGE;
}
-bool Base::GetIsFromCache() const
+bool
Visual::
Base::GetIsFromCache() const
{
return mImpl->mFlags & Impl::IS_FROM_CACHE;
}
{
return mImpl->mFlags & Impl::IS_FROM_CACHE;
}
-} // namespace Visual
-
} // namespace Internal
} // namespace Toolkit
} // namespace Internal
} // namespace Toolkit