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=383158927d1ccdb507be6464c3f452e8b5635bf4;hp=cbfa7544b0bb1aab36342c51a45a4f0e3d2a7e05;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=d04c5bdbb95cc98f90848c7a98b0b2804df6e5b8

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 cbfa754..3831589 100644
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/atlas-manager/atlas-manager.h>
+#include <dali-toolkit/internal/text/rendering/atlas/atlas-manager.h>
 #include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
@@ -34,7 +34,7 @@ class AtlasGlyphManager;
 }
 
 
-class DALI_IMPORT_API AtlasGlyphManager : public BaseHandle
+class AtlasGlyphManager : public BaseHandle
 {
 public:
 
@@ -43,8 +43,16 @@ public:
    */
   struct Metrics
   {
-    uint32_t mGlyphCount;                   // number of glyphs being managed
-    AtlasManager::Metrics mAtlasMetrics;    // metrics from the Atlas Manager
+    Metrics()
+    : mGlyphCount( 0u )
+    {}
+
+    ~Metrics()
+    {}
+
+    uint32_t mGlyphCount;                   ///< number of glyphs being managed
+    std::string mVerboseGlyphCounts;        ///< a verbose list of the glyphs + ref counts
+    AtlasManager::Metrics mAtlasMetrics;    ///< metrics from the Atlas Manager
   };
 
   /**
@@ -88,16 +96,7 @@ public:
    */
   void GenerateMeshData( uint32_t imageId,
                          const Vector2& position,
-                         MeshData& meshData );
-
-  /**
-   * @brief Stitch Two Meshes together
-   *
-   * @param[in] first first mesh
-   * @param[in] second second mesh
-   */
-  void StitchMesh( MeshData& first,
-                   const MeshData& second );
+                         Toolkit::AtlasManager::Mesh2D& mesh );
 
   /**
    * @brief Check to see if a glyph is being cached
@@ -105,10 +104,12 @@ public:
    * @param[in] fontId The font that this glyph comes from
    * @param[in] index The GlyphIndex of this glyph
    * @param[out] slot container holding information about the glyph( mImage = 0 indicates not being cached )
+   *
+   * @return Whether glyph is cached or not ?
    */
-  void Cached( Text::FontId fontId,
-               Text::GlyphIndex index,
-               AtlasManager::AtlasSlot& slot );
+  bool IsCached( Text::FontId fontId,
+                 Text::GlyphIndex index,
+                 AtlasManager::AtlasSlot& slot );
 
   /**
    * @brief Retrieve the size of an atlas
@@ -119,30 +120,42 @@ public:
    */
   Vector2 GetAtlasSize( uint32_t atlasId );
 
+   /**
+    * @brief Set the atlas size and block size for subsequent Atlas generation
+    *
+    * @param[in] width width of atlas in pixels
+    * @param[in] height height of atlas in pixels
+    * @param[in] blockWidth width of a block in pixels
+    * @param[in] blockHeight height of a block in pixels
+    */
+  void SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight );
+
   /**
-   * @brief Set the Atlas size and block size for subsequent atlas generation
+   * @brief Get the Pixel Format used by an atlas
+   *
+   * @param[in] atlasId Id of atlas to check
    *
-   * @param[in] size size of the atlas in pixels
-   * @param[in] blockSize size of a block in this atlas in pixels
+   * @return The pixel format of the atlas
    */
-  void SetNewAtlasSize( const Vector2& size,
-                        const Vector2& blockSize );
+  Pixel::Format GetPixelFormat( uint32_t atlasId );
 
   /**
-   * @brief Unreference an image from the atlas and remove from cache if no longer needed
+   * @brief Get the texture set used by an atlas
+   *
+   * @param[in] atlasId Id of an atlas
    *
-   * @param[in] imageId ID of the image
+   * @return The texture set used by the atlas
    */
-  void Remove( uint32_t imageId );
+  TextureSet GetTextures( uint32_t atlasId ) const;
 
   /**
-   * @brief Get the Pixel Format used by an atlas
+   * @brief Get the shader used by an atlas
    *
-   * @param[in] atlasId Id of atlas to check
+   * @param[in] atlasId Id of an atlas
    *
-   * @return The pixel format of the atlas
+   * @return The shader used by the atlas
    */
-  Pixel::Format GetPixelFormat( uint32_t atlasId );
+  Shader GetShader( uint32_t atlasId ) const;
 
   /**
    * @brief Get Glyph Manager metrics
@@ -151,6 +164,15 @@ public:
    */
   const Metrics& GetMetrics();
 
+  /**
+   * @brief Adjust the reference count for glyph
+   *
+   * @param[in] fontId The font this image came from
+   * @param[in] index The index of the glyph
+   * @param[in] delta The adjustment to make to the reference count
+   */
+  void AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta );
+
 private:
 
   explicit DALI_INTERNAL AtlasGlyphManager(Internal::AtlasGlyphManager *impl);