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 documentation for Text::EditableControlInterface interface override functi...
[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
e18d5cf
..
814fc67
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
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.
@@
-26,8
+26,6
@@
#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
{
@@
-145,18
+143,17
@@
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.
/**
* @bried Rasterize the svg with the given size, and add it to the visual.
@@
-182,7
+179,10
@@
private:
ImageVisualShaderFactory& mImageVisualShaderFactory;
Vector4 mAtlasRect;
VisualUrl mImageUrl;
ImageVisualShaderFactory& mImageVisualShaderFactory;
Vector4 mAtlasRect;
VisualUrl mImageUrl;
- NSVGimage* mParsedImage;
+ VectorImageRenderer mVectorRenderer;
+ uint32_t mDefaultWidth;
+ uint32_t mDefaultHeight;
+ bool mLoaded;
WeakHandle<Actor> mPlacementActor;
Vector2 mVisualSize;
bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture
WeakHandle<Actor> mPlacementActor;
Vector2 mVisualSize;
bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture