X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=6baaec219623f3f70e4d94c989fadd5cd9659e5e;hp=2ccc1d6d8d4e584ab0b83cc2eeca572b9b9bfb14;hb=d82f43904668532387d5c796aad7aa265d5536d6;hpb=1972f043026a3e1bdcaad71c17859a8f324d1e6d

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 2ccc1d6..dc35220 100644
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2015 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.
@@ -23,25 +23,32 @@
 #include <dali/public-api/object/property-array.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
+#include <dali/devel-api/scripting/scripting.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/text-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
 #include <dali-toolkit/internal/visuals/border/border-visual.h>
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
-#include <dali-toolkit/internal/visuals/debug/debug-visual.h>
 #include <dali-toolkit/internal/visuals/gradient/gradient-visual.h>
-#include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
+#include <dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h>
 #include <dali-toolkit/internal/visuals/image/image-visual.h>
-#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
 #include <dali-toolkit/internal/visuals/mesh/mesh-visual.h>
+#include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
 #include <dali-toolkit/internal/visuals/primitive/primitive-visual.h>
+#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
+#include <dali-toolkit/internal/visuals/text/text-visual.h>
+#include <dali-toolkit/internal/visuals/animated-image/animated-image-visual.h>
+#include <dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h>
+#include <dali-toolkit/internal/visuals/arc/arc-visual.h>
+#include <dali-toolkit/internal/visuals/wireframe/wireframe-visual.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
-#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
-
-namespace
-{
-const char * const BROKEN_RENDERER_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
-}
+#include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
 
 namespace Dali
 {
@@ -55,6 +62,10 @@ namespace Internal
 namespace
 {
 
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_CONTROL_VISUALS");
+#endif
+
 BaseHandle Create()
 {
   BaseHandle handle = Toolkit::VisualFactory::Get();
@@ -64,11 +75,16 @@ BaseHandle Create()
 
 DALI_TYPE_REGISTRATION_BEGIN_CREATE( Toolkit::VisualFactory, Dali::BaseHandle, Create, true )
 DALI_TYPE_REGISTRATION_END()
+const char* const BROKEN_IMAGE_FILE_NAME = "broken.png"; ///< The file name of the broken image.
 
 } // namespace
 
 VisualFactory::VisualFactory( bool debugEnabled )
-:mDebugEnabled( debugEnabled )
+: mFactoryCache(),
+  mImageVisualShaderFactory(),
+  mSlotDelegate(this),
+  mDebugEnabled( debugEnabled ),
+  mPreMultiplyOnLoad( true )
 {
 }
 
@@ -76,228 +92,349 @@ VisualFactory::~VisualFactory()
 {
 }
 
-VisualFactory::RendererType VisualFactory::GetRendererType( const Property::Map& propertyMap )
+void VisualFactory::OnStyleChangedSignal( Toolkit::StyleManager styleManager, StyleChange::Type type)
 {
-  RendererType rendererType = UNDEFINED;
-
-  Property::Value* type = propertyMap.Find( RENDERER_TYPE );
-  std::string typeValue ;
-  if( type && type->Get( typeValue ))
+  if( type == StyleChange::THEME_CHANGE )
   {
-    if( typeValue == COLOR_RENDERER )
-    {
-      rendererType = COLOR;
-    }
-    else if( typeValue == BORDER_RENDERER )
-    {
-      rendererType = BORDER;
-    }
-    else if( typeValue == GRADIENT_RENDERER )
+    const std::string imageDirPath = AssetManager::GetDaliImagePath();
+    std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME;
+
+    Property::Map config = Toolkit::DevelStyleManager::GetConfigurations( styleManager );
+    config["brokenImageUrl"].Get( brokenImageUrl );
+
+    if( mFactoryCache )
     {
-      rendererType = GRADIENT;
+      mFactoryCache->SetBrokenImageUrl(brokenImageUrl);
     }
-    else if( typeValue == IMAGE_RENDERER )
+  }
+}
+
+Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap )
+{
+  Visual::BasePtr visualPtr;
+
+  Property::Value* typeValue = propertyMap.Find( Toolkit::Visual::Property::TYPE, VISUAL_TYPE );
+  Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type.
+  if( typeValue )
+  {
+    Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType );
+  }
+
+  switch( visualType )
+  {
+    case Toolkit::Visual::BORDER:
     {
-      rendererType = IMAGE;
+      visualPtr = BorderVisual::New( GetFactoryCache(), propertyMap );
+      break;
     }
-    else if( typeValue == MESH_RENDERER )
+
+    case Toolkit::Visual::COLOR:
     {
-      rendererType = MESH;
+      visualPtr = ColorVisual::New( GetFactoryCache(), propertyMap );
+      break;
     }
-    else if( typeValue == PRIMITIVE_RENDERER )
+
+    case Toolkit::Visual::GRADIENT:
     {
-      rendererType = PRIMITIVE;
+      visualPtr = GradientVisual::New( GetFactoryCache(), propertyMap );
+      break;
     }
-  }
 
-  // check the url if exist, to decide the renderer type
-  if( rendererType == IMAGE || rendererType == UNDEFINED )
-  {
-    Property::Value* imageURLValue = propertyMap.Find( IMAGE_URL_NAME );
-    std::string imageUrl;
-    if( imageURLValue && imageURLValue->Get( imageUrl ))
+    case Toolkit::Visual::IMAGE:
     {
-      if( NinePatchImage::IsNinePatchUrl( imageUrl ) )
-      {
-        rendererType = N_PATCH;
-      }
-      else if( SvgVisual::IsSvgUrl( imageUrl ) )
+      Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+      std::string imageUrl;
+      if( imageURLValue )
       {
-        rendererType = SVG;
-      }
-      else
-      {
-        rendererType = IMAGE;
+        if( imageURLValue->Get( imageUrl ) )
+        {
+          if( !imageUrl.empty() )
+          {
+            VisualUrl visualUrl( imageUrl );
+
+            switch( visualUrl.GetType() )
+            {
+              case VisualUrl::N_PATCH:
+              {
+                visualPtr = NPatchVisual::New( GetFactoryCache(), visualUrl, propertyMap );
+                break;
+              }
+              case VisualUrl::SVG:
+              {
+                visualPtr = SvgVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap );
+                break;
+              }
+              case VisualUrl::GIF:
+              {
+                visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap );
+                break;
+              }
+              case VisualUrl::JSON:
+              {
+                visualPtr = AnimatedVectorImageVisual::New( GetFactoryCache(),  GetImageVisualShaderFactory(), imageUrl, propertyMap );
+                break;
+              }
+              case VisualUrl::REGULAR_IMAGE:
+              {
+                visualPtr = ImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap );
+                break;
+              }
+            }
+          }
+        }
+        else
+        {
+          Property::Array* array = imageURLValue->GetArray();
+          if( array )
+          {
+            visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap );
+          }
+        }
       }
