games/roguish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial fix of the crash with different map sizes but that's not the ultimate fix.

Browse source
This commit is contained in:
Zed A. Shaw 2024-11-09 10:14:53 -05:00
parent 809ec9ed0d
commit 2dccc6b17b
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gui.cpp
View file

@ -5,6 +5,7 @@
#include <string> // for string, operator<< #include <string> // for string, operator<<
#include <thread> // for sleep_for #include <thread> // for sleep_for
#include <array> #include <array>
#include <algorithm>
#include <ftxui/dom/elements.hpp> // for hflow, paragraph, separator, hbox, vbox, filler, operator|, border, Element #include <ftxui/dom/elements.hpp> // for hflow, paragraph, separator, hbox, vbox, filler, operator|, border, Element
#include <ftxui/dom/node.hpp> // for Render #include <ftxui/dom/node.hpp> // for Render
@ -50,10 +51,13 @@ GUI::GUI(DinkyECS::World &world, Map& game_map) :
void GUI::resize_map(int new_size) { void GUI::resize_map(int new_size) {
if($renderer.resize_map(new_size)) { if($renderer.resize_map(new_size)) {
auto bounds = $renderer.$base_glyph.bounds; auto bounds = $renderer.$base_glyph.bounds;
$view_port = { int view_x = std::ceil((VIDEO_X - GAME_MAP_POS) / bounds.width);
size_t(std::ceil((VIDEO_X - GAME_MAP_POS) / bounds.width)), int view_y = std::ceil(VIDEO_Y / bounds.height);
size_t(std::ceil(VIDEO_Y / bounds.height))
}; // don't allow resizing beyond/below game map size
if(view_x > GAME_MAP_X || view_y > GAME_MAP_Y) return;
$view_port = {size_t(view_x), size_t(view_y)};
// set canvas to best size // set canvas to best size
$canvas = Canvas($view_port.x * 2, $view_port.y * 4); $canvas = Canvas($view_port.x * 2, $view_port.y * 4);

10
map.hpp
View file

@ -96,8 +96,14 @@ public:
} }
Point center_camera(const Point &around, size_t view_x, size_t view_y) { Point center_camera(const Point &around, size_t view_x, size_t view_y) {
size_t start_x = std::clamp(int(around.x - view_x / 2), 0, int(width() - view_x)); int high_x = int(width() - view_x);
size_t start_y = std::clamp(int(around.y - view_y / 2), 0, int(height() - view_y)); int high_y = int(height() - view_y);
int center_x = int(around.x - view_x / 2);
int center_y = int(around.y - view_y / 2);
size_t start_x = std::clamp(center_x, 0, high_x);
size_t start_y = std::clamp(center_y, 0, high_y);
return {start_x, start_y}; return {start_x, start_y};
} }
}; };