qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-28 23:22:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[client] Switch to using canvases for screen and hud

Browse source 
Canvases provide layered rendering as for each canvas all components are
rendered in turn.
This commit is contained in:
Bill Currie 2023-01-21 03:34:33 +09:00
parent f0fab885d4
commit 3c8f02c655
7 changed files with 252 additions and 495 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
include/client/hud.h
View file

@ -30,34 +30,9 @@
struct view_s; struct view_s;
enum {
hud_update,
hud_updateonce,
hud_tile,
hud_pic,
hud_subpic,
hud_cachepic,
hud_fill,
hud_charbuff,
hud_func,
hud_outline,
hud_comp_count
};
typedef void (*hud_update_f) (struct view_s);
typedef void (*hud_func_f) (struct view_pos_s, struct view_pos_s);
typedef struct hud_subpic_s {
struct qpic_s *pic;
uint32_t x, y;
uint32_t w, h;
} hud_subpic_t;
extern struct ecs_system_s hud_system;
extern struct ecs_system_s hud_viewsys;
extern struct ecs_system_s hud_psgsys; extern struct ecs_system_s hud_psgsys;
extern uint32_t hud_canvas;
extern int hud_sb_lines; extern int hud_sb_lines;
extern int hud_sbar; extern int hud_sbar;
@ -67,18 +42,15 @@ extern int hud_pl;
extern int hud_ping; extern int hud_ping;
extern int hud_time; extern int hud_time;
extern struct view_s hud_view; //root view of the hud canvas
extern struct view_s hud_canvas_view;
extern struct view_s hud_overlay_view; struct ecs_registry_s;
extern struct view_s hud_stuff_view; struct canvas_system_s;
extern struct view_s hud_time_view;
extern struct view_s hud_fps_view;
extern struct view_s hud_ping_view;
extern struct view_s hud_pl_view;
void HUD_Init (void); void HUD_Init (struct ecs_registry_s *reg);
void HUD_Init_Cvars (void); void HUD_Init_Cvars (void);
void HUD_CreateCanvas (struct canvas_system_s canvas_sys);
void HUD_Calc_sb_lines (int view_size); void HUD_Calc_sb_lines (int view_size);
void HUD_Draw_Views (void);
#endif//__client_hud_h #endif//__client_hud_h

1
include/client/screen.h
View file

@ -2,6 +2,7 @@
#define __client_screen_h #define __client_screen_h
extern struct view_s cl_screen_view; extern struct view_s cl_screen_view;
extern struct canvas_system_s cl_canvas_sys;
struct viewstate_s; struct viewstate_s;
void CL_Init_Screen (void); void CL_Init_Screen (void);

5
libs/client/Makemodule.am
View file

@ -1,7 +1,10 @@
noinst_LTLIBRARIES += libs/client/libQFclient.la noinst_LTLIBRARIES += libs/client/libQFclient.la
libs_client_libQFclient_la_LDFLAGS= @STATIC@ libs_client_libQFclient_la_LDFLAGS= @STATIC@
libs_client_libQFclient_la_LIBADD= libs/gamecode/libQFgamecode.la libs/util/libQFutil.la libs_client_libQFclient_la_LIBADD= \
libs/ui/libQFgui.la \
libs/gamecode/libQFgamecode.la \
libs/util/libQFutil.la
libs_client_libQFclient_la_SOURCES= \ libs_client_libQFclient_la_SOURCES= \
libs/client/cl_chase.c \ libs/client/cl_chase.c \
libs/client/cl_effects.c \ libs/client/cl_effects.c \

92
libs/client/cl_screen.c
View file

