Rename of Control Renderers to Visuals

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

diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp b/dali-toolkit/internal/controls/renderers/visual-factory-impl.cpp
similarity index 57%
rename from dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
rename to dali-toolkit/internal/controls/renderers/visual-factory-impl.cpp
index e1c75a2..51bf68b 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
+++ b/dali-toolkit/internal/controls/renderers/visual-factory-impl.cpp
@@ -15,7 +15,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/controls/renderers/renderer-factory-impl.h>
+#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
@@ -25,17 +25,17 @@
 #include <dali/public-api/object/type-registry-helper.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/border/border-renderer.h>
-#include <dali-toolkit/internal/controls/renderers/color/color-renderer.h>
-#include <dali-toolkit/internal/controls/renderers/debug/debug-renderer.h>
-#include <dali-toolkit/internal/controls/renderers/gradient/gradient-renderer.h>
-#include <dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.h>
-#include <dali-toolkit/internal/controls/renderers/image/image-renderer.h>
-#include <dali-toolkit/internal/controls/renderers/svg/svg-renderer.h>
-#include <dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h>
-#include <dali-toolkit/internal/controls/renderers/primitive/primitive-renderer.h>
-#include <dali-toolkit/internal/controls/renderers/renderer-factory-cache.h>
-#include <dali-toolkit/internal/controls/renderers/renderer-string-constants.h>
+#include <dali-toolkit/internal/controls/renderers/border/border-visual.h>
+#include <dali-toolkit/internal/controls/renderers/color/color-visual.h>
+#include <dali-toolkit/internal/controls/renderers/debug/debug-visual.h>
+#include <dali-toolkit/internal/controls/renderers/gradient/gradient-visual.h>
+#include <dali-toolkit/internal/controls/renderers/npatch/npatch-visual.h>
+#include <dali-toolkit/internal/controls/renderers/image/image-visual.h>
+#include <dali-toolkit/internal/controls/renderers/svg/svg-visual.h>
+#include <dali-toolkit/internal/controls/renderers/mesh/mesh-visual.h>
+#include <dali-toolkit/internal/controls/renderers/primitive/primitive-visual.h>
+#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
+#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
 #include <dali-toolkit/internal/controls/renderers/image-atlas-manager.h>
 
 namespace
@@ -57,26 +57,26 @@ namespace
 
 BaseHandle Create()
 {
-  BaseHandle handle = Toolkit::RendererFactory::Get();
+  BaseHandle handle = Toolkit::VisualFactory::Get();
 
   return handle;
 }
 
-DALI_TYPE_REGISTRATION_BEGIN_CREATE( Toolkit::RendererFactory, Dali::BaseHandle, Create, true )
+DALI_TYPE_REGISTRATION_BEGIN_CREATE( Toolkit::VisualFactory, Dali::BaseHandle, Create, true )
 DALI_TYPE_REGISTRATION_END()
 
 } // namespace
 
-RendererFactory::RendererFactory( bool debugEnabled )
+VisualFactory::VisualFactory( bool debugEnabled )
 :mDebugEnabled( debugEnabled )
 {
 }
 
-RendererFactory::~RendererFactory()
+VisualFactory::~VisualFactory()
 {
 }
 
-RendererFactory::RendererType RendererFactory::GetRendererType( const Property::Map& propertyMap )
+VisualFactory::RendererType VisualFactory::GetRendererType( const Property::Map& propertyMap )
 {
   RendererType rendererType = UNDEFINED;
 
@@ -121,7 +121,7 @@ RendererFactory::RendererType RendererFactory::GetRendererType( const Property::
       {
         rendererType = N_PATCH;
       }
-      else if( SvgRenderer::IsSvgUrl( imageUrl ) )
+      else if( SvgVisual::IsSvgUrl( imageUrl ) )
       {
         rendererType = SVG;
       }
@@ -135,21 +135,21 @@ RendererFactory::RendererType RendererFactory::GetRendererType( const Property::
   return rendererType;
 }
 
-Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const Property::Map& propertyMap )
+Toolkit::Visual VisualFactory::CreateVisual( const Property::Map& propertyMap )
 {
-  ControlRenderer* rendererPtr = NULL;
+  Visual* rendererPtr = NULL;
 
   RendererType type = GetRendererType( propertyMap );
   if( type != UNDEFINED)
   {
     if( !mFactoryCache )
     {
-      mFactoryCache = new RendererFactoryCache();
+      mFactoryCache = new VisualFactoryCache();
     }
 
     if( mDebugEnabled )
     {
-      return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) );
+      return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) );
     }
   }
 
