TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Cache locals in get_char_width

Browse source
This commit is contained in:
Kp 2015-05-09 17:38:59 +00:00
parent 4b0f257698
commit aea5df067d
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
similar/2d/font.cpp
View file

@ -96,30 +96,25 @@ static inline bool INFONT(const unsigned c)
template <typename T>
static void get_char_width(const uint8_t c, const uint8_t c2, T *width, T *spacing)
{
const unsigned letter = c - grd_curcanv->cv_font->ft_minchar;
const auto &cv_font = *grd_curcanv->cv_font;
const unsigned letter = c - cv_font.ft_minchar;
const auto ft_flags = cv_font.ft_flags;
const auto proportional = ft_flags & FT_PROPORTIONAL;
if (!INFONT(letter)) { //not in font, draw as space
*width=0;
if (grd_curcanv->cv_font->ft_flags & FT_PROPORTIONAL)
*spacing = FONTSCALE_X(grd_curcanv->cv_font->ft_w)/2;
else
*spacing = grd_curcanv->cv_font->ft_w;
*spacing = proportional ? FONTSCALE_X(cv_font.ft_w) / 2 : cv_font.ft_w;
return;
}
if (grd_curcanv->cv_font->ft_flags & FT_PROPORTIONAL)
*width = FONTSCALE_X(grd_curcanv->cv_font->ft_widths[letter]);
else
*width = grd_curcanv->cv_font->ft_w;
*width = proportional ? FONTSCALE_X(cv_font.ft_widths[letter]) : cv_font.ft_w;
*spacing = *width;
if (grd_curcanv->cv_font->ft_flags & FT_KERNED) {
if (ft_flags & FT_KERNED)
{
if (!(c2==0 || c2=='\n')) {
const unsigned letter2 = c2-grd_curcanv->cv_font->ft_minchar;
const unsigned letter2 = c2 - cv_font.ft_minchar;
if (INFONT(letter2)) {
const auto p = find_kern_entry(*grd_curcanv->cv_font, letter, letter2);
const auto p = find_kern_entry(cv_font, letter, letter2);
if (p)
*spacing = FONTSCALE_X(p[2]);
}