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
(AnimatedVectorImage) Ensure the progress is kept according to actions
[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
268cb06
..
032bea2
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) 201
8
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-27,6
+27,7
@@
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-url.h>
#include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-url.h>
#include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h>
+#include <dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h>
namespace Dali
{
namespace Dali
{
@@
-83,17
+84,17
@@
public: // from Visual
/**
* @copydoc Visual::Base::GetNaturalSize
*/
/**
* @copydoc Visual::Base::GetNaturalSize
*/
- v
irtual v
oid GetNaturalSize( Vector2& naturalSize ) override;
+ void GetNaturalSize( Vector2& naturalSize ) override;
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- v
irtual v
oid DoCreatePropertyMap( Property::Map& map ) const override;
+ void DoCreatePropertyMap( Property::Map& map ) const override;
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
- v
irtual v
oid DoCreateInstancePropertyMap( Property::Map& map ) const override;
+ void DoCreateInstancePropertyMap( Property::Map& map ) const override;
protected:
protected:
@@
-114,27
+115,27
@@
protected:
/**
* @copydoc Visual::Base::DoSetProperties
*/
/**
* @copydoc Visual::Base::DoSetProperties
*/
- v
irtual v
oid DoSetProperties( const Property::Map& propertyMap ) override;
+ void DoSetProperties( const Property::Map& propertyMap ) override;
/**
* @copydoc Visual::Base::DoSetOnStage
*/
/**
* @copydoc Visual::Base::DoSetOnStage
*/
- v
irtual v
oid DoSetOnStage( Actor& actor ) override;
+ void DoSetOnStage( Actor& actor ) override;
/**
* @copydoc Visual::Base::DoSetOffStage
*/
/**
* @copydoc Visual::Base::DoSetOffStage
*/
- v
irtual v
oid DoSetOffStage( Actor& actor ) override;
+ void DoSetOffStage( Actor& actor ) override;
/**
* @copydoc Visual::Base::OnSetTransform
*/
/**
* @copydoc Visual::Base::OnSetTransform
*/
- v
irtual v
oid OnSetTransform() override;
+ void OnSetTransform() override;
/**
* @copydoc Visual::Base::OnDoAction
*/
/**
* @copydoc Visual::Base::OnDoAction
*/
- v
irtual v
oid OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override;
+ void OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override;
private:
private:
@@
-150,6
+151,16
@@
private:
*/
void OnResourceReady();
*/
void OnResourceReady();
+ /**
+ * @brief Event callback from rasterize thread. This is called after the animation is finished.
+ */
+ void OnAnimationFinished();
+
+ /**
+ * @brief Send animation data to the rasterize thread.
+ */
+ void SendAnimationData();
+
// Undefined
AnimatedVectorImageVisual( const AnimatedVectorImageVisual& visual ) = delete;
// Undefined
AnimatedVectorImageVisual( const AnimatedVectorImageVisual& visual ) = delete;
@@
-159,12
+170,12
@@
private:
private:
ImageVisualShaderFactory& mImageVisualShaderFactory;
VisualUrl mUrl;
private:
ImageVisualShaderFactory& mImageVisualShaderFactory;
VisualUrl mUrl;
+ VectorRasterizeThread mVectorRasterizeThread;
Vector2 mVisualSize;
Vector2 mPlayRange;
WeakHandle< Actor > mPlacementActor;
Vector2 mVisualSize;
Vector2 mPlayRange;
WeakHandle< Actor > mPlacementActor;
- std::unique_ptr< VectorRasterizeThread > mVectorRasterizeThread;
-
int32_t mLoopCount;
int32_t mLoopCount;
+ uint32_t mResendFlag;
DevelAnimatedVectorImageVisual::Action::Type mActionStatus;
};
DevelAnimatedVectorImageVisual::Action::Type mActionStatus;
};