X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-visual.cpp;h=a1da87f48c1275bb14a1e5520bd0fd56ec6e5e6f;hp=f73df9ff6377dad23d3b41b9bccb7ba63a027d51;hb=e0c063be9e7ecde0e5665079289489d456828abf;hpb=11ed6421771d05113ae1a6510167d8c2557ac20e

diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
index f73df9f..25e84fd 100644
--- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp
+++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -18,45 +18,61 @@
 // CLASS HEADER
 #include "svg-visual.h"
 
-// EXTERNAL INCLUDES
-#include <dali/public-api/images/buffer-image.h>
-#include <dali/public-api/common/stage.h>
-#include <dali/public-api/math/vector4.h>
-#include <dali/devel-api/images/atlas.h>
-#include <dali/devel-api/images/texture-set-image.h>
-#include <dali/integration-api/debug.h>
-
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/third-party/nanosvg/nanosvg.h>
+#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
+#include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
 #include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
-#include <dali-toolkit/internal/visuals/image/image-visual.h>
-#include <dali-toolkit/internal/visuals/visual-factory-cache.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/visual-string-constants.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/file-loader.h>
+#include <dali/devel-api/common/stage.h>
+#include <dali/integration-api/debug.h>
 
+namespace Dali
+{
+namespace Toolkit
+{
+namespace Internal
+{
 namespace
 {
-const char * const UNITS("px");
-
+// property name
 const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
-}
 
-namespace Dali
-{
+} // namespace
 
-namespace Toolkit
+SvgVisualPtr SvgVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties)
 {
+  SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl));
+  svgVisual->Load();
+  svgVisual->SetProperties(properties);
+  svgVisual->Initialize();
+  return svgVisual;
+}
 
-namespace Internal
+SvgVisualPtr SvgVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl)
 {
+  SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl));
+  svgVisual->Load();
+  svgVisual->Initialize();
+  return svgVisual;
+}
 
-SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlasManager )
-: Visual::Base( factoryCache ),
-  mAtlasRect( FULL_TEXTURE_RECT ),
-  mAtlasManager( atlasManager ),
-  mParsedImage( NULL )
+SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl)
+: Visual::Base(factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::SVG),
+  mImageVisualShaderFactory(shaderFactory),
+  mAtlasRect(FULL_TEXTURE_RECT),
+  mImageUrl(imageUrl),
+  mVectorRenderer(VectorImageRenderer::New()),
+  mDefaultWidth(0),
+  mDefaultHeight(0),
+  mPlacementActor(),
+  mVisualSize(Vector2::ZERO),
+  mLoadFailed(false),
+  mAttemptAtlasing(false)
 {
   // the rasterized image is with pre-multiplied alpha format
   mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
@@ -64,181 +80,320 @@ SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlas
 
 SvgVisual::~SvgVisual()
 {
-  if( mParsedImage )
-  {
-    nsvgDelete( mParsedImage );
-  }
 }
 
-bool SvgVisual::IsSvgUrl( const std::string& url )
+void SvgVisual::OnInitialize()
 {
-  return url.substr( url.find_last_of(".") + 1 ) == "svg";
+  Shader shader = GenerateShader();
+  Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY);
+  mImpl->mRenderer  = Renderer::New(geometry, shader);
 }
 
-void SvgVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap )
+void SvgVisual::DoSetProperties(const Property::Map& propertyMap)
 {
-  Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
-  if( imageURLValue )
+  // url already passed in from constructor
+  for(Property::Map::SizeType iter = 0; iter < propertyMap.Count(); ++iter)
   {
-    std::string imageUrl;
-    if( imageURLValue->Get( imageUrl ) )
+    KeyValuePair keyValue = propertyMap.GetKeyValue(iter);
+    if(keyValue.first.type == Property::Key::INDEX)
     {
-      SetImage( imageUrl );
+      DoSetProperty(keyValue.first.indexKey, keyValue.second);
     }
-    else
+    else if(keyValue.first == IMAGE_ATLASING)
+    {
+      DoSetProperty(Toolkit::ImageVisual::Property::ATLASING, keyValue.second);
+    }
+    else if(keyValue.first == SYNCHRONOUS_LOADING)
     {
-      DALI_LOG_ERROR( "The property '%s' is not a string\n", IMAGE_URL_NAME );
+      DoSetProperty(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second);
     }
   }
 }
 
