qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/client/cl_screen.c

342 lines
8.4 KiB
C
Raw Normal View History

gl_screen.c and screen.c are now client clean (and merged :)
2001-05-23 06:33:23 +00:00
/*
cl_screen.c
master for refresh, status bar, console, chat, notify, etc
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
re-arrange things so __attribute__ and __builtin_expect are properly autoconfiscated so rcsid will continue to work with gcc 3.3
2003-01-15 15:31:36 +00:00
gl_screen.c and screen.c are now client clean (and merged :)
2001-05-23 06:33:23 +00:00
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <time.h>
#include "QF/console.h"
no header includes cvar.h now
2001-05-31 03:41:35 +00:00
#include "QF/cvar.h"
gl_screen.c and screen.c are now client clean (and merged :)
2001-05-23 06:33:23 +00:00
#include "QF/draw.h"
nuke QF/texture.h moving it's contents into QF/image.h (yay, finally, a real home for tex_t:)
2003-09-04 18:59:39 +00:00
#include "QF/image.h"
gl_screen.c and screen.c are now client clean (and merged :)
2001-05-23 06:33:23 +00:00
#include "QF/pcx.h"
#include "QF/screen.h"
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
#include "QF/plugin/console.h"
[console] Switch to using a canvas for the console While the console background is broken in that alpha doesn't work, it's now rendered correctly in all renderers.
2023-01-21 18:45:50 +00:00
#include "QF/plugin/general.h"
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
#include "QF/plugin/vid_render.h"
[renderer] Use scene_t to set the model data This replaces *_NewMap with *_NewScene and adds SCR_NewScene to handle loading a new map (for quake) in the renderer, and will eventually be how any new scene is loaded.
2022-05-05 05:41:46 +00:00
#include "QF/scene/scene.h"
[renderer] Pass in a camera transform More r_data cleanup. Things could be better still, but this is a start.
2022-02-28 07:59:38 +00:00
#include "QF/scene/transform.h"
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
#include "QF/ui/canvas.h"
[video] Use views instead of conwidth and conheight conwidth and conheight have been moved into vid.conview (probably change the name at some time), and scr_vrect has been replaced by a view as well. This makes it much easier to create 2d elements that follow the screen size (taking advantage of a view's gravity) which will, in the end, make changing the window size easier.
2021-07-10 09:04:34 +00:00
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
#include "r_local.h" //FIXME for r_cache_thrash
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#include "client/hud.h"
[client] Move sbar.h into client Where it belongs :P
2022-12-01 04:11:16 +00:00
#include "client/sbar.h"
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
#include "client/screen.h"
#include "client/view.h"
[renderer] Support multiple entity queues While there's currently only the one still, this will allow the entities to be multiply queued for multi-pass rendering (eg, shadows). As the avoidance of putting an entity in the same queue more than once relies on the entity id, all entities now come from the scene (which is stored in cl_world in the client code for nq and qw), thus the extensive changes in the clients.
2022-03-04 16:48:10 +00:00
#include "client/world.h"
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
//#include "nq/include/client.h"
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
int scr_showpause;
static cvar_t scr_showpause_cvar = {
.name = "showpause",
.description =
"Toggles display of pause graphic",
.default_value = "1",
.flags = CVAR_NONE,
.value = { .type = &cexpr_int, .value = &scr_showpause },
};
int scr_showram;
static cvar_t scr_showram_cvar = {
.name = "showram",
.description =
"Show RAM icon if game is running low on memory",
.default_value = "1",
.flags = CVAR_NONE,
.value = { .type = &cexpr_int, .value = &scr_showram },
};
int scr_showturtle;
static cvar_t scr_showturtle_cvar = {
.name = "showturtle",
.description =
"Show a turtle icon if your fps is below 10",
.default_value = "0",
.flags = CVAR_NONE,
.value = { .type = &cexpr_int, .value = &scr_showturtle },
};
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
view_t cl_screen_view;
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
uint32_t cl_canvas;
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static view_t net_view;
static view_t timegraph_view;
static view_t zgraph_view;
static view_t loading_view;
static view_t ram_view;
static view_t turtle_view;
static view_t pause_view;
[client] Move cshift into client screen canvas This fixes cshifts affecting the console and debug canvases. The crosshair and center print have also been moved for the same reason.
2023-07-08 05:32:02 +00:00
static view_t crosshair_view;
static view_t cshift_view;
static view_t centerprint_view;
Revive the loading plaque. At the request of scar3crow.
2011-12-09 09:41:52 +00:00
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
static viewstate_t *_vs;//FIXME ick
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
canvas_system_t cl_canvas_sys;
[client] Clean up screen view creation
2023-07-08 05:04:29 +00:00
static ecs_system_t cl_view_system;
static view_t
clscr_view (int x, int y, int w, int h, grav_t gravity)
{
auto view = View_New (cl_view_system, cl_screen_view);
View_SetPos (view, x, y);
View_SetLen (view, w, h);
View_SetGravity (view, gravity);
View_SetVisible (view, 0);
return view;
}
static void
clscr_set_pic (view_t view, qpic_t *pic)
{
Ent_SetComponent (view.id, canvas_pic, view.reg, &pic);
}
static void
clscr_set_cachepic (view_t view, const char *name)
{
Ent_SetComponent (view.id, canvas_cachepic, view.reg, &name);
}
static void
clscr_set_canvas_func (view_t view, canvas_func_f func)
{
Ent_SetComponent (view.id, canvas_func, view.reg, &func);
}
Revamp cshifts and implement in glsl. The renderer should now be free of any direct access to client code. Even 3d rendering is now done via a function pointer. The cshift code is done as a 2d screen function.
2012-01-28 11:45:14 +00:00
static void
[client] Move cshift into client screen canvas This fixes cshifts affecting the console and debug canvases. The crosshair and center print have also been moved for the same reason.
2023-07-08 05:32:02 +00:00
cl_draw_crosshair (view_pos_t abs, view_pos_t len)
{
r_funcs->Draw_Crosshair ();
}
static void
cl_draw_centerprint (view_pos_t abs, view_pos_t len)
{
Sbar_DrawCenterPrint ();
}
static void
SCR_CShift (view_pos_t abs, view_pos_t len)
Revamp cshifts and implement in glsl. The renderer should now be free of any direct access to client code. Even 3d rendering is now done via a function pointer. The cshift code is done as a 2d screen function.
2012-01-28 11:45:14 +00:00
{
mleaf_t *leaf;
int contents = CONTENTS_EMPTY;
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
if (_vs->active && cl_world.scene->worldmodel) {
[renderer] Pass in a camera transform More r_data cleanup. Things could be better still, but this is a start.
2022-02-28 07:59:38 +00:00
vec4f_t origin;
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
origin = Transform_GetWorldPosition (_vs->camera_transform);
[model] Clean up the brush leaf api a little Those functions now all take mod_brush_t since they don't work with any other type of model.
2023-06-28 12:45:41 +00:00
leaf = Mod_PointInLeaf (origin, &cl_world.scene->worldmodel->brush);
Revamp cshifts and implement in glsl. The renderer should now be free of any direct access to client code. Even 3d rendering is now done via a function pointer. The cshift code is done as a 2d screen function.
2012-01-28 11:45:14 +00:00
contents = leaf->contents;
}
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
V_SetContentsColor (_vs, contents);
r_funcs->Draw_BlendScreen (_vs->cshift_color);
Revamp cshifts and implement in glsl. The renderer should now be free of any direct access to client code. Even 3d rendering is now done via a function pointer. The cshift code is done as a 2d screen function.
2012-01-28 11:45:14 +00:00
}
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
static void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
scr_draw_views (void)
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
if (scr_showturtle) {
static int count;
if (r_data->frametime < 0.1) {
count = 0;
} else {
count++;
}
View_SetVisible (turtle_view, count > 2);
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
// turn off for screenshots
View_SetVisible (pause_view, scr_showpause && r_data->paused);
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
View_SetVisible (ram_view, scr_showram && r_cache_thrash);
[client] Use realtime for net icon check viewstate's time is from cl.time which is not what's used to set last_servermessage (that uses realtime). After careful investigation, I found that cl.time is not at all suitable and that the original id code used realtime (I think it was just me being lazy when I merged the code). Fixes the stuck net icon.
2022-12-01 08:50:13 +00:00
double msg_time = _vs->realtime - _vs->last_servermessage;
View_SetVisible (net_view, (!_vs->demoplayback && msg_time >= 0.3));
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
View_SetVisible (loading_view, _vs->loading);
[client] Move cshift into client screen canvas This fixes cshifts affecting the console and debug canvases. The crosshair and center print have also been moved for the same reason.
2023-07-08 05:32:02 +00:00
View_SetVisible (crosshair_view, !_vs->intermission);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
// FIXME cvar callbacks
View_SetVisible (timegraph_view, r_timegraph);
View_SetVisible (zgraph_view, r_zgraph);
[qw] Move netgraph below the console Also, make nq draw the vid views (in theory, it loads too fast to see the loading pic).
2021-07-11 03:05:14 +00:00
[console] Switch to using a canvas for the console While the console background is broken in that alpha doesn't work, it's now rendered correctly in all renderers.
2023-01-21 18:45:50 +00:00
Con_DrawConsole ();
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
Canvas_Draw (cl_canvas_sys);
}
gl_screen.c and screen.c are now client clean (and merged :)
2001-05-23 06:33:23 +00:00
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
static SCR_Func scr_funcs[] = {
[nq,qw] Minimize differences in cl_screen.c
2022-11-01 12:00:40 +00:00
scr_draw_views,
first step of centerprint/finale cleanup. fixes the misplaced text for end-of-episode text
2004-03-01 23:47:39 +00:00
0
};
[client] Further decouple screen and console The wording might seem a little odd, but cl_screen is really the full 2D client HUD while the console is completely independent of the client and shouldn't know that the client even exists. Ideally, the resize events would be handled by the canvas system, to which end this is a small step.
2023-01-16 04:23:44 +00:00
static int cl_scale;
static int cl_xlen;
static int cl_ylen;
static void
cl_set_size (void)
{
int xlen = cl_xlen / cl_scale;
int ylen = cl_ylen / cl_scale;
[ui] Make Canvas_SetLen operate on only one canvas I plan on using sub-canvases to fix the imui window overlap issue and don't want the windows being affected by (eg) hud canvas size changes.
2023-07-08 11:56:40 +00:00
//printf ("cl_set_size: %d %d %d\n", cl_scale, xlen, ylen);
Canvas_SetLen (cl_canvas_sys, cl_canvas, (view_pos_t) { xlen, ylen });
Canvas_SetLen (cl_canvas_sys, hud_canvas, (view_pos_t) { xlen, ylen });
[client] Further decouple screen and console The wording might seem a little odd, but cl_screen is really the full 2D client HUD while the console is completely independent of the client and shouldn't know that the client even exists. Ideally, the resize events would be handled by the canvas system, to which end this is a small step.
2023-01-16 04:23:44 +00:00
}
static void
cl_scale_listener (void *data, const cvar_t *cvar)
{
cl_scale = *(int *) cvar->value.value;
cl_set_size ();
}
static void
cl_vidsize_listener (void *data, const viddef_t *vdef)
{
cl_xlen = vdef->width;
cl_ylen = vdef->height;
cl_set_size ();
}
[client] Clean up screen view creation
2023-07-08 05:04:29 +00:00
static void
cl_create_views (void)
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
{
qpic_t *pic;
[client] Clean up screen view creation
2023-07-08 05:04:29 +00:00
const char *name;
[client] Move cshift into client screen canvas This fixes cshifts affecting the console and debug canvases. The crosshair and center print have also been moved for the same reason.
2023-07-08 05:32:02 +00:00
auto vid = r_data->vid;
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
[client] Clean up screen view creation
2023-07-08 05:04:29 +00:00
pic = r_funcs->Draw_PicFromWad ("ram");
ram_view = clscr_view (32, 0, pic->width, pic->height, grav_northwest);
clscr_set_pic (ram_view, pic);
pic = r_funcs->Draw_PicFromWad ("turtle");
turtle_view = clscr_view (32, 0, pic->width, pic->height, grav_northwest);
clscr_set_pic (turtle_view, pic);
pic = r_funcs->Draw_PicFromWad ("net");
net_view = clscr_view (64, 0, pic->width, pic->height, grav_northwest);
clscr_set_pic (net_view, pic);
[client] Move cshift into client screen canvas This fixes cshifts affecting the console and debug canvases. The crosshair and center print have also been moved for the same reason.
2023-07-08 05:32:02 +00:00
timegraph_view = clscr_view (0, 0, vid->width, 100, grav_southwest);
[client] Clean up screen view creation
2023-07-08 05:04:29 +00:00
clscr_set_canvas_func (timegraph_view, R_TimeGraph);
View_SetVisible (timegraph_view, r_timegraph);
[client] Move cshift into client screen canvas This fixes cshifts affecting the console and debug canvases. The crosshair and center print have also been moved for the same reason.
2023-07-08 05:32:02 +00:00
zgraph_view = clscr_view (0, 0, vid->width, 100, grav_southwest);
[client] Clean up screen view creation
2023-07-08 05:04:29 +00:00
clscr_set_canvas_func (zgraph_view, R_ZGraph);
View_SetVisible (zgraph_view, r_zgraph);
name = "gfx/loading.lmp";
pic = r_funcs->Draw_CachePic (name, 1);
loading_view = clscr_view (0, -24, pic->width, pic->height, grav_center);
clscr_set_cachepic (loading_view, name);
name = "gfx/pause.lmp";
pic = r_funcs->Draw_CachePic (name, 1);
pause_view = clscr_view (0, -24, pic->width, pic->height, grav_center);
clscr_set_cachepic (pause_view, name);
[client] Move cshift into client screen canvas This fixes cshifts affecting the console and debug canvases. The crosshair and center print have also been moved for the same reason.
2023-07-08 05:32:02 +00:00
crosshair_view = clscr_view (0, 0, vid->width, vid->height, grav_northwest);
clscr_set_canvas_func (crosshair_view, cl_draw_crosshair);
cshift_view = clscr_view (0, 0, vid->width, vid->height, grav_northwest);
clscr_set_canvas_func (cshift_view, SCR_CShift);
View_SetVisible (cshift_view, 1);
centerprint_view = clscr_view (0, 0, vid->width, vid->height,
grav_northwest);
clscr_set_canvas_func (centerprint_view, cl_draw_centerprint);
[client] Clean up screen view creation
2023-07-08 05:04:29 +00:00
}
void
CL_Init_Screen (void)
{
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
__auto_type reg = ECS_NewRegistry ();
Canvas_InitSys (&cl_canvas_sys, reg);
[console] Switch to using a canvas for the console While the console background is broken in that alpha doesn't work, it's now rendered correctly in all renderers.
2023-01-21 18:45:50 +00:00
if (con_module) {
__auto_type cd = con_module->data->console;
cd->component_base = ECS_RegisterComponents (reg, cd->components,
cd->num_components);
cd->canvas_sys = &cl_canvas_sys;
}
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
HUD_Init (reg);
ECS_CreateComponentPools (reg);
[client] Further decouple screen and console The wording might seem a little odd, but cl_screen is really the full 2D client HUD while the console is completely independent of the client and shouldn't know that the client even exists. Ideally, the resize events would be handled by the canvas system, to which end this is a small step.
2023-01-16 04:23:44 +00:00
cl_xlen = viddef.width;
cl_ylen = viddef.height;
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
[client] Clean up screen view creation
2023-07-08 05:04:29 +00:00
cl_view_system = (ecs_system_t) {
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
.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);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
View_SetPos (cl_screen_view, 0, 0);
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
View_SetLen (cl_screen_view, cl_xlen, cl_ylen);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
View_SetGravity (cl_screen_view, grav_northwest);
View_SetVisible (cl_screen_view, 1);
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
Cvar_Register (&scr_showpause_cvar, 0, 0);
Cvar_Register (&scr_showram_cvar, 0, 0);
Cvar_Register (&scr_showturtle_cvar, 0, 0);
[client] Clean up screen view creation
2023-07-08 05:04:29 +00:00
cl_create_views ();
[client] Further decouple screen and console The wording might seem a little odd, but cl_screen is really the full 2D client HUD while the console is completely independent of the client and shouldn't know that the client even exists. Ideally, the resize events would be handled by the canvas system, to which end this is a small step.
2023-01-16 04:23:44 +00:00
cvar_t *con_scale = Cvar_FindVar ("con_scale");
Cvar_AddListener (con_scale, cl_scale_listener, 0);
cl_scale_listener (0, con_scale);
VID_OnVidResize_AddListener (cl_vidsize_listener, 0);
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
}
gl_screen.c and screen.c are now client clean (and merged :)
2001-05-23 06:33:23 +00:00
void
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
CL_UpdateScreen (viewstate_t *vs)
gl_screen.c and screen.c are now client clean (and merged :)
2001-05-23 06:33:23 +00:00
{
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
_vs = vs;
first step of centerprint/finale cleanup. fixes the misplaced text for end-of-episode text
2004-03-01 23:47:39 +00:00
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
//FIXME not every time
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
if (vs->active) {
if (vs->watervis)
Mostly "merge" cl_screen.c. Down to protocol/networking differences.
2012-06-03 00:30:31 +00:00
r_data->min_wateralpha = 0.0;
else
r_data->min_wateralpha = 1.0;
}
first step of centerprint/finale cleanup. fixes the misplaced text for end-of-episode text
2004-03-01 23:47:39 +00:00
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
V_PrepBlend (vs);
V_RenderView (vs);
[client] Switch to using canvases for screen and hud Canvases provide layered rendering as for each canvas all components are rendered in turn.
2023-01-20 18:34:33 +00:00
SCR_UpdateScreen (vs->camera_transform, vs->time, scr_funcs);
gl_screen.c and screen.c are now client clean (and merged :)
2001-05-23 06:33:23 +00:00
}
Reference in a new issue Copy permalink