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 "Fix for the cursor position with the arabic script." into 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
d46ef18
..
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
@@
-19,10
+19,9
@@
#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h>
// EXTERNAL INCLUDES
-#include <dali/
public
-api/adaptor-framework/singleton-service.h>
+#include <dali/
devel
-api/adaptor-framework/singleton-service.h>
// INTERNAL INCLUDES
// 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
@@
-70,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 );
@@
-78,45
+77,43
@@
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 )
+bool AtlasGlyphManager::IsCached( Text::FontId fontId,
+ Text::GlyphIndex index,
+ AtlasManager::AtlasSlot& slot )
{
{
-
GetImplementation(*this).StitchMesh( first, second
);
+
return GetImplementation(*this).IsCached( fontId, index, slot
);
}
}
-void AtlasGlyphManager::Cached( Text::FontId fontId,
- Text::GlyphIndex index,
- AtlasManager::AtlasSlot& slot )
+void AtlasGlyphManager::SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight )
{
{
- GetImplementation(*this).
Cached( fontId, index, slo
t );
+ GetImplementation(*this).
SetNewAtlasSize( width, height, blockWidth, blockHeigh
t );
}
}
-void AtlasGlyphManager::SetNewAtlasSize( const Vector2& size,
- const Vector2& blockSize )
+Vector2 AtlasGlyphManager::GetAtlasSize( uint32_t atlasId )
{
{
-
GetImplementation(*this).SetNewAtlasSize( size, blockSize
);
+
return GetImplementation(*this).GetAtlasSize( atlasId
);
}
}
-
Vector2 AtlasGlyphManager::GetAtlasSize
( uint32_t atlasId )
+
Pixel::Format AtlasGlyphManager::GetPixelFormat
( uint32_t atlasId )
{
{
- return GetImplementation(*this).Get
AtlasSize
( atlasId );
+ return GetImplementation(*this).Get
PixelFormat
( atlasId );
}
}
-void AtlasGlyphManager::Remove( uint32_t imageId )
+TextureSet AtlasGlyphManager::GetTextures( uint32_t atlasId ) const
{
{
-
GetImplementation(*this).Remove( image
Id );
+
return GetImplementation(*this).GetTextures( atlas
Id );
}
}
-Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
+Shader AtlasGlyphManager::GetShader( uint32_t atlasId ) const
{
{
- return GetImplementation(*this).Get
PixelFormat
( atlasId );
+ return GetImplementation(*this).Get
Shader
( atlasId );
}
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
}
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
@@
-124,6
+121,11
@@
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
return GetImplementation(*this).GetMetrics();
}
return GetImplementation(*this).GetMetrics();
}
+void AtlasGlyphManager::AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta )
+{
+ GetImplementation(*this).AdjustReferenceCount( fontId, index, delta );
+}
+
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali