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-impl.h;h=0c675014fde43c59c7048d0c042ba8ae2ac75895;hp=da659bc2f289e9efd6f0b90e848a1da1cefd1fc8;hb=refs%2Fchanges%2F65%2F49465%2F8;hpb=ef1f3134222a99e36397e4c55998b645ec0bbd08 diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h index da659bc..0c67501 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h @@ -81,17 +81,11 @@ public: Toolkit::AtlasManager::Mesh2D& mesh ); /** - * @copydoc Toolkit::AtlasGlyphManager::StitchMesh + * @copydoc Toolkit::AtlasGlyphManager::IsCached */ - void StitchMesh( Toolkit::AtlasManager::Mesh2D& first, - const Toolkit::AtlasManager::Mesh2D& second ); - - /** - * @copydoc Toolkit::AtlasGlyphManager::Cached - */ - bool Cached( Text::FontId fontId, - Text::GlyphIndex index, - Dali::Toolkit::AtlasManager::AtlasSlot& slot ); + bool IsCached( Text::FontId fontId, + Text::GlyphIndex index, + Dali::Toolkit::AtlasManager::AtlasSlot& slot ); /** * @copydoc Toolkit::AtlasGlyphManager::GetAtlasSize @@ -119,31 +113,10 @@ public: Material GetMaterial( uint32_t atlasId ) const; /** - * @copydoc Toolkit::AtlasGlyphManager::GetMaterial - */ - Image GetImage( uint32_t atlasId ) const; - - /** * @copydoc Toolkit::AtlasGlyphManager::GetMetrics */ const Toolkit::AtlasGlyphManager::Metrics& GetMetrics(); - /** - * @copydoc Toolkit::AtlasGlyphManager::GetEffectBufferShader - */ - Shader GetEffectBufferShader() const - { - return mEffectBufferShader; - } - - /** - * @copydoc Toolkit::AtlasGlyphManager::GetGlyphShadowShader - */ - Shader GetGlyphShadowShader() const - { - return mShadowShader; - } - protected: /** @@ -156,8 +129,9 @@ private: Dali::Toolkit::AtlasManager mAtlasManager; ///> Atlas Manager created by GlyphManager std::vector< FontGlyphRecord > mFontGlyphRecords; Toolkit::AtlasGlyphManager::Metrics mMetrics; ///> Metrics to pass back on GlyphManager status - Shader mEffectBufferShader; ///> Shader used to render drop shadow buffer textures - Shader mShadowShader; ///> Shader used to render drop shadow into buffer + + Shader mShaderL8; + Shader mShaderRgba; }; } // namespace Internal