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
Don't set position or offset on image visuals with fitting mode FILL
[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
92095dc
..
7f6dd18
100644
(file)
--- a/
dali-toolkit/internal/filters/emboss-filter.cpp
+++ b/
dali-toolkit/internal/filters/emboss-filter.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-29,7
+29,7
@@
// 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/
public-api/visuals/
visual-properties.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
@@
-97,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::VisualProperty::SHADER, customShader );
+ visualMap.Insert( Toolkit::Visual
::
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);
@@
-163,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 );