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.h;h=6096612cc4e6794984811101ab0939ce51bbe065;hp=fdc4141a87c73cd2c66c0c2ad6819746592da253;hb=d15b9def82b922ae3013ea250e4f6fe260417a79;hpb=22067c2397a2fe37a04c5722c5c23346795f6191

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
index fdc4141..6096612 100644
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
@@ -43,6 +43,13 @@ public:
    */
   struct Metrics
   {
+    Metrics()
+    : mGlyphCount( 0u )
+    {}
+
+    ~Metrics()
+    {}
+
     uint32_t mGlyphCount;                   // number of glyphs being managed
     AtlasManager::Metrics mAtlasMetrics;    // metrics from the Atlas Manager
   };
@@ -71,13 +78,11 @@ public:
   /**
    * @brief Ask Atlas Manager to add a glyph
    *
-   * @param[in] fontId fontId glyph comes from
    * @param[in] glyph glyph to add to an atlas
    * @param[in] bitmap bitmap to use for glyph addition
    * @param[out] slot information returned by atlas manager for addition
    */
-  void Add( Text::FontId fontId,
-            const Text::GlyphInfo& glyph,
+  void Add( const Text::GlyphInfo& glyph,
             const BufferImage& bitmap,
             AtlasManager::AtlasSlot& slot );
 
@@ -90,7 +95,7 @@ public:
    */
   void GenerateMeshData( uint32_t imageId,
                          const Vector2& position,
-                         MeshData& meshData );
+                         Toolkit::AtlasManager::Mesh2D& mesh );
 
   /**
    * @brief Stitch Two Meshes together
@@ -98,8 +103,8 @@ public:
    * @param[in] first first mesh
    * @param[in] second second mesh
    */
-  void StitchMesh( MeshData& first,
-                   const MeshData& second );
+  void StitchMesh( Toolkit::AtlasManager::Mesh2D& first,
+                   const Toolkit::AtlasManager::Mesh2D& second );
 
   /**
    * @brief Check to see if a glyph is being cached
@@ -143,6 +148,24 @@ public:
   Pixel::Format GetPixelFormat( uint32_t atlasId );
 
   /**
+   * @brief Get the material used by an atlas
+   *
+   * @param[in] atlasId Id of an atlas
+   *
+   * @return The material used by the atlas
+   */
+  Material GetMaterial( uint32_t atlasId ) const;
+
+  /**
+   * @brief Get the sampler used by an atlas
+   *
+   * @param[in] atlasId Id of an atlas
+   *
+   * @return The sampler used by the atlas
+   */
+  Sampler GetSampler( uint32_t atlasId ) const;
+
+  /**
    * @brief Get Glyph Manager metrics
    *
    * @return const reference to glyph manager metrics
@@ -158,6 +181,20 @@ public:
    */
   void AdjustReferenceCount( Text::FontId fontId, uint32_t imageId, int32_t delta );
 
+  /**
+   * @brief Get Shader used for rendering glyph effect buffers
+   *
+   * @return Handle of shader needed
+   */
+  Shader GetEffectBufferShader() const;
+
+  /**
+   * @brief Get Shader used rendering Glyph Shadows
+   *
+   * @return Handle of shader needed
+   */
+  Shader GetGlyphShadowShader() const;
+
 private:
 
   explicit DALI_INTERNAL AtlasGlyphManager(Internal::AtlasGlyphManager *impl);