qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-25 13:51:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

[nq] Clean up sbar updates for info changes

Browse source 
Most of the update functions are scheduled by Sbar_Changed() using
tables to determine what update functions need to be called for which
view entities. As hud_updateonce is called, and an entity can have only
one of any component, this becomes a set of updates to call when during
hud/sbar rendering.
This commit is contained in:
Bill Currie 2022-11-04 11:31:11 +09:00
parent 5f01dc9fb5
commit c0cfeec5d6
2 changed files with 64 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sbar.h
View file

@ -48,6 +48,8 @@ typedef enum {
sbc_info, sbc_info,
sbc_items, sbc_items,
sbc_weapon, sbc_weapon,
sbc_num_changed
} sbar_changed; } sbar_changed;
void Sbar_Changed (sbar_changed change); void Sbar_Changed (sbar_changed change);

86
nq/source/sbar.c
View file

@ -179,7 +179,7 @@ sbar_view (int x, int y, int w, int h, grav_t gravity, view_t parent)
} }
static inline void static inline void
sbar_setcomponent (view_t view, uint32_t comp, void *data) sbar_setcomponent (view_t view, uint32_t comp, const void *data)
{ {
Ent_SetComponent (view.id, comp, view.reg, data); Ent_SetComponent (view.id, comp, view.reg, data);
} }
@ -279,13 +279,6 @@ Sbar_ColorForMap (int m)
return (bound (0, m, 13) * 16) + 8; return (bound (0, m, 13) * 16) + 8;
} }
void
Sbar_Changed (sbar_changed change)
{
sb_update_flags |= 1 << change;
sb_updates = 0; // update next frame
}
static void static void
draw_num (view_t *view, int num, int digits, int color) draw_num (view_t *view, int num, int digits, int color)
{ {
@ -1495,20 +1488,73 @@ draw_miniteam (view_t *view)
#endif #endif
} }
typedef struct {
hud_update_f update;
view_t *view;
} sb_updater_t;
static const sb_updater_t ammo_update[] = {
{draw_miniammo, &sbar_miniammo},
{draw_ammo, &sbar_ammo},
{}
};
static const sb_updater_t armor_update[] = {
{draw_armor, &sbar_armor},
{}
};
static const sb_updater_t frags_update[] = {
{draw_frags, &sbar_frags},
{}
};
static const sb_updater_t health_update[] = {
{draw_health, &sbar_health},
{draw_face, &sbar_face},
{}
};
static const sb_updater_t info_update[] = {
{}
};
static const sb_updater_t items_update[] = {
{draw_items, &sbar_items},
{draw_sigils, &sbar_sigils},
{}
};
static const sb_updater_t weapon_update[] = {
{draw_weapons_sbar, &sbar_weapons},
{}
};
static const sb_updater_t * const sb_updaters[sbc_num_changed] = {
[sbc_ammo] = ammo_update,
[sbc_armor] = armor_update,
[sbc_frags] = frags_update,
[sbc_health] = health_update,
[sbc_info] = info_update,
[sbc_items] = items_update,
[sbc_weapon] = weapon_update,
};
void
Sbar_Changed (sbar_changed change)
{
sb_update_flags |= 1 << change;
sb_updates = 0; // update next frame
if ((unsigned) change >= (unsigned) sbc_num_changed) {
Sys_Error ("invalid sbar changed enum");
}
const sb_updater_t *ud = sb_updaters[change];
while (ud->update) {
sbar_setcomponent (*ud->view, hud_updateonce, &ud->update);
ud++;
}
}
void void
Sbar_Draw (void) Sbar_Draw (void)
{ {
if (cls.state != ca_active) { if (cls.state != ca_active) {
return; return;
} }
sb_update_flags = ~0;
if (sb_update_flags & (1 << sbc_ammo)) {
draw_miniammo (sbar_miniammo);
draw_ammo (sbar_ammo);
}
if (sb_update_flags & (1 << sbc_armor)) draw_armor (sbar_armor);
if (sb_update_flags & (1 << sbc_frags)) draw_frags (sbar_frags);
if (sb_update_flags & (1 << sbc_health)) draw_health (sbar_health);
if (sb_update_flags & (1 << sbc_info)) { if (sb_update_flags & (1 << sbc_info)) {
draw_miniteam (0); draw_miniteam (0);
draw_minifrags (0); draw_minifrags (0);
@ -1516,14 +1562,6 @@ Sbar_Draw (void)
Sbar_DeathmatchOverlay (0); Sbar_DeathmatchOverlay (0);
sbar_update_vis (); sbar_update_vis ();
} }
if (sb_update_flags & (1 << sbc_items)) {
draw_items (sbar_items);
draw_sigils (sbar_items);
}
if (sb_update_flags & (1 << sbc_weapon)) draw_weapons_sbar (sbar_weapons);
if (sb_update_flags & ((1 << sbc_health) | (1 << sbc_items))) {
draw_face (sbar_face);
}
if (sb_showscores) { if (sb_showscores) {
draw_solo_time (); draw_solo_time ();
} }