projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes I000b9684,I1a6a0f46 into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager.h
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
7a516e3
..
1870bd5
100644
(file)
--- 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
*/
// 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
#include <dali-toolkit/internal/text/text-definitions.h>
namespace Dali
@@
-43,8
+43,16
@@
public:
*/
struct Metrics
{
*/
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
};
/**
};
/**
@@
-91,24
+99,17
@@
public:
Toolkit::AtlasManager::Mesh2D& mesh );
/**
Toolkit::AtlasManager::Mesh2D& mesh );
/**
- * @brief Stitch Two Meshes together
- *
- * @param[in] first first mesh
- * @param[in] second second mesh
- */
- void StitchMesh( Toolkit::AtlasManager::Mesh2D& first,
- const Toolkit::AtlasManager::Mesh2D& second );
-
- /**
* @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[out] slot container holding information about the glyph( mImage = 0 indicates not being cached )
* @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[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 Is
Cached( Text::FontId fontId,
+
Text::GlyphIndex index,
+
AtlasManager::AtlasSlot& slot );
/**
* @brief Retrieve the size of an atlas
/**
* @brief Retrieve the size of an atlas
@@
-130,13
+131,6
@@
public:
void SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight );
/**
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
* @brief Get the Pixel Format used by an atlas
*
* @param[in] atlasId Id of atlas to check
@@
-155,20
+149,20
@@
public:
Material GetMaterial( uint32_t atlasId ) const;
/**
Material GetMaterial( uint32_t atlasId ) const;
/**
- * @brief Get the sampler used by an atlas
- *
- * @param[in] atlasId Id of an atlas
+ * @brief Get Glyph Manager metrics
*
*
- * @return
The sampler used by the atla
s
+ * @return
const reference to glyph manager metric
s
*/
*/
-
Sampler GetSampler( uint32_t atlasId ) const
;
+
const Metrics& GetMetrics()
;
/**
/**
- * @brief
Get Glyph Manager metrics
+ * @brief
Adjust the reference count for glyph
*
*
- * @return const reference to glyph manager metrics
+ * @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
*/
*/
-
const Metrics& GetMetrics(
);
+
void AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta
);
private:
private: