Button Upgrade to use Text Visual

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / visual-factory-impl.cpp

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index d7664ae..92cc53c 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -28,24 +28,22 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/visuals/image-visual-properties.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/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/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/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/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/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/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-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-string-constants.h>

-#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
-
-namespace
-{
-const char * const BROKEN_VISUAL_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
-}

 
 namespace Dali
 {
 
 namespace Dali
 {


@@ -66,11 +64,12 @@ 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, 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, DEBUG )
+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" );
 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();
 BaseHandle Create()
 {
   BaseHandle handle = Toolkit::VisualFactory::Get();


@@ -100,106 +99,113 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
     mFactoryCache = new VisualFactoryCache();
   }
 
     mFactoryCache = new VisualFactoryCache();
   }
 

-  // Return a new DebugVisual if we have debug enabled
-  if( mDebugEnabled )
-  {
-    return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) );
-  }
-
-  Visual::Base* visualPtr = NULL;
+  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 )
+  if( mDebugEnabled )

   {
   {

-    Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType );
+    //Create a WireframeVisual if we have debug enabled
+    visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ) );

   }
   }

-
-  switch( visualType )
+  else

   {
   {

-    case Toolkit::Visual::BORDER:
+    Property::Value* typeValue = propertyMap.Find( Toolkit::DevelVisual::Property::TYPE, VISUAL_TYPE );
+    Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type.
+    if( typeValue )

     {
     {

-      visualPtr = new BorderVisual( *( mFactoryCache.Get() ) );
-      break;
+      Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType );

     }
 
     }
 

-    case Toolkit::Visual::COLOR:
+    switch( visualType )

     {
     {

-      visualPtr = new ColorVisual( *( mFactoryCache.Get() ) );
-      break;
-    }
+      case Toolkit::Visual::BORDER:
+      {
+        visualPtr = BorderVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }

 
 

-    case Toolkit::Visual::GRADIENT:
-    {
-      visualPtr = new GradientVisual( *( mFactoryCache.Get() ) );
-      break;
-    }
+      case Toolkit::Visual::COLOR:
+      {
+        visualPtr = ColorVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }

 
 

-    default: // Default to Image type if unknown (check if there is a URL)
-    case Toolkit::Visual::IMAGE:
-    {
-      Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
-      std::string imageUrl;
-      if( imageURLValue && imageURLValue->Get( imageUrl ) )
+      case Toolkit::Visual::GRADIENT:

       {
       {

-        if( NinePatchImage::IsNinePatchUrl( imageUrl ) )
-        {
-          visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-        }
-        else
-        {
-          CreateAtlasManager();
+        visualPtr = GradientVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }

 
 

-          if( SvgVisual::IsSvgUrl( imageUrl ) )
+      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 = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+            visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );

           }
           }

-          else
+          else // Regular image

           {
           {

-            visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+            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;

       }
       }

-      else if( propertyMap.Find( Toolkit::Visual::Property::SHADER, CUSTOM_SHADER ) )
+
+      case Toolkit::Visual::MESH:

       {
       {

-        // Create Image Visual if it has a shader
-        // TODO: This is required because of EffectsView which should be fixed
-        CreateAtlasManager();
-        visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+        visualPtr = MeshVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;

       }
       }

-      break;
-    }

 
 

-    case Toolkit::Visual::MESH:
-    {
-      visualPtr = new MeshVisual( *( mFactoryCache.Get() ) );
-      break;
-    }
+      case Toolkit::Visual::PRIMITIVE:
+      {
+        visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }

 
 

-    case Toolkit::Visual::PRIMITIVE:
-    {
-      visualPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) );
-      break;
-    }
+      case Toolkit::Visual::WIREFRAME:
+      {
+        visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ) );
+        break;
+      }

 
 

-    case Toolkit::Visual::DEBUG:
-    {
-      visualPtr = new DebugVisual( *( mFactoryCache.Get() ) );
-      break;
+      case Toolkit::DevelVisual::TEXT:
+      {
+        visualPtr = TextVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }

     }
   }
 
     }
   }
 

-  if( visualPtr )
-  {
-    Actor actor;
-    visualPtr->Initialize( actor, propertyMap );
-  }
-  else
+  if( !visualPtr )

   {
     DALI_LOG_ERROR( "Renderer type unknown\n" );
   }
 
   {
     DALI_LOG_ERROR( "Renderer type unknown\n" );
   }
 

-  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 Image& image )


@@ -211,26 +217,22 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image )
 
   if( mDebugEnabled )
   {
 
   if( mDebugEnabled )
   {

-    return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) );
+    return Toolkit::Visual::Base( WireframeVisual::New( *( mFactoryCache.Get() ) ).Get() );

   }
 
   }
 

+  Visual::BasePtr visualPtr;
+

   NinePatchImage npatchImage = NinePatchImage::DownCast( image );
   if( npatchImage )
   {
   NinePatchImage npatchImage = NinePatchImage::DownCast( image );
   if( npatchImage )
   {

-    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-    visualPtr->SetImage( npatchImage );
-
-    return Toolkit::Visual::Base( visualPtr );
+    visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), npatchImage );

   }
   else
   {
   }
   else
   {

-    CreateAtlasManager();
-    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-    Actor actor;
-    visualPtr->SetImage( actor, image );
-
-    return Toolkit::Visual::Base( visualPtr );
+    visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), image );

   }
   }

+
+  return Toolkit::Visual::Base( visualPtr.Get() );

 }
 
 Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
 }
 
 Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )


@@ -242,47 +244,27 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image
 
   if( mDebugEnabled )
   {
 
   if( mDebugEnabled )
   {

-    return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) );
+    return Toolkit::Visual::Base( WireframeVisual::New( *( mFactoryCache.Get() ) ).Get() );

   }
 
   }
 

-  if( NinePatchImage::IsNinePatchUrl( url ) )
-  {
-    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-    visualPtr->SetImage( url );
+  Visual::BasePtr visualPtr;

 
 

-    return Toolkit::Visual::Base( visualPtr );
-  }
-  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* visualPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-    visualPtr->SetImage( url, size );
-    return Toolkit::Visual::Base( visualPtr );
+    visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), url );

   }
   }

-  else
+  else if( UrlType::SVG == type )

   {
   {

-    CreateAtlasManager();
-    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
-    Actor actor;
-    visualPtr->SetImage( actor, url, size );
-
-    return Toolkit::Visual::Base( visualPtr );
+    visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), url );

   }
   }

-}
-
-Image VisualFactory::GetBrokenVisualImage()
-{
-  return ResourceImage::New( BROKEN_VISUAL_IMAGE_URL );
-}
-
-void VisualFactory::CreateAtlasManager()
-{
-  if( !mAtlasManager )
+  else // Regular image

   {
   {

-    Shader shader = ImageVisual::GetImageShader( *( mFactoryCache.Get() ) );
-    mAtlasManager = new ImageAtlasManager();
-    mAtlasManager->SetBrokenImage( BROKEN_VISUAL_IMAGE_URL );
+    visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), url, size );

   }
   }

+
+  return Toolkit::Visual::Base( visualPtr.Get() );

 }
 
 } // namespace Internal
 }
 
 } // namespace Internal