Add font-dependent kerning #571
Merged
Conversation
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
ghost
reviewed
Aug 6, 2018
rwengine/src/render/TextRenderer.cpp
Outdated
| glm::vec2 gsize(1.f / 16.f, 1.f / fontHeight); | ||
| return glm::vec4(x, y, x + 1, y + 0.98f) * glm::vec4(gsize, gsize); | ||
| static glm::vec4 indexToTexCoord(int index, const glm::u32vec2 &textureSize, const glm::u8vec2 &glyphOffset) { | ||
| static const unsigned TEXTURE_COLUMNS = 16; |
madebr
force-pushed
the
kerning
branch
2 times, most recently
from
190ab38
to
07def71
Compare
ghost
reviewed
Aug 6, 2018
rwengine/src/render/TextRenderer.cpp
Outdated
| float fontHeight = ((font == FONT_PAGER) ? 16.f : 13.f); | ||
| glm::vec2 gsize(1.f / 16.f, 1.f / fontHeight); | ||
| return glm::vec4(x, y, x + 1, y + 0.98f) * glm::vec4(gsize, gsize); | ||
| static glm::vec4 indexToTexCoord(int index, const glm::u32vec2 &textureSize, const glm::u8vec2 &glyphOffset) { |
There was a problem hiding this comment.
Just to avoid the static keyword?
There was a problem hiding this comment.
Not sure if static is even needed.
Btw: http://www.comeaucomputing.com/techtalk/#nostatic
There was a problem hiding this comment.
charToIndex, indexToCoord, the shaders, and the font widths can all be static or in an anonymous namespace. Wrapping them all in a namespace is the expected C++ way.
ghost
reviewed
Aug 6, 2018
rwengine/src/render/TextRenderer.cpp
Outdated
| lineLength++; | ||
|
|
||
| glm::vec2 p = coord; | ||
| coord.x += ss.x; | ||
| float factor = ti.size / float(fontMetaData.glyphOffset.y); |
There was a problem hiding this comment.
(here and below) It's not old style cast, but as bad as that in terms of maintainability.
ghost
reviewed
Aug 6, 2018
rwengine/src/render/TextRenderer.hpp
Outdated
| std::array<GlyphInfo, GAME_GLYPHS> glyphData; | ||
| class FontMetaData { | ||
| public: | ||
| FontMetaData() |
|
Please check |
ghost
reviewed
Aug 6, 2018
rwengine/src/render/TextRenderer.cpp
Outdated
| continue; | ||
| } | ||
| auto tex = indexToTexCoord(glyph, fontMetaData.textureSize, fontMetaData.glyphOffset); | ||
| ss.x = ti.size * float(fontMetaData.glyphOffset.x) / fontMetaData.glyphOffset.y; |
ghost
reviewed
Aug 6, 2018
rwengine/src/render/TextRenderer.cpp
Outdated
| float glyphWidth = factor * static_cast<float>(fontMetaData.glyphWidths[glyph]); | ||
| if (fontMetaData.monoWidth != 0) { | ||
| float monoWidth = factor * fontMetaData.monoWidth; | ||
| p.x += float(monoWidth - glyphWidth) / 2; |
|
@ShFil119 reference: |
…lor string The string "~g" would crash rwviewer.
danhedron
approved these changes
Aug 7, 2018
ghost
approved these changes
Aug 7, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
These values are based on reverse engineering by jayfoxrox and aap but modified by me to look good.
original pr at madebr#2
I've used this script to optimize the offsets of the fonts.
Example usage of the
rwfontmaptool:This will create a 1024x1024 texture of fontmap 2 (=arial) with font size 64 using the
LiberationSans-Regularfont. Every glyph rectangle has a width / height aspect ratio of 1.125. The baseline is kept the same. The texture is written to file.png and metadata (such as aspect ratio & glyph advances) is written to file.binUsing this generated fontmap in my help script gives:
