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
[dali_2.3.17] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
motion-blur-effect.cpp
diff --git
a/dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp
b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp
index
430832e
..
a987243
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp
+++ b/
dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp
@@
-22,15
+22,14
@@
#include <dali/public-api/rendering/shader.h>
// INTERNAL INCLUDES
#include <dali/public-api/rendering/shader.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
namespace Dali
{
namespace Toolkit
{
namespace Dali
{
namespace Toolkit
{
-
-void SetMotionBlurProperties( Actor& actor, unsigned int numBlurSamples )
+void SetMotionBlurProperties(Actor& actor, unsigned int numBlurSamples)
{
actor.RegisterProperty("uBlurTexCoordScale", 0.125f);
actor.RegisterProperty("uGeometryStretchFactor", 0.05f);
{
actor.RegisterProperty("uBlurTexCoordScale", 0.125f);
actor.RegisterProperty("uGeometryStretchFactor", 0.05f);
@@
-48,7
+47,6
@@
void SetMotionBlurProperties( Actor& actor, unsigned int numBlurSamples )
constraint.Apply();
}
constraint.Apply();
}
-
Property::Map CreateMotionBlurEffect()
{
Property::Map map;
Property::Map CreateMotionBlurEffect()
{
Property::Map map;
@@
-66,5
+64,5
@@
Property::Map CreateMotionBlurEffect()
return map;
}
return map;
}
-} // Toolkit
-} // Dali
+} //
namespace
Toolkit
+} //
namespace
Dali