X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=9fab730503078601240b94c3947883ae16f0440f;hb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d;hp=76d0ba7395a31808e8e5db6342e9c7212a927e91;hpb=63f9b5207c2794cdc460d587723be89585872a51;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 76d0ba7..8c4b2f8 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) 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,56 +18,49 @@
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/scripting/scripting.h>
 #include <dali/integration-api/debug.h>
-#include <dali/public-api/images/image.h>
 #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/enum-helper.h>
-#include <dali/devel-api/scripting/scripting.h>
+#include <dali/public-api/object/type-registry.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/internal/visuals/animated-gradient/animated-gradient-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/border/border-visual.h>
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
 #include <dali-toolkit/internal/visuals/gradient/gradient-visual.h>
-#include <dali-toolkit/internal/visuals/image/batch-image-visual.h>
+#include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
 #include <dali-toolkit/internal/visuals/image/image-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/wireframe/wireframe-visual.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
-#include <dali-toolkit/internal/visuals/visual-factory-resolve-url.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
+#include <dali-toolkit/internal/visuals/wireframe/wireframe-visual.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>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 namespace
 {
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_CONTROL_VISUALS");
+#endif
 
-DALI_ENUM_TO_STRING_TABLE_BEGIN( VISUAL_TYPE )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, BORDER )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, COLOR )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, GRADIENT )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, IMAGE )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, MESH )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, PRIMITIVE )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, WIREFRAME )
-DALI_ENUM_TO_STRING_TABLE_END( VISUAL_TYPE )
-
-const char * const VISUAL_TYPE( "visualType" );
-const char * const BATCHING_ENABLED( "batchingEnabled" );
 BaseHandle Create()
 {
   BaseHandle handle = Toolkit::VisualFactory::Get();
@@ -75,13 +68,18 @@ BaseHandle Create()
   return handle;
 }
 
-DALI_TYPE_REGISTRATION_BEGIN_CREATE( Toolkit::VisualFactory, Dali::BaseHandle, Create, true )
+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 )
+VisualFactory::VisualFactory(bool debugEnabled)
+: mFactoryCache(),
+  mImageVisualShaderFactory(),
+  mSlotDelegate(this),
+  mDebugEnabled(debugEnabled),
+  mPreMultiplyOnLoad(true)
 {
 }
 
@@ -89,182 +87,318 @@ VisualFactory::~VisualFactory()
 {
 }
 
-Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap )
+void VisualFactory::OnStyleChangedSignal(Toolkit::StyleManager styleManager, StyleChange::Type type)
 {
-  // Create factory cache if it hasn't already been
-  if( !mFactoryCache )
+  if(type == StyleChange::THEME_CHANGE)
   {
-    mFactoryCache = new VisualFactoryCache();
-  }
+    const std::string imageDirPath   = AssetManager::GetDaliImagePath();
+    std::string       brokenImageUrl = imageDirPath + BROKEN_IMAGE_FILE_NAME;
 
-  // Return a new WireframeVisual if we have debug enabled
-  if( mDebugEnabled )
-  {
-    return Toolkit::Visual::Base( new WireframeVisual( *( mFactoryCache.Get() ) ) );
+    Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager);
+    config["brokenImageUrl"].Get(brokenImageUrl);
+
+    if(mFactoryCache)
+    {
+      mFactoryCache->SetBrokenImageUrl(brokenImageUrl);
+    }
   }
+}
 
-  Visual::Base* visualPtr = NULL;
+Toolkit::Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyMap)
+{
+  Visual::BasePtr visualPtr;
 
-  Property::Value* typeValue = propertyMap.Find( Toolkit::Visual::Property::TYPE, VISUAL_TYPE );
-  Toolkit::Visual::Type visualType = Toolkit::Visual::IMAGE; // Default to IMAGE type.
-  if( typeValue )
+  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 );
+    Scripting::GetEnumerationProperty(*typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType);
   }
 
