lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support 2D scale in gfx::painter::text

Browse source
This commit is contained in:
Nikita Lisitsa 2024-08-17 18:17:32 +03:00
parent 0568521879
commit 6368ca5e68
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/gfx/include/psemek/gfx/painter.hpp
View file

@ -42,7 +42,7 @@ namespace psemek::gfx
struct text_options struct text_options
{ {
font f = font::font_9x12; font f = font::font_9x12;
float scale = 1.f; geom::vector<float, 2> scale = {1.f, 1.f};
x_align x = x_align::center; x_align x = x_align::center;
y_align y = y_align::center; y_align y = y_align::center;
color c = {255, 255, 255, 255}; color c = {255, 255, 255, 255};
@ -61,7 +61,7 @@ namespace psemek::gfx
void besier(geom::point<float, 2> const & p0, geom::point<float, 2> const & p1, geom::point<float, 2> const & p2, float width, color const & c, int quality = 8, bool smooth = true); void besier(geom::point<float, 2> const & p0, geom::point<float, 2> const & p1, geom::point<float, 2> const & p2, float width, color const & c, int quality = 8, bool smooth = true);
// 2D text // 2D text
geom::vector<float, 2> text_size(std::string_view str, font f = font::font_9x12, float scale = 1.f); geom::vector<float, 2> text_size(std::string_view str, font f = font::font_9x12);
void text(geom::point<float, 2> const & p, std::string_view str, text_options const & opts); void text(geom::point<float, 2> const & p, std::string_view str, text_options const & opts);
void texture(texture_2d const & texture, geom::box<float, 2> const & box, color const & c = {0, 0, 0, 0}); void texture(texture_2d const & texture, geom::box<float, 2> const & box, color const & c = {0, 0, 0, 0});

11
libs/gfx/source/painter.cpp
View file

@ -281,7 +281,7 @@ namespace psemek::gfx
} }
} }
geom::vector<float, 2> painter::text_size(std::string_view str, font f, float scale) geom::vector<float, 2> painter::text_size(std::string_view str, font f)
{ {
// TODO: multiline text // TODO: multiline text
geom::vector<float, 2> s; geom::vector<float, 2> s;
@ -294,8 +294,7 @@ namespace psemek::gfx
throw util::unknown_enum_value_exception(f); throw util::unknown_enum_value_exception(f);
} }
s[0] *= str.size() * scale; s[0] *= str.size();
s[1] *= scale;
return s; return s;
} }
@ -471,7 +470,7 @@ namespace psemek::gfx
void painter::text3d(geom::point<float, 3> const & p, std::string_view str, text_options const & opts, geom::matrix<float, 3, 3> const & t) void painter::text3d(geom::point<float, 3> const & p, std::string_view str, text_options const & opts, geom::matrix<float, 3, 3> const & t)
{ {
auto const size = text_size(str, opts.f, opts.scale); auto const size = geom::pointwise_mult(text_size(str, opts.f), opts.scale);
geom::vector<float, 3> pen { 0.f, 0.f, 0.f }; geom::vector<float, 3> pen { 0.f, 0.f, 0.f };
@ -503,8 +502,8 @@ namespace psemek::gfx
throw util::unknown_enum_value_exception(opts.y); throw util::unknown_enum_value_exception(opts.y);
} }
geom::vector<float, 3> const sx = {9.f * opts.scale, 0.f, 0.f}; geom::vector<float, 3> const sx = {9.f * opts.scale[0], 0.f, 0.f};
geom::vector<float, 3> const sy = {0.f, 12.f * opts.scale, 0.f}; geom::vector<float, 3> const sy = {0.f, 12.f * opts.scale[1], 0.f};
auto to_texcoord = [](int tx, int ty, int ix, int iy) auto to_texcoord = [](int tx, int ty, int ix, int iy)
{ {