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
(Vector) Fix occasional tc failure
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-vector-image
/
animated-vector-image-visual.h
diff --git
a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
index
c809634
..
221cf23
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
+++ b/
dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_ANIMATED_VECTOR_IMAGE_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_ANIMATED_VECTOR_IMAGE_VISUAL_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-93,6
+93,11
@@
public: // from Visual
*/
void DoCreateInstancePropertyMap(Property::Map& map) const override;
*/
void DoCreateInstancePropertyMap(Property::Map& map) const override;
+ /**
+ * @copydoc Visual::Base::EnablePreMultipliedAlpha
+ */
+ void EnablePreMultipliedAlpha(bool preMultiplied) override;
+
protected: // From VectorAnimationManager::LifecycleObserver:
/**
* @copydoc VectorAnimationManager::LifecycleObserver::VectorAnimationManagerDestroyed()
protected: // From VectorAnimationManager::LifecycleObserver:
/**
* @copydoc VectorAnimationManager::LifecycleObserver::VectorAnimationManagerDestroyed()
@@
-140,6
+145,16
@@
protected:
void OnSetTransform() override;
/**
void OnSetTransform() override;
/**
+ * @copydoc Visual::Base::UpdateShader
+ */
+ void UpdateShader() override;
+
+ /**
+ * @copydoc Visual::Base::GenerateShader
+ */
+ Shader GenerateShader() const override;
+
+ /**
* @copydoc Visual::Base::OnDoAction
*/
void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override;
* @copydoc Visual::Base::OnDoAction
*/
void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override;
@@
-153,9
+168,10
@@
private:
void DoSetProperty(Property::Index index, const Property::Value& value);
/**
void DoSetProperty(Property::Index index, const Property::Value& value);
/**
- * @brief Called when the texture upload is completed.
+ * @brief Called when the resource is ready.
+ * @param[in] status The resource status
*/
*/
- void On
UploadCompleted(
);
+ void On
ResourceReady(VectorAnimationTask::ResourceStatus status
);
/**
* @brief Event callback from rasterize thread. This is called after the animation is finished.
/**
* @brief Event callback from rasterize thread. This is called after the animation is finished.