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=d7a6a1bd8a67b5ea52ecb4d1e2bfe9907780b551;hp=ccb0efc15875ae2f3db172ac5dc205fb0bae469d;hb=5f6befa398f1c68fcc8edff409a086f54af4d5f9;hpb=cd7d41bc8e0a0816da28401207091344fbbe0b2c 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 ccb0efc..d7a6a1b 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp @@ -78,15 +78,15 @@ void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph, void AtlasGlyphManager::GenerateMeshData( uint32_t imageId, const Vector2& position, - MeshData& meshData ) + Toolkit::AtlasManager::Mesh2D& mesh ) { GetImplementation(*this).GenerateMeshData( imageId, position, - meshData ); + mesh ); } -void AtlasGlyphManager::StitchMesh( MeshData& first, - const MeshData& second ) +void AtlasGlyphManager::StitchMesh( Toolkit::AtlasManager::Mesh2D& first, + const Toolkit::AtlasManager::Mesh2D& second ) { GetImplementation(*this).StitchMesh( first, second ); } @@ -118,6 +118,11 @@ Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId ) return GetImplementation(*this).GetPixelFormat( atlasId ); } +Material AtlasGlyphManager::GetMaterial( uint32_t atlasId ) const +{ + return GetImplementation(*this).GetMaterial( atlasId ); +} + const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics() { return GetImplementation(*this).GetMetrics();