qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 00:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/qw/source/cl_ngraph.c

156 lines
3.7 KiB
C
Raw Normal View History

sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
/*
cl_ngraph.c
client network diagnostic graph
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
gcc 3.0 compile fixes
2001-06-19 22:05:13 +00:00
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
no header includes cvar.h now
2001-05-31 03:41:35 +00:00
#include "QF/cvar.h"
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
#include "QF/draw.h"
#include "QF/render.h"
Change hudswap to use a callback, and instead of passing a swap variable to 10 functions, where only 2 use it, use a global variable. Make a few scr functions static inline, too. Got a totally unexpected ~0.45fps speedup.
2001-12-09 14:05:30 +00:00
#include "QF/screen.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
#include "QF/va.h"
#include "QF/ui/view.h"
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
header/whitespace sweep continues.
2001-08-28 23:05:45 +00:00
#include "compat.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
#include "qw/include/cl_parse.h"
#include "qw/include/client.h"
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
#include "sbar.h"
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
int cl_netgraph;
static cvar_t cl_netgraph_cvar = {
.name = "cl_netgraph",
.description =
"Toggle the display of a graph showing network performance",
.default_value = "0",
.flags = CVAR_NONE,
.value = { .type = &cexpr_int, .value = &cl_netgraph },
};
float cl_netgraph_alpha;
static cvar_t cl_netgraph_alpha_cvar = {
.name = "cl_netgraph_alpha",
.description =
"Net graph translucency",
.default_value = "0.5",
.flags = CVAR_ARCHIVE,
.value = { .type = &cexpr_float, .value = &cl_netgraph_alpha },
};
int cl_netgraph_box;
static cvar_t cl_netgraph_box_cvar = {
.name = "cl_netgraph_box",
.description =
" Draw box around net graph",
.default_value = "1",
.flags = CVAR_ARCHIVE,
.value = { .type = &cexpr_int, .value = &cl_netgraph_box },
};
int cl_netgraph_height;
static cvar_t cl_netgraph_height_cvar = {
.name = "cl_netgraph_height",
.description =
"Set the fullscale (1s) height of the graph",
.default_value = "32",
.flags = CVAR_ARCHIVE,
.value = { .type = &cexpr_int, .value = &cl_netgraph_height },
};
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
view_t *cl_netgraph_view;
static void
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
cl_netgraph_f (void *data, const cvar_t *cvar)
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
{
if (cl_netgraph_view) {
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
cl_netgraph_view->visible = cl_netgraph != 0;
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
}
}
static void
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
cl_netgraph_height_f (void *data, const cvar_t *cvar)
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
{
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
cl_netgraph_height = max (32, cl_netgraph_height);
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
if (cl_netgraph_view) {
view_resize (cl_netgraph_view, cl_netgraph_view->xlen,
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
cl_netgraph_height + 25);
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
}
}
header/whitespace sweep continues.
2001-08-28 23:05:45 +00:00
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
void
[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
CL_NetGraph (view_t *view)
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
{
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
int lost, a, l, x, y, i, o;
int timings[NET_TIMINGS];
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
[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
x = view->xabs;
y = view->yabs;
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
if (cl_netgraph_box) {
Get the basics linking. Still, nothing will work: no plugins are loaded and they're all broken anyway. glx, sgl, glslx etc are going away, just the basics will be built: fbdev (probably go away eventually), sdl, x11 and hopefully someday win. That's actually the only reason anything links.
2012-02-14 10:47:02 +00:00
r_funcs->Draw_TextBox (x, y, NET_TIMINGS / 8,
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
cl_netgraph_height / 8 + 1,
cl_netgraph_alpha * 255);
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
}
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
lost = CL_CalcNet ();
[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
x = view->xabs + 8;
y = view->yabs + view->ylen - 9;
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
l = NET_TIMINGS;
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
if (l > view->xlen - 8)
l = view->xlen - 8;
Whitespace, dead code removal, and a couple of tiny cleanups.
2002-07-03 05:40:33 +00:00
i = cls.netchan.outgoing_sequence & NET_TIMINGSMASK;
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
a = i - l;
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
o = 0;
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
if (a < 0) {
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
memcpy (timings + o, packet_latency + a + NET_TIMINGS,
-a * sizeof (timings[0]));
o -= a;
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
l += a;
a = 0;
}
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
memcpy (timings + o, packet_latency + a, l * sizeof (timings[0]));
r_funcs->R_LineGraph (x, y, timings,
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
NET_TIMINGS, cl_netgraph_height);
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
[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
x = view->xabs + 8;
y = view->yabs + 8;
r_funcs->Draw_String (x, y, va (0, "%3i%% packet loss", lost));
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
}
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
void
CL_NetGraph_Init_Cvars (void)
{
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
Cvar_Register (&cl_netgraph_cvar, cl_netgraph_f, 0);
Cvar_Register (&cl_netgraph_alpha_cvar, 0, 0);
Cvar_Register (&cl_netgraph_box_cvar, 0, 0);
Cvar_Register (&cl_netgraph_height_cvar, cl_netgraph_height_f, 0);
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
}
Reference in a new issue Copy permalink