X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Fatlas-glyph-manager.cpp;h=6858f262eacb76811d5a799197f10175e5e96143;hp=463a3e85105cb78c382641019c12cc212c6b379d;hb=6f990775daf7adf6170db59f0b99e00ae25fceed;hpb=5b3cf0e6742934674bdf62bbe15af00e39eae566

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
index 463a3e8..6858f26 100644
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
@@ -69,7 +69,7 @@ AtlasGlyphManager::AtlasGlyphManager(Internal::AtlasGlyphManager *impl)
 }
 
 void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
-                             const BufferImage& bitmap,
+                             const PixelData& bitmap,
                              AtlasManager::AtlasSlot& slot )
 {
   GetImplementation(*this).Add( glyph, bitmap, slot );
@@ -84,17 +84,11 @@ void AtlasGlyphManager::GenerateMeshData( uint32_t imageId,
                                              mesh );
 }
 
-void AtlasGlyphManager::StitchMesh( Toolkit::AtlasManager::Mesh2D& first,
-                                    const Toolkit::AtlasManager::Mesh2D& second )
+bool AtlasGlyphManager::IsCached( Text::FontId fontId,
+                                  Text::GlyphIndex index,
+                                  AtlasManager::AtlasSlot& slot )
 {
-  GetImplementation(*this).StitchMesh( first, second );
-}
-
-bool AtlasGlyphManager::Cached( Text::FontId fontId,
-                                Text::GlyphIndex index,
-                                AtlasManager::AtlasSlot& slot )
-{
-  return GetImplementation(*this).Cached( fontId, index, slot );
+  return GetImplementation(*this).IsCached( fontId, index, slot );
 }
 
 void AtlasGlyphManager::SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight )
@@ -112,14 +106,14 @@ Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
   return GetImplementation(*this).GetPixelFormat( atlasId );
 }
 
-Material AtlasGlyphManager::GetMaterial( uint32_t atlasId ) const
+TextureSet AtlasGlyphManager::GetTextures( uint32_t atlasId ) const
 {
-  return GetImplementation(*this).GetMaterial( atlasId );
+  return GetImplementation(*this).GetTextures( atlasId );
 }
 
-Sampler AtlasGlyphManager::GetSampler( uint32_t atlasId ) const
+Shader AtlasGlyphManager::GetShader( uint32_t atlasId ) const
 {
-  return GetImplementation(*this).GetSampler( atlasId );
+  return GetImplementation(*this).GetShader( atlasId );
 }
 
 const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
@@ -132,16 +126,6 @@ void AtlasGlyphManager::AdjustReferenceCount( Text::FontId fontId, Text::GlyphIn
   GetImplementation(*this).AdjustReferenceCount( fontId, index, delta );
 }
 
-Shader AtlasGlyphManager::GetEffectBufferShader() const
-{
-  return GetImplementation(*this).GetEffectBufferShader();
-}
-
-Shader AtlasGlyphManager::GetGlyphShadowShader() const
-{
-  return GetImplementation(*this).GetGlyphShadowShader();
-}
-
 } // namespace Toolkit
 
 } // namespace Dali