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=0e005b3223a4f2df62c88113d7dc3611c5aaaf33;hp=bf7641d8c901ca42e767f5cc5aa85c5ace7c0eff;hb=bb764a75b719ea839f4c255ab015b8fa54fd8039;hpb=e745d1583f3e730ebcc2abc1d0885c0052dcfbdd

diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
index bf7641d..0e005b3 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) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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,34 +18,22 @@
 // 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/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/public-api/visuals/visual-properties.h>
+#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/image-visual.h>
 #include <dali-toolkit/internal/visuals/image-atlas-manager.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/image-visual-shader-factory.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 
-
-namespace
-{
-const char * const UNITS("px");
-
-// property name
-const char * const IMAGE_ATLASING( "atlasing" );
-
-const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
-}
+// EXTERNAL INCLUDES
+#include <dali/devel-api/common/stage.h>
+#include <dali/devel-api/adaptor-framework/file-loader.h>
+#include <dali/integration-api/debug.h>
 
 namespace Dali
 {
@@ -56,28 +44,55 @@ namespace Toolkit
 namespace Internal
 {
 
-SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl, const Property::Map& properties )
+namespace
 {
-  SvgVisualPtr svgVisual( new SvgVisual( factoryCache ) );
+// property name
+const char * const UNITS("px");
+
+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, const VisualUrl& imageUrl )
+SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl )
 {
-  SvgVisualPtr svgVisual( new SvgVisual( factoryCache ) );
+  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 )
-: Visual::Base( factoryCache, Visual::FittingMode::FILL ),
+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( ),
+  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 )
@@ -88,10 +103,12 @@ SvgVisual::SvgVisual( VisualFactoryCache& factoryCache )
 
 SvgVisual::~SvgVisual()
 {
+#ifdef NO_THORVG
   if( mParsedImage )
   {
     nsvgDelete( mParsedImage );
   }
+#endif /* NO_THORVG */
 }
 
 void SvgVisual::DoSetProperties( const Property::Map& propertyMap )
@@ -108,6 +125,10 @@ 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 );
+    }
   }
 }
 
@@ -120,12 +141,45 @@ void SvgVisual::DoSetProperty( Property::Index index, const Property::Value& val
       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 = ImageVisual::GetImageShader( mFactoryCache, mAttemptAtlasing, true );
+  Shader shader;
+  if( !mImpl->mCustomShader )
+  {
+    shader = mImageVisualShaderFactory.GetShader( mFactoryCache, mAttemptAtlasing, true, false );
+  }
+  else
+  {
+    shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource() : mImpl->mCustomShader->mVertexShader,
+                          mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource() : mImpl->mCustomShader->mFragmentShader,
+                          mImpl->mCustomShader->mHints );
+
+    shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
+  }
+
   Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY );
   TextureSet textureSet = TextureSet::New();
   mImpl->mRenderer = Renderer::New( geometry, shader );
@@ -143,7 +197,7 @@ void SvgVisual::DoSetOnStage( Actor& actor )
   ResourceReady( Toolkit::Visual::ResourceStatus::READY );
 }
 
-void SvgVisual::DoSetOffStage( Actor& actor )
+void SvgVisual::DoSetOffScene( Actor& actor )
 {
   mFactoryCache.GetSVGRasterizationThread()->RemoveTask( this );
 
@@ -157,11 +211,19 @@ void SvgVisual::DoSetOffStage( Actor& actor )
 
 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;
@@ -177,6 +239,7 @@ void SvgVisual::DoCreatePropertyMap( Property::Map& map ) const
     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
@@ -184,42 +247,109 @@ void SvgVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
   // Do nothing
 }
 
+#ifdef NO_THORVG
 void SvgVisual::ParseFromUrl( const VisualUrl& imageUrl )
 {
   mImageUrl = imageUrl;
   if( mImageUrl.IsLocalResource() )
   {
     Vector2 dpi = Stage::GetCurrent().GetDpi();
-    float meanDpi = (dpi.height + dpi.width) * 0.5f;
-    mParsedImage = nsvgParseFromFile( mImageUrl.GetUrl().c_str(), UNITS, meanDpi );
+    float meanDpi = ( dpi.height + dpi.width ) * 0.5f;
+    Dali::Vector<char> buffer;
+    if ( Dali::FileLoader::ReadFile( mImageUrl.GetUrl(), buffer ) )
+    {
+      buffer.PushBack( '\0' );
+      mParsedImage = nsvgParse( buffer.Begin(), UNITS, meanDpi );
+    }
   }
 }
+#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 )
 {
-  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 );
 
-    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;
+
+#ifdef NO_THORVG
+    RasterizingTaskPtr newTask = new RasterizingTask( this, mParsedImage, mImageUrl, meanDpi, width, height );
+#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 );
+    }
   }
 }
 
-void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData )
+#ifdef NO_THORVG
+void SvgVisual::ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterizedPixelData )
+{
+  if( mParsedImage == NULL)
+  {
+    mParsedImage = parsedSvg;
+  }
+
+  if( mParsedImage && IsOnScene() )
+#else /* NO_THORVG */
+void SvgVisual::ApplyRasterizedImage( VectorImageRenderer vectorRenderer, PixelData rasterizedPixelData, bool isLoaded )
 {
-  if( IsOnStage()  )
+  mLoaded = isLoaded;
+
+  if( isLoaded && rasterizedPixelData && IsOnScene() )
+#endif /* NO_THORVG */
   {
     TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
-    if( mImpl->mFlags |= Impl::IS_ATLASING_APPLIED )
+    if( mImpl->mFlags & Impl::IS_ATLASING_APPLIED )
     {
       mFactoryCache.GetAtlasManager()->Remove( currentTextureSet, mAtlasRect );
     }
 
     TextureSet textureSet;
 
-    if( mAttemptAtlasing )
+    if( mAttemptAtlasing && !mImpl->mCustomShader )
     {
       Vector4 atlasRect;
       textureSet = mFactoryCache.GetAtlasManager()->Add(atlasRect, rasterizedPixelData );
@@ -273,13 +403,21 @@ void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData )
    // 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 );
+  }
 }
 
 void SvgVisual::OnSetTransform()
 {
   Vector2 visualSize = mImpl->mTransform.GetVisualSize( mImpl->mControlSize );
 
-  if( mParsedImage && IsOnStage() )
+  if( IsOnScene() )
   {
     if( visualSize != mVisualSize )
     {
@@ -287,6 +425,17 @@ void SvgVisual::OnSetTransform()
       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 );
 }
 
 } // namespace Internal