Rename of Control Renderers to Visuals

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

diff --git a/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp b/dali-toolkit/internal/controls/renderers/border/border-visual.cpp
similarity index 81%
rename from dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
rename to dali-toolkit/internal/controls/renderers/border/border-visual.cpp
index d765ac7..547ebc0 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
+++ b/dali-toolkit/internal/controls/renderers/border/border-visual.cpp
@@ -16,16 +16,16 @@
  */
 
 // CLASS HEADER
-#include "border-renderer.h"
+#include "border-visual.h"
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/renderer-factory-impl.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/control-renderer-data-impl.h>
+#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.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/visual-data-impl.h>
 
 namespace Dali
 {
@@ -101,8 +101,8 @@ const char* FRAGMENT_SHADER_ANTI_ALIASING = DALI_COMPOSE_SHADER(
 );
 }
 
-BorderRenderer::BorderRenderer( RendererFactoryCache& factoryCache )
-: ControlRenderer( factoryCache ),
+BorderVisual::BorderVisual( VisualFactoryCache& factoryCache )
+: Visual( factoryCache ),
   mBorderColor( Color::TRANSPARENT ),
   mBorderSize( 0.f ),
   mBorderColorIndex( Property::INVALID_INDEX ),
@@ -111,22 +111,22 @@ BorderRenderer::BorderRenderer( RendererFactoryCache& factoryCache )
 {
 }
 
-BorderRenderer::~BorderRenderer()
+BorderVisual::~BorderVisual()
 {
 }
 
-void BorderRenderer::DoInitialize( Actor& actor, const Property::Map& propertyMap )
+void BorderVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap )
 {
   Property::Value* color = propertyMap.Find( COLOR_NAME );
   if( !( color && color->Get(mBorderColor) ) )
   {
-    DALI_LOG_ERROR( "Fail to provide a border color to the BorderRenderer object" );
+    DALI_LOG_ERROR( "Fail to provide a border color to the BorderVisual object" );
   }
 
   Property::Value* size = propertyMap.Find( SIZE_NAME );
   if( !( size && size->Get(mBorderSize) ) )
   {
-    DALI_LOG_ERROR( "Fail to provide a border size to the BorderRenderer object" );
+    DALI_LOG_ERROR( "Fail to provide a border size to the BorderVisual object" );
   }
 
   Property::Value* antiAliasing = propertyMap.Find( ANTI_ALIASING );
@@ -136,14 +136,14 @@ void BorderRenderer::DoInitialize( Actor& actor, const Property::Map& propertyMa
   }
 }
 
-void BorderRenderer::SetClipRect( const Rect<int>& clipRect )
+void BorderVisual::SetClipRect( const Rect<int>& clipRect )
 {
-  ControlRenderer::SetClipRect( clipRect );
+  Visual::SetClipRect( clipRect );
 
   //ToDo: renderer responds to the clipRect change
 }
 
-void BorderRenderer::DoSetOnStage( Actor& actor )
+void BorderVisual::DoSetOnStage( Actor& actor )
 {
   InitializeRenderer();
 
@@ -155,7 +155,7 @@ void BorderRenderer::DoSetOnStage( Actor& actor )
   mBorderSizeIndex = (mImpl->mRenderer).RegisterProperty( SIZE_NAME, mBorderSize );
 }
 
-void BorderRenderer::DoCreatePropertyMap( Property::Map& map ) const
+void BorderVisual::DoCreatePropertyMap( Property::Map& map ) const
 {
   map.Clear();
   map.Insert( RENDERER_TYPE, BORDER_RENDERER );
@@ -163,13 +163,13 @@ void BorderRenderer::DoCreatePropertyMap( Property::Map& map ) const
   map.Insert( SIZE_NAME, mBorderSize );
 }
 
-void BorderRenderer::InitializeRenderer()
+void BorderVisual::InitializeRenderer()
 {
-  Geometry geometry = mFactoryCache.GetGeometry( RendererFactoryCache::BORDER_GEOMETRY );
+  Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::BORDER_GEOMETRY );
   if( !geometry )
   {
     geometry =  CreateBorderGeometry();
-    mFactoryCache.SaveGeometry( RendererFactoryCache::BORDER_GEOMETRY, geometry );
+    mFactoryCache.SaveGeometry( VisualFactoryCache::BORDER_GEOMETRY, geometry );
   }
 
 
@@ -178,7 +178,7 @@ void BorderRenderer::InitializeRenderer()
 
 }
 
-void BorderRenderer::SetBorderColor(const Vector4& color)
+void BorderVisual::SetBorderColor(const Vector4& color)
 {
   mBorderColor = color;
 
@@ -192,7 +192,7 @@ void BorderRenderer::SetBorderColor(const Vector4& color)
   }
 }
 
-void BorderRenderer::SetBorderSize( float size )
+void BorderVisual::SetBorderSize( float size )
 {
   mBorderSize = size;
 
@@ -202,7 +202,7 @@ void BorderRenderer::SetBorderSize( float size )
   }
 }
 
-void BorderRenderer::RequireAntiAliasing( bool antiAliasing )
+void BorderVisual::RequireAntiAliasing( bool antiAliasing )
 {
   if( mAntiAliasing != antiAliasing )
   {
@@ -219,25 +219,25 @@ void BorderRenderer::RequireAntiAliasing( bool antiAliasing )
   }
 }
 
-Shader BorderRenderer::GetBorderShader()
+Shader BorderVisual::GetBorderShader()
 {
   Shader shader;
   if( mAntiAliasing )
   {
-    shader = mFactoryCache.GetShader( RendererFactoryCache::BORDER_SHADER_ANTI_ALIASING );
+    shader = mFactoryCache.GetShader( VisualFactoryCache::BORDER_SHADER_ANTI_ALIASING );
     if( !shader )
     {
       shader = Shader::New( VERTEX_SHADER_ANTI_ALIASING, FRAGMENT_SHADER_ANTI_ALIASING );
-      mFactoryCache.SaveShader( RendererFactoryCache::BORDER_SHADER_ANTI_ALIASING, shader );
+      mFactoryCache.SaveShader( VisualFactoryCache::BORDER_SHADER_ANTI_ALIASING, shader );
     }
   }
   else
   {
-    shader = mFactoryCache.GetShader( RendererFactoryCache::BORDER_SHADER );
+    shader = mFactoryCache.GetShader( VisualFactoryCache::BORDER_SHADER );
     if( !shader )
     {
       shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
-      mFactoryCache.SaveShader( RendererFactoryCache::BORDER_SHADER, shader );
+      mFactoryCache.SaveShader( VisualFactoryCache::BORDER_SHADER, shader );
     }
   }
 
@@ -260,7 +260,7 @@ Shader BorderRenderer::GetBorderShader()
  * |/ |/ | \|
  * 12-13-14-15
  */
-Geometry BorderRenderer::CreateBorderGeometry()
+Geometry BorderVisual::CreateBorderGeometry()
 {
   const float halfWidth = 0.5f;
   const float halfHeight = 0.5f;