@@ -157,44 +157,44 @@ Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const Property:
   {
     case COLOR:
     {
-      rendererPtr = new ColorRenderer( *( mFactoryCache.Get() ) );
+      rendererPtr = new ColorVisual( *( mFactoryCache.Get() ) );
       break;
     }
      case GRADIENT:
      {
-       rendererPtr = new GradientRenderer( *( mFactoryCache.Get() ) );
+       rendererPtr = new GradientVisual( *( mFactoryCache.Get() ) );
        break;
      }
     case BORDER:
     {
-      rendererPtr = new BorderRenderer( *( mFactoryCache.Get() ) );
+      rendererPtr = new BorderVisual( *( mFactoryCache.Get() ) );
       break;
     }
     case IMAGE:
     {
       CreateAtlasManager();
-      rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+      rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
       break;
     }
     case N_PATCH:
     {
-      rendererPtr = new NPatchRenderer( *( mFactoryCache.Get() ) );
+      rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
       break;
     }
     case SVG:
     {
       CreateAtlasManager();
-      rendererPtr = new SvgRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+      rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
       break;
     }
     case MESH:
     {
-      rendererPtr = new MeshRenderer( *( mFactoryCache.Get() ) );
+      rendererPtr = new MeshVisual( *( mFactoryCache.Get() ) );
       break;
     }
     case PRIMITIVE:
     {
-      rendererPtr = new PrimitiveRenderer( *( mFactoryCache.Get() ) );
+      rendererPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) );
       break;
     }
     case UNDEFINED:
@@ -214,87 +214,87 @@ Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const Property:
     DALI_LOG_ERROR( "Renderer type unknown" );
   }
 
-  return Toolkit::ControlRenderer( rendererPtr );
+  return Toolkit::Visual( rendererPtr );
 }
 
-Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const Image& image )
+Toolkit::Visual VisualFactory::CreateVisual( const Image& image )
 {
   if( !mFactoryCache )
   {
-    mFactoryCache = new RendererFactoryCache();
+    mFactoryCache = new VisualFactoryCache();
   }
 
   if( mDebugEnabled )
   {
-    return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) );
+    return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) );
   }
 
   NinePatchImage npatchImage = NinePatchImage::DownCast( image );
   if( npatchImage )
   {
-    NPatchRenderer* rendererPtr = new NPatchRenderer( *( mFactoryCache.Get() ) );
+    NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
     rendererPtr->SetImage( npatchImage );
 
-    return Toolkit::ControlRenderer( rendererPtr );
+    return Toolkit::Visual( rendererPtr );
   }
   else
   {
     CreateAtlasManager();
-    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+    ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
     Actor actor;
     rendererPtr->SetImage( actor, image );
 
-    return Toolkit::ControlRenderer( rendererPtr );
+    return Toolkit::Visual( rendererPtr );
   }
 }
 
-Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const std::string& url, ImageDimensions size )
+Toolkit::Visual VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
 {
   if( !mFactoryCache )
   {
-    mFactoryCache = new RendererFactoryCache();
+    mFactoryCache = new VisualFactoryCache();
   }
 
   if( mDebugEnabled )
   {
-    return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) );
+    return Toolkit::Visual( new DebugVisual( *( mFactoryCache.Get() ) ) );
   }
 
   if( NinePatchImage::IsNinePatchUrl( url ) )
   {
-    NPatchRenderer* rendererPtr = new NPatchRenderer( *( mFactoryCache.Get() ) );
+    NPatchVisual* rendererPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
     rendererPtr->SetImage( url );
 
-    return Toolkit::ControlRenderer( rendererPtr );
+    return Toolkit::Visual( rendererPtr );
   }
-  else if( SvgRenderer::IsSvgUrl( url ) )
+  else if( SvgVisual::IsSvgUrl( url ) )
   {
     CreateAtlasManager();
-    SvgRenderer* rendererPtr = new SvgRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+    SvgVisual* rendererPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
     rendererPtr->SetImage( url, size );
-    return Toolkit::ControlRenderer( rendererPtr );
+    return Toolkit::Visual( rendererPtr );
   }
   else
   {
     CreateAtlasManager();
-    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+    ImageVisual* rendererPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
     Actor actor;
     rendererPtr->SetImage( actor, url, size );
 
-    return Toolkit::ControlRenderer( rendererPtr );
+    return Toolkit::Visual( rendererPtr );
   }
 }
 
-Image RendererFactory::GetBrokenRendererImage()
+Image VisualFactory::GetBrokenRendererImage()
 {
   return ResourceImage::New( BROKEN_RENDERER_IMAGE_URL );
 }
 
-void RendererFactory::CreateAtlasManager()
+void VisualFactory::CreateAtlasManager()
 {
   if( !mAtlasManager )
   {
-    Shader shader = ImageRenderer::GetImageShader( *( mFactoryCache.Get() ) );
+    Shader shader = ImageVisual::GetImageShader( *( mFactoryCache.Get() ) );
     mAtlasManager = new ImageAtlasManager();
     mAtlasManager->SetBrokenImage( BROKEN_RENDERER_IMAGE_URL );
   }