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
[dali_2.1.33] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-vector-image
/
vector-animation-task.h
diff --git
a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
index
fb4a55c
..
42d13f8
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
+++ b/
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
@@
-21,11
+21,13
@@
#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
#include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
#include <dali/devel-api/threading/conditional-wait.h>
#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
#include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
#include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/object/property-array.h>
#include <chrono>
#include <memory>
// INTERNAL INCLUDES
#include <dali/public-api/object/property-array.h>
#include <chrono>
#include <memory>
// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h>
#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
namespace Dali
#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
namespace Dali
@@
-45,9
+47,17
@@
typedef IntrusivePtr<VectorAnimationTask> VectorAnimationTaskPtr;
class VectorAnimationTask : public RefObject, public ConnectionTracker
{
public:
class VectorAnimationTask : public RefObject, public ConnectionTracker
{
public:
- using ResourceReadySignalType = Signal<void(bool)>;
+ enum class ResourceStatus
+ {
+ LOADED, /// Resource is loaded
+ READY, /// Resource is ready
+ FAILED /// Resource is fail to load
+ };
+
+ using ResourceReadySignalType = Signal<void(ResourceStatus)>;
- using TimePoint = std::chrono::time_point<std::chrono::steady_clock>;
+ using TimePoint = std::chrono::time_point<std::chrono::steady_clock>;
+ using DynamicPropertyType = std::vector<DevelAnimatedVectorImageVisual::DynamicPropertyInfo>;
/**
* Flags for re-sending data to the vector animation thread
/**
* Flags for re-sending data to the vector animation thread
@@
-61,7
+71,8
@@
public:
RESEND_CURRENT_FRAME = 1 << 4,
RESEND_SIZE = 1 << 5,
RESEND_PLAY_STATE = 1 << 6,
RESEND_CURRENT_FRAME = 1 << 4,
RESEND_SIZE = 1 << 5,
RESEND_PLAY_STATE = 1 << 6,
- RESEND_NEED_RESOURCE_READY = 1 << 7
+ RESEND_NEED_RESOURCE_READY = 1 << 7,
+ RESEND_DYNAMIC_PROPERTY = 1 << 8
};
/**
};
/**
@@
-72,6
+83,7
@@
public:
AnimationData()
: resendFlag(0),
playRange(),
AnimationData()
: resendFlag(0),
playRange(),
+ dynamicProperties(),
playState(),
stopBehavior(DevelImageVisual::StopBehavior::CURRENT_FRAME),
loopingMode(DevelImageVisual::LoopingMode::RESTART),
playState(),
stopBehavior(DevelImageVisual::StopBehavior::CURRENT_FRAME),
loopingMode(DevelImageVisual::LoopingMode::RESTART),
@@
-93,11
+105,13
@@
public:
width = rhs.width;
height = rhs.height;
loopCount = rhs.loopCount;
width = rhs.width;
height = rhs.height;
loopCount = rhs.loopCount;
+ dynamicProperties.insert(dynamicProperties.end(), rhs.dynamicProperties.begin(), rhs.dynamicProperties.end());
return *this;
}
uint32_t resendFlag;
Property::Array playRange;
return *this;
}
uint32_t resendFlag;
Property::Array playRange;
+ DynamicPropertyType dynamicProperties;
DevelImageVisual::PlayState::Type playState;
DevelImageVisual::StopBehavior::Type stopBehavior;
DevelImageVisual::LoopingMode::Type loopingMode;
DevelImageVisual::PlayState::Type playState;
DevelImageVisual::StopBehavior::Type stopBehavior;
DevelImageVisual::LoopingMode::Type loopingMode;
@@
-132,13
+146,19
@@
public:
void SetRenderer(Renderer renderer);
/**
void SetRenderer(Renderer renderer);
/**
- * @brief Request to load the animation file.
+ * @brief Request
s
to load the animation file.
*
* @param[in] url The url of the vector animation file
*/
void RequestLoad(const std::string& url);
/**
*
* @param[in] url The url of the vector animation file
*/
void RequestLoad(const std::string& url);
/**
+ * @brief Queries whether loading is requested.
+ * @return True if loading is requested.
+ */
+ bool IsLoadRequested() const;
+
+ /**
* @brief Sets data to specify animation playback.
* @param[in] data The animation data
*/
* @brief Sets data to specify animation playback.
* @param[in] data The animation data
*/