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
[dali_1.2.26] Merge branch 'devel/master'
[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
463a3e8
..
6858f26
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,7
+69,7
@@
AtlasGlyphManager::AtlasGlyphManager(Internal::AtlasGlyphManager *impl)
}
void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
}
void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
- const
BufferImage
& bitmap,
+ const
PixelData
& bitmap,
AtlasManager::AtlasSlot& slot )
{
GetImplementation(*this).Add( glyph, bitmap, slot );
AtlasManager::AtlasSlot& slot )
{
GetImplementation(*this).Add( glyph, bitmap, slot );
@@
-84,17
+84,11
@@
void AtlasGlyphManager::GenerateMeshData( uint32_t imageId,
mesh );
}
mesh );
}
-void AtlasGlyphManager::StitchMesh( Toolkit::AtlasManager::Mesh2D& first,
- const Toolkit::AtlasManager::Mesh2D& second )
+bool AtlasGlyphManager::IsCached( Text::FontId fontId,
+ Text::GlyphIndex index,
+ AtlasManager::AtlasSlot& slot )
{
{
- GetImplementation(*this).StitchMesh( first, second );
-}
-
-bool AtlasGlyphManager::Cached( Text::FontId fontId,
- Text::GlyphIndex index,
- AtlasManager::AtlasSlot& slot )
-{
- return GetImplementation(*this).Cached( fontId, index, slot );
+ return GetImplementation(*this).IsCached( fontId, index, 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 )
@@
-112,14
+106,14
@@
Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
return GetImplementation(*this).GetPixelFormat( atlasId );
}
return GetImplementation(*this).GetPixelFormat( atlasId );
}
-
Material AtlasGlyphManager::GetMaterial
( uint32_t atlasId ) const
+
TextureSet AtlasGlyphManager::GetTextures
( uint32_t atlasId ) const
{
{
- return GetImplementation(*this).Get
Material
( atlasId );
+ return GetImplementation(*this).Get
Textures
( atlasId );
}
}
-S
ampler AtlasGlyphManager::GetSampl
er( uint32_t atlasId ) const
+S
hader AtlasGlyphManager::GetShad
er( uint32_t atlasId ) const
{
{
- return GetImplementation(*this).GetS
ampl
er( atlasId );
+ return GetImplementation(*this).GetS
had
er( atlasId );
}
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
}
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
@@
-132,16
+126,6
@@
void AtlasGlyphManager::AdjustReferenceCount( Text::FontId fontId, Text::GlyphIn
GetImplementation(*this).AdjustReferenceCount( fontId, index, delta );
}
GetImplementation(*this).AdjustReferenceCount( fontId, index, delta );
}
-Shader AtlasGlyphManager::GetEffectBufferShader() const
-{
- return GetImplementation(*this).GetEffectBufferShader();
-}
-
-Shader AtlasGlyphManager::GetGlyphShadowShader() const
-{
- return GetImplementation(*this).GetGlyphShadowShader();
-}
-
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali