diff --git a/source/core.adb b/source/core.adb index 406618c..0395a2f 100644 --- a/source/core.adb +++ b/source/core.adb @@ -190,17 +190,31 @@ package body core is ------------------------------------------------------------------------------------------ procedure draw_squared_grid (x, y, width, height : in integer) is - offset_x : constant integer := x + base + (width mod base) / 2; + offset_x : constant integer := x + base / 2 + (width mod base) / 2; offset_y : constant integer := y + base / 2 + (height mod base) / 2; + full_vector, crop_vector : integer; begin - for horizontal in 0 .. height / base + for horizontal in 0 .. height / base - 1 loop render_vector (x, offset_y + horizontal * base, x + width, offset_y + horizontal * base); -- - for vertical in 0 .. width / base + for vertical in 0 .. width / base - 1 loop - render_vector (offset_x + vertical * base, y, offset_x + vertical * base, y + height); + full_vector := y + 2 * base * (horizontal / 2) - ((y + height) mod base) / 2; + -- + render_vector (offset_x + vertical * base, full_vector, offset_x + vertical * base, full_vector + base); + render_vector (offset_x + vertical * base + base / 2, full_vector + base, offset_x + vertical * base + base / 2, full_vector + base + base); end loop; + -- + --~render_vector (offset_x + vertical * base, full_vector, offset_x + vertical * base, full_vector + base); + --~render_vector (offset_x + (width / base) * base, full_vector + 2 * base, offset_x + (width / base) * base, full_vector + 2 * base + base); + end loop; + for vertical in 0 .. width / base - 1 + loop + full_vector := y + 2 * base * ((height / base) / 2) - ((y + height) mod base) / 2; + -- + render_vector (offset_x + vertical * base, full_vector, offset_x + vertical * base, full_vector + base); + --~render_vector (offset_x + vertical * base + base / 2, full_vector + base, offset_x + vertical * base + base / 2, full_vector + base + base); end loop; end draw_squared_grid; diff --git a/source/main.adb b/source/main.adb index 5e37179..0d59758 100644 --- a/source/main.adb +++ b/source/main.adb @@ -84,8 +84,8 @@ begin core.draw_central_grid (24, 24, core.window_width - 480 - 48, core.window_height - 48); core.draw_squared_grid (24, 24, core.window_width - 480 - 48, core.window_height - 48); -- - ui.draw_menu (0, 0, core.window_width - 480, core.window_height, false); - ui.draw_tiny_menu (core.window_width - 480, 0, 480, core.window_height, true); + --~ui.draw_menu (0, 0, core.window_width - 480, core.window_height, false); + --~ui.draw_tiny_menu (core.window_width - 480, 0, 480, core.window_height, true); -- --~for this in magic.blow_away .. magic.thunderclap loop magic.draw (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.chain_magic_arrow)) - 60, 112 * 0 + 64); end loop; --~for this in magic.agony_mass .. magic.weakness loop magic.draw (this, 112 * (magic.codex'pos (this) - magic.codex'pos (magic.thunderclap)) - 60, 112 * 1 + 64); end loop;