Adding Visual namespace and Visual becomes Visual::Base

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

diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
index 638e1ff..1f0d9e0 100644 (file)
--- a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
+++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
@@ -27,7 +27,7 @@
 
 //INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
-#include <dali-toolkit/internal/visuals/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
 
 namespace Dali
 {
@@ -278,7 +278,7 @@ const char* NORMAL_MAP_FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
 } // namespace
 
 MeshVisual::MeshVisual( VisualFactoryCache& factoryCache )
-: Visual( factoryCache ),
+: Visual::Base( factoryCache ),
   mShaderType( ALL_TEXTURES ),
   mUseTexture( true ),
   mUseMipmapping( true ),
@@ -370,14 +370,14 @@ void MeshVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap )
 
 void MeshVisual::SetSize( const Vector2& size )
 {
-  Visual::SetSize( size );
+  Visual::Base::SetSize( size );
 
   // ToDo: renderer responds to the size change
 }
 
 void MeshVisual::SetClipRect( const Rect<int>& clipRect )
 {
-  Visual::SetClipRect( clipRect );
+  Visual::Base::SetClipRect( clipRect );
 
   //ToDo: renderer responds to the clipRect change
 }
@@ -474,7 +474,7 @@ void MeshVisual::SupplyEmptyGeometry()
   mShader = Shader::New( SIMPLE_VERTEX_SHADER, SIMPLE_FRAGMENT_SHADER );
   mImpl->mRenderer = Renderer::New( mGeometry, mShader );
 
-  DALI_LOG_ERROR( "Initialisation error in mesh renderer.\n" );
+  DALI_LOG_ERROR( "Initialisation error in mesh visual.\n" );
 }
 
 void MeshVisual::UpdateShaderUniforms()
@@ -542,7 +542,7 @@ bool MeshVisual::CreateGeometry()
     return true;
   }
 
-  DALI_LOG_ERROR( "Failed to load geometry in mesh renderer.\n" );
+  DALI_LOG_ERROR( "Failed to load geometry in mesh visual.\n" );
   return false;
 }
 
@@ -563,7 +563,7 @@ bool MeshVisual::LoadGeometry()
     return true;
   }
 
-  DALI_LOG_ERROR( "Failed to find object to load in mesh renderer.\n" );
+  DALI_LOG_ERROR( "Failed to find object to load in mesh visual.\n" );
   return false;
 }
 
@@ -579,7 +579,7 @@ bool MeshVisual::LoadMaterial()
     return true;
   }
 
-  DALI_LOG_ERROR( "Failed to find texture set to load in mesh renderer.\n" );
+  DALI_LOG_ERROR( "Failed to find texture set to load in mesh visual.\n" );
   mUseTexture = false;
   return false;
 }
@@ -609,7 +609,7 @@ bool MeshVisual::LoadTextures()
       }
       else
       {
-        DALI_LOG_ERROR( "Failed to load diffuse map texture in mesh renderer.\n");
+        DALI_LOG_ERROR( "Failed to load diffuse map texture in mesh visual.\n");
         return false;
       }
     }
@@ -627,7 +627,7 @@ bool MeshVisual::LoadTextures()
       }
       else
       {
-        DALI_LOG_ERROR( "Failed to load normal map texture in mesh renderer.\n");
+        DALI_LOG_ERROR( "Failed to load normal map texture in mesh visual.\n");
         return false;
       }
     }
@@ -645,7 +645,7 @@ bool MeshVisual::LoadTextures()
       }
       else
       {
-        DALI_LOG_ERROR( "Failed to load gloss map texture in mesh renderer.\n");
+        DALI_LOG_ERROR( "Failed to load gloss map texture in mesh visual.\n");
         return false;
       }
     }