X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-view-impl.h;h=1f4bc167a777b787787fcde29375e0cf3e3f93fc;hp=e17f2a0660daef8cc1b658d038bb04b999a41435;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=a9e64686388c10743bf66a9c5d6e0aa06e198c70 diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h index e17f2a0..1f4bc16 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h @@ -64,16 +64,16 @@ protected: /** * Apply an effect onto the page actor. - * @param[in] shader The shader for rendering effect. + * @param[in] newShader The shader for rendering effect. */ - void UseEffect(Shader shader); + void UseEffect(Shader newShader); /** * Apply an effect onto the page actor. - * @param[in] shader The shader for rendering effect. + * @param[in] newShader The shader for rendering effect. * @param[in] geometry The geometry for rendering effect. */ - void UseEffect(Shader shader, Geometry geometry); + void UseEffect(Shader newShader, Geometry geometry); /** * Change the page turning direction. @@ -105,7 +105,8 @@ protected: void SetCurrentCenter( const Vector2& value ); Actor actor; ///< The page actor - Material material; ///< The material of the actor + Shader shader; ///< The shader used by the actor + TextureSet textureSet; ///< The set of textures used by the actor Renderer renderer; ///< The renderer of the actor bool isTurnBack; ///< The turning direction Property::Index propertyPanDisplacement; ///< The horizontal displacement of the pan