X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Fatlas-glyph-manager-impl.cpp;h=7bd8f1883da9ebd3ebb9cadadcc6f2be8d95fee9;hb=5f6befa398f1c68fcc8edff409a086f54af4d5f9;hp=734b82a6beffeb0c8da0dbcf927c40841dfb8142;hpb=030e7c680a6eb0e8d87bfdb8ec359a0267ef7db2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp index 734b82a..7bd8f18 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp @@ -81,13 +81,13 @@ void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph, void AtlasGlyphManager::GenerateMeshData( uint32_t imageId, const Vector2& position, - MeshData& meshData ) + Toolkit::AtlasManager::Mesh2D& mesh ) { - mAtlasManager.GenerateMeshData( imageId, position, meshData ); + mAtlasManager.GenerateMeshData( imageId, position, mesh ); } -void AtlasGlyphManager::StitchMesh( MeshData& first, - const MeshData& second ) +void AtlasGlyphManager::StitchMesh( Toolkit::AtlasManager::Mesh2D& first, + const Toolkit::AtlasManager::Mesh2D& second ) { mAtlasManager.StitchMesh( first, second ); } @@ -144,6 +144,11 @@ Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId ) return mAtlasManager.GetPixelFormat( atlasId ); } +Material AtlasGlyphManager::GetMaterial( uint32_t atlasId ) const +{ + return mAtlasManager.GetMaterial( atlasId ); +} + const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics() { mMetrics.mGlyphCount = mGlyphRecords.Size();