+      break;
     }
-  }
 
-  return rendererType;
-}
-
-Toolkit::Visual VisualFactory::CreateVisual( const Property::Map& propertyMap )
-{
-  Visual* rendererPtr = NULL;
-
-  RendererType type = GetRendererType( propertyMap );
-  if( type != UNDEFINED)
-  {
-    if( !mFactoryCache )
+    case Toolkit::Visual::MESH:
     {
-      mFactoryCache = new VisualFactoryCache();
+      visualPtr = MeshVisual::New( GetFactoryCache(), propertyMap );
+      break;
     }
 
-    if( mDebugEnabled )
+    case Toolkit::Visual::PRIMITIVE:
     {
-      return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) );
+      visualPtr = PrimitiveVisual::New( GetFactoryCache(), propertyMap );
+      break;
     }
-  }
 
-  switch( type )
-  {
-    case COLOR:
+    case Toolkit::Visual::WIREFRAME:
     {
-      rendererPtr = new ColorVisual( *( mFactoryCache.Get() ) );
+      visualPtr = WireframeVisual::New( GetFactoryCache(), propertyMap );
       break;
     }
-     case GRADIENT:
-     {
-       rendererPtr = new GradientVisual( *( mFactoryCache.Get() ) );
-       break;
-     }
-    case BORDER:
+
+    case Toolkit::Visual::TEXT:
     {
-      rendererPtr = new BorderVisual( *( mFactoryCache.Get() ) );
+      visualPtr = TextVisual::New( GetFactoryCache(), propertyMap );
       break;
     }
-    case IMAGE:
+
+    case Toolkit::Visual::N_PATCH:
     {
-      CreateAtlasManager();
-      rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+      Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+      std::string imageUrl;
+      if( imageURLValue && imageURLValue->Get( imageUrl ) )
+      {
+        visualPtr = NPatchVisual::New( GetFactoryCache(), imageUrl, propertyMap );
+      }
       break;
     }
-    case N_PATCH:
+
+    case Toolkit::Visual::SVG:
     {
-      rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
+      Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+      std::string imageUrl;
+      if( imageURLValue && imageURLValue->Get( imageUrl ) )
+      {
+        visualPtr = SvgVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap );
+      }
       break;
     }