-void SvgVisual::DoSetOnStage( Actor& actor )
+void SvgVisual::DoSetProperty(Property::Index index, const Property::Value& value)
 {
-  Shader shader = ImageVisual::GetImageShader( mFactoryCache );
-  Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY );
-  if( !geometry )
+  switch(index)
   {
-    geometry =  mFactoryCache.CreateQuadGeometry();
-    mFactoryCache.SaveGeometry( VisualFactoryCache::QUAD_GEOMETRY, geometry );
-  }
-  TextureSet textureSet = TextureSet::New();
-  mImpl->mRenderer = Renderer::New( geometry, shader );
-  mImpl->mRenderer.SetTextures( textureSet );
-
-  if( mImpl->mSize != Vector2::ZERO && mParsedImage )
-  {
-    AddRasterizationTask( mImpl->mSize );
+    case Toolkit::ImageVisual::Property::ATLASING:
+    {
+      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::DoSetOffStage( Actor& actor )
+void SvgVisual::DoSetOnScene(Actor& actor)
 {
-  mFactoryCache.GetSVGRasterizationThread()->RemoveTask( this );
+  TextureSet textureSet = TextureSet::New();
+  mImpl->mRenderer.SetTextures(textureSet);
 
-  actor.RemoveRenderer( mImpl->mRenderer );
-  mImpl->mRenderer.Reset();
-}
+  // Register transform properties
+  mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
 
-void SvgVisual::GetNaturalSize( Vector2& naturalSize ) const
-{
-  if( mParsedImage )
+  // Defer the rasterisation task until we get given a size (by Size Negotiation algorithm)
+
+  // Hold the weak handle of the placement actor and delay the adding of renderer until the svg rasterization is finished.
+  mPlacementActor = actor;
+
+  if(mLoadFailed)
   {
-    naturalSize.x = mParsedImage->width;
-    naturalSize.y = mParsedImage->height;
+    Vector2 imageSize = Vector2::ZERO;
+    imageSize = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+    mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize);
+    actor.AddRenderer(mImpl->mRenderer);
+
+    ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
   }
   else
   {
-    naturalSize = Vector2::ZERO;
+    // SVG visual needs it's size set before it can be rasterized hence set ResourceReady once on stage
+    ResourceReady(Toolkit::Visual::ResourceStatus::READY);
   }
 }
 
-void SvgVisual::SetSize( const Vector2& size )
+void SvgVisual::DoSetOffScene(Actor& actor)
 {
-  if(mImpl->mSize != size && mParsedImage && GetIsOnStage() )
-  {
-    AddRasterizationTask( size );
-  }
-  mImpl->mSize = size;
+  mFactoryCache.GetSVGRasterizationThread()->RemoveTask(this);
+
+  actor.RemoveRenderer(mImpl->mRenderer);
+  mPlacementActor.Reset();
+
+  // Reset the visual size to zero so that when adding the actor back to stage the SVG rasterization is forced
+  mVisualSize = Vector2::ZERO;
+}
+
+void SvgVisual::GetNaturalSize(Vector2& naturalSize)
+{
+  naturalSize.x = mDefaultWidth;
+  naturalSize.y = mDefaultHeight;
 }
 
-void SvgVisual::DoCreatePropertyMap( Property::Map& map ) const
+void SvgVisual::DoCreatePropertyMap(Property::Map& map) const
 {
   map.Clear();
-  map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
-  if( !mImageUrl.empty() )
+  map.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::SVG);
+  if(mImageUrl.IsValid())
   {
-    map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl );
+    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::SetImage( const std::string& imageUrl, ImageDimensions size )
+void SvgVisual::DoCreateInstancePropertyMap(Property::Map& map) const
 {
-  if( mImageUrl != imageUrl )
-  {
-    mImageUrl = imageUrl;
-
-    NSVGimage* parsedImageOld = mParsedImage;
-
-    Vector2 dpi = Stage::GetCurrent().GetDpi();
-    float meanDpi = (dpi.height + dpi.width) * 0.5f;
-    mParsedImage = nsvgParseFromFile(mImageUrl.c_str(), UNITS, meanDpi);
+  // Do nothing
+}
 
-    if( size.GetWidth() != 0u && size.GetHeight() != 0u)
+void SvgVisual::Load()
+{
+  // load remote resource on svg rasterize thread.
+  if(mImageUrl.IsLocalResource())
+  {
+    Dali::Vector<uint8_t> buffer;
+    if(Dali::FileLoader::ReadFile(mImageUrl.GetUrl(), buffer))
     {
-      mImpl->mSize.x = size.GetWidth();
-      mImpl->mSize.y = size.GetHeight();
-    }
+      buffer.PushBack('\0');
 
-    if( mImpl->mSize != Vector2::ZERO && GetIsOnStage() )
+      Vector2 dpi     = Stage::GetCurrent().GetDpi();
+      float   meanDpi = (dpi.height + dpi.width) * 0.5f;
+      if(!mVectorRenderer.Load(buffer, meanDpi))
+      {
+        mLoadFailed = true;
+        DALI_LOG_ERROR("SvgVisual::Load: Failed to load file! [%s]\n", mImageUrl.GetUrl().c_str());
+        return;
+      }
+      mVectorRenderer.GetDefaultSize(mDefaultWidth, mDefaultHeight);
+    }
+    else
     {
-      AddRasterizationTask( mImpl->mSize );
+      mLoadFailed = true;
+      DALI_LOG_ERROR("SvgVisual::Load: Failed to read file! [%s]\n", mImageUrl.GetUrl().c_str());
     }
-
-    mFactoryCache.GetSVGRasterizationThread()->DeleteImage( parsedImageOld );
   }
 }
 
-void SvgVisual::AddRasterizationTask( const Vector2& size )
+void SvgVisual::AddRasterizationTask(const Vector2& size)
 {
-  if( mImpl->mRenderer && mParsedImage )
+  if(mImpl->mRenderer)
   {
-    unsigned int width = static_cast<unsigned int>(size.width);
-    unsigned int height = static_cast<unsigned int>( size.height );
-    BufferImage image = BufferImage::New( width, height, Pixel::RGBA8888);
+    unsigned int width  = static_cast<unsigned int>(size.width);
+    unsigned int height = static_cast<unsigned int>(size.height);
 
-    RasterizingTaskPtr newTask = new RasterizingTask( this, mParsedImage, width, height );
-    mFactoryCache.GetSVGRasterizationThread()->AddTask( newTask );
+    Vector2 dpi     = Stage::GetCurrent().GetDpi();
+    float   meanDpi = (dpi.height + dpi.width) * 0.5f;
+
+    RasterizingTaskPtr newTask = new RasterizingTask(this, mVectorRenderer, mImageUrl, meanDpi, width, height);
+    if(IsSynchronousLoadingRequired() && mImageUrl.IsLocalResource())
+    {
+      newTask->Load();
+      newTask->Rasterize();
+      ApplyRasterizedImage(newTask->GetVectorRenderer(), newTask->GetPixelData(), newTask->IsLoaded());
+    }
+    else
+    {
+      mFactoryCache.GetSVGRasterizationThread()->AddTask(newTask);
+    }
   }
 }
 
-void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData )
+void SvgVisual::ApplyRasterizedImage(VectorImageRenderer vectorRenderer, PixelData rasterizedPixelData, bool isLoaded)
 {
-  if( GetIsOnStage()  )
+  if(isLoaded && rasterizedPixelData && IsOnScene())
   {
     TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
-    if( mAtlasRect != FULL_TEXTURE_RECT )
+    if(mImpl->mFlags & Impl::IS_ATLASING_APPLIED)
     {
-      mAtlasManager.Remove( currentTextureSet, mAtlasRect );
+      mFactoryCache.GetAtlasManager()->Remove(currentTextureSet, mAtlasRect);
     }
 
-    Vector4 atlasRect;
-    TextureSet textureSet = mAtlasManager.Add(atlasRect, rasterizedPixelData );
-    if( textureSet ) // atlasing
+    TextureSet textureSet;
+
+    if(mAttemptAtlasing && !mImpl->mCustomShader)
     {
-      if( textureSet != currentTextureSet )
+      Vector4 atlasRect;
+      textureSet = mFactoryCache.GetAtlasManager()->Add(atlasRect, rasterizedPixelData);
+      if(textureSet) // atlasing
       {
-        mImpl->mRenderer.SetTextures( textureSet );
+        if(textureSet != currentTextureSet)
+        {
+          mImpl->mRenderer.SetTextures(textureSet);
+        }
+        mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, atlasRect);
+        mAtlasRect = atlasRect;
+        mImpl->mFlags |= Impl::IS_ATLASING_APPLIED;
       }
-      mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect );
-      mAtlasRect = atlasRect;
     }
