X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-vector-image%2Fvector-rasterize-thread.h;h=e21809e85eb615471476ac8a70d03ae957046ea2;hp=c40e6e96fda8eb4402dd04b67f55aedc4bd83bf9;hb=2c6a6697e24d39ef061f134b39f30acc5c47b0cb;hpb=10bc364fd6c2989274886822794fa8bf87046037 diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h index c40e6e9..e21809e 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_VECTOR_IMAGE_RASTERIZE_THREAD_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,17 +18,16 @@ */ // EXTERNAL INCLUDES -#include -#include +//#include #include -#include #include #include -#include +#include #include +//#include // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -48,10 +47,8 @@ public: /** * @brief Constructor. - * - * @param[in] url The url of the vector animation file */ - VectorRasterizeThread( const std::string& url ); + VectorRasterizeThread(); /** * @brief Destructor. @@ -59,106 +56,17 @@ public: virtual ~VectorRasterizeThread(); /** - * @brief Sets the renderer used to display the result image. - * - * @param[in] renderer The renderer used to display the result image + * The callback is called from the rasterize thread after the rasterization is completed. + * @param[in] callBack The function to call. */ - void SetRenderer( Renderer renderer ); + void SetCompletedCallback( CallbackBase* callback ); /** - * @brief Sets the target image size. + * Add a task to rasterize. * - * @param[in] width The target image width - * @param[in] height The target image height - */ - void SetSize( uint32_t width, uint32_t height ); - - /** - * @brief Play the vector animation. - */ - void PlayAnimation(); - - /** - * @brief Stop the vector animation. - */ - void StopAnimation(); - - /** - * @brief Pause the vector animation. - */ - void PauseAnimation(); - - /** - * @brief Render one frame. The current frame number will be increased. - */ - void RenderFrame(); - - /** - * @brief This callback is called after the first frame is ready. - * @param[in] callback The resource ready callback - */ - void SetResourceReadyCallback( EventThreadCallback* callback ); - - /** - * @brief This callback is called after the animation is finished. - * @param[in] callback The animation finished callback - */ - void SetAnimationFinishedCallback( EventThreadCallback* callback ); - - /** - * @brief Enable looping for 'count' repeats. -1 means to repeat forever. - * @param[in] count The number of times to loop - */ - void SetLoopCount( int32_t count ); - - /** - * @brief Gets the loop count. -1 means to repeat forever. - * @return The number of times to loop + * @param[in] task The task to rasterize */ - int32_t GetLoopCount() const; - - /** - * @brief Set the playing range. - * @param[in] range Two values between [0,1] to specify minimum and maximum progress. - * The animation will play between those values. - */ - void SetPlayRange( Vector2 range ); - - /** - * @brief Gets the playing range. - * @return The play range defined for the animation - */ - Vector2 GetPlayRange() const; - - /** - * @brief Get the play state - * @return The play state - */ - DevelImageVisual::PlayState GetPlayState() const; - - /** - * @brief Queries whether the resource is ready. - * @return true if ready, false otherwise - */ - bool IsResourceReady() const; - - /** - * @brief Sets the progress of the animation. - * @param[in] progress The new progress as a normalized value between [0,1] or between the play range if specified. - */ - void SetCurrentProgress( float progress ); - - /** - * @brief Retrieves the current progress of the animation. - * @return The current progress as a normalized value between [0,1] - */ - float GetCurrentProgress() const; - - /** - * @brief Gets the default size of the file,. - * @return The default size of the file - */ - void GetDefaultSize( uint32_t& width, uint32_t& height ) const; + void AddTask( VectorAnimationTaskPtr task ); protected: @@ -171,15 +79,12 @@ protected: private: /** - * @brief Initialize the vector renderer. - */ - void Initialize(); - - /** - * @brief Rasterize the current frame. + * Rasterizes the tasks. */ void Rasterize(); +private: + // Undefined VectorRasterizeThread( const VectorRasterizeThread& thread ) = delete; @@ -188,29 +93,12 @@ private: private: - std::string mUrl; - VectorAnimationRenderer mVectorRenderer; - ConditionalWait mConditionalWait; - std::unique_ptr< EventThreadCallback > mResourceReadyTrigger; - std::unique_ptr< EventThreadCallback > mAnimationFinishedTrigger; - Vector2 mPlayRange; - DevelImageVisual::PlayState mPlayState; - int64_t mFrameDurationNanoSeconds; - float mProgress; - float mFrameRate; - uint32_t mCurrentFrame; - uint32_t mTotalFrame; - uint32_t mStartFrame; - uint32_t mEndFrame; - uint32_t mWidth; - uint32_t mHeight; - int32_t mLoopCount; - int32_t mCurrentLoop; - bool mNeedRender; - bool mDestroyThread; ///< Whether the thread be destroyed - bool mResourceReady; - bool mCurrentFrameUpdated; - const Dali::LogFactoryInterface& mLogFactory; ///< The log factory + std::vector< VectorAnimationTaskPtr > mRasterizeTasks; + ConditionalWait mConditionalWait; + std::unique_ptr< CallbackBase > mCompletedCallback; + bool mDestroyThread; ///< Whether the thread be destroyed + bool mIsThreadStarted; + const Dali::LogFactoryInterface& mLogFactory; ///< The log factory };