Rename of Control Renderers to Visuals

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

diff --git a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp b/dali-toolkit/internal/controls/renderers/npatch/npatch-visual.cpp
similarity index 88%
rename from dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp
rename to dali-toolkit/internal/controls/renderers/npatch/npatch-visual.cpp
index 677d5ad..7417105 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp
+++ b/dali-toolkit/internal/controls/renderers/npatch/npatch-visual.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include "npatch-renderer.h"
+#include "npatch-visual.h"
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/platform-abstraction.h>
@@ -25,11 +25,11 @@
 #include <dali/devel-api/images/texture-set-image.h>
 
 // INTERNAL IINCLUDES
-#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-impl.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-impl.h>
+#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
 
 
 namespace Dali
@@ -197,19 +197,19 @@ void RegisterStretchProperties( Renderer& renderer, const char * uniformName, co
 
 } //unnamed namespace
 
-/////////////////NPatchRenderer////////////////
+/////////////////NPatchVisual////////////////
 
-NPatchRenderer::NPatchRenderer( RendererFactoryCache& factoryCache )
-: ControlRenderer( factoryCache ),
+NPatchVisual::NPatchVisual( VisualFactoryCache& factoryCache )
+: Visual( factoryCache ),
   mBorderOnly( false )
 {
 }
 
-NPatchRenderer::~NPatchRenderer()
+NPatchVisual::~NPatchVisual()
 {
 }
 
-void NPatchRenderer::DoInitialize( Actor& actor, const Property::Map& propertyMap )
+void NPatchVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap )
 {
   Property::Value* imageURLValue = propertyMap.Find( IMAGE_URL_NAME );
   if( imageURLValue )
@@ -234,7 +234,7 @@ void NPatchRenderer::DoInitialize( Actor& actor, const Property::Map& propertyMa
   }
 }
 
-void NPatchRenderer::GetNaturalSize( Vector2& naturalSize ) const
+void NPatchVisual::GetNaturalSize( Vector2& naturalSize ) const
 {
   if( mImage )
   {
@@ -253,38 +253,38 @@ void NPatchRenderer::GetNaturalSize( Vector2& naturalSize ) const
   }
 }
 
-void NPatchRenderer::SetClipRect( const Rect<int>& clipRect )
+void NPatchVisual::SetClipRect( const Rect<int>& clipRect )
 {
-  ControlRenderer::SetClipRect( clipRect );
+  Visual::SetClipRect( clipRect );
   //ToDo: renderer responds to the clipRect change
 }
 
-void NPatchRenderer::SetOffset( const Vector2& offset )
+void NPatchVisual::SetOffset( const Vector2& offset )
 {
   //ToDo: renderer applies the offset
 }
 
-Geometry NPatchRenderer::CreateGeometry()
+Geometry NPatchVisual::CreateGeometry()
 {
   Geometry geometry;
   if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 )
   {
     if( !mBorderOnly )
     {
-      geometry = mFactoryCache.GetGeometry( RendererFactoryCache::NINE_PATCH_GEOMETRY );
+      geometry = mFactoryCache.GetGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY );
       if( !geometry )
       {
         geometry = CreateGeometry( Uint16Pair( 3, 3 ) );
-        mFactoryCache.SaveGeometry( RendererFactoryCache::NINE_PATCH_GEOMETRY, geometry );
+        mFactoryCache.SaveGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY, geometry );
       }
     }
     else
     {
-      geometry = mFactoryCache.GetGeometry( RendererFactoryCache::NINE_PATCH_BORDER_GEOMETRY );
+      geometry = mFactoryCache.GetGeometry( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY );
       if( !geometry )
       {
         geometry = CreateGeometryBorder( Uint16Pair( 3, 3 ) );
-        mFactoryCache.SaveGeometry( RendererFactoryCache::NINE_PATCH_BORDER_GEOMETRY, geometry );
+        mFactoryCache.SaveGeometry( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY, geometry );
       }
     }
   }
@@ -297,18 +297,18 @@ Geometry NPatchRenderer::CreateGeometry()
   return geometry;
 }
 
-Shader NPatchRenderer::CreateShader()
+Shader NPatchVisual::CreateShader()
 {
   Shader shader;
   if( !mImpl->mCustomShader )
   {
     if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 )
     {
-      shader = mFactoryCache.GetShader( RendererFactoryCache::NINE_PATCH_SHADER );
+      shader = mFactoryCache.GetShader( VisualFactoryCache::NINE_PATCH_SHADER );
       if( !shader )
       {
         shader = Shader::New( VERTEX_SHADER_3X3, FRAGMENT_SHADER );
-        mFactoryCache.SaveShader( RendererFactoryCache::NINE_PATCH_SHADER, shader );
+        mFactoryCache.SaveShader( VisualFactoryCache::NINE_PATCH_SHADER, shader );
       }
     }
     else if( mStretchPixelsX.Size() > 0 || mStretchPixelsY.Size() > 0)
@@ -350,7 +350,7 @@ Shader NPatchRenderer::CreateShader()
   return shader;
 }
 
