upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2024-09-19 23:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display: add get_location_rect

Browse Source
This commit is contained in:
Charles Dang 2024-09-19 15:03:22 -04:00
parent 7bd657e2a5
commit 7380885226
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/display.cpp
View File

@ -702,6 +702,12 @@ point display::get_location(const map_location& loc) const
};
}
rect display::get_location_rect(const map_location& loc) const
{
// TODO: evaluate how these functions should be defined in terms of each other
return { get_location(loc), point{hex_size(), hex_size()} };
}
map_location display::minimap_location_on(int x, int y)
{
// TODO: don't return location for this,
@ -1266,14 +1272,7 @@ uint32_t generate_hex_key(const drawing_layer layer, const map_location& loc)
void display::drawing_buffer_add(const drawing_layer layer, const map_location& loc, decltype(draw_helper::do_draw) draw_func)
{
const rect dest {
get_location_x(loc),
get_location_y(loc),
int(zoom_),
int(zoom_)
};
drawing_buffer_.AGGREGATE_EMPLACE(generate_hex_key(layer, loc), draw_func, dest);
drawing_buffer_.AGGREGATE_EMPLACE(generate_hex_key(layer, loc), draw_func, get_location_rect(loc));
}
void display::drawing_buffer_commit()

3
src/display.hpp
View File

@ -315,6 +315,9 @@ public:
int get_location_y(const map_location& loc) const;
point get_location(const map_location& loc) const;
/** Returns the on-screen rect corresponding to a @a loc */
rect get_location_rect(const map_location& loc) const;
/**
* Rectangular area of hexes, allowing to decide how the top and bottom
* edges handles the vertical shift for each parity of the x coordinate