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
Revert TextVisual in TextLabel Patches
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
filters
/
emboss-filter.cpp
diff --git
a/dali-toolkit/internal/filters/emboss-filter.cpp
b/dali-toolkit/internal/filters/emboss-filter.cpp
index
849e81b
..
6350a1d
100644
(file)
--- a/
dali-toolkit/internal/filters/emboss-filter.cpp
+++ b/
dali-toolkit/internal/filters/emboss-filter.cpp
@@
-29,8
+29,9
@@
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/visual
-factory/devel-visual-properties
.h>
+#include <dali-toolkit/devel-api/visual
s/visual-properties-devel
.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
namespace Dali
{
namespace Dali
{
@@
-96,7
+97,7
@@
void EmbossFilter::Enable()
Property::Map customShader;
customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = EMBOSS_FRAGMENT_SOURCE;
Property::Map visualMap;
Property::Map customShader;
customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = EMBOSS_FRAGMENT_SOURCE;
Property::Map visualMap;
- visualMap.Insert( Toolkit::
Visual
Property::SHADER, customShader );
+ visualMap.Insert( Toolkit::
DevelVisual::
Property::SHADER, customShader );
// create actor to render input with applied emboss effect
mActorForInput1 = Toolkit::ImageView::New(mInputImage);
// create actor to render input with applied emboss effect
mActorForInput1 = Toolkit::ImageView::New(mInputImage);
@@
-127,10
+128,10
@@
void EmbossFilter::Enable()
mRootActor.Add( mActorForComposite );
mRootActor.Add( mActorForComposite );
- InitializeVisual( mActorForComposite, mVisualForEmboss1, mImageForEmboss1 );
+ In
ternal::In
itializeVisual( mActorForComposite, mVisualForEmboss1, mImageForEmboss1 );
Toolkit::GetImplementation( mVisualForEmboss1 ).SetCustomShader( customShader );
mActorForComposite.GetRendererAt(0).RegisterProperty( COLOR_UNIFORM_NAME, Color::BLACK );
Toolkit::GetImplementation( mVisualForEmboss1 ).SetCustomShader( customShader );
mActorForComposite.GetRendererAt(0).RegisterProperty( COLOR_UNIFORM_NAME, Color::BLACK );
- InitializeVisual( mActorForComposite, mVisualForEmboss2, mImageForEmboss2 );
+ In
ternal::In
itializeVisual( mActorForComposite, mVisualForEmboss2, mImageForEmboss2 );
Toolkit::GetImplementation( mVisualForEmboss2 ).SetCustomShader( customShader );
mActorForComposite.GetRendererAt(1).RegisterProperty( COLOR_UNIFORM_NAME, Color::WHITE );
Toolkit::GetImplementation( mVisualForEmboss2 ).SetCustomShader( customShader );
mActorForComposite.GetRendererAt(1).RegisterProperty( COLOR_UNIFORM_NAME, Color::WHITE );
@@
-162,8
+163,8
@@
void EmbossFilter::Disable()
if( mActorForComposite )
{
if( mActorForComposite )
{
-
mVisualForEmboss1
.SetOffStage( mActorForComposite );
-
mVisualForEmboss2
.SetOffStage( mActorForComposite );
+
Toolkit::GetImplementation(mVisualForEmboss1)
.SetOffStage( mActorForComposite );
+
Toolkit::GetImplementation(mVisualForEmboss2)
.SetOffStage( mActorForComposite );
mVisualForEmboss1.Reset();
mVisualForEmboss2.Reset();
mRootActor.Remove( mActorForComposite );
mVisualForEmboss1.Reset();
mVisualForEmboss2.Reset();
mRootActor.Remove( mActorForComposite );
@@
-181,6
+182,11
@@
void EmbossFilter::Disable()
taskList.RemoveTask(mRenderTaskForEmboss2);
}
taskList.RemoveTask(mRenderTaskForEmboss2);
}
+ if( mRenderTaskForOutput )
+ {
+ taskList.RemoveTask( mRenderTaskForOutput );
+ }
+
mRootActor.Reset();
}
}
mRootActor.Reset();
}
}