kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix high cpu usage in TextLayout

Browse Source
This commit is contained in:
vroad
2015-06-03 22:28:18 +09:00
parent 0e8991b2f3
commit 21b84a5b3b
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/include/text/TextLayout.h
View File

@@ -19,7 +19,6 @@ namespace lime {
} GlyphPosition; } GlyphPosition;
class TextLayout { class TextLayout {
@@ -35,6 +34,8 @@ namespace lime {
private: private:
Font *mFont;
void *mHBFont;
void *mBuffer; void *mBuffer;
long mDirection; long mDirection;
long mScript; long mScript;

15
project/src/text/TextLayout.cpp
View File

@@ -14,6 +14,8 @@ namespace lime {
if (strlen (script) != 4) return; if (strlen (script) != 4) return;
mFont = 0;
mHBFont = 0;
mDirection = (hb_direction_t)direction; mDirection = (hb_direction_t)direction;
mLanguage = (long)hb_language_from_string (language, strlen (language)); mLanguage = (long)hb_language_from_string (language, strlen (language));
mScript = hb_script_from_string (script, -1); mScript = hb_script_from_string (script, -1);
@@ -29,12 +31,20 @@ namespace lime {
TextLayout::~TextLayout () { TextLayout::~TextLayout () {
hb_buffer_destroy ((hb_buffer_t*)mBuffer); hb_buffer_destroy ((hb_buffer_t*)mBuffer);
hb_font_destroy ((hb_font_t*)mHBFont);
} }
void TextLayout::Position (Font *font, size_t size, const char *text, ByteArray *bytes) { void TextLayout::Position (Font *font, size_t size, const char *text, ByteArray *bytes) {
if (mFont != font) {
mFont = font;
hb_font_destroy ((hb_font_t*)mHBFont);
mHBFont = hb_ft_font_create ((FT_Face)font->face, NULL);
}
font->SetSize (size); font->SetSize (size);
// reset buffer // reset buffer
@@ -45,8 +55,7 @@ namespace lime {
// layout the text // layout the text
hb_buffer_add_utf8 ((hb_buffer_t*)mBuffer, text, strlen (text), 0, -1); hb_buffer_add_utf8 ((hb_buffer_t*)mBuffer, text, strlen (text), 0, -1);
hb_font_t *hb_font = hb_ft_font_create ((FT_Face)font->face, NULL); hb_shape ((hb_font_t*)mHBFont, (hb_buffer_t*)mBuffer, NULL, 0);
hb_shape (hb_font, (hb_buffer_t*)mBuffer, NULL, 0);
uint32_t glyph_count; uint32_t glyph_count;
hb_glyph_info_t *glyph_info = hb_buffer_get_glyph_infos ((hb_buffer_t*)mBuffer, &glyph_count); hb_glyph_info_t *glyph_info = hb_buffer_get_glyph_infos ((hb_buffer_t*)mBuffer, &glyph_count);
@@ -88,8 +97,6 @@ namespace lime {
} }
hb_font_destroy (hb_font);
} }