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
Changed Atlas manager to use Dali::Texture instead of Dali::Atlas
[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
0438314
..
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
@@
-22,7
+22,6
@@
#include <dali/devel-api/adaptor-framework/singleton-service.h>
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/singleton-service.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/atlas-manager/atlas-manager-impl.h>
#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h>
namespace Dali
#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h>
namespace Dali
@@
-69,34
+68,27
@@
AtlasGlyphManager::AtlasGlyphManager(Internal::AtlasGlyphManager *impl)
{
}
{
}
-void AtlasGlyphManager::Add( Text::FontId fontId,
- const Text::GlyphInfo& glyph,
- const BufferImage& bitmap,
+void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
+ const PixelData& bitmap,
AtlasManager::AtlasSlot& slot )
{
AtlasManager::AtlasSlot& slot )
{
- GetImplementation(*this).Add(
fontId,
glyph, bitmap, slot );
+ GetImplementation(*this).Add( glyph, bitmap, slot );
}
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 )
+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 )
@@
-114,14
+106,24
@@
Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
return GetImplementation(*this).GetPixelFormat( atlasId );
}
return GetImplementation(*this).GetPixelFormat( atlasId );
}
+TextureSet AtlasGlyphManager::GetTextures( uint32_t atlasId ) const
+{
+ 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,
uint32_t imageId
, int32_t delta )
+void AtlasGlyphManager::AdjustReferenceCount( Text::FontId fontId,
Text::GlyphIndex index
, int32_t delta )
{
{
- GetImplementation(*this).AdjustReferenceCount( fontId, i
mageId
, delta );
+ GetImplementation(*this).AdjustReferenceCount( fontId, i
ndex
, delta );
}
} // namespace Toolkit
}
} // namespace Toolkit