projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(AnimatedVectorImageVisual) Change renderer on stage again
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-vector-image
/
vector-rasterize-thread.h
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
8ee52be
..
f8d409b
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
+++ b/
dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
@@
-50,11
+50,8
@@
public:
* @brief Constructor.
*
* @param[in] url The url of the vector animation file
* @brief Constructor.
*
* @param[in] url The url of the vector animation file
- * @param[in] renderer The renderer used to render the image
- * @param[in] width The width of the content
- * @param[in] height The height of the content
*/
*/
- VectorRasterizeThread( const std::string& url
, Renderer renderer, uint32_t width, uint32_t height
);
+ VectorRasterizeThread( const std::string& url );
/**
* @brief Destructor.
/**
* @brief Destructor.
@@
-62,6
+59,13
@@
public:
virtual ~VectorRasterizeThread();
/**
virtual ~VectorRasterizeThread();
/**
+ * @brief Sets the renderer used to display the result image.
+ *
+ * @param[in] renderer The renderer used to display the result image
+ */
+ void SetRenderer( Renderer renderer );
+
+ /**
* @brief Sets the target image size.
*
* @param[in] width The target image width
* @brief Sets the target image size.
*
* @param[in] width The target image width
@@
-72,7
+76,7
@@
public:
/**
* @brief Play the vector animation.
*/
/**
* @brief Play the vector animation.
*/
- void
Start
Animation();
+ void
Play
Animation();
/**
* @brief Stop the vector animation.
/**
* @brief Stop the vector animation.
@@
-105,7
+109,13
@@
public:
* @brief Enable looping for 'count' repeats. -1 means to repeat forever.
* @param[in] count The number of times to loop
*/
* @brief Enable looping for 'count' repeats. -1 means to repeat forever.
* @param[in] count The number of times to loop
*/
- void SetLoopCount( int16_t count );
+ void SetLoopCount( int32_t count );
+
+ /**
+ * @brief Gets the loop count. -1 means to repeat forever.
+ * @return The number of times to loop
+ */
+ int32_t GetLoopCount() const;
/**
* @brief Set the playing range.
/**
* @brief Set the playing range.
@@
-115,10
+125,22
@@
public:
void SetPlayRange( Vector2 range );
/**
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
*/
* @brief Get the play state
* @return The play state
*/
- DevelImageVisual::PlayState GetPlayState();
+ DevelImageVisual::PlayState GetPlayState() const;
+
+ /**
+ * @brief Queries whether the resource is ready.
+ * @return true if ready, false otherwise
+ */
+ bool IsResourceReady() const;
protected:
protected:
@@
-162,14
+184,15
@@
private:
std::unique_ptr< EventThreadCallback > mAnimationFinishedTrigger;
Vector2 mPlayRange;
DevelImageVisual::PlayState mPlayState;
std::unique_ptr< EventThreadCallback > mAnimationFinishedTrigger;
Vector2 mPlayRange;
DevelImageVisual::PlayState mPlayState;
+ float mProgress;
uint32_t mCurrentFrame;
uint32_t mTotalFrame;
uint32_t mStartFrame;
uint32_t mEndFrame;
uint32_t mWidth;
uint32_t mHeight;
uint32_t mCurrentFrame;
uint32_t mTotalFrame;
uint32_t mStartFrame;
uint32_t mEndFrame;
uint32_t mWidth;
uint32_t mHeight;
- int
16
_t mLoopCount;
- int
16
_t mCurrentLoop;
+ int
32
_t mLoopCount;
+ int
32
_t mCurrentLoop;
bool mNeedRender;
bool mDestroyThread; ///< Whether the thread be destroyed
bool mResourceReady;
bool mNeedRender;
bool mDestroyThread; ///< Whether the thread be destroyed
bool mResourceReady;