Fixed an issue where font metrics were incorrect for monospaced fonts. #8886
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,6 +83,8 @@ namespace dmRender | |
| , m_CacheCellPadding(0) | ||
| , m_LayerMask(FACE) | ||
| , m_ImageFormat(dmRenderDDF::TYPE_BITMAP) | ||
| , m_IsMonospaced(false) | ||
| , m_Padding(0) | ||
| { | ||
|
|
||
| } | ||
|
|
@@ -111,6 +113,8 @@ namespace dmRender | |
| , m_CacheCellMaxAscent(0) | ||
| , m_CacheCellPadding(0) | ||
| , m_LayerMask(FACE) | ||
| , m_IsMonospaced(false) | ||
| , m_Padding(0) | ||
| { | ||
|
|
||
| } | ||
|
|
@@ -162,6 +166,8 @@ namespace dmRender | |
| uint32_t m_CacheCellMaxAscent; | ||
| uint8_t m_CacheCellPadding; | ||
| uint8_t m_LayerMask; | ||
| uint8_t m_IsMonospaced:1; | ||
| uint8_t m_Padding:7; | ||
| }; | ||
|
|
||
| static float GetLineTextMetrics(HFontMap font_map, float tracking, const char* text, int n, bool measure_trailing_space); | ||
|
|
@@ -235,6 +241,8 @@ namespace dmRender | |
| uint32_t cell_count = font_map->m_CacheColumns * font_map->m_CacheRows; | ||
|
|
||
| font_map->m_CellTempData = (uint8_t*)malloc(font_map->m_CacheCellWidth*font_map->m_CacheCellHeight*4); | ||
| font_map->m_IsMonospaced = params.m_IsMonospaced; | ||
| font_map->m_Padding = params.m_Padding; | ||
|
|
||
| switch (params.m_GlyphChannels) | ||
| { | ||
|
|
@@ -325,6 +333,8 @@ namespace dmRender | |
| font_map->m_OutlineAlpha = params.m_OutlineAlpha; | ||
| font_map->m_ShadowAlpha = params.m_ShadowAlpha; | ||
| font_map->m_LayerMask = params.m_LayerMask; | ||
| font_map->m_IsMonospaced = params.m_IsMonospaced; | ||
| font_map->m_Padding = params.m_Padding; | ||
|
|
||
| font_map->m_CacheWidth = params.m_CacheWidth; | ||
| font_map->m_CacheHeight = params.m_CacheHeight; | ||
|
|
@@ -515,7 +525,7 @@ namespace dmRender | |
| center_x += metrics.m_Width/2; // move halfway to the right since we're aligning left | ||
| break; | ||
| case TEXT_ALIGN_RIGHT: | ||
| center_x -= metrics.m_Width/2; // move halfway to the left from pivot since we're aligning right | ||
| break; | ||
| // nothing to do for TEXT_ALIGN_CENTER. Pivot is already at the center of the text X-wise | ||
| } | ||
|
|
@@ -739,6 +749,10 @@ namespace dmRender | |
| float layout_width; | ||
| int line_count = Layout(text, width, lines, max_lines, &layout_width, lm, measure_trailing_space); | ||
| float x_offset = OffsetX(te.m_Align, te.m_Width); | ||
| if (font_map->m_IsMonospaced) | ||
| { | ||
| x_offset -= font_map->m_Padding * 0.5f; | ||
|
There was a problem hiding this comment. please check the comment for clojure code. |
||
| } | ||
| float y_offset = OffsetY(te.m_VAlign, te.m_Height, font_map->m_MaxAscent, font_map->m_MaxDescent, te.m_Leading, line_count); | ||
|
|
||
| const Vector4 face_color = dmGraphics::UnpackRGBA(te.m_FaceColor); | ||
|
|
@@ -835,8 +849,8 @@ namespace dmRender | |
|
|
||
| for (int line = 0; line < line_count; ++line) { | ||
| TextLine& l = lines[line]; | ||
|
There was a problem hiding this comment. Rounded vertex coordinates is the reason of dancing text (#7197) |
||
| float x = x_offset - OffsetX(te.m_Align, l.m_Width); | ||
| float y = y_offset - line * leading; | ||
| const char* cursor = &text[l.m_Index]; | ||
| int n = l.m_Count; | ||
| for (int j = 0; j < n; ++j) | ||
|
|
@@ -1015,7 +1029,7 @@ namespace dmRender | |
| vertexindex += vertices_per_quad; | ||
| } | ||
| } | ||
| x += g->m_Advance + tracking; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -1201,15 +1215,20 @@ namespace dmRender | |
| } | ||
|
|
||
| last = g; | ||
| width += g->m_Advance + tracking; | ||
| } | ||
| if (n > 0 && 0 != last) | ||
| { | ||
| if (font_map->m_IsMonospaced) { | ||
| width += font_map->m_Padding; | ||
| } | ||
| else { | ||
| uint32_t last_width = (measure_trailing_space && last->m_Character == ' ') ? last->m_Advance : last->m_Width; | ||
| float last_end_point = last->m_LeftBearing + last_width; | ||
| float last_right_bearing = last->m_Advance - last_end_point; | ||
| width = width - last_right_bearing; | ||
| } | ||
| width -= tracking; | ||
| } | ||
|
|
||
| return width; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For non-monospaced fonts, this value taken into account as part of the last glyph width (we add padding*2 to each width). But for monospaced fonts, we need it to add it as part of the text width and also to offset it back when rendering monospaced font.