X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fmotion-blur-effect.h;h=8e7179173baf8f4a3d8a24d807af2e3436c54084;hb=refs%2Fchanges%2F67%2F67467%2F3;hp=aede5f1eb34b00767ef0e626718857850a94ff89;hpb=6da8438e9ac7350d9cc6f69b35cbcc4ab3987da1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h index aede5f1..8e71791 100644 --- a/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h +++ b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h @@ -19,7 +19,6 @@ */ // EXTERNAL INCLUDES -#include #include namespace Dali @@ -31,7 +30,8 @@ namespace Toolkit /** * @brief Set the properties for the motion blur * - * @param numBlurSamples Number of samples used by the shader + * @param[in] actor The actor that registers the uniform properties + * @param[in] numBlurSamples Number of samples used by the shader */ inline void SetMotionBlurProperties( Actor& actor, unsigned int numBlurSamples = 8 ) { @@ -223,14 +223,14 @@ inline Property::Map CreateMotionBlurEffect() Property::Map map; Property::Map customShader; - customShader[ "vertex-shader" ] = vertexSource; - customShader[ "fragment-shader" ] = fragmentSource; + customShader[ "vertexShader" ] = vertexSource; + customShader[ "fragmentShader" ] = fragmentSource; - customShader[ "subdivide-grid-x" ] = 10; - customShader[ "subdivide-grid-y" ] = 10; + customShader[ "subdivideGridX" ] = 10; + customShader[ "subdivideGridY" ] = 10; // NOTE: we must turn on alpha blending for the actor (HINT_BLENDING) - customShader[ "hints" ] = "output-is-transparent"; + customShader[ "hints" ] = "outputIsTransparent"; map[ "shader" ] = customShader; return map;