Blend Equation Advanced Supporting

[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 a9989c0..09d8de2 100644 (file)
--- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp
+++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
@@ -19,8 +19,6 @@
 #include "svg-visual.h"
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/third-party/nanosvg/nanosvg.h>
-#include <dali-toolkit/third-party/nanosvg/nanosvgrast.h>
 #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>
@@ -45,8 +43,6 @@ namespace Internal
 namespace
 {
 // property name
-const char * const UNITS("px");
-
 const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
 
 }
@@ -54,17 +50,15 @@ 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 ) );
-  svgVisual->ParseFromUrl( imageUrl );
-  svgVisual->SetProperties( properties );
-
+  svgVisual->Load();
+  svgVisual->SetProperties(properties);
   return svgVisual;
 }
 
 SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl )
 {
   SvgVisualPtr svgVisual( new SvgVisual( factoryCache, shaderFactory, imageUrl ) );
-  svgVisual->ParseFromUrl( imageUrl );
-
+  svgVisual->Load();
   return svgVisual;
 }
 
@@ -73,7 +67,10 @@ SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory
   mImageVisualShaderFactory( shaderFactory ),
   mAtlasRect( FULL_TEXTURE_RECT ),
   mImageUrl( imageUrl ),
-  mParsedImage( NULL ),
+  mVectorRenderer( VectorImageRenderer::New() ),
+  mDefaultWidth( 0 ),
+  mDefaultHeight( 0 ),
+  mLoaded( false ),
   mPlacementActor(),
   mVisualSize(Vector2::ZERO),
   mAttemptAtlasing( false )
@@ -84,10 +81,6 @@ SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory
 
 SvgVisual::~SvgVisual()
 {
-  if( mParsedImage )
-  {
-    nsvgDelete( mParsedImage );
-  }
 }
 
 void SvgVisual::DoSetProperties( const Property::Map& propertyMap )
@@ -152,8 +145,8 @@ void SvgVisual::DoSetOnScene( Actor& actor )
   }
   else
   {
-    shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource() : mImpl->mCustomShader->mVertexShader,
-                          mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource() : mImpl->mCustomShader->mFragmentShader,
+    shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource().data() : mImpl->mCustomShader->mVertexShader,
+                          mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource().data() : mImpl->mCustomShader->mFragmentShader,
                           mImpl->mCustomShader->mHints );
 
     shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
@@ -190,10 +183,10 @@ void SvgVisual::DoSetOffScene( Actor& actor )
 
 void SvgVisual::GetNaturalSize( Vector2& naturalSize )
 {
-  if( mParsedImage )
+  if(mLoaded)
   {
-    naturalSize.x = mParsedImage->width;
-    naturalSize.y = mParsedImage->height;
+    naturalSize.x = mDefaultWidth;
+    naturalSize.y = mDefaultHeight;
   }
   else
   {
@@ -218,18 +211,29 @@ void SvgVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
   // Do nothing
 }
 
-void SvgVisual::ParseFromUrl( const VisualUrl& imageUrl )
+void SvgVisual::Load()
 {
-  mImageUrl = imageUrl;
-  if( mImageUrl.IsLocalResource() )
+  // load remote resource on svg rasterize thread.
+  if(!mLoaded && mImageUrl.IsLocalResource())
   {
-    Vector2 dpi = Stage::GetCurrent().GetDpi();
-    float meanDpi = ( dpi.height + dpi.width ) * 0.5f;
-    Dali::Vector<char> buffer;
-    if ( Dali::FileLoader::ReadFile( mImageUrl.GetUrl(), buffer ) )
+    Dali::Vector<uint8_t> buffer;
+    if(Dali::FileLoader::ReadFile(mImageUrl.GetUrl(), buffer))
     {
-      buffer.PushBack( '\0' );
-      mParsedImage = nsvgParse( buffer.Begin(), UNITS, meanDpi );
+      buffer.PushBack('\0');
+
+      Vector2 dpi = Stage::GetCurrent().GetDpi();
+      float meanDpi = (dpi.height + dpi.width) * 0.5f;
+      if(!mVectorRenderer.Load(buffer, meanDpi))
+      {
+        DALI_LOG_ERROR("SvgVisual::Load: Failed to load file! [%s]\n", mImageUrl.GetUrl().c_str());
+        return;
+      }
+      mVectorRenderer.GetDefaultSize(mDefaultWidth, mDefaultHeight);
+      mLoaded = true;
+    }
+    else
+    {
+      DALI_LOG_ERROR("SvgVisual::Load: Failed to read file! [%s]\n", mImageUrl.GetUrl().c_str());
     }
   }
 }
@@ -244,11 +248,12 @@ void SvgVisual::AddRasterizationTask( const Vector2& size )
     Vector2 dpi = Stage::GetCurrent().GetDpi();
     float meanDpi = ( dpi.height + dpi.width ) * 0.5f;
 
-    RasterizingTaskPtr newTask = new RasterizingTask( this, mParsedImage, mImageUrl, meanDpi, width, height );
-    if ( IsSynchronousLoadingRequired() )
+    RasterizingTaskPtr newTask = new RasterizingTask(this, mVectorRenderer, mImageUrl, meanDpi, width, height, mLoaded);
+    if(IsSynchronousLoadingRequired())
     {
+      newTask->Load();
       newTask->Rasterize();
-      ApplyRasterizedImage( newTask->GetParsedImage(), newTask->GetPixelData() );
+      ApplyRasterizedImage(newTask->GetVectorRenderer(), newTask->GetPixelData(), newTask->IsLoaded());
     }
     else
     {
@@ -257,14 +262,11 @@ void SvgVisual::AddRasterizationTask( const Vector2& size )
   }
 }
 
-void SvgVisual::ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterizedPixelData )
+void SvgVisual::ApplyRasterizedImage( VectorImageRenderer vectorRenderer, PixelData rasterizedPixelData, bool isLoaded )
 {
-  if( mParsedImage == NULL)
-  {
-    mParsedImage = parsedSvg;
-  }
+  mLoaded = isLoaded;
 
-  if( mParsedImage && IsOnScene() )
+  if(isLoaded && rasterizedPixelData && IsOnScene())
   {
     TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
     if( mImpl->mFlags & Impl::IS_ATLASING_APPLIED )
@@ -325,10 +327,10 @@ void SvgVisual::ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterized
       mPlacementActor.Reset();
     }
 
-   // Svg loaded and ready to display
-   ResourceReady( Toolkit::Visual::ResourceStatus::READY );
+    // Svg loaded and ready to display
+    ResourceReady( Toolkit::Visual::ResourceStatus::READY );
   }
-  else if( !mParsedImage )
+  else if(!isLoaded || !rasterizedPixelData)
   {
     ResourceReady( Toolkit::Visual::ResourceStatus::FAILED );
   }