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

Pass canvas to gr_internal_string_clipped_template

Browse source
This commit is contained in:
Kp 2017-01-08 22:31:59 +00:00
parent 9dbcbc51ce
commit c291873041
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
similar/2d/font.cpp
View file

@ -1078,7 +1078,7 @@ void gr_set_fontcolor( int fg_color, int bg_color )
} }
template <bool masked_draws_background> template <bool masked_draws_background>
static int gr_internal_string_clipped_template(int x, int y, const char *s) static int gr_internal_string_clipped_template(grs_canvas &canvas, int x, int y, const char *const s)
{ {
const char * text_ptr, * next_row, * text_ptr1; const char * text_ptr, * next_row, * text_ptr1;
int letter; int letter;
@ -1086,11 +1086,11 @@ static int gr_internal_string_clipped_template(int x, int y, const char *s)
next_row = s; next_row = s;
const auto &cv_font = *grd_curcanv->cv_font; const auto &cv_font = *canvas.cv_font;
const auto &&INFONT = font_character_extent(cv_font); const auto &&INFONT = font_character_extent(cv_font);
const auto ft_flags = cv_font.ft_flags; const auto ft_flags = cv_font.ft_flags;
const auto proportional = ft_flags & FT_PROPORTIONAL; const auto proportional = ft_flags & FT_PROPORTIONAL;
const auto cv_font_bg_color = grd_curcanv->cv_font_bg_color; const auto cv_font_bg_color = canvas.cv_font_bg_color;
while (next_row != NULL ) while (next_row != NULL )
{ {
@ -1116,7 +1116,7 @@ static int gr_internal_string_clipped_template(int x, int y, const char *s)
} }
if (c0 == CC_COLOR) if (c0 == CC_COLOR)
{ {
grd_curcanv->cv_font_fg_color = static_cast<uint8_t>(*++text_ptr); canvas.cv_font_fg_color = static_cast<uint8_t>(*++text_ptr);
continue; continue;
} }
@ -1141,14 +1141,14 @@ static int gr_internal_string_clipped_template(int x, int y, const char *s)
x += spacing; x += spacing;
continue; continue;
} }
const auto cv_font_fg_color = grd_curcanv->cv_font_fg_color; const auto cv_font_fg_color = canvas.cv_font_fg_color;
auto color = cv_font_fg_color; auto color = cv_font_fg_color;
if (width) if (width)
{ {
if (underline) { if (underline) {
for (uint_fast32_t i = width; i--;) for (uint_fast32_t i = width; i--;)
{ {
gr_pixel(*grd_curcanv, x++, y, color); gr_pixel(canvas, x++, y, color);
} }
} else { } else {
auto fp = proportional ? cv_font.ft_chars[letter] : cv_font.ft_data + letter * BITS_TO_BYTES(width) * cv_font.ft_h; auto fp = proportional ? cv_font.ft_chars[letter] : cv_font.ft_data + letter * BITS_TO_BYTES(width) * cv_font.ft_h;
@ -1178,7 +1178,7 @@ static int gr_internal_string_clipped_template(int x, int y, const char *s)
if (!bit_enabled) if (!bit_enabled)
continue; continue;
} }
gr_pixel(*grd_curcanv, x, y, color); gr_pixel(canvas, x, y, color);
} }
} }
} }
@ -1192,12 +1192,12 @@ static int gr_internal_string_clipped_template(int x, int y, const char *s)
static int gr_internal_string_clipped_m(int x, int y, const char *s ) static int gr_internal_string_clipped_m(int x, int y, const char *s )
{ {
return gr_internal_string_clipped_template<true>(x, y, s); return gr_internal_string_clipped_template<true>(*grd_curcanv, x, y, s);
} }
static int gr_internal_string_clipped(int x, int y, const char *s ) static int gr_internal_string_clipped(int x, int y, const char *s )
{ {
return gr_internal_string_clipped_template<false>(x, y, s); return gr_internal_string_clipped_template<false>(*grd_curcanv, x, y, s);
} }
} }