xolatile/xhads
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Experimenting with UI...

Browse Source
This commit is contained in:
Ognjen Milan Robovic 2024-05-03 07:55:17 -04:00
parent 7253eb25cb
commit f798e6c799
4 changed files with 127 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
source/main.adb
View File

@ -47,64 +47,64 @@ procedure main is
-- TODO: This menu code is now useless due to new UI code. -- TODO: This menu code is now useless due to new UI code.
type menu_index is ( --~type menu_index is (
menu_none, menu_attribute, menu_skill, menu_resource, menu_unit, menu_might, menu_magic --~menu_none, menu_attribute, menu_skill, menu_resource, menu_unit, menu_might, menu_magic
); --~);
menu_limit : constant integer := 3; --~menu_limit : constant integer := 3;
menu_count : integer := 0; --~menu_count : integer := 0;
menu_stack : array (1 .. menu_limit) of menu_index := (others => menu_none); --~menu_stack : array (1 .. menu_limit) of menu_index := (others => menu_none);
procedure menu_insert (index : in menu_index) is --~procedure menu_insert (index : in menu_index) is
begin --~begin
if menu_count = menu_limit then return; end if; --~if menu_count = menu_limit then return; end if;
-- --~--
menu_count := menu_count mod menu_limit + 1; --~menu_count := menu_count mod menu_limit + 1;
-- --~--
menu_stack (menu_count) := index; --~menu_stack (menu_count) := index;
end menu_insert; --~end menu_insert;
procedure menu_remove is --~procedure menu_remove is
begin --~begin
if menu_count = 0 then return; end if; --~if menu_count = 0 then return; end if;
-- --~--
menu_stack (menu_count) := menu_none; --~menu_stack (menu_count) := menu_none;
-- --~--
menu_count := menu_count - 1; --~menu_count := menu_count - 1;
end menu_remove; --~end menu_remove;
procedure menu_render is --~procedure menu_render is
begin --~begin
--~if menu_count > 0 then --~if menu_count > 0 then
--~core.overlay; THIS SLOWS DOWN RENDERING BY 10 FRAMES! --~core.overlay; THIS SLOWS DOWN RENDERING BY 10 FRAMES!
--~end if; --~end if;
-- --~--
for index in 1 .. menu_limit loop --~for index in 1 .. menu_limit loop
case menu_stack (index) is --~case menu_stack (index) is
when menu_none => null; --~when menu_none => null;
when menu_attribute => attribute.menu (100, 100, false); --~when menu_attribute => attribute.menu (100, 100, false);
when menu_skill => skill.menu (200, 200, false); --~when menu_skill => skill.menu (200, 200, false);
when menu_resource => resource.menu (300, 300, false); --~when menu_resource => resource.menu (300, 300, false);
when menu_unit => unit.menu (0, 0, true); --~when menu_unit => unit.menu (0, 0, true);
when menu_might => might.menu (0, 0, true); --~when menu_might => might.menu (0, 0, true);
when menu_magic => magic.menu (0, 0, true); --~when menu_magic => magic.menu (0, 0, true);
end case; --~end case;
end loop; --~end loop;
end menu_render; --~end menu_render;
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
-- TODO: Also useless, delete later... -- TODO: Also useless, delete later...
procedure show_attribute_menu is begin menu_insert (menu_attribute); end show_attribute_menu; --~procedure show_attribute_menu is begin menu_insert (menu_attribute); end show_attribute_menu;
procedure show_skill_menu is begin menu_insert (menu_skill); end show_skill_menu; --~procedure show_skill_menu is begin menu_insert (menu_skill); end show_skill_menu;
procedure show_resource_menu is begin menu_insert (menu_resource); end show_resource_menu; --~procedure show_resource_menu is begin menu_insert (menu_resource); end show_resource_menu;
procedure show_unit_menu is begin menu_insert (menu_unit); end show_unit_menu; --~procedure show_unit_menu is begin menu_insert (menu_unit); end show_unit_menu;
procedure show_might_menu is begin menu_insert (menu_might); end show_might_menu; --~procedure show_might_menu is begin menu_insert (menu_might); end show_might_menu;
procedure show_magic_menu is begin menu_insert (menu_magic); end show_magic_menu; --~procedure show_magic_menu is begin menu_insert (menu_magic); end show_magic_menu;
procedure ui_main_style is begin ui.active := ui.style'val ((ui.style'pos (ui.active) + 1) mod 7); end ui_main_style; procedure ui_main_style is begin ui.active := ui.style'val ((ui.style'pos (ui.active) + 1) mod 7); end ui_main_style;
procedure hide_top_menu is begin menu_remove; end hide_top_menu; --~procedure hide_top_menu is begin menu_remove; end hide_top_menu;
procedure zoom_in is begin core.zoom := 2; end zoom_in; procedure zoom_in is begin core.zoom := 2; end zoom_in;
procedure zoom_out is begin core.zoom := 1; end zoom_out; procedure zoom_out is begin core.zoom := 1; end zoom_out;
@ -115,14 +115,14 @@ procedure main is
core.signal_down => core.move_camera_down'access, core.signal_down => core.move_camera_down'access,
core.signal_left => core.move_camera_left'access, core.signal_left => core.move_camera_left'access,
core.signal_right => core.move_camera_right'access, core.signal_right => core.move_camera_right'access,
core.signal_a => show_attribute_menu'access, --~core.signal_a => show_attribute_menu'access,
core.signal_s => show_skill_menu'access, --~core.signal_s => show_skill_menu'access,
core.signal_r => show_resource_menu'access, --~core.signal_r => show_resource_menu'access,
core.signal_u => show_unit_menu'access, --~core.signal_u => show_unit_menu'access,
core.signal_m => show_might_menu'access, --~core.signal_m => show_might_menu'access,
core.signal_n => show_magic_menu'access, --~core.signal_n => show_magic_menu'access,
core.signal_v => ui_main_style'access, core.signal_v => ui_main_style'access,
core.signal_grave => hide_top_menu'access, --~core.signal_grave => hide_top_menu'access,
core.signal_kp_add => zoom_in'access, core.signal_kp_add => zoom_in'access,
core.signal_kp_subtract => zoom_out'access, core.signal_kp_subtract => zoom_out'access,
others => core.idle'access others => core.idle'access
@ -173,6 +173,8 @@ begin
b := core.import_sprite ("./sprite/magic/light/heal.png", 1, 1); b := core.import_sprite ("./sprite/magic/light/heal.png", 1, 1);
c := core.import_sprite ("./sprite/magic/dark/torment.png", 1, 1); c := core.import_sprite ("./sprite/magic/dark/torment.png", 1, 1);
ui.active := ui.imp;
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
gameplay: loop gameplay: loop
@ -180,7 +182,12 @@ begin
-- --
exit when core.engine_active = false; exit when core.engine_active = false;
-- --
if not screen_view_list (status_preview_panel) then
side_panel := 0;
else
side_panel := core.window_width / 4; side_panel := core.window_width / 4;
end if;
--
preview_width := core.window_width - side_panel; preview_width := core.window_width - side_panel;
preview_height := core.window_height - text_box_height; preview_height := core.window_height - text_box_height;
text_box_height := 32; text_box_height := 32;
@ -190,10 +197,19 @@ begin
-- --
world.draw; world.draw;
-- --
if screen_view_list (map_preview_panel) then ui.draw_menu (0, 0, preview_width, preview_height); end if; if screen_view_list (map_preview_panel) then
if screen_view_list (status_preview_panel) then ui.draw_tiny_menu (preview_width, 0, side_panel, preview_height); end if; ui.draw_menu (0, 0, preview_width, preview_height);
if screen_view_list (status_preview_panel) then ui.draw_state_box (preview_width + 32, 32); end if; end if;
if screen_view_list (text_box_panel) then ui.draw_help_box (0, core.window_height - text_box_height, core.window_width - core.icon * (screen_view'pos (screen_view'last) + 1), text_box_height); end if; --
if screen_view_list (status_preview_panel) then
ui.draw_tiny_menu (preview_width, 0, side_panel, preview_height);
ui.draw_state_box (preview_width + 32, 32);
end if;
--
if screen_view_list (text_box_panel) then
ui.draw_help_box (0, core.window_height - text_box_height, core.window_width - core.icon * (screen_view'pos (screen_view'last) + 1), text_box_height);
end if;
--
for index in screen_view loop for index in screen_view loop
ui.draw_icon (screen_view_icon (index), screen_view_text (index), ui.draw_icon (screen_view_icon (index), screen_view_text (index),
core.window_width - core.icon * (screen_view'pos (screen_view'last) + 1) + core.icon * screen_view'pos (index), core.window_width - core.icon * (screen_view'pos (screen_view'last) + 1) + core.icon * screen_view'pos (index),
@ -209,7 +225,7 @@ begin
--~ui.draw_menu (60, 60, 256, 256); --~ui.draw_menu (60, 60, 256, 256);
--~ui.draw_tiny_menu (360, 60, 256, 256); --~ui.draw_tiny_menu (360, 60, 256, 256);
-- --
menu_render; --~menu_render;
-- --
core.draw (a, 64*1, core.window_height - 56 - 64); core.draw (a, 64*1, core.window_height - 56 - 64);
core.draw (b, 64*2, core.window_height - 56 - 64); core.draw (b, 64*2, core.window_height - 56 - 64);

4
source/skill.adb
View File

@ -10,11 +10,10 @@ package body skill is
sprite : array (enumeration) of core.sprite; sprite : array (enumeration) of core.sprite;
menu_data : ui.structure := ("Skill Menu ", core.signal_o, false, true, false, 0, 0, 320, 160);
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
procedure configure is procedure configure is
menu_data : ui.structure := ("Skill Menu ", core.signal_s, false, true, false, 0, 0, 320, 160, 0, (others => (ui.gui_none, "- ", 0, (others => 0))));
begin begin
core.echo (core.comment, "Configuring skill components..."); core.echo (core.comment, "Configuring skill components...");
-- --
@ -22,6 +21,7 @@ package body skill is
-- --
for index in enumeration loop for index in enumeration loop
sprite (index) := core.import_sprite ("./sprite/skill/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1); sprite (index) := core.import_sprite ("./sprite/skill/" & core.lowercase (enumeration'image (index)) & ".png", 1, 1);
ui.add_structure_button (menu_data, sprite (index), trait (index).name, trait (index).text);
end loop; end loop;
end configure; end configure;

26
source/ui.adb
View File

@ -150,13 +150,27 @@ package body ui is
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
procedure draw_structure (data : in out structure) is procedure draw_structure (data : in out structure) is
offset : constant integer := 16;
new_width : constant integer := (if data.resize then 640 else data.width); new_width : constant integer := (if data.resize then 640 else data.width);
new_height : constant integer := (if data.resize then 480 else data.height); new_height : constant integer := (if data.resize then 480 else data.height);
new_x : constant integer := (if data.center then (core.window_width - new_width) / 2 else data.x); new_x : constant integer := (if data.center then (core.window_width - new_width) / 2 else data.x);
new_y : constant integer := (if data.center then (core.window_height - new_height) / 2 else data.y); new_y : constant integer := (if data.center then (core.window_height - new_height) / 2 else data.y);
--
at_x : integer := new_x;
at_y : integer := new_y;
begin begin
draw_tiny_menu (new_x, new_y, new_width, new_height); draw_tiny_menu (new_x, new_y, new_width, new_height);
draw_title_bar (new_x, new_y, new_width, data.title); draw_title_bar (new_x, new_y, new_width, data.title);
--
for x in 0 .. data.gui_n loop
case data.gui_list (x).kind is
when gui_button =>
draw_frame ("", at_x + offset, at_y, new_width - 2 * offset, core.icon + offset);
draw_icon (data.gui_list (x).image, "", at_x + 3 * offset / 2, at_y + offset / 2);
write (data.gui_list (x).text, at_x + 3 * offset / 2 + core.icon, at_y + offset / 2);
when others => null;
end case;
end loop;
end draw_structure; end draw_structure;
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
@ -447,6 +461,18 @@ package body ui is
structure_count := structure_count + 1; structure_count := structure_count + 1;
end add_structure; end add_structure;
------------------------------------------------------------------------------------------
procedure add_structure_button (data : in out structure; icon : in core.sprite; text, description : in string) is
begin
data.gui_list (data.gui_n).kind := gui_button;
data.gui_list (data.gui_n).text := text;
data.gui_list (data.gui_n).number := 0;
data.gui_list (data.gui_n).image := icon;
--
data.gui_n := data.gui_n + 1;
end add_structure_button;
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
end ui; end ui;

25
source/ui.ads
View File

@ -13,17 +13,22 @@ package ui is
fairy, dwarf, gnoll, kobold, goblin, imp fairy, dwarf, gnoll, kobold, goblin, imp
); );
--~type enumeration is ( type enumeration is (
--~gui_button, gui_line, gui_text, gui_icon, gui_sprite, gui_list gui_none, gui_button, gui_line, gui_text, gui_icon, gui_sprite, gui_orient
--~); );
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
--~type gui_data is record gui_size : constant := 24;
--~text : string;
--~number : integer; type gui_data is record
--~image : core.sprite; kind : enumeration;
--~end record; text : core.short_string;
number : integer;
image : core.sprite;
end record;
type gui_array is array (0 .. gui_size) of gui_data;
type structure is record type structure is record
title : core.short_string := "- "; title : core.short_string := "- ";
@ -35,6 +40,8 @@ package ui is
y : integer := 0; y : integer := 0;
width : integer := 0; width : integer := 0;
height : integer := 0; height : integer := 0;
gui_n : natural := 0;
gui_list : gui_array := (others => (gui_none, "- ", 0, (others => 0)));
end record; end record;
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
@ -71,6 +78,8 @@ package ui is
procedure add_structure (data : in structure); procedure add_structure (data : in structure);
procedure add_structure_button (data : in out structure; icon : in core.sprite; text, description : in string);
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
end ui; end ui;