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 "(Vector) Change event processing" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
svg
/
svg-visual.h
diff --git
a/dali-toolkit/internal/visuals/svg/svg-visual.h
b/dali-toolkit/internal/visuals/svg/svg-visual.h
index
0456bb5
..
e18d5cf
100644
(file)
--- a/
dali-toolkit/internal/visuals/svg/svg-visual.h
+++ b/
dali-toolkit/internal/visuals/svg/svg-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_SVG_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.
@@
-20,10
+20,11
@@
// EXTERNAL INCLUDES
#include <dali/public-api/common/intrusive-ptr.h>
// EXTERNAL INCLUDES
#include <dali/public-api/common/intrusive-ptr.h>
-#include <dali/
devel
-api/object/weak-handle.h>
+#include <dali/
public
-api/object/weak-handle.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
struct NSVGimage;
struct NSVGimage;
@@
-36,6
+37,7
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+class ImageVisualShaderFactory;
class SvgVisual;
typedef IntrusivePtr< SvgVisual > SvgVisualPtr;
class SvgVisual;
typedef IntrusivePtr< SvgVisual > SvgVisualPtr;
@@
-54,12
+56,18
@@
class SvgVisual: public Visual::Base
public:
/**
public:
/**
- * @brief Create a new SVG visual.
+ * @brief Create the SVG Visual using the image URL.
+ *
+ * The visual will parse the SVG image once it is set.
+ * And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] shaderFactory The ImageVisualShaderFactory object
+ * @param[in] imageUrl The URL to svg resource to use
+ * @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @return A smart-pointer to the newly allocated visual.
*/
- static SvgVisualPtr New( VisualFactoryCache& factoryCache );
+ static SvgVisualPtr New( VisualFactoryCache& factoryCache
, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties
);
/**
* @brief Create the SVG Visual using the image URL.
/**
* @brief Create the SVG Visual using the image URL.
@@
-68,37
+76,28
@@
public:
* And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] shaderFactory The ImageVisualShaderFactory object
* @param[in] imageUrl The URL to svg resource to use
* @param[in] imageUrl The URL to svg resource to use
- * @
param[in] size The required size for the SVG
+ * @
return A smart-pointer to the newly allocated visual.
*/
*/
- static SvgVisualPtr New( VisualFactoryCache& factoryCache,
const std::string& imageUrl, ImageDimensions size = ImageDimensions()
);
+ static SvgVisualPtr New( VisualFactoryCache& factoryCache,
ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl
);
public: // from Visual
/**
* @copydoc Visual::Base::GetNaturalSize
*/
public: // from Visual
/**
* @copydoc Visual::Base::GetNaturalSize
*/
- virtual void GetNaturalSize( Vector2& naturalSize ) const;
-
- /**
- * @copydoc Visual::Base::SetSize
- */
- virtual void SetSize( const Vector2& size );
+ void GetNaturalSize( Vector2& naturalSize ) override;
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
- /**
- * @copydoc Visual::Base::DoSetProperty
- */
- virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
+ void DoCreatePropertyMap( Property::Map& map ) const override;
/**
/**
- * @copydoc Visual::Base::
DoGetProperty
+ * @copydoc Visual::Base::
CreateInstancePropertyMap
*/
*/
- v
irtual Dali::Property::Value DoGetProperty( Dali::Property::Index index )
;
+ v
oid DoCreateInstancePropertyMap( Property::Map& map ) const override
;
protected:
protected:
@@
-106,8
+105,10
@@
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
+ * @param[in] imageUrl The URL to svg resource to use
*/
*/
- SvgVisual( VisualFactoryCache& factoryCache );
+ SvgVisual( VisualFactoryCache& factoryCache
, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl
);
/**
* @brief A reference counted object may only be deleted by calling Unreference().
/**
* @brief A reference counted object may only be deleted by calling Unreference().
@@
-117,36
+118,45
@@
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
;
/**
/**
- * @copydoc Visual::Base::DoSetOnS
tag
e
+ * @copydoc Visual::Base::DoSetOnS
cen
e
*/
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid DoSetOnScene( Actor& actor ) override
;
/**
/**
- * @copydoc Visual::Base::DoSetOffS
tag
e
+ * @copydoc Visual::Base::DoSetOffS
cen
e
*/
*/
- virtual void DoSetOffStage( Actor& actor );
+ void DoSetOffScene( Actor& actor ) override;
+
+ /**
+ * @copydoc Visual::Base::OnSetTransform
+ */
+ void OnSetTransform() override;
+
+ /**
+ * @copydoc Visual::Base::IsResourceReady
+ */
+ bool IsResourceReady() const override;
public:
/**
* @bried Apply the rasterized image to the visual.
*
public:
/**
* @bried Apply the rasterized image to the visual.
*
+ * @param[in] parsedSvg The data of parsed image.
* @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels
*/
* @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels
*/
- void ApplyRasterizedImage( PixelData rasterizedPixelData );
+ void ApplyRasterizedImage(
NSVGimage* parsedSvg,
PixelData rasterizedPixelData );
private:
private:
-
/**
/**
- * @brief Parses the SVG Image from the set URL.
- *
- * @param[in] imageUrl The URL of the image to parse the SVG from.
- * @param[in] size The required size of the SVG
- */
- void ParseFromUrl( const std::string& imageUrl, ImageDimensions size = ImageDimensions() );
+ * @brief Parses the SVG Image from the set URL.
+ *
+ * @param[in] imageUrl The URL of the image to parse the SVG from.
+ */
+ void ParseFromUrl( const VisualUrl& imageUrl );
/**
* @bried Rasterize the svg with the given size, and add it to the visual.
/**
* @bried Rasterize the svg with the given size, and add it to the visual.
@@
-155,6
+165,12
@@
private:
*/
void AddRasterizationTask( const Vector2& size );
*/
void AddRasterizationTask( const Vector2& size );
+ /**
+ * Helper method to set individual values by index key.
+ * @param[in] index The index key of the value
+ * @param[in] value The value
+ */
+ void DoSetProperty( Property::Index index, const Property::Value& value );
// Undefined
SvgVisual( const SvgVisual& svgRenderer );
// Undefined
SvgVisual( const SvgVisual& svgRenderer );
@@
-163,11
+179,13
@@
private:
SvgVisual& operator=( const SvgVisual& svgRenderer );
private:
SvgVisual& operator=( const SvgVisual& svgRenderer );
private:
- Vector4 mAtlasRect;
- std::string mImageUrl;
- NSVGimage* mParsedImage;
- WeakHandle<Actor> mPlacementActor;
-
+ ImageVisualShaderFactory& mImageVisualShaderFactory;
+ Vector4 mAtlasRect;
+ VisualUrl mImageUrl;
+ NSVGimage* mParsedImage;
+ WeakHandle<Actor> mPlacementActor;
+ Vector2 mVisualSize;
+ bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture
};
} // namespace Internal
};
} // namespace Internal