X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Fatlas-glyph-manager.h;h=a74ce28ee972ebb9509aeaadcacc16c94392dbb9;hb=refs%2Fchanges%2F07%2F43907%2F1;hp=ad2c5ea24c65ab91c15303753ab2571a23f56697;hpb=47877a348028967d02e77c3b86fe2707bbc7d940;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 ad2c5ea..a74ce28 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h @@ -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,7 +96,7 @@ public: */ void GenerateMeshData( uint32_t imageId, const Vector2& position, - MeshData& meshData ); + Toolkit::AtlasManager::Mesh2D& mesh ); /** * @brief Stitch Two Meshes together @@ -96,8 +104,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 @@ -105,8 +113,10 @@ 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, + bool Cached( Text::FontId fontId, Text::GlyphIndex index, AtlasManager::AtlasSlot& slot ); @@ -130,13 +140,6 @@ public: void SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight ); /** - * @brief Unreference an image from the atlas and remove from cache if no longer needed - * - * @param[in] imageId ID of the image - */ - void Remove( uint32_t imageId ); - - /** * @brief Get the Pixel Format used by an atlas * * @param[in] atlasId Id of atlas to check @@ -146,12 +149,53 @@ 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 */ 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 ); + + /** + * @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);