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=92cc53c9de6e033cd215e6b8b3e0954f73098a57;hp=2ccc1d6d8d4e584ab0b83cc2eeca572b9b9bfb14;hb=863244a09761c6e22a224299b6155a285e21d6ec;hpb=257a9991486e4e05335212b21ecc1f5a0aacbc63

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 2ccc1d6..92cc53c 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) 2016 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,27 @@
 #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>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.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/image/batch-image-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/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/image-atlas-manager.h>
-
-namespace
-{
-const char * const BROKEN_RENDERER_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
-}
 
 namespace Dali
 {
@@ -55,6 +57,19 @@ namespace Internal
 namespace
 {
 
+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::DevelVisual, TEXT )
+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();
@@ -76,148 +91,124 @@ VisualFactory::~VisualFactory()
 {
 }
 
-VisualFactory::RendererType VisualFactory::GetRendererType( const Property::Map& propertyMap )
+Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& propertyMap )
 {
-  RendererType rendererType = UNDEFINED;
+  // Create factory cache if it hasn't already been
+  if( !mFactoryCache )
+  {
+    mFactoryCache = new VisualFactoryCache();
+  }
+
+  Visual::BasePtr visualPtr;
 
-  Property::Value* type = propertyMap.Find( RENDERER_TYPE );
-  std::string typeValue ;
-  if( type && type->Get( typeValue ))
+  if( mDebugEnabled )
   {
-    if( typeValue == COLOR_RENDERER )
-    {
-      rendererType = COLOR;
-    }
-    else if( typeValue == BORDER_RENDERER )
-    {
-      rendererType = BORDER;
-    }
-    else if( typeValue == GRADIENT_RENDERER )
-    {
-      rendererType = GRADIENT;
-    }
-    else if( typeValue == IMAGE_RENDERER )
-    {
-      rendererType = IMAGE;
-    }
-    else if( typeValue == MESH_RENDERER )
-    {
-      rendererType = MESH;
-    }
-    else if( typeValue == PRIMITIVE_RENDERER )
+    //Create a WireframeVisual if we have debug enabled
+    visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ) );
+  }
+  else
+  {
+    Property::Value* typeValue = propertyMap.Find( Toolkit::DevelVisual::Property::TYPE, VISUAL_TYPE );
+    Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type.
+    if( typeValue )
     {
-      rendererType = PRIMITIVE;
+      Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType );
     }
-  }
 
-  // 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 ))
+    switch( visualType )
     {
-      if( NinePatchImage::IsNinePatchUrl( imageUrl ) )
+      case Toolkit::Visual::BORDER:
       {
-        rendererType = N_PATCH;
+        visualPtr = BorderVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
       }
-      else if( SvgVisual::IsSvgUrl( imageUrl ) )
+
+      case Toolkit::Visual::COLOR:
       {
-        rendererType = SVG;
+        visualPtr = ColorVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
       }
-      else
+
+      case Toolkit::Visual::GRADIENT:
       {
-        rendererType = IMAGE;
+        visualPtr = GradientVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
       }
-    }
-  }
 
-  return rendererType;
-}
+      case Toolkit::Visual::IMAGE:
+      {
+        Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+        std::string imageUrl;
+        if( imageURLValue && imageURLValue->Get( imageUrl ) )
+        {
+          // first resolve url type to know which visual to create
+          UrlType::Type type = ResolveUrlType( imageUrl );
+          if( UrlType::N_PATCH == type )
+          {
+            visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
+          }
+          else if( UrlType::SVG == type )
+          {
+            visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
+          }
+          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 )
+            {
+              visualPtr = BatchImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
+            }
+            else
+            {
+              visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
+            }
+          }
+        }
+
+        break;
+      }
 
-Toolkit::Visual VisualFactory::CreateVisual( const Property::Map& propertyMap )
-{
-  Visual* rendererPtr = NULL;
+      case Toolkit::Visual::MESH:
+      {
+        visualPtr = MeshVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }
 
-  RendererType type = GetRendererType( propertyMap );
-  if( type != UNDEFINED)
-  {
-    if( !mFactoryCache )
-    {
-      mFactoryCache = new VisualFactoryCache();
-    }
+      case Toolkit::Visual::PRIMITIVE:
+      {
+        visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }
 
-    if( mDebugEnabled )
-    {
-      return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) );
-    }
-  }
+      case Toolkit::Visual::WIREFRAME:
+      {
+        visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ) );
+        break;
+      }
 