@ -49,7 +49,7 @@
#include "QF/scene/scene.h" #include "QF/scene/scene.h"
#include "QF/scene/transform.h" #include "QF/scene/transform.h"
#include "QF/ui/view.h" #include "QF/ui/canvas.h"
#include "r_local.h" //FIXME for r_cache_thrash #include "r_local.h" //FIXME for r_cache_thrash
@ -90,6 +90,7 @@ static cvar_t scr_showturtle_cvar = {
}; };
view_t cl_screen_view; view_t cl_screen_view;
uint32_t cl_canvas;
static view_t net_view; static view_t net_view;
static view_t timegraph_view; static view_t timegraph_view;
static view_t zgraph_view; static view_t zgraph_view;
@ -100,6 +101,8 @@ static view_t pause_view;
static viewstate_t *_vs;//FIXME ick static viewstate_t *_vs;//FIXME ick
canvas_system_t cl_canvas_sys;
static void static void
SCR_CShift (void) SCR_CShift (void)
{ {
@ -139,31 +142,21 @@ scr_draw_views (void)
// FIXME cvar callbacks // FIXME cvar callbacks
View_SetVisible (timegraph_view, r_timegraph); View_SetVisible (timegraph_view, r_timegraph);
View_SetVisible (zgraph_view, r_zgraph); View_SetVisible (zgraph_view, r_zgraph);
if (!_vs->intermission) {
r_funcs->Draw_Crosshair ();//FIXME canvas_func
}
Canvas_Draw (cl_canvas_sys);
SCR_CShift ();//FIXME canvas_func
Sbar_DrawCenterPrint ();//FIXME canvas_func
Con_DrawConsole ();//FIXME canvas_func
} }
static SCR_Func scr_funcs_normal[] = { static SCR_Func scr_funcs[] = {
0, //Draw_Crosshair,
HUD_Draw_Views,
SCR_CShift,
Sbar_DrawCenterPrint,
scr_draw_views, scr_draw_views,
Con_DrawConsole,
0 0
}; };
static SCR_Func scr_funcs_intermission[] = {
HUD_Draw_Views,
Sbar_DrawCenterPrint,
scr_draw_views,
Con_DrawConsole,
0
};
static SCR_Func *scr_funcs[] = {
scr_funcs_normal,
scr_funcs_intermission,
};
static int cl_scale; static int cl_scale;
static int cl_xlen; static int cl_xlen;
static int cl_ylen; static int cl_ylen;
@ -174,8 +167,9 @@ cl_set_size (void)
int xlen = cl_xlen / cl_scale; int xlen = cl_xlen / cl_scale;
int ylen = cl_ylen / cl_scale; int ylen = cl_ylen / cl_scale;
printf ("cl_set_size: %d %d %d\n", cl_scale, xlen, ylen); printf ("cl_set_size: %d %d %d\n", cl_scale, xlen, ylen);
View_SetLen (cl_screen_view, xlen, ylen); //View_SetLen (cl_screen_view, xlen, ylen);
View_UpdateHierarchy (cl_screen_view); //View_UpdateHierarchy (cl_screen_view);
Canvas_SetLen (cl_canvas_sys, (view_pos_t) { xlen, ylen });
} }
static void static void
@ -198,31 +192,43 @@ CL_Init_Screen (void)
{ {
qpic_t *pic; qpic_t *pic;
HUD_Init (); __auto_type reg = ECS_NewRegistry ();
Canvas_InitSys (&cl_canvas_sys, reg);
HUD_Init (reg);
ECS_CreateComponentPools (reg);
cl_xlen = viddef.width; cl_xlen = viddef.width;
cl_ylen = viddef.height; cl_ylen = viddef.height;
cl_screen_view = View_New (hud_viewsys, nullview); ecs_system_t vsys = {
.reg = reg,
.base = cl_canvas_sys.view_base,
};
HUD_CreateCanvas (cl_canvas_sys);
cl_canvas = Canvas_New (cl_canvas_sys);
cl_screen_view = Canvas_GetRootView (cl_canvas_sys, cl_canvas);
View_SetPos (cl_screen_view, 0, 0); View_SetPos (cl_screen_view, 0, 0);
View_SetLen (cl_screen_view, viddef.width, viddef.height); View_SetLen (cl_screen_view, cl_xlen, cl_ylen);
View_SetGravity (cl_screen_view, grav_northwest); View_SetGravity (cl_screen_view, grav_northwest);
View_SetVisible (cl_screen_view, 1); View_SetVisible (cl_screen_view, 1);
pic = r_funcs->Draw_PicFromWad ("ram"); pic = r_funcs->Draw_PicFromWad ("ram");
ram_view = View_New (hud_viewsys, cl_screen_view); ram_view = View_New (vsys, cl_screen_view);
View_SetPos (ram_view, 32, 0); View_SetPos (ram_view, 32, 0);
View_SetLen (ram_view, pic->width, pic->height); View_SetLen (ram_view, pic->width, pic->height);
View_SetGravity (ram_view, grav_northwest); View_SetGravity (ram_view, grav_northwest);
Ent_SetComponent (ram_view.id, hud_pic, ram_view.reg, &pic); Ent_SetComponent (ram_view.id, canvas_pic, ram_view.reg, &pic);
View_SetVisible (ram_view, 0); View_SetVisible (ram_view, 0);
pic = r_funcs->Draw_PicFromWad ("turtle"); pic = r_funcs->Draw_PicFromWad ("turtle");
turtle_view = View_New (hud_viewsys, cl_screen_view); turtle_view = View_New (vsys, cl_screen_view);
View_SetPos (turtle_view, 32, 0); View_SetPos (turtle_view, 32, 0);
View_SetLen (turtle_view, pic->width, pic->height); View_SetLen (turtle_view, pic->width, pic->height);
View_SetGravity (turtle_view, grav_northwest); View_SetGravity (turtle_view, grav_northwest);
Ent_SetComponent (turtle_view.id, hud_pic, turtle_view.reg, &pic); Ent_SetComponent (turtle_view.id, canvas_pic, turtle_view.reg, &pic);
View_SetVisible (turtle_view, 0); View_SetVisible (turtle_view, 0);
Cvar_Register (&scr_showpause_cvar, 0, 0); Cvar_Register (&scr_showpause_cvar, 0, 0);
@ -230,45 +236,46 @@ CL_Init_Screen (void)
Cvar_Register (&scr_showturtle_cvar, 0, 0); Cvar_Register (&scr_showturtle_cvar, 0, 0);
pic = r_funcs->Draw_PicFromWad ("net"); pic = r_funcs->Draw_PicFromWad ("net");
net_view = View_New (hud_viewsys, cl_screen_view); net_view = View_New (vsys, cl_screen_view);
View_SetPos (net_view, 64, 0); View_SetPos (net_view, 64, 0);
View_SetLen (net_view, pic->width, pic->height); View_SetLen (net_view, pic->width, pic->height);
View_SetGravity (net_view, grav_northwest); View_SetGravity (net_view, grav_northwest);
Ent_SetComponent (net_view.id, hud_pic, net_view.reg, &pic); Ent_SetComponent (net_view.id, canvas_pic, net_view.reg, &pic);
View_SetVisible (net_view, 0); View_SetVisible (net_view, 0);
timegraph_view = View_New (hud_viewsys, cl_screen_view); timegraph_view = View_New (vsys, cl_screen_view);
View_SetPos (timegraph_view, 0, 0); View_SetPos (timegraph_view, 0, 0);
View_SetLen (timegraph_view, r_data->vid->width, 100); View_SetLen (timegraph_view, r_data->vid->width, 100);
View_SetGravity (timegraph_view, grav_southwest); View_SetGravity (timegraph_view, grav_southwest);
void *rtg = R_TimeGraph; void *rtg = R_TimeGraph;
Ent_SetComponent (timegraph_view.id, hud_func, timegraph_view.reg, &rtg); Ent_SetComponent (timegraph_view.id, canvas_func, timegraph_view.reg, &rtg);
View_SetVisible (timegraph_view, r_timegraph); View_SetVisible (timegraph_view, r_timegraph);
zgraph_view = View_New (hud_viewsys, cl_screen_view); zgraph_view = View_New (vsys, cl_screen_view);
View_SetPos (zgraph_view, 0, 0); View_SetPos (zgraph_view, 0, 0);
View_SetLen (zgraph_view, r_data->vid->width, 100); View_SetLen (zgraph_view, r_data->vid->width, 100);
View_SetGravity (zgraph_view, grav_southwest); View_SetGravity (zgraph_view, grav_southwest);
void *rzg = R_ZGraph; void *rzg = R_ZGraph;
Ent_SetComponent (zgraph_view.id, hud_func, zgraph_view.reg, &rzg); Ent_SetComponent (zgraph_view.id, canvas_func, zgraph_view.reg, &rzg);
View_SetVisible (zgraph_view, r_zgraph); View_SetVisible (zgraph_view, r_zgraph);
const char *name = "gfx/loading.lmp"; const char *name = "gfx/loading.lmp";
pic = r_funcs->Draw_CachePic (name, 1); pic = r_funcs->Draw_CachePic (name, 1);
loading_view = View_New (hud_viewsys, cl_screen_view); loading_view = View_New (vsys, cl_screen_view);
View_SetPos (loading_view, 0, -24); View_SetPos (loading_view, 0, -24);
View_SetLen (loading_view, pic->width, pic->height); View_SetLen (loading_view, pic->width, pic->height);
View_SetGravity (loading_view, grav_center); View_SetGravity (loading_view, grav_center);
Ent_SetComponent (loading_view.id, hud_cachepic, loading_view.reg, &name); Ent_SetComponent (loading_view.id, canvas_cachepic,
loading_view.reg, &name);
View_SetVisible (loading_view, 0); View_SetVisible (loading_view, 0);
name = "gfx/pause.lmp"; name = "gfx/pause.lmp";
pic = r_funcs->Draw_CachePic (name, 1); pic = r_funcs->Draw_CachePic (name, 1);
pause_view = View_New (hud_viewsys, cl_screen_view); pause_view = View_New (vsys, cl_screen_view);
View_SetPos (pause_view, 0, -24); View_SetPos (pause_view, 0, -24);
View_SetLen (pause_view, pic->width, pic->height); View_SetLen (pause_view, pic->width, pic->height);
View_SetGravity (pause_view, grav_center); View_SetGravity (pause_view, grav_center);
Ent_SetComponent (pause_view.id, hud_cachepic, pause_view.reg, &name); Ent_SetComponent (pause_view.id, canvas_cachepic, pause_view.reg, &name);
View_SetVisible (pause_view, 0); View_SetVisible (pause_view, 0);
cvar_t *con_scale = Cvar_FindVar ("con_scale"); cvar_t *con_scale = Cvar_FindVar ("con_scale");
@ -280,12 +287,8 @@ CL_Init_Screen (void)
void void
CL_UpdateScreen (viewstate_t *vs) CL_UpdateScreen (viewstate_t *vs)
{ {
unsigned index = !!vs->intermission;
_vs = vs; _vs = vs;
if (index >= sizeof (scr_funcs) / sizeof (scr_funcs[0]))
index = 0;
//FIXME not every time //FIXME not every time
if (vs->active) { if (vs->active) {
if (vs->watervis) if (vs->watervis)
@ -293,9 +296,8 @@ CL_UpdateScreen (viewstate_t *vs)
else else
r_data->min_wateralpha = 1.0; r_data->min_wateralpha = 1.0;
} }
scr_funcs_normal[0] = r_funcs->Draw_Crosshair;
V_PrepBlend (vs); V_PrepBlend (vs);
V_RenderView (vs); V_RenderView (vs);
SCR_UpdateScreen (vs->camera_transform, vs->time, scr_funcs[index]); SCR_UpdateScreen (vs->camera_transform, vs->time, scr_funcs);
} }

310
libs/client/hud.c
View file

@ -36,59 +36,17 @@
#include "QF/screen.h" #include "QF/screen.h"
#include "QF/render.h" #include "QF/render.h"
#include "QF/plugin/vid_render.h" #include "QF/plugin/vid_render.h"
#include "QF/ui/canvas.h"
#include "QF/ui/passage.h" #include "QF/ui/passage.h"
#include "QF/ui/view.h" #include "QF/ui/view.h"
#include "compat.h" #include "compat.h"
#include "client/hud.h" #include "client/hud.h"
#include "client/screen.h"
static const component_t hud_components[hud_comp_count] = {
[hud_update] = {
.size = sizeof (hud_update_f),
.name = "update",
},
[hud_updateonce] = {
.size = sizeof (hud_update_f),
.name = "updateonce",
},
[hud_tile] = {
.size = sizeof (byte),
.name = "tile",
},
[hud_pic] = {
.size = sizeof (qpic_t *),
.name = "pic",
},
[hud_subpic] = {
.size = sizeof (hud_subpic_t),
.name = "subpic",
},
[hud_cachepic] = {
.size = sizeof (const char *),
.name = "cachepic",
},
[hud_fill] = {
.size = sizeof (byte),
.name = "fill",
},
[hud_charbuff] = {
.size = sizeof (draw_charbuffer_t *),
.name = "charbuffer",
},
[hud_func] = {
.size = sizeof (hud_func_f),
.name = "func",
},
[hud_outline] = {
.size = sizeof (byte),
.name = "outline",
},
};
ecs_system_t hud_system;
ecs_system_t hud_viewsys;
ecs_system_t hud_psgsys; ecs_system_t hud_psgsys;
uint32_t hud_canvas;
int hud_sb_lines; int hud_sb_lines;
int hud_sbar; int hud_sbar;
@ -100,7 +58,8 @@ static cvar_t hud_sbar_cvar = {
.flags = CVAR_ARCHIVE, .flags = CVAR_ARCHIVE,
.value = { .type = &cexpr_int, .value = &hud_sbar }, .value = { .type = &cexpr_int, .value = &hud_sbar },
}; };
grav_t hud_scoreboard_gravity; grav_t hud_scoreboard_gravity = grav_center;
#if 0
static cvar_t hud_scoreboard_gravity_cvar = { static cvar_t hud_scoreboard_gravity_cvar = {
.name = "hud_scoreboard_gravity", .name = "hud_scoreboard_gravity",
.description = .description =
@ -110,6 +69,7 @@ static cvar_t hud_scoreboard_gravity_cvar = {
.flags = CVAR_ARCHIVE, .flags = CVAR_ARCHIVE,
.value = { .type = &grav_t_type, .value = &hud_scoreboard_gravity }, .value = { .type = &grav_t_type, .value = &hud_scoreboard_gravity },
}; };
#endif
int hud_swap; int hud_swap;
static cvar_t hud_swap_cvar = { static cvar_t hud_swap_cvar = {
.name = "hud_swap", .name = "hud_swap",
@ -165,34 +125,22 @@ static cvar_t hud_debug_cvar = {
.value = { .type = &cexpr_int, .value = &hud_debug }, .value = { .type = &cexpr_int, .value = &hud_debug },
}; };
view_t sbar_view; view_t hud_canvas_view;
view_t sbar_inventory_view;
view_t sbar_frags_view;
view_t hud_view;
view_t hud_overlay_view;
view_t hud_stuff_view;
view_t hud_time_view;
view_t hud_fps_view;
view_t hud_ping_view;
view_t hud_pl_view;
static void static void
hud_add_outlines (view_t view) hud_add_outlines (view_t view, byte color)
{ {
byte color = 0x6f; Ent_SetComponent (view.id, canvas_outline, view.reg, &color);
Ent_SetComponent (view.id, hud_outline, view.reg, &color);
uint32_t count = View_ChildCount (view); uint32_t count = View_ChildCount (view);
for (uint32_t i = 0; i < count; i++) { for (uint32_t i = 0; i < count; i++) {
hud_add_outlines (View_GetChild (view, i)); hud_add_outlines (View_GetChild (view, i), color);
} }
} }
static void static void
hud_remove_outlines (view_t view) hud_remove_outlines (view_t view)
{ {
Ent_RemoveComponent (view.id, hud_outline, view.reg); Ent_RemoveComponent (view.id, canvas_outline, view.reg);
uint32_t count = View_ChildCount (view); uint32_t count = View_ChildCount (view);
for (uint32_t i = 0; i < count; i++) { for (uint32_t i = 0; i < count; i++) {
hud_remove_outlines (View_GetChild (view, i)); hud_remove_outlines (View_GetChild (view, i));
@ -202,15 +150,15 @@ hud_remove_outlines (view_t view)
static void static void
hud_debug_f (void *data, const cvar_t *cvar) hud_debug_f (void *data, const cvar_t *cvar)
{ {
if (!View_Valid (hud_view)) { if (!View_Valid (hud_canvas_view)) {
return; return;
} }
if (hud_debug) { if (hud_debug) {
hud_add_outlines (hud_view); hud_add_outlines (cl_screen_view, 0xfb);
hud_add_outlines (hud_overlay_view); hud_add_outlines (hud_canvas_view, 0x6f);
} else { } else {
hud_remove_outlines (hud_view); hud_remove_outlines (hud_canvas_view);
hud_remove_outlines (hud_overlay_view); hud_remove_outlines (cl_screen_view);
} }
} }
@ -222,10 +170,9 @@ hud_sbar_f (void *data, const cvar_t *cvar)
#if 0//XXX #if 0//XXX
if (hud_sbar) { if (hud_sbar) {
view_remove (hud_main_view, hud_main_view->children[0]); view_remove (hud_main_view, hud_main_view->children[0]);
view_insert (hud_main_view, sbar_view, 0);
} else { } else {
view_remove (hud_main_view, hud_main_view->children[0]); view_remove (hud_main_view, hud_main_view->children[0]);
view_insert (hud_main_view, hud_view, 0); view_insert (hud_main_view, hud_canvas_view, 0);
} }
#endif #endif
} }
@ -252,7 +199,7 @@ hud_swap_f (void *data, const cvar_t *cvar)
view_move (hud_stuff_view, hud_stuff_view->xpos, hud_stuff_view->ypos); view_move (hud_stuff_view, hud_stuff_view->xpos, hud_stuff_view->ypos);
#endif #endif
} }
#if 0
static void static void
hud_scoreboard_gravity_f (void *data, const cvar_t *cvar) hud_scoreboard_gravity_f (void *data, const cvar_t *cvar)
{ {
@ -260,6 +207,7 @@ hud_scoreboard_gravity_f (void *data, const cvar_t *cvar)
View_SetGravity (hud_overlay_view, hud_scoreboard_gravity); View_SetGravity (hud_overlay_view, hud_scoreboard_gravity);
} }
} }
#endif
static void static void
C_GIB_HUD_Enable_f (void) C_GIB_HUD_Enable_f (void)
{ {
@ -273,19 +221,14 @@ C_GIB_HUD_Disable_f (void)
} }
void void
HUD_Init (void) HUD_Init (ecs_registry_t *reg)
{ {
hud_system.reg = ECS_NewRegistry (); hud_psgsys = (ecs_system_t) {
hud_viewsys.reg = hud_system.reg; .reg = reg,
hud_psgsys.reg = hud_system.reg; .base = ECS_RegisterComponents (reg, passage_components,
hud_system.base = ECS_RegisterComponents (hud_system.reg, hud_components, passage_comp_count),
hud_comp_count); };
hud_viewsys.base = ECS_RegisterComponents (hud_system.reg, view_components,
view_comp_count);
hud_psgsys.base = ECS_RegisterComponents (hud_system.reg,
passage_components,
passage_comp_count);
ECS_CreateComponentPools (hud_system.reg);
// register GIB builtins // register GIB builtins
GIB_Builtin_Add ("HUD::enable", C_GIB_HUD_Enable_f); GIB_Builtin_Add ("HUD::enable", C_GIB_HUD_Enable_f);
GIB_Builtin_Add ("HUD::disable", C_GIB_HUD_Disable_f); GIB_Builtin_Add ("HUD::disable", C_GIB_HUD_Disable_f);
@ -303,7 +246,20 @@ HUD_Init_Cvars (void)
Cvar_Register (&hud_sbar_cvar, hud_sbar_f, 0); Cvar_Register (&hud_sbar_cvar, hud_sbar_f, 0);
Cvar_Register (&hud_swap_cvar, hud_swap_f, 0); Cvar_Register (&hud_swap_cvar, hud_swap_f, 0);
#if 0
Cvar_Register (&hud_scoreboard_gravity_cvar, hud_scoreboard_gravity_f, 0); Cvar_Register (&hud_scoreboard_gravity_cvar, hud_scoreboard_gravity_f, 0);
#endif
}
void
HUD_CreateCanvas (canvas_system_t canvas_sys)
{
hud_canvas = Canvas_New (canvas_sys);
hud_canvas_view = Canvas_GetRootView (canvas_sys, hud_canvas);
View_SetPos (hud_canvas_view, 0, 0);
View_SetLen (hud_canvas_view, viddef.width, viddef.height);
View_SetGravity (hud_canvas_view, grav_northwest);
View_SetVisible (hud_canvas_view, 1);
} }
void void
@ -317,203 +273,21 @@ HUD_Calc_sb_lines (int view_size)
stuff_y = 0; stuff_y = 0;
} else if (view_size >= 110) { } else if (view_size >= 110) {
hud_sb_lines = 24; hud_sb_lines = 24;
sbar_inventory_view->visible = 0;
hud_inventory_view->visible = 0; hud_inventory_view->visible = 0;
hud_armament_view->visible = 0; hud_armament_view->visible = 0;
stuff_y = 32; stuff_y = 32;
} else { } else {
hud_sb_lines = 48; hud_sb_lines = 48;
sbar_inventory_view->visible = 1;
hud_inventory_view->visible = 1; hud_inventory_view->visible = 1;
hud_armament_view->visible = 1; hud_armament_view->visible = 1;
stuff_y = 48; stuff_y = 48;
} }
if (hud_sb_lines) { if (hud_sb_lines) {
sbar_view->visible = 1; hud_canvas_view->visible = 1;
hud_view->visible = 1; view_resize (hud_canvas_view, hud_canvas_view->xlen, hud_sb_lines);
view_resize (sbar_view, sbar_view->xlen, hud_sb_lines);
view_resize (hud_view, hud_view->xlen, hud_sb_lines);
} else { } else {
sbar_view->visible = 0; hud_canvas_view->visible = 0;
hud_view->visible = 0;
} }
view_move (hud_stuff_view, hud_stuff_view->xpos, stuff_y); view_move (hud_stuff_view, hud_stuff_view->xpos, stuff_y);
#endif #endif
} }
static void
draw_update (ecs_pool_t *pool)
{
uint32_t count = pool->count;
uint32_t *ent = pool->dense;
hud_update_f *func = pool->data;
while (count-- > 0) {
(*func++) (View_FromEntity (hud_viewsys, *ent++));
}
}
static void
draw_updateonce (ecs_pool_t *pool)
{
draw_update (pool);
pool->count = 0;
}
static void
draw_tile_views (ecs_pool_t *pool)
{
uint32_t count = pool->count;
uint32_t *ent = pool->dense;
while (count-- > 0) {
view_t view = View_FromEntity (hud_viewsys, *ent++);
if (View_GetVisible (view)) {
view_pos_t pos = View_GetAbs (view);
view_pos_t len = View_GetLen (view);
r_funcs->Draw_TileClear (pos.x, pos.y, len.x, len.y);
}
}
}
static void
draw_pic_views (ecs_pool_t *pool)
{
uint32_t count = pool->count;
uint32_t *ent = pool->dense;
qpic_t **pic = pool->data;
while (count-- > 0) {
view_t view = View_FromEntity (hud_viewsys, *ent++);
if (View_GetVisible (view)) {
view_pos_t pos = View_GetAbs (view);
r_funcs->Draw_Pic (pos.x, pos.y, *pic);
}
pic++;
}
}
static void
draw_subpic_views (ecs_pool_t *pool)
{
uint32_t count = pool->count;
uint32_t *ent = pool->dense;
hud_subpic_t *subpic = pool->data;
while (count-- > 0) {
view_t view = View_FromEntity (hud_viewsys, *ent++);
if (View_GetVisible (view)) {
view_pos_t pos = View_GetAbs (view);
r_funcs->Draw_SubPic (pos.x, pos.y, subpic->pic,
subpic->x, subpic->y, subpic->w, subpic->h);
}
subpic++;
}
}
static void
draw_cachepic_views (ecs_pool_t *pool)
{
uint32_t count = pool->count;
uint32_t *ent = pool->dense;
const char **name = pool->data;
while (count-- > 0) {
view_t view = View_FromEntity (hud_viewsys, *ent++);
if (View_GetVisible (view)) {
view_pos_t pos = View_GetAbs (view);
qpic_t *pic = r_funcs->Draw_CachePic (*name, 1);
r_funcs->Draw_Pic (pos.x, pos.y, pic);
}
name++;
}
}
static void
draw_fill_views (ecs_pool_t *pool)
{
uint32_t count = pool->count;
uint32_t *ent = pool->dense;
byte *fill = pool->data;
while (count-- > 0) {
view_t view = View_FromEntity (hud_viewsys, *ent++);
if (View_GetVisible (view)) {
view_pos_t pos = View_GetAbs (view);
view_pos_t len = View_GetLen (view);
r_funcs->Draw_Fill (pos.x, pos.y, len.x, len.y, *fill);
}
fill++;
}
}
static void
draw_charbuff_views (ecs_pool_t *pool)
{
uint32_t count = pool->count;
uint32_t *ent = pool->dense;
draw_charbuffer_t **charbuff = pool->data;
while (count-- > 0) {
view_t view = View_FromEntity (hud_viewsys, *ent++);
if (View_GetVisible (view)) {
view_pos_t pos = View_GetAbs (view);
r_funcs->Draw_CharBuffer (pos.x, pos.y, *charbuff);
}
charbuff++;
}
}
static void
draw_func_views (ecs_pool_t *pool)
{
uint32_t count = pool->count;
uint32_t *ent = pool->dense;
hud_func_f *func = pool->data;
while (count-- > 0) {
view_t view = View_FromEntity (hud_viewsys, *ent++);
if (View_GetVisible (view)) {
view_pos_t pos = View_GetAbs (view);
view_pos_t len = View_GetLen (view);
(*func) (pos, len);
}
func++;
}
}
static void
draw_outline_views (ecs_pool_t *pool)
{
uint32_t count = pool->count;
uint32_t *ent = pool->dense;
byte *col = pool->data;
__auto_type line = r_funcs->Draw_Line;
while (count-- > 0) {
view_t view = View_FromEntity (hud_viewsys, *ent++);
byte c = *col++;
if (View_GetVisible (view)) {
view_pos_t p = View_GetAbs (view);
view_pos_t l = View_GetLen (view);
view_pos_t q = { p.x + l.x - 1, p.y + l.y - 1 };
line (p.x, p.y, q.x, p.y, c);
line (p.x, q.y, q.x, q.y, c);
line (p.x, p.y, p.x, q.y, c);
line (q.x, p.y, q.x, q.y, c);
}
}
}
void
HUD_Draw_Views (void)
{
static void (*draw_func[hud_comp_count]) (ecs_pool_t *) = {
[hud_update] = draw_update,
[hud_updateonce] = draw_updateonce,
[hud_tile] = draw_tile_views,
[hud_pic] = draw_pic_views,
[hud_subpic] = draw_subpic_views,
[hud_cachepic] = draw_cachepic_views,
[hud_fill] = draw_fill_views,
[hud_charbuff] = draw_charbuff_views,
[hud_func] = draw_func_views,
[hud_outline] = draw_outline_views,
};
for (int i = 0; i < hud_comp_count; i++) {
if (draw_func[i]) {
draw_func[i] (&hud_system.reg->comp_pools[i + hud_system.base]);
}
}
}