-    case SVG:
+
+    case Toolkit::Visual::ANIMATED_IMAGE:
     {
-      CreateAtlasManager();
-      rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+      Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+      std::string imageUrl;
+      if( imageURLValue )
+      {
+        if( imageURLValue->Get( imageUrl ) )
+        {
+          visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap );
+        }
+        else
+        {
+          Property::Array* array = imageURLValue->GetArray();
+          if( array )
+          {
+            visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap );
+          }
+        }
+      }
       break;
     }
-    case MESH:
+
+    case Toolkit::DevelVisual::ANIMATED_GRADIENT:
     {
-      rendererPtr = new MeshVisual( *( mFactoryCache.Get() ) );
+      visualPtr = AnimatedGradientVisual::New( GetFactoryCache(), propertyMap );
       break;
     }
-    case PRIMITIVE:
+
+    case Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE:
     {
-      rendererPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) );
+      Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+      std::string imageUrl;
+      if( imageURLValue && imageURLValue->Get( imageUrl ) )
+      {
+        visualPtr = AnimatedVectorImageVisual::New( GetFactoryCache(),  GetImageVisualShaderFactory(), imageUrl, propertyMap );
+      }
       break;
     }
-    case UNDEFINED:
-    default:
+
+    case Toolkit::DevelVisual::ARC:
     {
+      visualPtr = ArcVisual::New( GetFactoryCache(), propertyMap );
       break;
     }
   }
 
-  if( rendererPtr )
+  DALI_LOG_INFO( gLogFilter, Debug::Concise, "VisualFactory::CreateVisual( VisualType:%s %s%s)\n",
+                 Scripting::GetEnumerationName<Toolkit::DevelVisual::Type>( visualType,
+                                                                            VISUAL_TYPE_TABLE,
+                                                                            VISUAL_TYPE_TABLE_COUNT ),
+                 ( visualType == Toolkit::DevelVisual::IMAGE ) ? "url:" : "",
+                 ( visualType == Toolkit::DevelVisual::IMAGE ) ?
+                             ( ([&] (){
+                                        // Return URL if present in PropertyMap else return "not found message"
+                                        Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+                                        return ( imageURLValue ) ? imageURLValue->Get<std::string>().c_str() : "url not found in PropertyMap";
+                                      })()
+                             )
+                             : "" );
+
+  if( !visualPtr )
   {
-    Actor actor;
-    rendererPtr->Initialize( actor, propertyMap );
+    DALI_LOG_ERROR( "VisualType unknown\n" );
   }
-  else
+
+  if( mDebugEnabled && visualType !=  Toolkit::DevelVisual::WIREFRAME )
   {
-    DALI_LOG_ERROR( "Renderer type unknown" );
+    //Create a WireframeVisual if we have debug enabled
+    visualPtr = WireframeVisual::New(GetFactoryCache(), visualPtr, propertyMap );
   }
 
-  return Toolkit::Visual( rendererPtr );
+  return Toolkit::Visual::Base( visualPtr.Get() );
 }
 
-Toolkit::Visual VisualFactory::CreateVisual( const Image& image )
+Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image )
 {
-  if( !mFactoryCache )
-  {
-    mFactoryCache = new VisualFactoryCache();
-  }
+  Visual::BasePtr visualPtr;
 
-  if( mDebugEnabled )
+  if( image )
   {
-    return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) );
+    NinePatchImage npatchImage = NinePatchImage::DownCast( image );
+    if( npatchImage )
+    {
+      visualPtr = NPatchVisual::New( GetFactoryCache(), npatchImage );
+    }
+    else
+    {
+      visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), image );
+    }
   }
 
-  NinePatchImage npatchImage = NinePatchImage::DownCast( image );
-  if( npatchImage )
+  if( mDebugEnabled )
   {
-    NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-    rendererPtr->SetImage( npatchImage );
-
-    return Toolkit::Visual( rendererPtr );
+    //Create a WireframeVisual if we have debug enabled
+    visualPtr = WireframeVisual::New( GetFactoryCache(), visualPtr );
   }
-  else
-  {
-    CreateAtlasManager();
-    ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-    Actor actor;
-    rendererPtr->SetImage( actor, image );
 
-    return Toolkit::Visual( rendererPtr );
-  }
+  return Toolkit::Visual::Base( visualPtr.Get() );
 }
 
-Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
+Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
 {
-  if( !mFactoryCache )
+  Visual::BasePtr visualPtr;
+
+  if( !url.empty() )
   {
-    mFactoryCache = new VisualFactoryCache();
+    // first resolve url type to know which visual to create
+    VisualUrl visualUrl( url );
+    switch( visualUrl.GetType() )
+    {
+      case VisualUrl::N_PATCH:
+      {
+        visualPtr = NPatchVisual::New( GetFactoryCache(), visualUrl );
+        break;
+      }
+      case VisualUrl::SVG:
+      {
+        visualPtr = SvgVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl );
+        break;
+      }
+      case VisualUrl::GIF:
+      {
+        visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl );
+        break;
+      }
+      case VisualUrl::JSON:
+      {
+        visualPtr = AnimatedVectorImageVisual::New( GetFactoryCache(),  GetImageVisualShaderFactory(), visualUrl );
+        break;
+      }
+      case VisualUrl::REGULAR_IMAGE:
+      {
+        visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size );
+        break;
+      }
+    }
   }
 
   if( mDebugEnabled )
   {
-    return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) );
+    //Create a WireframeVisual if we have debug enabled
+    visualPtr = WireframeVisual::New( GetFactoryCache(), visualPtr );
   }
 
-  if( NinePatchImage::IsNinePatchUrl( url ) )
-  {
-    NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-    rendererPtr->SetImage( url );
+  return Toolkit::Visual::Base( visualPtr.Get() );
+}
 
-    return Toolkit::Visual( rendererPtr );
-  }
-  else if( SvgVisual::IsSvgUrl( url ) )
+void VisualFactory::SetPreMultiplyOnLoad( bool preMultiply )
+{
+  if( mPreMultiplyOnLoad != preMultiply )
   {
-    CreateAtlasManager();
-    SvgVisual* rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-    rendererPtr->SetImage( url, size );
-    return Toolkit::Visual( rendererPtr );
+    GetFactoryCache().SetPreMultiplyOnLoad( preMultiply );
   }
-  else
-  {
-    CreateAtlasManager();
-    ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-    Actor actor;
-    rendererPtr->SetImage( actor, url, size );
+  mPreMultiplyOnLoad = preMultiply;
+}
 
-    return Toolkit::Visual( rendererPtr );
-  }
+bool VisualFactory::GetPreMultiplyOnLoad() const
+{
+  return mPreMultiplyOnLoad;
 }
 
-Image VisualFactory::GetBrokenRendererImage()
+Internal::TextureManager& VisualFactory::GetTextureManager()
 {
-  return ResourceImage::New( BROKEN_RENDERER_IMAGE_URL );
+  return GetFactoryCache().GetTextureManager();
+}
+
+Internal::VisualFactoryCache& VisualFactory::GetFactoryCache()
+{
+  if( !mFactoryCache )
+  {
+    mFactoryCache = std::unique_ptr<VisualFactoryCache>( new VisualFactoryCache( mPreMultiplyOnLoad ) );
+
+    const std::string imageDirPath = AssetManager::GetDaliImagePath();
+    std::string brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME;
+
+    Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
+    if( styleManager )
+    {
+      Property::Map config = Toolkit::DevelStyleManager::GetConfigurations( styleManager );
+      config["brokenImageUrl"].Get( brokenImageUrl );
+      styleManager.StyleChangedSignal().Connect( mSlotDelegate, &VisualFactory::OnStyleChangedSignal );
+    }
+
+    mFactoryCache->SetBrokenImageUrl(brokenImageUrl);
+  }
+  return *mFactoryCache;
 }
 
-void VisualFactory::CreateAtlasManager()
+ImageVisualShaderFactory& VisualFactory::GetImageVisualShaderFactory()
 {
-  if( !mAtlasManager )
+  if( !mImageVisualShaderFactory )
   {
-    Shader shader = ImageVisual::GetImageShader( *( mFactoryCache.Get() ) );
-    mAtlasManager = new ImageAtlasManager();
-    mAtlasManager->SetBrokenImage( BROKEN_RENDERER_IMAGE_URL );
+    mImageVisualShaderFactory = std::unique_ptr< ImageVisualShaderFactory >( new ImageVisualShaderFactory() );
   }
+  return *mImageVisualShaderFactory;
 }
 
 } // namespace Internal