-  switch( type )
-  {
-    case COLOR:
-    {
-      rendererPtr = new ColorVisual( *( mFactoryCache.Get() ) );
-      break;
-    }
-     case GRADIENT:
-     {
-       rendererPtr = new GradientVisual( *( mFactoryCache.Get() ) );
-       break;
-     }
-    case BORDER:
-    {
-      rendererPtr = new BorderVisual( *( mFactoryCache.Get() ) );
-      break;
-    }
-    case IMAGE:
-    {
-      CreateAtlasManager();
-      rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-      break;
-    }
-    case N_PATCH:
-    {
-      rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-      break;
-    }
-    case SVG:
-    {
-      CreateAtlasManager();
-      rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-      break;
-    }
-    case MESH:
-    {
-      rendererPtr = new MeshVisual( *( mFactoryCache.Get() ) );
-      break;
-    }
-    case PRIMITIVE:
-    {
-      rendererPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) );
-      break;
-    }
-    case UNDEFINED:
-    default:
-    {
-      break;
+      case Toolkit::DevelVisual::TEXT:
+      {
+        visualPtr = TextVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }
     }
   }
 
-  if( rendererPtr )
-  {
-    Actor actor;
-    rendererPtr->Initialize( actor, propertyMap );
-  }
-  else
+  if( !visualPtr )
   {
-    DALI_LOG_ERROR( "Renderer type unknown" );
+    DALI_LOG_ERROR( "Renderer type unknown\n" );
   }
 
-  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 )
   {
@@ -226,29 +217,25 @@ Toolkit::Visual VisualFactory::CreateVisual( const Image& image )
 
   if( mDebugEnabled )
   {
-    return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) );
+    return Toolkit::Visual::Base( WireframeVisual::New( *( mFactoryCache.Get() ) ).Get() );
   }
 
+  Visual::BasePtr visualPtr;
+
   NinePatchImage npatchImage = NinePatchImage::DownCast( image );
   if( npatchImage )
   {
-    NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-    rendererPtr->SetImage( npatchImage );
-
-    return Toolkit::Visual( rendererPtr );
+    visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), npatchImage );
   }
   else
   {
-    CreateAtlasManager();
-    ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-    Actor actor;
-    rendererPtr->SetImage( actor, image );
-
-    return Toolkit::Visual( rendererPtr );
+    visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), image );
   }
+
+  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 )
   {
@@ -257,47 +244,27 @@ Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimens
 
   if( mDebugEnabled )
   {
-    return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) );
+    return Toolkit::Visual::Base( WireframeVisual::New( *( mFactoryCache.Get() ) ).Get() );
   }
 
-  if( NinePatchImage::IsNinePatchUrl( url ) )
-  {
-    NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-    rendererPtr->SetImage( url );
+  Visual::BasePtr visualPtr;
 
-    return Toolkit::Visual( rendererPtr );
-  }
-  else if( SvgVisual::IsSvgUrl( url ) )
+  // first resolve url type to know which visual to create
+  UrlType::Type type = ResolveUrlType( url );
+  if( UrlType::N_PATCH == type )
   {
-    CreateAtlasManager();
-    SvgVisual* rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-    rendererPtr->SetImage( url, size );
-    return Toolkit::Visual( rendererPtr );
+    visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), url );
   }
-  else
+  else if( UrlType::SVG == type )
   {
-    CreateAtlasManager();
-    ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-    Actor actor;
-    rendererPtr->SetImage( actor, url, size );
-
-    return Toolkit::Visual( rendererPtr );
+    visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), url );
   }
-}
-
-Image VisualFactory::GetBrokenRendererImage()
-{
-  return ResourceImage::New( BROKEN_RENDERER_IMAGE_URL );
-}
-
-void VisualFactory::CreateAtlasManager()
-{
-  if( !mAtlasManager )
+  else // Regular image
   {
-    Shader shader = ImageVisual::GetImageShader( *( mFactoryCache.Get() ) );
-    mAtlasManager = new ImageAtlasManager();
-    mAtlasManager->SetBrokenImage( BROKEN_RENDERER_IMAGE_URL );
+    visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), url, size );
   }
+
+  return Toolkit::Visual::Base( visualPtr.Get() );
 }
 
 } // namespace Internal