287
libs/client/sbar.c
View file

@ -54,6 +54,7 @@
#include "QF/plugin/console.h" #include "QF/plugin/console.h"
#include "QF/plugin/vid_render.h" #include "QF/plugin/vid_render.h"
#include "QF/ui/canvas.h"
#include "QF/ui/passage.h" #include "QF/ui/passage.h"
#include "QF/ui/view.h" #include "QF/ui/view.h"
@ -89,11 +90,18 @@ static int sbar_gametype;
static int sbar_active; static int sbar_active;
static int sbar_intermission; static int sbar_intermission;
static view_t hud_overlay_view;
static view_t hud_stuff_view;
static view_t hud_time_view;
static view_t hud_fps_view;
static view_t hud_ping_view;
static view_t hud_pl_view;
static view_t intermission_view; static view_t intermission_view;
static view_t intermission_time; static view_t intermission_time;
static view_t intermission_secr; static view_t intermission_secr;
static view_t intermission_kill; static view_t intermission_kill;
// view_t hud_view; static view_t hud_view;
static view_t hud_miniteam; static view_t hud_miniteam;
static view_t sbar_main; static view_t sbar_main;
static view_t hud_minifrags; // child of sbar_main for positioning static view_t hud_minifrags; // child of sbar_main for positioning
@ -165,7 +173,7 @@ static view_def_t miniteam_defs[] = {
}; };
static view_def_t sbar_defs[] = { static view_def_t sbar_defs[] = {
{&hud_overlay_view, { 0, 0,320,200}, grav_center, &cl_screen_view}, {&hud_overlay_view, { 0, 0,320,200}, grav_center, &hud_canvas_view},
{&intermission_view, { 0, 0,320,200}, grav_northwest, &hud_overlay_view}, {&intermission_view, { 0, 0,320,200}, grav_northwest, &hud_overlay_view},
{0, {0, 24, 192, 24}, grav_north, &intermission_view, 1, 0, 0}, {0, {0, 24, 192, 24}, grav_north, &intermission_view, 1, 0, 0},
{0, {0, 56, 160, 144}, grav_northwest, &intermission_view, 1, 0, 0}, {0, {0, 56, 160, 144}, grav_northwest, &intermission_view, 1, 0, 0},
@ -183,7 +191,7 @@ static view_def_t sbar_defs[] = {
{0, {72, 0, 16, 24}, grav_northwest, &intermission_kill, 1, 0, 0}, {0, {72, 0, 16, 24}, grav_northwest, &intermission_kill, 1, 0, 0},
{0, {80, 0, 24, 24}, grav_northwest, &intermission_kill, 3, 24, 0}, {0, {80, 0, 24, 24}, grav_northwest, &intermission_kill, 3, 24, 0},
{&hud_view, { 0, 0,320, 48}, grav_south, &cl_screen_view}, {&hud_view, { 0, 0,320, 48}, grav_south, &hud_canvas_view},
{&hud_miniteam, { 0, 0, 96, 48}, grav_southeast, &hud_view}, {&hud_miniteam, { 0, 0, 96, 48}, grav_southeast, &hud_view},
{0, {0,0,96,8}, grav_northwest, &hud_miniteam, 6, 0, 8, miniteam_defs}, {0, {0,0,96,8}, grav_northwest, &hud_miniteam, 6, 0, 8, miniteam_defs},
{&sbar_main, { 0, 0,320, 48}, grav_south, &hud_view}, {&sbar_main, { 0, 0,320, 48}, grav_south, &hud_view},
@ -229,12 +237,12 @@ static view_def_t sbar_defs[] = {
{0, { 0, 0, 24, 24}, grav_northwest, &sbar_health, 3, 24, 0}, {0, { 0, 0, 24, 24}, grav_northwest, &sbar_health, 3, 24, 0},
{0, {10, 0, 24, 8}, grav_northwest, &sbar_miniammo, 4, 48, 0}, {0, {10, 0, 24, 8}, grav_northwest, &sbar_miniammo, 4, 48, 0},
{&spectator_view, { 0, 0,320, 32}, grav_south, &cl_screen_view}, {&spectator_view, { 0, 0,320, 32}, grav_south, &hud_canvas_view},
{0, { 0, 0, 312, 8}, grav_north, &spectator_view, 1, 0, 0}, {0, { 0, 0, 312, 8}, grav_north, &spectator_view, 1, 0, 0},
{0, { 0, 8, 320, 24}, grav_northwest, &spectator_view, 1, 0, 0}, {0, { 0, 8, 320, 24}, grav_northwest, &spectator_view, 1, 0, 0},
{0, { 0, 12, 112, 8}, grav_north, &spectator_view, 1, 0, 0}, {0, { 0, 12, 112, 8}, grav_north, &spectator_view, 1, 0, 0},
{0, { 0, 20, 232, 8}, grav_north, &spectator_view, 1, 0, 0}, {0, { 0, 20, 232, 8}, grav_north, &spectator_view, 1, 0, 0},
{&deathmatch_view, { 0, 0,320, 200}, grav_center, &cl_screen_view}, {&deathmatch_view, { 0, 0,320, 200}, grav_center, &hud_canvas_view},
{} {}
}; };
@ -251,10 +259,12 @@ static draw_charbuffer_t *solo_secrets;
static draw_charbuffer_t *solo_time; static draw_charbuffer_t *solo_time;
static draw_charbuffer_t *solo_name; static draw_charbuffer_t *solo_name;
static ecs_system_t sbar_viewsys;
static view_t static view_t
sbar_view (int x, int y, int w, int h, grav_t gravity, view_t parent) sbar_view (int x, int y, int w, int h, grav_t gravity, view_t parent)
{ {
view_t view = View_New (hud_viewsys, parent); view_t view = View_New (sbar_viewsys, parent);
View_SetPos (view, x, y); View_SetPos (view, x, y);
View_SetLen (view, w, h); View_SetLen (view, w, h);
View_SetGravity (view, gravity); View_SetGravity (view, gravity);
@ -287,9 +297,9 @@ sbar_remcomponent (view_t view, uint32_t comp)
} }
static inline void static inline void
set_update (view_t view, hud_update_f func) set_update (view_t view, canvas_update_f func)
{ {
sbar_setcomponent (view, hud_updateonce, &func); sbar_setcomponent (view, canvas_updateonce, &func);
} }
#define STAT_MINUS 10 // num frame for '-' stats digit #define STAT_MINUS 10 // num frame for '-' stats digit
@ -298,7 +308,7 @@ static qpic_t *sb_nums[2][11];
static qpic_t *sb_colon, *sb_slash; static qpic_t *sb_colon, *sb_slash;
static qpic_t *sb_ibar[2]; static qpic_t *sb_ibar[2];
static int sb_ibar_index; static int sb_ibar_index;
static hud_subpic_t sb_miniammo[4]; static canvas_subpic_t sb_miniammo[4];
static qpic_t *sb_sbar; static qpic_t *sb_sbar;
static qpic_t *sb_scorebar; static qpic_t *sb_scorebar;
@ -307,7 +317,7 @@ static qpic_t *sb_scorebar;
static int sb_weapon_count; static int sb_weapon_count;
static int sb_weapon_view_count; static int sb_weapon_view_count;
static int sb_game; static int sb_game;
static hud_subpic_t sb_weapons[7][12]; static canvas_subpic_t sb_weapons[7][12];
static qpic_t *sb_ammo[7]; // rogue adds 3 ammo types static qpic_t *sb_ammo[7]; // rogue adds 3 ammo types
static qpic_t *sb_sigil[4]; static qpic_t *sb_sigil[4];
static qpic_t *sb_armor[3]; static qpic_t *sb_armor[3];
@ -440,7 +450,7 @@ draw_num (view_t *view, int num, int digits, int color)
if (l > digits) if (l > digits)
ptr += (l - digits); ptr += (l - digits);
while (digits > l) { while (digits > l) {
sbar_remcomponent (view[x++], hud_pic); sbar_remcomponent (view[x++], canvas_pic);
digits--; digits--;
} }
@ -450,7 +460,7 @@ draw_num (view_t *view, int num, int digits, int color)
else else
frame = *ptr - '0'; frame = *ptr - '0';
sbar_setcomponent (view[x++], hud_pic, &sb_nums[color][frame]); sbar_setcomponent (view[x++], canvas_pic, &sb_nums[color][frame]);
ptr++; ptr++;
} }
} }
@ -458,7 +468,7 @@ draw_num (view_t *view, int num, int digits, int color)
static void static void
draw_smallnum (view_t view, int n, int packed, int colored) draw_smallnum (view_t view, int n, int packed, int colored)
{ {
void *comp = sbar_getcomponent (view, hud_charbuff); void *comp = sbar_getcomponent (view, canvas_charbuff);
__auto_type charbuff = *(draw_charbuffer_t **) comp; __auto_type charbuff = *(draw_charbuffer_t **) comp;
char num[4]; char num[4];
@ -516,9 +526,9 @@ draw_ammo (view_t view)
view_t ammo = View_GetChild (view, 0); view_t ammo = View_GetChild (view, 0);
if (pic) { if (pic) {
sbar_setcomponent (ammo, hud_pic, &pic); sbar_setcomponent (ammo, canvas_pic, &pic);
} else { } else {
sbar_remcomponent (ammo, hud_pic); sbar_remcomponent (ammo, canvas_pic);
} }
view_t num[3] = { view_t num[3] = {
@ -582,10 +592,11 @@ draw_weapons (view_t view)
flashon = calc_flashon (time, mask, 2); flashon = calc_flashon (time, mask, 2);
if (flashon > 1) if (flashon > 1)
sb_updates = 0; // force update to remove flash sb_updates = 0; // force update to remove flash
sbar_setcomponent (weap, hud_subpic, &sb_weapons[flashon][i]); sbar_setcomponent (weap, canvas_subpic,
&sb_weapons[flashon][i]);
} }
} else { } else {
sbar_remcomponent (weap, hud_subpic); sbar_remcomponent (weap, canvas_subpic);
} }
} }
} }
@ -605,9 +616,9 @@ draw_items (view_t view)
-1, 1); -1, 1);
if (flashon > 1) if (flashon > 1)
sb_updates = 0; // force update to remove flash sb_updates = 0; // force update to remove flash
sbar_setcomponent (item, hud_pic, &sb_items[flashon][i]); sbar_setcomponent (item, canvas_pic, &sb_items[flashon][i]);
} else { } else {
sbar_remcomponent (item, hud_pic); sbar_remcomponent (item, canvas_pic);
} }
} }
} }
@ -618,9 +629,9 @@ draw_sigils (view_t view)
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
view_t sigil = View_GetChild (view, i); view_t sigil = View_GetChild (view, i);
if (sbar_stats[STAT_ITEMS] & (1 << (28 + i))) { if (sbar_stats[STAT_ITEMS] & (1 << (28 + i))) {
sbar_setcomponent (sigil, hud_pic, &sb_sigil[i]); sbar_setcomponent (sigil, canvas_pic, &sb_sigil[i]);
} else { } else {
sbar_remcomponent (sigil, hud_pic); sbar_remcomponent (sigil, canvas_pic);
} }
} }
} }
@ -777,69 +788,69 @@ draw_solo_time (void)
static void static void
draw_solo (view_t view) draw_solo (view_t view)
{ {
sbar_setcomponent (sbar_solo, hud_pic, &sb_scorebar); sbar_setcomponent (sbar_solo, canvas_pic, &sb_scorebar);
sbar_setcomponent (sbar_solo_monsters, hud_charbuff, &solo_monsters); sbar_setcomponent (sbar_solo_monsters, canvas_charbuff, &solo_monsters);
sbar_setcomponent (sbar_solo_secrets, hud_charbuff, &solo_secrets); sbar_setcomponent (sbar_solo_secrets, canvas_charbuff, &solo_secrets);
sbar_setcomponent (sbar_solo_time, hud_charbuff, &solo_time); sbar_setcomponent (sbar_solo_time, canvas_charbuff, &solo_time);
sbar_setcomponent (sbar_solo_name, hud_charbuff, &solo_name); sbar_setcomponent (sbar_solo_name, canvas_charbuff, &solo_name);
} }
static void static void
hide_solo (view_t view) hide_solo (view_t view)
{ {
sbar_remcomponent (sbar_solo, hud_pic); sbar_remcomponent (sbar_solo, canvas_pic);
sbar_remcomponent (sbar_solo_monsters, hud_charbuff); sbar_remcomponent (sbar_solo_monsters, canvas_charbuff);
sbar_remcomponent (sbar_solo_secrets, hud_charbuff); sbar_remcomponent (sbar_solo_secrets, canvas_charbuff);
sbar_remcomponent (sbar_solo_time, hud_charbuff); sbar_remcomponent (sbar_solo_time, canvas_charbuff);
sbar_remcomponent (sbar_solo_name, hud_charbuff); sbar_remcomponent (sbar_solo_name, canvas_charbuff);
} }
static void static void
clear_frags_bar (view_t view) clear_frags_bar (view_t view)
{ {
sbar_remcomponent (View_GetChild (view, 0), hud_fill); sbar_remcomponent (View_GetChild (view, 0), canvas_fill);
sbar_remcomponent (View_GetChild (view, 1), hud_fill); sbar_remcomponent (View_GetChild (view, 1), canvas_fill);
sbar_remcomponent (View_GetChild (view, 2), hud_charbuff); sbar_remcomponent (View_GetChild (view, 2), canvas_charbuff);
sbar_remcomponent (View_GetChild (view, 3), hud_func); sbar_remcomponent (View_GetChild (view, 3), canvas_func);
} }
static void static void
clear_minifrags_bar (view_t view) clear_minifrags_bar (view_t view)
{ {
clear_frags_bar (view); clear_frags_bar (view);
sbar_remcomponent (View_GetChild (view, 4), hud_charbuff); sbar_remcomponent (View_GetChild (view, 4), canvas_charbuff);
sbar_remcomponent (View_GetChild (view, 5), hud_charbuff); sbar_remcomponent (View_GetChild (view, 5), canvas_charbuff);
sbar_remcomponent (View_GetChild (view, 6), hud_charbuff); sbar_remcomponent (View_GetChild (view, 6), canvas_charbuff);
} }
static void static void
set_frags_bar (view_t view, byte top, byte bottom, draw_charbuffer_t *buff, set_frags_bar (view_t view, byte top, byte bottom, draw_charbuffer_t *buff,
hud_func_f func) canvas_func_f func)
{ {
sbar_setcomponent (View_GetChild (view, 0), hud_fill, &top); sbar_setcomponent (View_GetChild (view, 0), canvas_fill, &top);
sbar_setcomponent (View_GetChild (view, 1), hud_fill, &bottom); sbar_setcomponent (View_GetChild (view, 1), canvas_fill, &bottom);
sbar_setcomponent (View_GetChild (view, 2), hud_charbuff, &buff); sbar_setcomponent (View_GetChild (view, 2), canvas_charbuff, &buff);
if (func) { if (func) {
sbar_setcomponent (View_GetChild (view, 3), hud_func, &func); sbar_setcomponent (View_GetChild (view, 3), canvas_func, &func);
} else { } else {
sbar_remcomponent (View_GetChild (view, 3), hud_func); sbar_remcomponent (View_GetChild (view, 3), canvas_func);
} }
} }
static void static void
set_minifrags_bar (view_t view, byte top, byte bottom, draw_charbuffer_t *buff, set_minifrags_bar (view_t view, byte top, byte bottom, draw_charbuffer_t *buff,
hud_func_f func, draw_charbuffer_t *team, canvas_func_f func, draw_charbuffer_t *team,
draw_charbuffer_t *name) draw_charbuffer_t *name)
{ {
set_frags_bar (view, top, bottom, buff, func); set_frags_bar (view, top, bottom, buff, func);
if (team) { if (team) {
sbar_setcomponent (View_GetChild (view, 4), hud_charbuff, &team); sbar_setcomponent (View_GetChild (view, 4), canvas_charbuff, &team);
sbar_setcomponent (View_GetChild (view, 5), hud_charbuff, &name); sbar_setcomponent (View_GetChild (view, 5), canvas_charbuff, &name);
sbar_remcomponent (View_GetChild (view, 6), hud_charbuff); sbar_remcomponent (View_GetChild (view, 6), canvas_charbuff);
} else { } else {
sbar_remcomponent (View_GetChild (view, 4), hud_charbuff); sbar_remcomponent (View_GetChild (view, 4), canvas_charbuff);
sbar_remcomponent (View_GetChild (view, 5), hud_charbuff); sbar_remcomponent (View_GetChild (view, 5), canvas_charbuff);
sbar_setcomponent (View_GetChild (view, 6), hud_charbuff, &name); sbar_setcomponent (View_GetChild (view, 6), canvas_charbuff, &name);
} }
} }
@ -926,21 +937,21 @@ draw_minifrags (view_t view)
static void static void
clear_miniteam_bar (view_t view) clear_miniteam_bar (view_t view)
{ {
sbar_remcomponent (View_GetChild (view, 0), hud_charbuff); sbar_remcomponent (View_GetChild (view, 0), canvas_charbuff);
sbar_remcomponent (View_GetChild (view, 1), hud_charbuff); sbar_remcomponent (View_GetChild (view, 1), canvas_charbuff);
sbar_remcomponent (View_GetChild (view, 2), hud_func); sbar_remcomponent (View_GetChild (view, 2), canvas_func);
} }
static void static void
set_miniteam_bar (view_t view, draw_charbuffer_t *team, set_miniteam_bar (view_t view, draw_charbuffer_t *team,
draw_charbuffer_t *frags, hud_func_f func) draw_charbuffer_t *frags, canvas_func_f func)
{ {
sbar_setcomponent (View_GetChild (view, 0), hud_charbuff, &team); sbar_setcomponent (View_GetChild (view, 0), canvas_charbuff, &team);
sbar_setcomponent (View_GetChild (view, 1), hud_charbuff, &frags); sbar_setcomponent (View_GetChild (view, 1), canvas_charbuff, &frags);
if (func) { if (func) {
sbar_setcomponent (View_GetChild (view, 2), hud_func, &func); sbar_setcomponent (View_GetChild (view, 2), canvas_func, &func);
} else { } else {
sbar_remcomponent (View_GetChild (view, 2), hud_func); sbar_remcomponent (View_GetChild (view, 2), canvas_func);
} }
} }
@ -963,7 +974,7 @@ draw_miniteam (view_t view)
team_t *tm = teams + k; team_t *tm = teams + k;
__auto_type s = &sbar_players[k]; __auto_type s = &sbar_players[k];
view_t bar = View_GetChild (view, i); view_t bar = View_GetChild (view, i);
hud_func_f func = 0; canvas_func_f func = 0;
if (player_team && strnequal (player_team->value, tm->team, 16)) { if (player_team && strnequal (player_team->value, tm->team, 16)) {
func = frags_marker; func = frags_marker;
} }
@ -986,7 +997,7 @@ draw_face (view_t view)
return; return;
} }
if (sbar_stats[STAT_HEALTH] <= 0) {//FIXME hide_Face or hide_sbar if (sbar_stats[STAT_HEALTH] <= 0) {//FIXME hide_Face or hide_sbar
sbar_remcomponent (sbar_face, hud_pic); sbar_remcomponent (sbar_face, canvas_pic);
return; return;
} }
if ((sbar_stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY)) if ((sbar_stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY))
@ -1014,7 +1025,7 @@ draw_face (view_t view)
} }
face = sb_faces[f][anim]; face = sb_faces[f][anim];
} }
sbar_setcomponent (view, hud_pic, &face); sbar_setcomponent (view, canvas_pic, &face);
} }
static void static void
@ -1028,21 +1039,21 @@ draw_spectator (view_t view)
}; };
if (sbar_autotrack < 0) { if (sbar_autotrack < 0) {
sbar_setcomponent (back, hud_pic, &sb_scorebar); sbar_setcomponent (back, canvas_pic, &sb_scorebar);
sbar_setcomponent (notrack[0], hud_charbuff, &spec_buff[0]); sbar_setcomponent (notrack[0], canvas_charbuff, &spec_buff[0]);
sbar_setcomponent (notrack[1], hud_charbuff, &spec_buff[1]); sbar_setcomponent (notrack[1], canvas_charbuff, &spec_buff[1]);
sbar_remcomponent (tracking, hud_charbuff); sbar_remcomponent (tracking, canvas_charbuff);
} else { } else {
sbar_remcomponent (back, hud_pic); sbar_remcomponent (back, canvas_pic);
sbar_remcomponent (notrack[0], hud_charbuff); sbar_remcomponent (notrack[0], canvas_charbuff);
sbar_remcomponent (notrack[1], hud_charbuff); sbar_remcomponent (notrack[1], canvas_charbuff);
if (sbar_players[sbar_autotrack].name) { if (sbar_players[sbar_autotrack].name) {
write_charbuff_cl (spec_buff[3], 0, 0, write_charbuff_cl (spec_buff[3], 0, 0,
va (0, "Tracking %.13s, [JUMP] for next", va (0, "Tracking %.13s, [JUMP] for next",
sbar_players[sbar_autotrack].name->value)); sbar_players[sbar_autotrack].name->value));
sbar_setcomponent (tracking, hud_charbuff, &spec_buff[3]); sbar_setcomponent (tracking, canvas_charbuff, &spec_buff[3]);
} else { } else {
sbar_setcomponent (tracking, hud_charbuff, &spec_buff[2]); sbar_setcomponent (tracking, canvas_charbuff, &spec_buff[2]);
} }
} }
} }
@ -1051,8 +1062,8 @@ static void
hide_spectator (view_t view) hide_spectator (view_t view)
{ {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
sbar_remcomponent (View_GetChild (view, i), hud_charbuff); sbar_remcomponent (View_GetChild (view, i), canvas_charbuff);
sbar_remcomponent (View_GetChild (view, i), hud_pic); sbar_remcomponent (View_GetChild (view, i), canvas_pic);
} }
} }
@ -1070,13 +1081,13 @@ draw_armor (view_t view)
} else { } else {
draw_num (num, sbar_stats[STAT_ARMOR], 3, sbar_stats[STAT_ARMOR] <= 25); draw_num (num, sbar_stats[STAT_ARMOR], 3, sbar_stats[STAT_ARMOR] <= 25);
if (sbar_stats[STAT_ITEMS] & IT_ARMOR3) if (sbar_stats[STAT_ITEMS] & IT_ARMOR3)
sbar_setcomponent (armor, hud_pic, &sb_armor[2]); sbar_setcomponent (armor, canvas_pic, &sb_armor[2]);
else if (sbar_stats[STAT_ITEMS] & IT_ARMOR2) else if (sbar_stats[STAT_ITEMS] & IT_ARMOR2)
sbar_setcomponent (armor, hud_pic, &sb_armor[1]); sbar_setcomponent (armor, canvas_pic, &sb_armor[1]);
else if (sbar_stats[STAT_ITEMS] & IT_ARMOR1) else if (sbar_stats[STAT_ITEMS] & IT_ARMOR1)
sbar_setcomponent (armor, hud_pic, &sb_armor[0]); sbar_setcomponent (armor, canvas_pic, &sb_armor[0]);
else else
sbar_remcomponent (armor, hud_pic); sbar_remcomponent (armor, canvas_pic);
} }
} }
@ -1097,11 +1108,11 @@ draw_rogue_ctf_face (view_t view)
__auto_type p = &sbar_players[sbar_viewplayer]; __auto_type p = &sbar_players[sbar_viewplayer];
byte top = Sbar_ColorForMap (p->topcolor); byte top = Sbar_ColorForMap (p->topcolor);
byte bottom = Sbar_ColorForMap (p->bottomcolor); byte bottom = Sbar_ColorForMap (p->bottomcolor);
sbar_setcomponent (View_GetChild (view, 0), hud_fill, &top); sbar_setcomponent (View_GetChild (view, 0), canvas_fill, &top);
sbar_setcomponent (View_GetChild (view, 1), hud_fill, &bottom); sbar_setcomponent (View_GetChild (view, 1), canvas_fill, &bottom);
sbar_setcomponent (View_GetChild (view, 2), hud_charbuff, sbar_setcomponent (View_GetChild (view, 2), canvas_charbuff,
&sb_frags[sbar_viewplayer]); &sb_frags[sbar_viewplayer]);
sbar_setcomponent (view, hud_pic, &rsb_teambord); sbar_setcomponent (view, canvas_pic, &rsb_teambord);
} }
static void static void
@ -1124,7 +1135,7 @@ static void
setup_spect (view_t spect, int player) setup_spect (view_t spect, int player)
{ {
view_t v = sbar_view (0, 0, 88, 4, grav_north, spect); view_t v = sbar_view (0, 0, 88, 4, grav_north, spect);
sbar_setcomponent (v, hud_charbuff, &sb_spectator); sbar_setcomponent (v, canvas_charbuff, &sb_spectator);
} }
typedef struct dmo_def_s { typedef struct dmo_def_s {
@ -1301,7 +1312,7 @@ make_dmo_line (view_t parent, int player, int line_type)
grav_northwest, line); grav_northwest, line);
if (d->buffer) { if (d->buffer) {
draw_charbuffer_t *buff = d->buffer[player]; draw_charbuffer_t *buff = d->buffer[player];
sbar_setcomponent (v, hud_charbuff, &buff); sbar_setcomponent (v, canvas_charbuff, &buff);
} else if (d->setup) { } else if (d->setup) {
d->setup (v, player); d->setup (v, player);
} }
@ -1621,8 +1632,8 @@ Sbar_DrawCenterString (view_t view, unsigned remaining)
static void static void
clear_views (view_t view) clear_views (view_t view)
{ {
sbar_remcomponent (view, hud_cachepic); sbar_remcomponent (view, canvas_cachepic);
sbar_remcomponent (view, hud_pic); sbar_remcomponent (view, canvas_pic);
for (uint32_t i = 0; i < View_ChildCount (view); i++) { for (uint32_t i = 0; i < View_ChildCount (view); i++) {
clear_views (View_GetChild (view, i)); clear_views (View_GetChild (view, i));
@ -1635,9 +1646,9 @@ draw_intermission (view_t view)
clear_views (view); clear_views (view);
const char *n; const char *n;
n = "gfx/complete.lmp"; n = "gfx/complete.lmp";
sbar_setcomponent (View_GetChild (view, 0), hud_cachepic, &n); sbar_setcomponent (View_GetChild (view, 0), canvas_cachepic, &n);
n = "gfx/inter.lmp"; n = "gfx/inter.lmp";
sbar_setcomponent (View_GetChild (view, 1), hud_cachepic, &n); sbar_setcomponent (View_GetChild (view, 1), canvas_cachepic, &n);
view_t time_views[] = { view_t time_views[] = {
View_GetChild (intermission_time, 0), View_GetChild (intermission_time, 0),
@ -1650,7 +1661,7 @@ draw_intermission (view_t view)
int dig = sbar_completed_time / 60; int dig = sbar_completed_time / 60;
int num = sbar_completed_time - dig * 60; int num = sbar_completed_time - dig * 60;
draw_num (time_views + 0, dig, 3, 0); draw_num (time_views + 0, dig, 3, 0);
sbar_setcomponent (time_views[3], hud_pic, &sb_colon); sbar_setcomponent (time_views[3], canvas_pic, &sb_colon);
draw_num (time_views + 4, num, 2, 0); draw_num (time_views + 4, num, 2, 0);
view_t secr_views[] = { view_t secr_views[] = {
@ -1663,7 +1674,7 @@ draw_intermission (view_t view)
View_GetChild (intermission_secr, 6), View_GetChild (intermission_secr, 6),
}; };
draw_num (secr_views + 0, sbar_stats[STAT_SECRETS], 3, 0); draw_num (secr_views + 0, sbar_stats[STAT_SECRETS], 3, 0);
sbar_setcomponent (secr_views[3], hud_pic, &sb_slash); sbar_setcomponent (secr_views[3], canvas_pic, &sb_slash);
draw_num (secr_views + 4, sbar_stats[STAT_TOTALSECRETS], 3, 0); draw_num (secr_views + 4, sbar_stats[STAT_TOTALSECRETS], 3, 0);
view_t kill_views[] = { view_t kill_views[] = {
@ -1676,7 +1687,7 @@ draw_intermission (view_t view)
View_GetChild (intermission_kill, 6), View_GetChild (intermission_kill, 6),
}; };
draw_num (kill_views + 0, sbar_stats[STAT_MONSTERS], 3, 0); draw_num (kill_views + 0, sbar_stats[STAT_MONSTERS], 3, 0);
sbar_setcomponent (kill_views[3], hud_pic, &sb_slash); sbar_setcomponent (kill_views[3], canvas_pic, &sb_slash);
draw_num (kill_views + 4, sbar_stats[STAT_TOTALMONSTERS], 3, 0); draw_num (kill_views + 4, sbar_stats[STAT_TOTALMONSTERS], 3, 0);
} }
@ -1688,7 +1699,7 @@ draw_finale (view_t view)
r_data->scr_copyeverything = 1; r_data->scr_copyeverything = 1;
const char *n = "gfx/finale.lmp"; const char *n = "gfx/finale.lmp";
sbar_setcomponent (View_GetChild (view, 2), hud_cachepic, &n); sbar_setcomponent (View_GetChild (view, 2), canvas_cachepic, &n);
} }
static void static void
@ -1700,7 +1711,7 @@ draw_cutscene (view_t view)
void void
Sbar_Intermission (int mode, double completed_time) Sbar_Intermission (int mode, double completed_time)
{ {
static hud_update_f intermission_funcs[2][3] = { static canvas_update_f intermission_funcs[2][3] = {
{ draw_intermission, draw_finale, draw_cutscene, }, { draw_intermission, draw_finale, draw_cutscene, },
{ draw_deathmatch, draw_finale, draw_cutscene, }, { draw_deathmatch, draw_finale, draw_cutscene, },
}; };
@ -1838,12 +1849,12 @@ update_weapon (int stat)
if (hud_sbar) { if (hud_sbar) {
// shouldn't need to sort the pics because the component is already // shouldn't need to sort the pics because the component is already
// on the entity, so the position in the pool won't be affected // on the entity, so the position in the pool won't be affected
sbar_setcomponent (sbar_inventory, hud_pic, &sb_ibar[sb_ibar_index]); sbar_setcomponent (sbar_inventory, canvas_pic, &sb_ibar[sb_ibar_index]);
} else { } else {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
view_t v = View_GetChild (sbar_miniammo, i); view_t v = View_GetChild (sbar_miniammo, i);
sb_miniammo[i].pic = sb_ibar[sb_ibar_index]; sb_miniammo[i].pic = sb_ibar[sb_ibar_index];
sbar_setcomponent (v, hud_subpic, &sb_miniammo[i]); sbar_setcomponent (v, canvas_subpic, &sb_miniammo[i]);
} }
} }
} }
@ -2019,22 +2030,6 @@ sbar_hud_swap_f (void *data, const cvar_t *cvar)
View_UpdateHierarchy (hud_view); View_UpdateHierarchy (hud_view);
} }
static int
href_cmp (const void *_a, const void *_b, void *arg)
{
uint32_t enta = *(const uint32_t *)_a;
uint32_t entb = *(const uint32_t *)_b;
ecs_registry_t *reg = hud_viewsys.reg;
uint32_t href = hud_viewsys.base + view_href;
hierref_t *ref_a = Ent_GetComponent (enta, href, reg);
hierref_t *ref_b = Ent_GetComponent (entb, href, reg);
if (ref_a->hierarchy == ref_b->hierarchy) {
return ref_a->index - ref_b->index;
}
ptrdiff_t diff = ref_a->hierarchy - ref_b->hierarchy;
return diff > 0 ? 1 : diff < 0 ? -1 : 0;
}
static void static void
set_hud_sbar (void) set_hud_sbar (void)
{ {
@ -2059,8 +2054,8 @@ set_hud_sbar (void)
View_SetLen (v, sb_weapons[0][i].pic->width, 16); View_SetLen (v, sb_weapons[0][i].pic->width, 16);
x += sb_weapons[0][i].pic->width; x += sb_weapons[0][i].pic->width;
if (sbar_hascomponent (v, hud_subpic)) { if (sbar_hascomponent (v, canvas_subpic)) {
hud_subpic_t *subpic = sbar_getcomponent(v, hud_subpic); canvas_subpic_t *subpic = sbar_getcomponent(v, canvas_subpic);
subpic->w = subpic->pic->width; subpic->w = subpic->pic->width;
} }
} }
@ -2068,7 +2063,7 @@ set_hud_sbar (void)
v = View_GetChild (sbar_miniammo, i); v = View_GetChild (sbar_miniammo, i);
View_SetPos (v, i * 48 + 10, 0); View_SetPos (v, i * 48 + 10, 0);
View_SetLen (v, 42, 8); View_SetLen (v, 42, 8);
sbar_remcomponent (v, hud_subpic); sbar_remcomponent (v, canvas_subpic);
} }
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
for (int j = 0; j < sb_weapon_view_count; j++) { for (int j = 0; j < sb_weapon_view_count; j++) {
@ -2079,10 +2074,10 @@ set_hud_sbar (void)
} }
} }
sbar_setcomponent (sbar_inventory, hud_pic, &sb_ibar[sb_ibar_index]); sbar_setcomponent (sbar_inventory, canvas_pic, &sb_ibar[sb_ibar_index]);
sbar_setcomponent (sbar_statusbar, hud_pic, &sb_sbar); sbar_setcomponent (sbar_statusbar, canvas_pic, &sb_sbar);
sbar_setcomponent (sbar_tile[0], hud_tile, 0); sbar_setcomponent (sbar_tile[0], canvas_tile, 0);
sbar_setcomponent (sbar_tile[1], hud_tile, 0); sbar_setcomponent (sbar_tile[1], canvas_tile, 0);
} else { } else {
View_SetParent (sbar_armament, hud_view); View_SetParent (sbar_armament, hud_view);
View_SetPos (sbar_armament, 0, 48); View_SetPos (sbar_armament, 0, 48);
@ -2100,8 +2095,8 @@ set_hud_sbar (void)
View_SetPos (v, 0, i * 16); View_SetPos (v, 0, i * 16);
View_SetLen (v, 24, 16); View_SetLen (v, 24, 16);
if (sbar_hascomponent (v, hud_subpic)) { if (sbar_hascomponent (v, canvas_subpic)) {
hud_subpic_t *subpic = sbar_getcomponent(v, hud_subpic); canvas_subpic_t *subpic = sbar_getcomponent(v, canvas_subpic);
subpic->w = 24; subpic->w = 24;
} }
} }
@ -2109,7 +2104,7 @@ set_hud_sbar (void)
v = View_GetChild (sbar_miniammo, i); v = View_GetChild (sbar_miniammo, i);
View_SetPos (v, 0, i * 11); View_SetPos (v, 0, i * 11);
View_SetLen (v, 42, 11); View_SetLen (v, 42, 11);
sbar_setcomponent (v, hud_subpic, &sb_miniammo[i]); sbar_setcomponent (v, canvas_subpic, &sb_miniammo[i]);
} }
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
for (int j = 0; j < sb_weapon_view_count; j++) { for (int j = 0; j < sb_weapon_view_count; j++) {
@ -2120,13 +2115,12 @@ set_hud_sbar (void)
} }
} }
sbar_remcomponent (sbar_inventory, hud_pic); sbar_remcomponent (sbar_inventory, canvas_pic);
sbar_remcomponent (sbar_statusbar, hud_pic); sbar_remcomponent (sbar_statusbar, canvas_pic);
sbar_remcomponent (sbar_tile[0], hud_tile); sbar_remcomponent (sbar_tile[0], canvas_tile);
sbar_remcomponent (sbar_tile[1], hud_tile); sbar_remcomponent (sbar_tile[1], canvas_tile);
} }
ECS_SortComponentPool (hud_system.reg, hud_system.base + hud_pic, Canvas_SortComponentPool (cl_canvas_sys, hud_canvas, canvas_pic);
href_cmp, 0);
} }
static void static void
@ -2141,11 +2135,11 @@ sbar_hud_fps_f (void *data, const cvar_t *cvar)
{ {
if (hud_fps) { if (hud_fps) {
void *f = draw_fps; void *f = draw_fps;
sbar_setcomponent (hud_fps_view, hud_update, &f); sbar_setcomponent (hud_fps_view, canvas_update, &f);
sbar_setcomponent (hud_fps_view, hud_charbuff, &fps_buff); sbar_setcomponent (hud_fps_view, canvas_charbuff, &fps_buff);
} else { } else {
sbar_remcomponent (hud_fps_view, hud_update); sbar_remcomponent (hud_fps_view, canvas_update);
sbar_remcomponent (hud_fps_view, hud_charbuff); sbar_remcomponent (hud_fps_view, canvas_charbuff);
} }
} }
@ -2153,9 +2147,9 @@ static void
sbar_hud_ping_f (void *data, const cvar_t *cvar) sbar_hud_ping_f (void *data, const cvar_t *cvar)
{ {
if (hud_ping) { if (hud_ping) {
sbar_setcomponent (hud_ping_view, hud_charbuff, &ping_buff); sbar_setcomponent (hud_ping_view, canvas_charbuff, &ping_buff);
} else { } else {
sbar_remcomponent (hud_ping_view, hud_charbuff); sbar_remcomponent (hud_ping_view, canvas_charbuff);
} }
} }
@ -2163,9 +2157,9 @@ static void
sbar_hud_pl_f (void *data, const cvar_t *cvar) sbar_hud_pl_f (void *data, const cvar_t *cvar)
{ {
if (hud_pl) { if (hud_pl) {
sbar_setcomponent (hud_pl_view, hud_charbuff, &pl_buff); sbar_setcomponent (hud_pl_view, canvas_charbuff, &pl_buff);
} else { } else {
sbar_remcomponent (hud_pl_view, hud_charbuff); sbar_remcomponent (hud_pl_view, canvas_charbuff);
} }
} }
@ -2174,11 +2168,11 @@ sbar_hud_time_f (void *data, const cvar_t *cvar)
{ {
if (hud_time) { if (hud_time) {
void *f = draw_time; void *f = draw_time;
sbar_setcomponent (hud_time_view, hud_update, &f); sbar_setcomponent (hud_time_view, canvas_update, &f);
sbar_setcomponent (hud_time_view, hud_charbuff, &time_buff); sbar_setcomponent (hud_time_view, canvas_charbuff, &time_buff);
} else { } else {
sbar_remcomponent (hud_time_view, hud_update); sbar_remcomponent (hud_time_view, canvas_update);
sbar_remcomponent (hud_time_view, hud_charbuff); sbar_remcomponent (hud_time_view, canvas_charbuff);
} }
} }
@ -2217,7 +2211,7 @@ static void
init_sbar_views (void) init_sbar_views (void)
{ {
create_views (sbar_defs, nullview); create_views (sbar_defs, nullview);
view_pos_t slen = View_GetLen (cl_screen_view); view_pos_t slen = View_GetLen (hud_canvas_view);
view_pos_t hlen = View_GetLen (hud_view); view_pos_t hlen = View_GetLen (hud_view);
View_SetLen (hud_view, slen.x, hlen.y); View_SetLen (hud_view, slen.x, hlen.y);
View_SetResize (hud_view, 1, 0); View_SetResize (hud_view, 1, 0);
@ -2226,7 +2220,7 @@ init_sbar_views (void)
view_t v = View_GetChild (sbar_miniammo, i); view_t v = View_GetChild (sbar_miniammo, i);
draw_charbuffer_t *buffer = Draw_CreateBuffer (3, 1); draw_charbuffer_t *buffer = Draw_CreateBuffer (3, 1);
Draw_ClearBuffer (buffer); Draw_ClearBuffer (buffer);
sbar_setcomponent (v, hud_charbuff, &buffer); sbar_setcomponent (v, canvas_charbuff, &buffer);
} }
if (r_data->vid->width > 320) { if (r_data->vid->width > 320) {
@ -2235,8 +2229,8 @@ init_sbar_views (void)
View_SetLen (sbar_tile[0], l, 48); View_SetLen (sbar_tile[0], l, 48);
View_SetPos (sbar_tile[1], -l, 0); View_SetPos (sbar_tile[1], -l, 0);
View_SetLen (sbar_tile[1], l, 48); View_SetLen (sbar_tile[1], l, 48);
sbar_setcomponent (sbar_tile[0], hud_tile, 0); sbar_setcomponent (sbar_tile[0], canvas_tile, 0);
sbar_setcomponent (sbar_tile[1], hud_tile, 0); sbar_setcomponent (sbar_tile[1], canvas_tile, 0);
} }
solo_monsters = Draw_CreateBuffer (17, 1); solo_monsters = Draw_CreateBuffer (17, 1);
@ -2264,7 +2258,7 @@ init_sbar_views (void)
static void static void
init_views (void) init_views (void)
{ {
hud_stuff_view = sbar_view (0, 48, 152, 16, grav_southwest, cl_screen_view); hud_stuff_view = sbar_view (0, 48, 152, 16, grav_southwest, hud_canvas_view);
hud_time_view = sbar_view (8, 0, 64, 8, grav_northwest, hud_stuff_view); hud_time_view = sbar_view (8, 0, 64, 8, grav_northwest, hud_stuff_view);
hud_fps_view = sbar_view (80, 0, 80, 8, grav_northwest, hud_stuff_view); hud_fps_view = sbar_view (80, 0, 80, 8, grav_northwest, hud_stuff_view);
hud_ping_view = sbar_view (0, 8, 48, 0, grav_northwest, hud_stuff_view); hud_ping_view = sbar_view (0, 8, 48, 0, grav_northwest, hud_stuff_view);
@ -2497,7 +2491,7 @@ load_pics (void)
sb_ibar[1] = sb_ibar[0]; sb_ibar[1] = sb_ibar[0];
} }
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
sb_miniammo[i] = (hud_subpic_t) { sb_miniammo[i] = (canvas_subpic_t) {
.pic = sb_ibar[0], .pic = sb_ibar[0],
.x = 3 + (i * 48), .x = 3 + (i * 48),
.y = 0, .y = 0,
@ -2554,6 +2548,11 @@ Sbar_Init (int *stats, float *item_gettime)
sbar_stats = stats; sbar_stats = stats;
sbar_item_gettime = item_gettime; sbar_item_gettime = item_gettime;
sbar_viewsys = (ecs_system_t) {
.reg = cl_canvas_sys.reg,
.base = cl_canvas_sys.view_base,
};
center_passage.reg = hud_psgsys.reg; center_passage.reg = hud_psgsys.reg;
center_passage.comp_base = hud_psgsys.base; center_passage.comp_base = hud_psgsys.base;
HUD_Init_Cvars (); HUD_Init_Cvars ();

10
qw/source/cl_ngraph.c
View file

@ -40,6 +40,7 @@
#include "QF/render.h" #include "QF/render.h"
#include "QF/screen.h" #include "QF/screen.h"
#include "QF/va.h" #include "QF/va.h"
#include "QF/ui/canvas.h"
#include "QF/ui/view.h" #include "QF/ui/view.h"
#include "client/hud.h" #include "client/hud.h"
@ -156,12 +157,17 @@ CL_NetGraph (view_pos_t abs, view_pos_t len)
void void
CL_NetGraph_Init (void) CL_NetGraph_Init (void)
{ {
cl_netgraph_view = View_New (hud_viewsys, cl_screen_view); ecs_system_t vsys = {
.reg = cl_canvas_sys.reg,
.base = cl_canvas_sys.view_base,
};
cl_netgraph_view = View_New (vsys, cl_screen_view);
View_SetPos (cl_netgraph_view, 0, 64); View_SetPos (cl_netgraph_view, 0, 64);
View_SetLen (cl_netgraph_view, NET_TIMINGS + 16, cl_netgraph_height + 25); View_SetLen (cl_netgraph_view, NET_TIMINGS + 16, cl_netgraph_height + 25);
View_SetGravity (cl_netgraph_view, grav_southwest); View_SetGravity (cl_netgraph_view, grav_southwest);
void *f = CL_NetGraph; void *f = CL_NetGraph;
Ent_SetComponent (cl_netgraph_view.id, hud_func, cl_netgraph_view.reg, &f); Ent_SetComponent (cl_netgraph_view.id, canvas_func,
cl_netgraph_view.reg, &f);
View_SetVisible (cl_netgraph_view, cl_netgraph); View_SetVisible (cl_netgraph_view, cl_netgraph);
} }