-  switch( visualType )
+  switch(visualType)
   {
     case Toolkit::Visual::BORDER:
     {
-      visualPtr = new BorderVisual( *( mFactoryCache.Get() ) );
+      visualPtr = BorderVisual::New(GetFactoryCache(), propertyMap);
       break;
     }
 
     case Toolkit::Visual::COLOR:
     {
-      visualPtr = new ColorVisual( *( mFactoryCache.Get() ) );
+      visualPtr = ColorVisual::New(GetFactoryCache(), propertyMap);
       break;
     }
 
     case Toolkit::Visual::GRADIENT:
     {
-      visualPtr = new GradientVisual( *( mFactoryCache.Get() ) );
+      visualPtr = GradientVisual::New(GetFactoryCache(), propertyMap);
       break;
     }
 
     case Toolkit::Visual::IMAGE:
     {
-      Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
-      std::string imageUrl;
-      if( imageURLValue && imageURLValue->Get( imageUrl ) )
+      Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME);
+      std::string      imageUrl;
+      if(imageURLValue)
       {
-        // first resolve url type to know which visual to create
-        UrlType::Type type = ResolveUrlType( imageUrl );
-        if( UrlType::N_PATCH == type )
+        if(imageURLValue->Get(imageUrl))
         {
-          visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-        }
-        else if( UrlType::SVG == type )
-        {
-          visualPtr = new SvgVisual( *( mFactoryCache.Get() ) );
-        }
-        else // Regular image
-        {
-          bool batchingEnabled( false );
-          Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED );
-          if( batchingEnabledValue  )
-          {
-            batchingEnabledValue->Get( batchingEnabled );
-          }
-
-          if( batchingEnabled )
+          if(!imageUrl.empty())
           {
-            visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ) );
-            break;
+            VisualUrl visualUrl(imageUrl);
+
+            switch(visualUrl.GetType())
+            {
+              case VisualUrl::N_PATCH:
+              {
+                visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap);
+                break;
+              }
+              case VisualUrl::SVG:
+              {
+                visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap);
+                break;
+              }
+              case VisualUrl::GIF:
+              case VisualUrl::WEBP:
+              {
+                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
+        }
+        else
+        {
+          Property::Array* array = imageURLValue->GetArray();
+          if(array)
           {
-            visualPtr = new ImageVisual( *( mFactoryCache.Get() ) );
+            visualPtr = AnimatedImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), *array, propertyMap);
           }
         }
       }
-
       break;
     }
 
     case Toolkit::Visual::MESH:
     {
-      visualPtr = new MeshVisual( *( mFactoryCache.Get() ) );
+      visualPtr = MeshVisual::New(GetFactoryCache(), propertyMap);
       break;
     }
 
     case Toolkit::Visual::PRIMITIVE:
     {
-      visualPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) );
+      visualPtr = PrimitiveVisual::New(GetFactoryCache(), propertyMap);
       break;
     }
 
     case Toolkit::Visual::WIREFRAME:
     {
-      visualPtr = new WireframeVisual( *( mFactoryCache.Get() ) );
+      visualPtr = WireframeVisual::New(GetFactoryCache(), propertyMap);
       break;
     }
 
     case Toolkit::Visual::TEXT:
     {
-      visualPtr = new TextVisual( *( mFactoryCache.Get() ) );
+      visualPtr = TextVisual::New(GetFactoryCache(), propertyMap);
+      break;
+    }
+
+    case Toolkit::Visual::N_PATCH:
+    {
+      Property::Value* imageURLValue = propertyMap.Find(Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME);
+      std::string      imageUrl;
+      if(imageURLValue && imageURLValue->Get(imageUrl))
+      {
+        visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), imageUrl, propertyMap);
+      }
+      break;
+    }
+
+    case Toolkit::Visual::SVG:
+    {
+      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 Toolkit::Visual::ANIMATED_IMAGE:
+    {
+      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 Toolkit::DevelVisual::ANIMATED_GRADIENT:
+    {
+      visualPtr = AnimatedGradientVisual::New(GetFactoryCache(), propertyMap);
+      break;
+    }
+
+    case Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE:
+    {
+      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 Toolkit::DevelVisual::ARC:
+    {
+      visualPtr = ArcVisual::New(GetFactoryCache(), propertyMap);
+      break;
+    }
   }
 
-  if( visualPtr )
+  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;
-    visualPtr->Initialize( actor, propertyMap );
+    DALI_LOG_ERROR("VisualType unknown\n");
   }
-  else
+
+  if(mDebugEnabled && visualType != Toolkit::DevelVisual::WIREFRAME)
   {
-    DALI_LOG_ERROR( "Renderer type unknown\n" );
+    //Create a WireframeVisual if we have debug enabled
+    visualPtr = WireframeVisual::New(GetFactoryCache(), visualPtr, propertyMap);
   }
 
-  return Toolkit::Visual::Base( visualPtr );
+  return Toolkit::Visual::Base(visualPtr.Get());
 }
 
-Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image )
+Toolkit::Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageDimensions size)
 {
-  if( !mFactoryCache )
-  {
-    mFactoryCache = new VisualFactoryCache();
-  }
+  Visual::BasePtr visualPtr;
 
-  if( mDebugEnabled )
+  if(!url.empty())
   {
-    return Toolkit::Visual::Base( new WireframeVisual( *( mFactoryCache.Get() ) ) );
+    // first resolve url type to know which visual to create
+    VisualUrl visualUrl(url);
+    switch(visualUrl.GetType())
+    {
+      case VisualUrl::N_PATCH:
+      {
+        visualPtr = NPatchVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl);
+        break;
+      }
+      case VisualUrl::SVG:
+      {
+        visualPtr = SvgVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl);
+        break;
+      }
+      case VisualUrl::GIF:
+      case VisualUrl::WEBP:
+      {
+        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;
+      }
+    }
   }
 
-  NinePatchImage npatchImage = NinePatchImage::DownCast( image );
-  if( npatchImage )
+  if(mDebugEnabled)
   {
-    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ), npatchImage );
-    return Toolkit::Visual::Base( visualPtr );
-  }
-  else
-  {
-    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), image );
-    return Toolkit::Visual::Base( visualPtr );
+    //Create a WireframeVisual if we have debug enabled
+    visualPtr = WireframeVisual::New(GetFactoryCache(), visualPtr);
   }
+
+  return Toolkit::Visual::Base(visualPtr.Get());
 }
 
-Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
+void VisualFactory::SetPreMultiplyOnLoad(bool preMultiply)
 {
-  if( !mFactoryCache )
+  if(mPreMultiplyOnLoad != preMultiply)
   {
-    mFactoryCache = new VisualFactoryCache();
+    GetFactoryCache().SetPreMultiplyOnLoad(preMultiply);
   }
+  mPreMultiplyOnLoad = preMultiply;
+}
 
-  if( mDebugEnabled )
-  {
-    return Toolkit::Visual::Base( new WireframeVisual( *( mFactoryCache.Get() ) ) );
-  }
+bool VisualFactory::GetPreMultiplyOnLoad() const
+{
+  return mPreMultiplyOnLoad;
+}
 
-  // first resolve url type to know which visual to create
-  UrlType::Type type = ResolveUrlType( url );
-  if( UrlType::N_PATCH == type )
-  {
-    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ), url );
-    return Toolkit::Visual::Base( visualPtr );
-  }
-  else if( UrlType::SVG == type )
+Internal::TextureManager& VisualFactory::GetTextureManager()
+{
+  return GetFactoryCache().GetTextureManager();
+}
+
+Internal::VisualFactoryCache& VisualFactory::GetFactoryCache()
+{
+  if(!mFactoryCache)
   {
-    SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ), url, size );
-    return Toolkit::Visual::Base( visualPtr );
+    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);
   }
-  else // Regular image
+  return *mFactoryCache;
+}
+
+ImageVisualShaderFactory& VisualFactory::GetImageVisualShaderFactory()
+{
+  if(!mImageVisualShaderFactory)
   {
-    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), url, size );
-    return Toolkit::Visual::Base( visualPtr );
+    mImageVisualShaderFactory = std::unique_ptr<ImageVisualShaderFactory>(new ImageVisualShaderFactory());
   }
+  return *mImageVisualShaderFactory;
 }
 
 } // namespace Internal