X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-gradient%2Fanimated-gradient-visual.h;h=70e992514aff4b164d3443190c8482139b1dc3e5;hp=96ea9ab88faeadfb6b1fb3e013ead82d292e0c8c;hb=9ddd5fea6278d06b8874988498c7c4c6508750ba;hpb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d diff --git a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h old mode 100755 new mode 100644 index 96ea9ab..70e9925 --- a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h +++ b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h @@ -19,26 +19,24 @@ */ //EXTERNAL INCLUDES +#include +#include #include #include -#include -#include //INTERNAL INCLUDES +#include #include #include -#include namespace Dali { - namespace Toolkit { - namespace Internal { class AnimatedGradientVisual; -typedef IntrusivePtr< AnimatedGradientVisual > AnimatedGradientVisualPtr; +typedef IntrusivePtr AnimatedGradientVisualPtr; /** * This visual which renders smooth transition of colors to the control's quad. @@ -131,34 +129,32 @@ typedef IntrusivePtr< AnimatedGradientVisual > AnimatedGradientVisualPtr; class AnimatedGradientVisual : public Visual::Base { public: - /** * Animation informations what this visual using */ struct GradientAnimationData { - GradientAnimationData() - : index( Property::INVALID_INDEX ), - loop_count( 0 ), - delay( 0.0f ), - forward( false ), - auto_mirror( false ) + GradientAnimationData() + : index(Property::INVALID_INDEX), + loop_count(0), + delay(0.0f), + forward(false), + auto_mirror(false) { } Toolkit::TransitionData transition; - Animation animation; - Property::Index index; - int loop_count; ///< if < 0, loop unlimited. else, loop loop_count times. - float delay; ///< delay time. if > 0, wait 'delay' seconds. else, play animation at '-delay' seconds. - bool forward; ///< True if AnimationParameter::DirectionType::Type is FORWARD - bool auto_mirror; ///< True if AnimationParameter::LoopType::Type is MIRROR + Animation animation; + Property::Index index; + int loop_count; ///< if < 0, loop unlimited. else, loop loop_count times. + float delay; ///< delay time. if > 0, wait 'delay' seconds. else, play animation at '-delay' seconds. + bool forward; ///< True if AnimationParameter::DirectionType::Type is FORWARD + bool auto_mirror; ///< True if AnimationParameter::LoopType::Type is MIRROR }; - using GradientAnimationDataList = Dali::OwnerContainer< GradientAnimationData* >; + using GradientAnimationDataList = Dali::OwnerContainer; public: - /** * @brief Create a new animated gradient visual. * @@ -166,28 +162,26 @@ public: * @param[in] properties A Property::Map containing settings for this visual * @return A smart-pointer to the newly allocated visual */ - static AnimatedGradientVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties ); + static AnimatedGradientVisualPtr New(VisualFactoryCache& factoryCache, const Property::Map& properties); private: //from Visual - /** * @copydoc Visual::Base::CreatePropertyMap */ - void DoCreatePropertyMap( Property::Map& map ) const override; + void DoCreatePropertyMap(Property::Map& map) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - void DoCreateInstancePropertyMap( Property::Map& map ) const override; + void DoCreateInstancePropertyMap(Property::Map& map) const override; protected: - /** * @brief Constructor. * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object */ - AnimatedGradientVisual( VisualFactoryCache& factoryCache ); + AnimatedGradientVisual(VisualFactoryCache& factoryCache); /** * @brief A reference counted object may only be deleted by calling Unrefecence() @@ -203,7 +197,7 @@ protected: //from Visual /** * @copydoc Visual::Base::DoSetProperties */ - void DoSetProperties( const Property::Map& propertyMap ) override; + void DoSetProperties(const Property::Map& propertyMap) override; /** * @copydoc Visual::Base::OnSetTransform @@ -213,15 +207,14 @@ protected: //from Visual /** * @copydoc Visual::Base::DoSetOnScene */ - void DoSetOnScene( Actor& actor ) override; + void DoSetOnScene(Actor& actor) override; /** * @copydoc Visual::Base::DoSetOffScene */ - void DoSetOffScene( Actor& actor ) override; + void DoSetOffScene(Actor& actor) override; private: - /** * @brief Initialize the default value of properies. */ @@ -247,7 +240,7 @@ private: * * param[in] propertyMap A Property::Map come from DoSetProperties */ - void SetupGradientAnimationData( const Property::Map& propertyMap ); + void SetupGradientAnimationData(const Property::Map& propertyMap); /** * @brief Create new shader @@ -257,24 +250,24 @@ private: Shader CreateShader(); // Undefined - AnimatedGradientVisual( const AnimatedGradientVisual& gradientRenderer ); + AnimatedGradientVisual(const AnimatedGradientVisual& gradientRenderer); // Undefined - AnimatedGradientVisual& operator=( const AnimatedGradientVisual& gradientRenderer ); + AnimatedGradientVisual& operator=(const AnimatedGradientVisual& gradientRenderer); private: GradientAnimationDataList mGradientAnimationDataList; - Property::Map mValueMap; + Property::Map mValueMap; Dali::Toolkit::DevelAnimatedGradientVisual::GradientType::Type mGradientType; - Dali::Toolkit::DevelAnimatedGradientVisual::UnitType::Type mUnitType; - Dali::Toolkit::DevelAnimatedGradientVisual::SpreadType::Type mSpreadType; + Dali::Toolkit::DevelAnimatedGradientVisual::UnitType::Type mUnitType; + Dali::Toolkit::DevelAnimatedGradientVisual::SpreadType::Type mSpreadType; }; -}//namespace Internal +} //namespace Internal -}//namespace Toolkit +} //namespace Toolkit -}//namespace Dali +} //namespace Dali #endif