-void NPatchRenderer::InitializeRenderer()
+void NPatchVisual::InitializeRenderer()
 {
   Geometry geometry = CreateGeometry();
   Shader shader = CreateShader();
@@ -367,7 +367,7 @@ void NPatchRenderer::InitializeRenderer()
 }
 
 
-void NPatchRenderer::DoSetOnStage( Actor& actor )
+void NPatchVisual::DoSetOnStage( Actor& actor )
 {
   if( !mCroppedImage )
   {
@@ -391,14 +391,14 @@ void NPatchRenderer::DoSetOnStage( Actor& actor )
   }
 }
 
-void NPatchRenderer::DoSetOffStage( Actor& actor )
+void NPatchVisual::DoSetOffStage( Actor& actor )
 {
   mCroppedImage.Reset();
   actor.RemoveRenderer( mImpl->mRenderer );
   mImpl->mRenderer.Reset();
 }
 
-void NPatchRenderer::DoCreatePropertyMap( Property::Map& map ) const
+void NPatchVisual::DoCreatePropertyMap( Property::Map& map ) const
 {
   map.Clear();
   map.Insert( RENDERER_TYPE, IMAGE_RENDERER );
@@ -413,7 +413,7 @@ void NPatchRenderer::DoCreatePropertyMap( Property::Map& map ) const
   map.Insert( BORDER_ONLY, mBorderOnly );
 }
 
-void NPatchRenderer::ChangeRenderer( bool oldBorderOnly, size_t oldGridX, size_t oldGridY )
+void NPatchVisual::ChangeRenderer( bool oldBorderOnly, size_t oldGridX, size_t oldGridY )
 {
   //check to see if the border style has changed
 
@@ -449,7 +449,7 @@ void NPatchRenderer::ChangeRenderer( bool oldBorderOnly, size_t oldGridX, size_t
   }
 }
 
-void NPatchRenderer::SetImage( const std::string& imageUrl, bool borderOnly )
+void NPatchVisual::SetImage( const std::string& imageUrl, bool borderOnly )
 {
   bool oldBorderOnly = mBorderOnly;
   size_t oldGridX = mStretchPixelsX.Size();
@@ -477,7 +477,7 @@ void NPatchRenderer::SetImage( const std::string& imageUrl, bool borderOnly )
   }
 }
 
-void NPatchRenderer::SetImage( NinePatchImage image, bool borderOnly )
+void NPatchVisual::SetImage( NinePatchImage image, bool borderOnly )
 {
   bool oldBorderOnly = mBorderOnly;
   size_t oldGridX = mStretchPixelsX.Size();
@@ -503,7 +503,7 @@ void NPatchRenderer::SetImage( NinePatchImage image, bool borderOnly )
   }
 }
 
-void NPatchRenderer::InitializeFromImage( NinePatchImage nPatch )
+void NPatchVisual::InitializeFromImage( NinePatchImage nPatch )
 {
   mCroppedImage = nPatch.CreateCroppedBufferImage();
   if( !mCroppedImage )
@@ -519,9 +519,9 @@ void NPatchRenderer::InitializeFromImage( NinePatchImage nPatch )
   mStretchPixelsY = nPatch.GetStretchPixelsY();
 }
 
-void NPatchRenderer::InitializeFromBrokenImage()
+void NPatchVisual::InitializeFromBrokenImage()
 {
-  mCroppedImage = RendererFactory::GetBrokenRendererImage();
+  mCroppedImage = VisualFactory::GetBrokenRendererImage();
   mImageSize = ImageDimensions( mCroppedImage.GetWidth(), mCroppedImage.GetHeight() );
 
   mStretchPixelsX.Clear();
@@ -530,7 +530,7 @@ void NPatchRenderer::InitializeFromBrokenImage()
   mStretchPixelsY.PushBack( Uint16Pair( 0, mImageSize.GetHeight() ) );
 }
 
-void NPatchRenderer::ApplyImageToSampler()
+void NPatchVisual::ApplyImageToSampler()
 {
   TextureSet textureSet = mImpl->mRenderer.GetTextures();
   if( textureSet )
@@ -562,7 +562,7 @@ void NPatchRenderer::ApplyImageToSampler()
   }
 }
 
-Geometry NPatchRenderer::CreateGeometry( Uint16Pair gridSize )
+Geometry NPatchVisual::CreateGeometry( Uint16Pair gridSize )
 {
   uint16_t gridWidth = gridSize.GetWidth();
   uint16_t gridHeight = gridSize.GetHeight();
@@ -597,7 +597,7 @@ Geometry NPatchRenderer::CreateGeometry( Uint16Pair gridSize )
   return GenerateGeometry( vertices, indices );
 }
 
-Geometry NPatchRenderer::CreateGeometryBorder( Uint16Pair gridSize )
+Geometry NPatchVisual::CreateGeometryBorder( Uint16Pair gridSize )
 {
   uint16_t gridWidth = gridSize.GetWidth();
   uint16_t gridHeight = gridSize.GetHeight();