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
Merged with Tizen Branch ( builds )
[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
275836c
..
d7a6a1b
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
@@
-78,15
+78,15
@@
void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
void AtlasGlyphManager::GenerateMeshData( uint32_t imageId,
const Vector2& position,
void AtlasGlyphManager::GenerateMeshData( uint32_t imageId,
const Vector2& position,
-
MeshData& meshData
)
+
Toolkit::AtlasManager::Mesh2D& mesh
)
{
GetImplementation(*this).GenerateMeshData( imageId,
position,
{
GetImplementation(*this).GenerateMeshData( imageId,
position,
- mesh
Data
);
+ mesh );
}
}
-void AtlasGlyphManager::StitchMesh(
MeshData
& first,
- const
MeshData
& second )
+void AtlasGlyphManager::StitchMesh(
Toolkit::AtlasManager::Mesh2D
& first,
+ const
Toolkit::AtlasManager::Mesh2D
& second )
{
GetImplementation(*this).StitchMesh( first, second );
}
{
GetImplementation(*this).StitchMesh( first, second );
}
@@
-98,10
+98,14
@@
void AtlasGlyphManager::Cached( Text::FontId fontId,
GetImplementation(*this).Cached( fontId, index, slot );
}
GetImplementation(*this).Cached( fontId, index, slot );
}
-void AtlasGlyphManager::SetNewAtlasSize( const Vector2& size,
- const Vector2& blockSize )
+void AtlasGlyphManager::SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight )
{
{
- GetImplementation(*this).SetNewAtlasSize( size, blockSize );
+ GetImplementation(*this).SetNewAtlasSize( width, height, blockWidth, blockHeight );
+}
+
+Vector2 AtlasGlyphManager::GetAtlasSize( uint32_t atlasId )
+{
+ return GetImplementation(*this).GetAtlasSize( atlasId );
}
void AtlasGlyphManager::Remove( uint32_t imageId )
}
void AtlasGlyphManager::Remove( uint32_t imageId )
@@
-114,6
+118,11
@@
Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
return GetImplementation(*this).GetPixelFormat( atlasId );
}
return GetImplementation(*this).GetPixelFormat( atlasId );
}
+Material AtlasGlyphManager::GetMaterial( uint32_t atlasId ) const
+{
+ return GetImplementation(*this).GetMaterial( atlasId );
+}
+
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
{
return GetImplementation(*this).GetMetrics();
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
{
return GetImplementation(*this).GetMetrics();