#include "svg-visual.h"
// INTERNAL INCLUDES
+#ifdef NO_THORVG
#include <dali-toolkit/third-party/nanosvg/nanosvg.h>
+#include <dali-toolkit/third-party/nanosvg/nanosvgrast.h>
+#endif /* NO_THORVG */
#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
#include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
-#include <dali/devel-api/adaptor-framework/file-loader.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
// EXTERNAL INCLUDES
-#include <dali/public-api/common/stage.h>
+#include <dali/devel-api/common/stage.h>
+#include <dali/devel-api/adaptor-framework/file-loader.h>
+#include <dali/integration-api/debug.h>
namespace Dali
{
// property name
const char * const UNITS("px");
-const char * const IMAGE_ATLASING( "atlasing" );
-
const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
+
}
SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties )
{
SvgVisualPtr svgVisual( new SvgVisual( factoryCache, shaderFactory, imageUrl ) );
+#ifdef NO_THORVG
svgVisual->ParseFromUrl( imageUrl );
svgVisual->SetProperties( properties );
+#else /* NO_THORVG */
+ svgVisual->Load();
+ svgVisual->SetProperties( properties );
+#endif /* NO_THORVG */
return svgVisual;
}
SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl )
{
SvgVisualPtr svgVisual( new SvgVisual( factoryCache, shaderFactory, imageUrl ) );
+#ifdef NO_THORVG
svgVisual->ParseFromUrl( imageUrl );
+#else /* NO_THORVG */
+ svgVisual->Load();
+#endif /* NO_THORVG */
return svgVisual;
}
SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl )
-: Visual::Base( factoryCache, Visual::FittingMode::FILL ),
+: Visual::Base( factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::SVG ),
mImageVisualShaderFactory( shaderFactory ),
mAtlasRect( FULL_TEXTURE_RECT ),
mImageUrl( imageUrl ),
+#ifdef NO_THORVG
mParsedImage( NULL ),
+#else
+ mVectorRenderer( VectorImageRenderer::New() ),
+ mDefaultWidth( 0 ),
+ mDefaultHeight( 0 ),
+ mLoaded( false ),
+ mLocalResource( true ),
+#endif /* NO_THORVG */
mPlacementActor(),
mVisualSize(Vector2::ZERO),
mAttemptAtlasing( false )
SvgVisual::~SvgVisual()
{
+#ifdef NO_THORVG
if( mParsedImage )
{
nsvgDelete( mParsedImage );
}
+#endif /* NO_THORVG */
}
void SvgVisual::DoSetProperties( const Property::Map& propertyMap )
{
DoSetProperty( Toolkit::ImageVisual::Property::ATLASING, keyValue.second );
}
+ else if( keyValue.first == SYNCHRONOUS_LOADING )
+ {
+ DoSetProperty( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second );
+ }
}
}
value.Get( mAttemptAtlasing );
break;
}
+ case Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING:
+ {
+ bool sync = false;
+ if( value.Get( sync ) )
+ {
+ if( sync )
+ {
+ mImpl->mFlags |= Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+ }
+ else
+ {
+ mImpl->mFlags &= ~Impl::IS_SYNCHRONOUS_RESOURCE_LOADING;
+ }
+ }
+ else
+ {
+ DALI_LOG_ERROR("ImageVisual: synchronousLoading property has incorrect type\n");
+ }
+ break;
+ }
}
}
-void SvgVisual::DoSetOnStage( Actor& actor )
+void SvgVisual::DoSetOnScene( Actor& actor )
{
Shader shader;
if( !mImpl->mCustomShader )
{
- shader = mImageVisualShaderFactory.GetShader( mFactoryCache, mAttemptAtlasing, true );
+ shader = mImageVisualShaderFactory.GetShader( mFactoryCache, mAttemptAtlasing, true, false );
}
else
{
ResourceReady( Toolkit::Visual::ResourceStatus::READY );
}
-void SvgVisual::DoSetOffStage( Actor& actor )
+void SvgVisual::DoSetOffScene( Actor& actor )
{
mFactoryCache.GetSVGRasterizationThread()->RemoveTask( this );
void SvgVisual::GetNaturalSize( Vector2& naturalSize )
{
+#ifdef NO_THORVG
if( mParsedImage )
{
naturalSize.x = mParsedImage->width;
naturalSize.y = mParsedImage->height;
}
+#else /* NO_THORVG */
+ if ( mLoaded )
+ {
+ naturalSize.x = mDefaultWidth;
+ naturalSize.y = mDefaultHeight;
+ }
+#endif /* NO_THORVG */
else
{
naturalSize = Vector2::ZERO;
map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl.GetUrl() );
map.Insert( Toolkit::ImageVisual::Property::ATLASING, mAttemptAtlasing );
}
+ map.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, IsSynchronousLoadingRequired() );
}
void SvgVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
// Do nothing
}
+#ifdef NO_THORVG
void SvgVisual::ParseFromUrl( const VisualUrl& imageUrl )
{
mImageUrl = imageUrl;
}
}
}
+#else /* NO_THORVG */
+void SvgVisual::Load()
+{
+ if( mLoaded || !mLocalResource )
+ {
+ return;
+ }
+
+ mLocalResource = mImageUrl.IsLocalResource();
+
+ if( !mLocalResource )
+ {
+ // load remote resource on svg rasterize thread.
+ return;
+ }
+
+ if( !mVectorRenderer.Load( mImageUrl.GetUrl() ) )
+ {
+ DALI_LOG_ERROR( "Failed to load file!\n" );
+ return;
+ }
+
+ mVectorRenderer.GetDefaultSize(mDefaultWidth, mDefaultHeight);
+ mLoaded = true;
+}
+#endif /* NO_THORVG */
+
void SvgVisual::AddRasterizationTask( const Vector2& size )
{
Vector2 dpi = Stage::GetCurrent().GetDpi();
float meanDpi = ( dpi.height + dpi.width ) * 0.5f;
+#ifdef NO_THORVG
RasterizingTaskPtr newTask = new RasterizingTask( this, mParsedImage, mImageUrl, meanDpi, width, height );
- mFactoryCache.GetSVGRasterizationThread()->AddTask( newTask );
+#else /* NO_THORVG */
+ RasterizingTaskPtr newTask = new RasterizingTask( this, mVectorRenderer, mImageUrl, meanDpi, width, height, mLoaded );
+#endif /* NO_THORVG */
+ if ( IsSynchronousLoadingRequired() )
+ {
+#ifdef NO_THORVG
+ newTask->Rasterize();
+ ApplyRasterizedImage( newTask->GetParsedImage(), newTask->GetPixelData() );
+#else /* NO_THORVG */
+ newTask->Load();
+ newTask->Rasterize();
+ ApplyRasterizedImage( newTask->GetVectorRenderer(), newTask->GetPixelData(), newTask->IsLoaded() );
+#endif /* NO_THORVG */
+ }
+ else
+ {
+ mFactoryCache.GetSVGRasterizationThread()->AddTask( newTask );
+ }
}
}
+#ifdef NO_THORVG
void SvgVisual::ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterizedPixelData )
{
if( mParsedImage == NULL)
mParsedImage = parsedSvg;
}
- if( mParsedImage && IsOnStage() )
+ if( mParsedImage && IsOnScene() )
+#else /* NO_THORVG */
+void SvgVisual::ApplyRasterizedImage( VectorImageRenderer vectorRenderer, PixelData rasterizedPixelData, bool isLoaded )
+{
+ mLoaded = isLoaded;
+
+ if( isLoaded && rasterizedPixelData && IsOnScene() )
+#endif /* NO_THORVG */
{
TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
if( mImpl->mFlags & Impl::IS_ATLASING_APPLIED )
// Svg loaded and ready to display
ResourceReady( Toolkit::Visual::ResourceStatus::READY );
}
+#ifdef NO_THORVG
else if( !mParsedImage )
+#else /* NO_THORVG */
+ else if( !isLoaded || !rasterizedPixelData )
+#endif /* NO_THORVG */
{
ResourceReady( Toolkit::Visual::ResourceStatus::FAILED );
}
{
Vector2 visualSize = mImpl->mTransform.GetVisualSize( mImpl->mControlSize );
- if( IsOnStage() )
+ if( IsOnScene() )
{
if( visualSize != mVisualSize )
{