X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-impl.h;h=e7d8ddd45939c3ef1d17ef3170442450c83afa9f;hp=432a3f224dce9429e76beae11f3f5311ca3dca2f;hb=5a2a5883422f4d114902ac57d57d7d1e973fbb2e;hpb=6ccaa1ddf53d121a0d8427ae6959137279be18fc diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h index 432a3f2..e7d8ddd 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@ -19,15 +19,18 @@ */ // EXTERNAL INCLUDES +#include #include #include #include +#include #include // INTERNAL INCLUDES #include -#include #include +#include +#include namespace Dali { @@ -84,22 +87,22 @@ public: /** * @copydoc Toolkit::Visual::Base::SetSize */ - virtual void SetSize( const Vector2& size ); + void SetTransformAndSize( const Property::Map& transform, Size controlSize ); /** - * @copydoc Toolkit::Visual::Base::GetSize + * @copydoc Toolkit::Visual::Base::GetHeightForWidth */ - const Vector2& GetSize() const; + virtual float GetHeightForWidth( float width ); /** - * @copydoc Toolkit::Visual::Base::GetHeightForWidth + * @copydoc Toolkit::Visual::Base::GetWidthForHeight */ - virtual float GetHeightForWidth( float width ) const; + virtual float GetWidthForHeight( float height ); /** * @copydoc Toolkit::Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ) const; + virtual void GetNaturalSize( Vector2& naturalSize ); /** * @copydoc Toolkit::Visual::Base::SetDepthIndex @@ -157,6 +160,44 @@ public: */ Dali::Property::Value GetProperty( Dali::Property::Index index ); + /** + * Gets currently staged renderer, or an empty handle if not staged + */ + Renderer GetRenderer(); + + /** + * Sets the mix color ( including opacity ) of the visual. + * @param[in] mixColor The new mix color + */ + void SetMixColor( const Vector4& color ); + + /** + * Sets the mix color of the visual. + * @param[in] mixColor The new mix color + */ + void SetMixColor( const Vector3& color ); + + /** + * Gets the mix color of the visual. + * @return The mix color + */ + const Vector4& GetMixColor() const; + + /** + * Animate the property if it exists in the visual or renderer. + * + * If it's a visual property such as mix color or a transform property, + * saves the target value to the local data. + * + * If the visual isn't staged (i.e. it doesn't have a renderer), + * then this will not add an animation. + * + * @param[in] transition The animation to create or attach to + * @param[in] animator The animation parameters of the property. + */ + void AnimateProperty( Dali::Animation& transition, + Internal::TransitionData::Animator& animator ); + protected: /** @@ -172,6 +213,7 @@ protected: virtual ~Base(); protected: + /** * @brief Called by CreatePropertyMap() allowing sub classes to respond to the CreatePropertyMap event * @@ -186,7 +228,11 @@ protected: */ virtual void DoSetProperties( const Property::Map& propertyMap ) = 0; -protected: + /** + * @brief Called when transform or control size changes + * ( Of use to SVG and Text visuals ) + */ + virtual void OnSetTransform() = 0; /** * @brief Called by SetOnStage() allowing sub classes to respond to the SetOnStage event @@ -220,25 +266,93 @@ protected: */ bool IsFromCache() const; -protected: +private: + + /** + * Register the mix color uniform on the Renderer and store the property index. + * Note, this is not used by Color or Primitive Visuals, which will use their + * own property index. + */ + void RegisterMixColor(); + /** - * @brief Called by SetProperty(). To be overriden by derived clases in order to set properties. + * Find the matching property on the renderer or shader. If it's a shader + * property, register it on the renderer in order to animate it for this + * visual independently. + * @param[in] key The key to match. + * @return the matching index, or INVALID_INDEX if it's not found + */ + Property::Index GetPropertyIndex( Property::Key key ); + + /** + * Set up the transition. If no animation is required, then + * transition will be untouched. * - * @param [in] index The index of the property. - * @param [in] propertyValue The new value of the property. + * @param[in] transition The transition to use or set up. + * @param[in] animator The animation data to use + * @param[in] index The property index on the renderer to animate + * @param[in] initialValue The optional initial value + * @param[in] targetValue The target value to use */ - virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ) = 0; + void SetupTransition( Dali::Animation& transition, + Internal::TransitionData::Animator& animator, + Property::Index index, + Property::Value& initialValue, + Property::Value& targetValue ); /** - * @brief Called by GetProperty(). To be overriden by derived classes in order to retrieve properties. + * Animate the opacity property - Special handling to + * ensure that the blend mode is set to ON whilst animating, + * and set back to AUTO if it's opaque at the end of the + * animation. * - * @param [in] index The index of the property. + * @param[in] transition The transition to use or set up. + * @param[in] animator The animation data to use + */ + void AnimateOpacityProperty( Dali::Animation& transition, + Internal::TransitionData::Animator& animator ); + + /** + * Animate the renderer property - no special handling * - * @return The property value. + * @param[in] transition The transition to use or set up. + * @param[in] animator The animation data to use */ - virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index ) = 0; + void AnimateRendererProperty( Dali::Animation& transition, + Internal::TransitionData::Animator& animator ); -private: + /** + * Animate the mix color property. + * + * If the animator is a vec3, then it only animates the color + * channels without animating the opacity. If it's a vec4, then it + * runs 2 animators, one for the the vec3 mixColor, and one for the + * opacity. (They are separate uniforms in the shader ) + * + * @param[in] transition The transition to use or set up. + * @param[in] animator The animation data to use + */ + void AnimateMixColorProperty( Dali::Animation& transition, + Internal::TransitionData::Animator& animator ); + + /** + * Set up the right blend mode if the opacity is being animated. + * Also ensure that when the animation finishes, the blend mode is + * set to the appropriate value. It also uses the target value as + * set into mMixColor. + * + * @param[in] transition The transition to listen to + * @param[in] isInitialOpaque Whether the initial value is opaque + * @param[in] animating If the transition animates the value. + */ + void SetupBlendMode( Dali::Animation& transition, + bool isInitialOpaque, bool animating ); + + /** + * When a mix color animation has finished, ensure the blend mode is set back + * to the right value for the target opacity. + */ + void OnMixColorFinished( Animation& animation ); // Undefined Base( const Visual::Base& visual );