X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Fatlas-glyph-manager.h;h=592017bcf7c7aeec9ce4ea103ac6ff280b7a2fba;hb=43ca048f4200d2f1d6e59c2163af59cd99a45b2e;hp=6a5348164ef68d91a44d1b25dddeea4e77d7f4ad;hpb=0f548619463110abcd5c2b8d6787491110188da8;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 6a53481..592017b 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_H__ -#define __DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_H__ +#ifndef DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_H +#define DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include namespace Dali @@ -34,7 +34,7 @@ class AtlasGlyphManager; } -class DALI_IMPORT_API AtlasGlyphManager : public BaseHandle +class AtlasGlyphManager : public BaseHandle { public: @@ -43,8 +43,29 @@ 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 + }; + + struct GlyphStyle + { + GlyphStyle() + : outline{ 0u }, + isItalic{ false }, + isBold{ false } + {} + + uint16_t outline; ///< The outline width of this glyph + bool isItalic:1; ///< Whether the glyph is italic. + bool isBold:1; ///< Whether the glyph is bold. }; /** @@ -72,11 +93,13 @@ public: * @brief Ask Atlas Manager to add a glyph * * @param[in] glyph glyph to add to an atlas + * @param[in] style The style of this glyph * @param[in] bitmap bitmap to use for glyph addition * @param[out] slot information returned by atlas manager for addition */ void Add( const Text::GlyphInfo& glyph, - const BufferImage& bitmap, + const GlyphStyle& style, + const PixelData& bitmap, AtlasManager::AtlasSlot& slot ); /** @@ -88,43 +111,41 @@ 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 * * @param[in] fontId The font that this glyph comes from * @param[in] index The GlyphIndex of this glyph + * @param[in] style The style of this glyph * @param[out] slot container holding information about the glyph( mImage = 0 indicates not being cached ) - */ - void Cached( Text::FontId fontId, - Text::GlyphIndex index, - AtlasManager::AtlasSlot& slot ); - - /** - * @brief Set the Atlas size and block size for subsequent atlas generation * - * @param[in] size size of the atlas in pixels - * @param[in] blockSize size of a block in this atlas in pixels + * @return Whether glyph is cached or not ? */ - void SetNewAtlasSize( const Vector2& size, - const Vector2& blockSize ); + bool IsCached( Text::FontId fontId, + Text::GlyphIndex index, + const GlyphStyle& style, + AtlasManager::AtlasSlot& slot ); /** - * @brief Unreference an image from the atlas and remove from cache if no longer needed + * @brief Retrieve the size of an atlas + * + * @param[in] atlasId Id of the atlas to interrogate * - * @param[in] imageId ID of the image + * @return The pixel size of the atlas */ - void Remove( uint32_t imageId ); + 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 Get the Pixel Format used by an atlas @@ -136,12 +157,31 @@ public: Pixel::Format GetPixelFormat( uint32_t atlasId ); /** + * @brief Get the texture set used by an atlas + * + * @param[in] atlasId Id of an atlas + * + * @return The texture set used by the atlas + */ + TextureSet GetTextures( 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] style The style of this glyph + * @param[in] delta The adjustment to make to the reference count + */ + void AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, const GlyphStyle& style, int32_t delta ); + private: explicit DALI_INTERNAL AtlasGlyphManager(Internal::AtlasGlyphManager *impl); @@ -152,4 +192,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_H__ +#endif // DALI_TOOLKIT_ATLAS_GLYPH_MANAGER_H