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 "Fix issue, agif to play a number of times of loopcount." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-image
/
animated-image-visual.h
diff --git
a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
old mode 100644
(file)
new mode 100755
(executable)
index
2796c20
..
791783d
--- a/
dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
+++ b/
dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_ANIMATED_IMAGE_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_ANIMATED_IMAGE_VISUAL_H
/*
- * Copyright (c) 201
6
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.
@@
-22,12
+22,15
@@
#include <dali/public-api/common/dali-vector.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/math/vector4.h>
#include <dali/public-api/common/dali-vector.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/math/vector4.h>
+#include <dali/public-api/object/weak-handle.h>
#include <dali/public-api/adaptor-framework/timer.h>
#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/devel-api/adaptor-framework/gif-loading.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-url.h>
#include <dali-toolkit/internal/visuals/animated-image/image-cache.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-url.h>
#include <dali-toolkit/internal/visuals/animated-image/image-cache.h>
+#include <dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h>
namespace Dali
{
namespace Dali
{
@@
-38,6
+41,7
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+class ImageVisualShaderFactory;
class AnimatedImageVisual;
typedef IntrusivePtr< AnimatedImageVisual > AnimatedImageVisualPtr;
class AnimatedImageVisual;
typedef IntrusivePtr< AnimatedImageVisual > AnimatedImageVisualPtr;
@@
-87,46
+91,54
@@
public:
* @brief Create the animated image Visual using the image URL.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Create the animated image Visual using the image URL.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] shaderFactory The ImageVisualShaderFactory object
* @param[in] imageUrl The URL to gif resource to use
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @param[in] imageUrl The URL to gif resource to use
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
- static AnimatedImageVisualPtr New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl, const Property::Map& properties );
+ static AnimatedImageVisualPtr New( VisualFactoryCache& factoryCache,
ImageVisualShaderFactory& shaderFactory,
const VisualUrl& imageUrl, const Property::Map& properties );
/**
* @brief Create the animated image Visual using image URLs.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
/**
* @brief Create the animated image Visual using image URLs.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] shaderFactory The ImageVisualShaderFactory object
* @param[in] imageUrls A Property::Array containing the URLs to the image resources
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @param[in] imageUrls A Property::Array containing the URLs to the image resources
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
- static AnimatedImageVisualPtr New( VisualFactoryCache& factoryCache, const Property::Array& imageUrls, const Property::Map& properties );
+ static AnimatedImageVisualPtr New( VisualFactoryCache& factoryCache,
ImageVisualShaderFactory& shaderFactory,
const Property::Array& imageUrls, const Property::Map& properties );
/**
* @brief Create the animated image visual using the image URL.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
/**
* @brief Create the animated image visual using the image URL.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] shaderFactory The ImageVisualShaderFactory object
* @param[in] imageUrl The URL to animated image resource to use
*/
* @param[in] imageUrl The URL to animated image resource to use
*/
- static AnimatedImageVisualPtr New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl );
+ static AnimatedImageVisualPtr New( VisualFactoryCache& factoryCache,
ImageVisualShaderFactory& shaderFactory,
const VisualUrl& imageUrl );
public: // from Visual
/**
* @copydoc Visual::Base::GetNaturalSize
*/
public: // from Visual
/**
* @copydoc Visual::Base::GetNaturalSize
*/
- v
irtual void GetNaturalSize( Vector2& naturalSize )
;
+ v
oid GetNaturalSize( Vector2& naturalSize ) override
;
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- v
irtual void DoCreatePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreatePropertyMap( Property::Map& map ) const override
;
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
- virtual void DoCreateInstancePropertyMap( Property::Map& map ) const;
+ void DoCreateInstancePropertyMap( Property::Map& map ) const override;
+
+ /**
+ * @copydoc Visual::Base::OnDoAction
+ */
+ void OnDoAction( const Dali::Property::Index actionName, const Dali::Property::Value& attributes ) override;
protected:
protected:
@@
-134,8
+146,9
@@
protected:
* @brief Constructor.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Constructor.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] shaderFactory The ImageVisualShaderFactory object
*/
*/
- AnimatedImageVisual( VisualFactoryCache& factoryCache );
+ AnimatedImageVisual( VisualFactoryCache& factoryCache
, ImageVisualShaderFactory& shaderFactory
);
/**
* @brief A reference counted object may only be deleted by calling Unreference().
/**
* @brief A reference counted object may only be deleted by calling Unreference().
@@
-145,7
+158,7
@@
protected:
/**
* @copydoc Visual::Base::DoSetProperties
*/
/**
* @copydoc Visual::Base::DoSetProperties
*/
- v
irtual void DoSetProperties( const Property::Map& propertyMap )
;
+ v
oid DoSetProperties( const Property::Map& propertyMap ) override
;
/**
* Helper method to set individual values by index key.
/**
* Helper method to set individual values by index key.
@@
-157,17
+170,17
@@
protected:
/**
* @copydoc Visual::Base::DoSetOnStage
*/
/**
* @copydoc Visual::Base::DoSetOnStage
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid DoSetOnStage( Actor& actor ) override
;
/**
* @copydoc Visual::Base::DoSetOffStage
*/
/**
* @copydoc Visual::Base::DoSetOffStage
*/
- v
irtual void DoSetOffStage( Actor& actor )
;
+ v
oid DoSetOffStage( Actor& actor ) override
;
/**
* @copydoc Visual::Base::OnSetTransform
*/
/**
* @copydoc Visual::Base::OnSetTransform
*/
- v
irtual void OnSetTransform()
;
+ v
oid OnSetTransform() override
;
private:
/**
private:
/**
@@
-183,6
+196,7
@@
private:
/**
* Adds the texture set to the renderer, and the renderer to the
* placement actor, and starts the frame timer
/**
* Adds the texture set to the renderer, and the renderer to the
* placement actor, and starts the frame timer
+ * @param[in] textureSet The texture set to apply
*/
void StartFirstFrame( TextureSet& textureSet );
*/
void StartFirstFrame( TextureSet& textureSet );
@@
-192,18
+206,14
@@
private:
TextureSet PrepareTextureSet();
/**
TextureSet PrepareTextureSet();
/**
- * Load the gif image and pack the frames into atlas.
- * @return The atlas texture.
- */
- TextureSet PrepareAnimatedGifImage();
-
- /**
* Set the image size from the texture set
* Set the image size from the texture set
+ * @param[in] textureSet The texture set to get the size from
*/
void SetImageSize( TextureSet& textureSet );
/**
* Called when the next frame is ready.
*/
void SetImageSize( TextureSet& textureSet );
/**
* Called when the next frame is ready.
+ * @param[in] textureSet the texture set to apply
*/
void FrameReady( TextureSet textureSet );
*/
void FrameReady( TextureSet textureSet );
@@
-213,6
+223,11
@@
private:
*/
bool DisplayNextFrame();
*/
bool DisplayNextFrame();
+ /**
+ * Initialize the gif variables.
+ * @param[in] imageUrl The url of the animated gif
+ */
+ void InitializeGif( const VisualUrl& imageUrl );
// Undefined
AnimatedImageVisual( const AnimatedImageVisual& animatedImageVisual );
// Undefined
AnimatedImageVisual( const AnimatedImageVisual& animatedImageVisual );
@@
-224,12
+239,13
@@
private:
Timer mFrameDelayTimer;
WeakHandle<Actor> mPlacementActor;
Timer mFrameDelayTimer;
WeakHandle<Actor> mPlacementActor;
+ ImageVisualShaderFactory& mImageVisualShaderFactory;
// Variables for GIF player
// Variables for GIF player
- Dali::Vector<Vector4> mTextureRectContainer;
Dali::Vector<uint32_t> mFrameDelayContainer;
Vector4 mPixelArea;
VisualUrl mImageUrl;
Dali::Vector<uint32_t> mFrameDelayContainer;
Vector4 mPixelArea;
VisualUrl mImageUrl;
+ std::unique_ptr<Dali::GifLoading> mGifLoading; // Only needed for animated gifs
uint32_t mCurrentFrameIndex; // Frame index into textureRects
// Variables for Multi-Image player
uint32_t mCurrentFrameIndex; // Frame index into textureRects
// Variables for Multi-Image player
@@
-238,13
+254,17
@@
private:
uint16_t mCacheSize;
uint16_t mBatchSize;
uint16_t mFrameDelay;
uint16_t mCacheSize;
uint16_t mBatchSize;
uint16_t mFrameDelay;
+ int16_t mLoopCount;
+ int16_t mCurrentLoopIndex;
uint16_t mUrlIndex;
// Shared variables
uint16_t mUrlIndex;
// Shared variables
+ uint32_t mFrameCount; // Number of frames
ImageDimensions mImageSize;
Dali::WrapMode::Type mWrapModeU:3;
Dali::WrapMode::Type mWrapModeV:3;
ImageDimensions mImageSize;
Dali::WrapMode::Type mWrapModeU:3;
Dali::WrapMode::Type mWrapModeV:3;
+ DevelAnimatedImageVisual::Action::Type mActionStatus:3;
bool mStartFirstFrame:1;
};
bool mStartFirstFrame:1;
};