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
Fix the text visual shaders to work with pre-multiplied alpha
[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
c829e8f
..
bd31fe7
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.cpp
@@
-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
@@
-301,9
+303,9
@@
void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const
}
}
-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
+316,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 ) );
}
}
}
}
@@
-366,7
+369,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 )