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
[dali_2.1.6] Merge branch '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
81bfb5d
..
66de43c
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) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-26,20
+26,15
@@
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-url.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/visual-url.h>
-struct NSVGimage;
-
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
class ImageVisualShaderFactory;
class SvgVisual;
class ImageVisualShaderFactory;
class SvgVisual;
-typedef IntrusivePtr<
SvgVisual
> SvgVisualPtr;
+typedef IntrusivePtr<
SvgVisual
> SvgVisualPtr;
/**
* The visual which renders a svg image
/**
* The visual which renders a svg image
@@
-51,10
+46,9
@@
typedef IntrusivePtr< SvgVisual > SvgVisualPtr;
* | url | STRING |
*
*/
* | url | STRING |
*
*/
-class SvgVisual: public Visual::Base
+class SvgVisual
: public Visual::Base
{
public:
{
public:
-
/**
* @brief Create the SVG Visual using the image URL.
*
/**
* @brief Create the SVG Visual using the image URL.
*
@@
-67,7
+61,7
@@
public:
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
- static SvgVisualPtr New(
VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties
);
+ 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.
@@
-80,27
+74,25
@@
public:
* @param[in] imageUrl The URL to svg resource to use
* @return A smart-pointer to the newly allocated visual.
*/
* @param[in] imageUrl The URL to svg resource to use
* @return A smart-pointer to the newly allocated visual.
*/
- static SvgVisualPtr New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl );
-
-public: // from Visual
+ static SvgVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl);
+public: // from Visual
/**
* @copydoc Visual::Base::GetNaturalSize
*/
/**
* @copydoc Visual::Base::GetNaturalSize
*/
- void GetNaturalSize(
Vector2& naturalSize
) override;
+ void GetNaturalSize(
Vector2& naturalSize
) override;
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- void DoCreatePropertyMap(
Property::Map& map
) const override;
+ void DoCreatePropertyMap(
Property::Map& map
) const override;
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
- void DoCreateInstancePropertyMap(
Property::Map& map
) const override;
+ void DoCreateInstancePropertyMap(
Property::Map& map
) const override;
protected:
protected:
-
/**
* @brief Constructor.
*
/**
* @brief Constructor.
*
@@
-108,7
+100,7
@@
protected:
* @param[in] shaderFactory The ImageVisualShaderFactory object
* @param[in] imageUrl The URL to svg resource to use
*/
* @param[in] shaderFactory The ImageVisualShaderFactory object
* @param[in] imageUrl The URL to svg resource to use
*/
- SvgVisual(
VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl
);
+ 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().
@@
-116,19
+108,24
@@
protected:
virtual ~SvgVisual();
/**
virtual ~SvgVisual();
/**
+ * @copydoc Visual::Base::OnInitialize
+ */
+ void OnInitialize() override;
+
+ /**
* @copydoc Visual::Base::DoSetProperties
*/
* @copydoc Visual::Base::DoSetProperties
*/
- void DoSetProperties(
const Property::Map& propertyMap
) override;
+ void DoSetProperties(
const Property::Map& propertyMap
) override;
/**
/**
- * @copydoc Visual::Base::DoSetOnS
tag
e
+ * @copydoc Visual::Base::DoSetOnS
cen
e
*/
*/
- void DoSetOnS
tage( Actor& actor
) override;
+ void DoSetOnS
cene(Actor& actor
) override;
/**
/**
- * @copydoc Visual::Base::DoSetOffS
tag
e
+ * @copydoc Visual::Base::DoSetOffS
cen
e
*/
*/
- void DoSetOffS
tage( Actor& actor
) override;
+ void DoSetOffS
cene(Actor& actor
) override;
/**
* @copydoc Visual::Base::OnSetTransform
/**
* @copydoc Visual::Base::OnSetTransform
@@
-140,52
+137,63
@@
protected:
*/
bool IsResourceReady() const override;
*/
bool IsResourceReady() const override;
-public:
+ /**
+ * @copydoc Visual::Base::UpdateShader
+ */
+ void UpdateShader() override;
/**
/**
+ * @copydoc Visual::Base::GenerateShader
+ */
+ Shader GenerateShader() const override;
+
+public:
+ /**
* @bried Apply the rasterized image to the visual.
*
* @bried Apply the rasterized image to the visual.
*
- * @param[in]
parsedSvg The data of parsed
image.
+ * @param[in]
vectorImage The data of vector
image.
* @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels
* @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels
+ * @param[in] bool Whether the resource is loaded
*/
*/
- void ApplyRasterizedImage(
NSVGimage* parsedSvg, PixelData rasterizedPixelData
);
+ void ApplyRasterizedImage(
VectorImageRenderer vectorImage, PixelData rasterizedPixelData, bool isLoaded
);
private:
/**
private:
/**
- * @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 );
+ * @brief Load the SVG Image from the set URL.
+ */
+ void Load();
/**
* @bried Rasterize the svg with the given size, and add it to the visual.
*
* @param[in] size The target size of the SVG rasterization.
*/
/**
* @bried Rasterize the svg with the given size, and add it to the visual.
*
* @param[in] size The target size of the SVG rasterization.
*/
- 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
*/
/**
* 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
);
+ void DoSetProperty(
Property::Index index, const Property::Value& value
);
// Undefined
// Undefined
- SvgVisual(
const SvgVisual& svgRenderer
);
+ SvgVisual(
const SvgVisual& svgRenderer
);
// Undefined
// Undefined
- SvgVisual& operator=(
const SvgVisual& svgRenderer
);
+ SvgVisual& operator=(
const SvgVisual& svgRenderer
);
private:
ImageVisualShaderFactory& mImageVisualShaderFactory;
Vector4 mAtlasRect;
VisualUrl mImageUrl;
private:
ImageVisualShaderFactory& mImageVisualShaderFactory;
Vector4 mAtlasRect;
VisualUrl mImageUrl;
- NSVGimage* mParsedImage;
+ VectorImageRenderer mVectorRenderer;
+ uint32_t mDefaultWidth;
+ uint32_t mDefaultHeight;
WeakHandle<Actor> mPlacementActor;
Vector2 mVisualSize;
WeakHandle<Actor> mPlacementActor;
Vector2 mVisualSize;
- bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture
+ bool mLoadFailed;
+ bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture
};
} // namespace Internal
};
} // namespace Internal