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
change to highp from mediump for uMvpMatrix
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager.cpp
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
index
6858f26
..
bd6850d
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
@@
-69,10
+69,11
@@
AtlasGlyphManager::AtlasGlyphManager(Internal::AtlasGlyphManager *impl)
}
void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
}
void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
+ const uint32_t outlineWidth,
const PixelData& bitmap,
AtlasManager::AtlasSlot& slot )
{
const PixelData& bitmap,
AtlasManager::AtlasSlot& slot )
{
- GetImplementation(*this).Add( glyph, bitmap, slot );
+ GetImplementation(*this).Add( glyph,
outlineWidth,
bitmap, slot );
}
void AtlasGlyphManager::GenerateMeshData( uint32_t imageId,
}
void AtlasGlyphManager::GenerateMeshData( uint32_t imageId,
@@
-86,9
+87,10
@@
void AtlasGlyphManager::GenerateMeshData( uint32_t imageId,
bool AtlasGlyphManager::IsCached( Text::FontId fontId,
Text::GlyphIndex index,
bool AtlasGlyphManager::IsCached( Text::FontId fontId,
Text::GlyphIndex index,
+ uint32_t outlineWidth,
AtlasManager::AtlasSlot& slot )
{
AtlasManager::AtlasSlot& slot )
{
- return GetImplementation(*this).IsCached( fontId, index, slot );
+ return GetImplementation(*this).IsCached( fontId, index,
outlineWidth,
slot );
}
void AtlasGlyphManager::SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight )
}
void AtlasGlyphManager::SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight )
@@
-111,19
+113,14
@@
TextureSet AtlasGlyphManager::GetTextures( uint32_t atlasId ) const
return GetImplementation(*this).GetTextures( atlasId );
}
return GetImplementation(*this).GetTextures( atlasId );
}
-Shader AtlasGlyphManager::GetShader( uint32_t atlasId ) const
-{
- return GetImplementation(*this).GetShader( atlasId );
-}
-
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
{
return GetImplementation(*this).GetMetrics();
}
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
{
return GetImplementation(*this).GetMetrics();
}
-void AtlasGlyphManager::AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta )
+void AtlasGlyphManager::AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index,
uint32_t outlineWidth,
int32_t delta )
{
{
- GetImplementation(*this).AdjustReferenceCount( fontId, index, delta );
+ GetImplementation(*this).AdjustReferenceCount( fontId, index,
outlineWidth,
delta );
}
} // namespace Toolkit
}
} // namespace Toolkit