X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fmotion-blur-effect.h;h=9e6adc7e9fed597eaf85133eb1a5fa58cf2c5f96;hb=refs%2Fchanges%2F60%2F81060%2F11;hp=aede5f1eb34b00767ef0e626718857850a94ff89;hpb=2da985674b8a2344bc07ea3cf02f05d86d512249;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..9e6adc7 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 ) { @@ -77,11 +77,11 @@ inline void SetMotionBlurProperties( Actor& actor, unsigned int numBlurSamples = * "uObjectFadeStart" - The displacement from the centre of the actor that the actor will start to fade towards its * edges. This is used to prevent an unsightly hard edge between the blurred actor and the scene. * Depends on the values of the vertices in the vertex stream. When the actor is at rest this is - * not applied. Default 0.25, which is half way towards the edge for an ImageRenderer::QUAD. + * not applied. Default 0.25, which is half way towards the edge for an ImageVisual::QUAD. * "uObjectFadeEnd" - The displacement from the centre of the actor that the actor will finish fading towards its * edges. This is used to prevent an unsightly hard edge between the blurred actor and the scene. * Depends on the values of the vertices in the vertex stream. When the actor is at rest this is - * not applied.Default 0.5, which is all the way towards the edge for an ImageRenderer::QUAD. + * not applied.Default 0.5, which is all the way towards the edge for an ImageVisual::QUAD. * "uAlphaScale" - Global scaler applied to the alpha of the actor. Used to make the blurred actor a bit more subtle * (helps to hide discontinuities due to limited number of texture samples) and reveal a bit of the * background behind it as it moves. When the actor is at rest this is not applied. Default 0.75. @@ -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;