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
Merge "Updates for NativeImageInterface" into devel/master
[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
78848d0
..
6eaead5
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) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
@@
-22,7
+22,9
@@
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/object/weak-handle.h>
#include <dali/public-api/object/property-notification.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/object/weak-handle.h>
#include <dali/public-api/object/property-notification.h>
+#include <dali/public-api/adaptor-framework/window.h>
#include <dali/devel-api/actors/actor-devel.h>
#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/integration-api/processor-interface.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
@@
-54,7
+56,7
@@
using AnimatedVectorImageVisualPtr = IntrusivePtr< AnimatedVectorImageVisual >;
* | url | STRING |
*
*/
* | url | STRING |
*
*/
-class AnimatedVectorImageVisual: public Visual::Base, public ConnectionTracker
+class AnimatedVectorImageVisual: public Visual::Base, public ConnectionTracker
, public Integration::Processor
{
public:
{
public:
@@
-137,6
+139,13
@@
protected:
*/
void OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override;
*/
void OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override;
+protected: // Implementation of Processor
+
+ /**
+ * @copydoc Dali::Integration::Processor::Process()
+ */
+ void Process() override;
+
private:
/**
private:
/**
@@
-167,6
+176,16
@@
private:
void SetVectorImageSize();
/**
void SetVectorImageSize();
/**
+ * @brief Stop the animation.
+ */
+ void StopAnimation();
+
+ /**
+ * @brief Trigger rasterization of the vector content.
+ */
+ void TriggerVectorRasterization();
+
+ /**
* @brief Callback when the world scale factor changes.
*/
void OnScaleNotification( PropertyNotification& source );
* @brief Callback when the world scale factor changes.
*/
void OnScaleNotification( PropertyNotification& source );
@@
-179,7
+198,12
@@
private:
/**
* @brief Callback when the visibility of the actor is changed.
*/
/**
* @brief Callback when the visibility of the actor is changed.
*/
- void OnVisibilityChanged( Actor actor, bool visible, DevelActor::VisibilityChange::Type type );
+ void OnControlVisibilityChanged( Actor actor, bool visible, DevelActor::VisibilityChange::Type type );
+
+ /**
+ * @brief Callback when the visibility of the window is changed.
+ */
+ void OnWindowVisibilityChanged( Window window, bool visible );
// Undefined
AnimatedVectorImageVisual( const AnimatedVectorImageVisual& visual ) = delete;
// Undefined
AnimatedVectorImageVisual( const AnimatedVectorImageVisual& visual ) = delete;
@@
-189,6
+213,7
@@
private:
private:
VisualUrl mUrl;
private:
VisualUrl mUrl;
+ VectorAnimationTask::AnimationData mAnimationData;
VectorAnimationTaskPtr mVectorAnimationTask;
ImageVisualShaderFactory& mImageVisualShaderFactory;
PropertyNotification mScaleNotification;
VectorAnimationTaskPtr mVectorAnimationTask;
ImageVisualShaderFactory& mImageVisualShaderFactory;
PropertyNotification mScaleNotification;
@@
-196,14
+221,9
@@
private:
Vector2 mVisualSize;
Vector2 mVisualScale;
WeakHandle< Actor > mPlacementActor;
Vector2 mVisualSize;
Vector2 mVisualScale;
WeakHandle< Actor > mPlacementActor;
- int32_t mLoopCount;
- uint32_t mStartFrame;
- uint32_t mEndFrame;
- uint32_t mResendFlag;
- DevelAnimatedVectorImageVisual::Action::Type mActionStatus;
- DevelImageVisual::StopBehavior::Type mStopBehavior;
- DevelImageVisual::LoopingMode::Type mLoopingMode;
+ DevelImageVisual::PlayState::Type mPlayState;
bool mRendererAdded;
bool mRendererAdded;
+ bool mRasterizationTriggered;
};
} // namespace Internal
};
} // namespace Internal