-    else // no atlasing
+
+    if(!textureSet) // no atlasing - mAttemptAtlasing is false or adding to atlas is failed
     {
-      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 )
+      if(mAtlasRect == FULL_TEXTURE_RECT)
       {
         textureSet = currentTextureSet;
       }
       else
       {
         textureSet = TextureSet::New();
-        mImpl->mRenderer.SetTextures( textureSet );
+        mImpl->mRenderer.SetTextures(textureSet);
 
-        mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT );
+        mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT);
         mAtlasRect = FULL_TEXTURE_RECT;
       }
 
-      if( textureSet )
+      if(textureSet)
       {
-        TextureSetImage( textureSet, 0u, texture );
+        textureSet.SetTexture(0, texture);
       }
     }
+
+    // Rasterized pixels are uploaded to texture. If weak handle is holding a placement actor, it is the time to add the renderer to actor.
+    Actor actor = mPlacementActor.GetHandle();
+    if(actor)
+    {
+      actor.AddRenderer(mImpl->mRenderer);
+      // reset the weak handle so that the renderer only get added to actor once
+      mPlacementActor.Reset();
+    }
+
+    // Svg loaded and ready to display
+    ResourceReady(Toolkit::Visual::ResourceStatus::READY);
+  }
+  else if(!isLoaded || !rasterizedPixelData)
+  {
+    Actor actor = mPlacementActor.GetHandle();
+    if(actor)
+    {
+      Vector2 imageSize = Vector2::ZERO;
+      imageSize = actor.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+      mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize);
+      actor.AddRenderer(mImpl->mRenderer);
+    }
+
+    ResourceReady(Toolkit::Visual::ResourceStatus::FAILED);
+  }
+}
+
+void SvgVisual::OnSetTransform()
+{
+  Vector2 visualSize = mImpl->mTransform.GetVisualSize(mImpl->mControlSize);
+
+  if(IsOnScene() && !mLoadFailed)
+  {
+    if(visualSize != mVisualSize)
+    {
+      AddRasterizationTask(visualSize);
+      mVisualSize = visualSize;
+    }
+  }
+
+  if(mImpl->mRenderer)
+  {
+    mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
   }
 }
 
+bool SvgVisual::IsResourceReady() const
+{
+  return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY ||
+          mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED);
+}
 
+void SvgVisual::UpdateShader()
+{
+  if(mImpl->mRenderer)
+  {
+    Shader shader = GenerateShader();
+    mImpl->mRenderer.SetShader(shader);
+  }
+}
+
+Shader SvgVisual::GenerateShader() const
+{
+  Shader shader;
+  if(!mImpl->mCustomShader)
+  {
+    shader = mImageVisualShaderFactory.GetShader(
+      mFactoryCache,
+      ImageVisualShaderFeature::FeatureBuilder()
+      .EnableTextureAtlas(mAttemptAtlasing)
+      .EnableRoundedCorner(IsRoundedCornerRequired())
+      .EnableBorderline(IsBorderlineRequired())
+    );
+  }
+  else
+  {
+    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);
+  }
+  return shader;
+}
 
 } // namespace Internal