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
Stop trying to find the URL parameter multiple times from property map
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
svg
/
svg-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/svg/svg-visual.cpp
b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
index
832fd19
..
652b03d
100644
(file)
--- a/
dali-toolkit/internal/visuals/svg/svg-visual.cpp
+++ b/
dali-toolkit/internal/visuals/svg/svg-visual.cpp
@@
-28,6
+28,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
+#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
#include <dali-toolkit/third-party/nanosvg/nanosvg.h>
#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
#include <dali-toolkit/internal/visuals/image/image-visual.h>
#include <dali-toolkit/third-party/nanosvg/nanosvg.h>
#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
#include <dali-toolkit/internal/visuals/image/image-visual.h>
@@
-53,10
+54,19
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, const std::string& imageUrl, ImageDimensions size )
+{
+ SvgVisual* svgVisual = new SvgVisual( factoryCache );
+ svgVisual->ParseFromUrl( imageUrl, size );
+ return svgVisual;
+}
+
SvgVisual::SvgVisual( VisualFactoryCache& factoryCache )
: Visual::Base( factoryCache ),
mAtlasRect( FULL_TEXTURE_RECT ),
SvgVisual::SvgVisual( VisualFactoryCache& factoryCache )
: Visual::Base( factoryCache ),
mAtlasRect( FULL_TEXTURE_RECT ),
- mParsedImage( NULL )
+ mImageUrl(),
+ mParsedImage( NULL ),
+ mPlacementActor()
{
// the rasterized image is with pre-multiplied alpha format
mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
{
// the rasterized image is with pre-multiplied alpha format
mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
@@
-70,21
+80,9
@@
SvgVisual::~SvgVisual()
}
}
}
}
-void SvgVisual::Do
Initialize( Actor& actor,
const Property::Map& propertyMap )
+void SvgVisual::Do
SetProperties(
const Property::Map& propertyMap )
{
{
- Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
- if( imageURLValue )
- {
- std::string imageUrl;
- if( imageURLValue->Get( imageUrl ) )
- {
- SetImage( imageUrl );
- }
- else
- {
- DALI_LOG_ERROR( "The property '%s' is not a string\n", IMAGE_URL_NAME );
- }
- }
+ // url already passed in from constructor
}
void SvgVisual::DoSetOnStage( Actor& actor )
}
void SvgVisual::DoSetOnStage( Actor& actor )
@@
-133,7
+131,7
@@
void SvgVisual::GetNaturalSize( Vector2& naturalSize ) const
void SvgVisual::SetSize( const Vector2& size )
{
void SvgVisual::SetSize( const Vector2& size )
{
- if(mImpl->mSize != size && mParsedImage &&
Get
IsOnStage() )
+ if(mImpl->mSize != size && mParsedImage && IsOnStage() )
{
AddRasterizationTask( size );
}
{
AddRasterizationTask( size );
}
@@
-143,37
+141,36
@@
void SvgVisual::SetSize( const Vector2& size )
void SvgVisual::DoCreatePropertyMap( Property::Map& map ) const
{
map.Clear();
void SvgVisual::DoCreatePropertyMap( Property::Map& map ) const
{
map.Clear();
- map.Insert( Toolkit::Visual
::
Property::TYPE, Toolkit::Visual::IMAGE );
+ map.Insert( Toolkit::VisualProperty::TYPE, Toolkit::Visual::IMAGE );
if( !mImageUrl.empty() )
{
map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl );
}
}
if( !mImageUrl.empty() )
{
map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl );
}
}
-void SvgVisual::
SetImage( const std::string& imageUrl, ImageDimensions siz
e )
+void SvgVisual::
DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValu
e )
{
{
- if( mImageUrl != imageUrl )
- {
- mImageUrl = imageUrl;
-
- NSVGimage* parsedImageOld = mParsedImage;
+ // TODO
+}
- Vector2 dpi = Stage::GetCurrent().GetDpi();
- float meanDpi = (dpi.height + dpi.width) * 0.5f;
- mParsedImage = nsvgParseFromFile(mImageUrl.c_str(), UNITS, meanDpi);
+Dali::Property::Value SvgVisual::DoGetProperty( Dali::Property::Index index )
+{
+ // TODO
+ return Dali::Property::Value();
+}
- if( size.GetWidth() != 0u && size.GetHeight() != 0u)
- {
- mImpl->mSize.x = size.GetWidth();
- mImpl->mSize.y = size.GetHeight();
- }
+void SvgVisual::ParseFromUrl( const std::string& imageUrl, ImageDimensions size )
+{
+ mImageUrl = imageUrl;
- if( mImpl->mSize != Vector2::ZERO && GetIsOnStage() )
- {
- AddRasterizationTask( mImpl->mSize );
- }
+ Vector2 dpi = Stage::GetCurrent().GetDpi();
+ float meanDpi = (dpi.height + dpi.width) * 0.5f;
+ mParsedImage = nsvgParseFromFile( imageUrl.c_str(), UNITS, meanDpi );
- mFactoryCache.GetSVGRasterizationThread()->DeleteImage( parsedImageOld );
+ if( size.GetWidth() != 0u && size.GetHeight() != 0u)
+ {
+ mImpl->mSize.x = size.GetWidth();
+ mImpl->mSize.y = size.GetHeight();
}
}
}
}
@@
-192,7
+189,7
@@
void SvgVisual::AddRasterizationTask( const Vector2& size )
void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData )
{
void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData )
{
- if(
Get
IsOnStage() )
+ if( IsOnStage() )
{
TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
if( mAtlasRect != FULL_TEXTURE_RECT )
{
TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
if( mAtlasRect != FULL_TEXTURE_RECT )
@@
-214,8
+211,9
@@
void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData )
}
else // no atlasing
{
}
else // no atlasing
{
- Atlas texture = Atlas::New( rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight() );
- texture.Upload( rasterizedPixelData, 0, 0 );
+ Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888,
+ rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight() );
+ texture.Upload( rasterizedPixelData );
mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
if( mAtlasRect == FULL_TEXTURE_RECT )
mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
if( mAtlasRect == FULL_TEXTURE_RECT )
@@
-233,7
+231,7
@@
void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData )
if( textureSet )
{
if( textureSet )
{
-
TextureSetImage( textureSet, 0u
, texture );
+
textureSet.SetTexture( 0
, texture );
}
}
}
}