From 23a95f84a8985dbb689ac6f76323a3db6235d2f7 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Mon, 12 Sep 2022 00:44:03 +0200 Subject: [PATCH] ConVar names cleanup --- r5dev/public/iconvar.h | 2 +- r5dev/resource/cfg/autoexec_client_dev.cfg | 29 ++++---- r5dev/tier1/IConVar.cpp | 85 +++++++++++----------- r5dev/tier1/cvar.cpp | 60 +++++++-------- r5dev/tier1/cvar.h | 60 +++++++-------- r5dev/vgui/vgui_debugpanel.cpp | 78 ++++++++++---------- 6 files changed, 158 insertions(+), 156 deletions(-) diff --git a/r5dev/public/iconvar.h b/r5dev/public/iconvar.h index 47b09a79..e1b90f74 100644 --- a/r5dev/public/iconvar.h +++ b/r5dev/public/iconvar.h @@ -44,7 +44,7 @@ class CCommand; #define FCVAR_DEMO (1<<16) // record this cvar when starting a demo file #define FCVAR_DONTRECORD (1<<17) // don't record these command in demofiles #define FCVAR_SS_ADDED (1<<18) // This is one of the "added" FCVAR_SS variables for the splitscreen players -#define FCVAR_RELEASE (1<<19) // Cvars tagged with this are the only cvars avaliable to customers +#define FCVAR_RELEASE (1<<19) // Cvars tagged with this are the only cvars available to customers #define FCVAR_RELOAD_MATERIALS (1<<20) // If this cvar changes, it forces a material reload #define FCVAR_RELOAD_TEXTURES (1<<21) // If this cvar changes, if forces a texture reload diff --git a/r5dev/resource/cfg/autoexec_client_dev.cfg b/r5dev/resource/cfg/autoexec_client_dev.cfg index d9190215..0e3ed573 100644 --- a/r5dev/resource/cfg/autoexec_client_dev.cfg +++ b/r5dev/resource/cfg/autoexec_client_dev.cfg @@ -27,34 +27,37 @@ cl_showpos "1" // Shows detailed positi host_speeds "2" // Show general system running times. cl_showhoststats "1" // Shows detailed host stats. -cl_hoststats_invert_rect_x "0" // Inverts the X rect for host speeds debug overlay. -cl_hoststats_invert_rect_y "0" // Inverts the Y rect for host speeds debug overlay. +cl_hoststats_invert_x "0" // Inverts the X offset for host speeds debug overlay. +cl_hoststats_invert_y "0" // Inverts the Y offset for host speeds debug overlay. cl_hoststats_offset_x "10" // Host stats 'X' offset. cl_hoststats_offset_y "10" // Host stats 'Y' offset. cl_showsimstats "1" // Shows detailed simulation stats. -cl_simstats_invert_rect_x "1" // Inverts the X rect for simulation debug overlay. -cl_simstats_invert_rect_y "1" // Inverts the Y rect for simulation debug overlay. +cl_simstats_invert_x "1" // Inverts the X offset for simulation debug overlay. +cl_simstats_invert_y "1" // Inverts the Y offset for simulation debug overlay. cl_simstats_offset_x "650" // Simulation stats 'X' offset. cl_simstats_offset_y "120" // Simulation stats 'Y' offset. cl_showgpustats "1" // Shows detailed GPU memory stats. -cl_gpustats_invert_rect_x "1" // Inverts the X rect for texture streaming debug overlay. -cl_gpustats_invert_rect_y "1" // Inverts the Y rect for texture streaming debug overlay. +cl_gpustats_invert_x "1" // Inverts the X offset for texture streaming debug overlay. +cl_gpustats_invert_y "1" // Inverts the Y offset for texture streaming debug overlay. cl_gpustats_offset_x "650" // GPU stats 'X' offset. cl_gpustats_offset_y "105" // GPU stats 'Y' offset. -cl_drawconsoleoverlay "1" // Shows DevMsg RUI console overlay. -cl_consoleoverlay_lines "5" // Num log lines for RUI console overlay. -cl_consoleoverlay_invert_rect_x "0" // X offset for RUI console overlay. -cl_consoleoverlay_invert_rect_y "1" // Y offset for RUI console overlay. -cl_consoleoverlay_offset_x "10" // RUI console overlay 'X' offset. -cl_consoleoverlay_offset_y "170" // RUI console overlay 'Y' offset. - phys_showObjectCount "1" // Shows physics object count. rui_defaultDebugFontFace "ArameMono" // Sets the RUI debug font face. hitch_alert_color "255 000 000 255" // Sets the RUI hitch alert font color. +////////////////////////// +//// NOTIFY TEXT //// +////////////////////////// +con_drawnotify "1" // Shows DevMsg RUI console overlay. +con_notifylines "5" // Num log lines for RUI console overlay. +con_notify_invert_x "0" // Invert X offset for RUI console overlay. +con_notify_invert_y "1" // Invert Y offset for RUI console overlay. +con_notify_offset_x "10" // RUI console overlay 'X' offset. +con_notify_offset_y "170" // RUI console overlay 'Y' offset. + ////////////////////////// //// DEBUG DRAW //// ////////////////////////// diff --git a/r5dev/tier1/IConVar.cpp b/r5dev/tier1/IConVar.cpp index 8ab15659..31566cba 100644 --- a/r5dev/tier1/IConVar.cpp +++ b/r5dev/tier1/IConVar.cpp @@ -122,56 +122,55 @@ void ConVar::Init(void) const #ifndef DEDICATED cl_rcon_request_sendlogs = ConVar::Create("cl_rcon_request_sendlogs", "1" , FCVAR_RELEASE, "Request the rcon server to send console logs on connect.", false, 0.f, false, 0.f, nullptr, nullptr); - con_drawnotify = ConVar::Create("con_drawnotify" , "0" , FCVAR_DEVELOPMENTONLY, "Draws the RUI console overlay at the top of the screen.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_consoleoverlay_lines = ConVar::Create("cl_consoleoverlay_lines" , "3" , FCVAR_DEVELOPMENTONLY, "Number of lines of console output to draw.", true, 1.f, false, 0.f, nullptr, nullptr); - cl_consoleoverlay_invert_rect_x = ConVar::Create("cl_consoleoverlay_invert_rect_x", "0" , FCVAR_DEVELOPMENTONLY, "Inverts the X rect for RUI console overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_consoleoverlay_invert_rect_y = ConVar::Create("cl_consoleoverlay_invert_rect_y", "0" , FCVAR_DEVELOPMENTONLY, "Inverts the Y rect for RUI console overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_consoleoverlay_offset_x = ConVar::Create("cl_consoleoverlay_offset_x" , "10", FCVAR_DEVELOPMENTONLY, "X offset for RUI console overlay.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_consoleoverlay_offset_y = ConVar::Create("cl_consoleoverlay_offset_y" , "10", FCVAR_DEVELOPMENTONLY, "Y offset for RUI console overlay.", false, 1.f, false, 50.f, nullptr, nullptr); + cl_showhoststats = ConVar::Create("cl_showhoststats" , "0", FCVAR_DEVELOPMENTONLY, "Host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_hoststats_invert_x = ConVar::Create("cl_hoststats_invert_x", "0", FCVAR_DEVELOPMENTONLY, "Inverts the X offset for host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_hoststats_invert_y = ConVar::Create("cl_hoststats_invert_y", "0", FCVAR_DEVELOPMENTONLY, "Inverts the Y offset for host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_hoststats_offset_x = ConVar::Create("cl_hoststats_offset_x", "10", FCVAR_DEVELOPMENTONLY, "X offset for host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_hoststats_offset_y = ConVar::Create("cl_hoststats_offset_y", "10", FCVAR_DEVELOPMENTONLY, "Y offset for host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_showsimstats = ConVar::Create("cl_showsimstats" , "0" , FCVAR_DEVELOPMENTONLY, "Shows the tick counter for the server/client simulation and the render frame.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_simstats_invert_x = ConVar::Create("cl_simstats_invert_x", "1" , FCVAR_DEVELOPMENTONLY, "Inverts the X offset for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_simstats_invert_y = ConVar::Create("cl_simstats_invert_y", "1" , FCVAR_DEVELOPMENTONLY, "Inverts the Y offset for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_simstats_offset_x = ConVar::Create("cl_simstats_offset_x", "650", FCVAR_DEVELOPMENTONLY, "X offset for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_simstats_offset_y = ConVar::Create("cl_simstats_offset_y", "120", FCVAR_DEVELOPMENTONLY, "Y offset for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - con_notifytime = ConVar::Create("con_notifytime", "6", FCVAR_DEVELOPMENTONLY | FCVAR_MATERIAL_SYSTEM_THREAD, "How long to display recent console text to the upper part of the game window.", false, 1.f, false, 50.f, nullptr, nullptr); - - cl_conoverlay_script_server_clr = ConVar::Create("cl_conoverlay_script_server_clr", "130 120 245 255", FCVAR_DEVELOPMENTONLY, "Script SERVER VM RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_script_client_clr = ConVar::Create("cl_conoverlay_script_client_clr", "117 116 139 255", FCVAR_DEVELOPMENTONLY, "Script CLIENT VM RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_script_ui_clr = ConVar::Create("cl_conoverlay_script_ui_clr" , "200 110 110 255", FCVAR_DEVELOPMENTONLY, "Script UI VM RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - - cl_conoverlay_native_server_clr = ConVar::Create("cl_conoverlay_native_server_clr", "20 50 248 255" , FCVAR_DEVELOPMENTONLY, "Native SERVER RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_native_client_clr = ConVar::Create("cl_conoverlay_native_client_clr", "70 70 70 255" , FCVAR_DEVELOPMENTONLY, "Native CLIENT RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_native_ui_clr = ConVar::Create("cl_conoverlay_native_ui_clr" , "200 60 60 255" , FCVAR_DEVELOPMENTONLY, "Native UI RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_native_engine_clr = ConVar::Create("cl_conoverlay_native_engine_clr", "255 255 255 255", FCVAR_DEVELOPMENTONLY, "Native engine RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_native_fs_clr = ConVar::Create("cl_conoverlay_native_fs_clr" , "0 100 225 255" , FCVAR_DEVELOPMENTONLY, "Native filesystem RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_native_rtech_clr = ConVar::Create("cl_conoverlay_native_rtech_clr" , "25 100 100 255" , FCVAR_DEVELOPMENTONLY, "Native rtech RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_native_ms_clr = ConVar::Create("cl_conoverlay_native_ms_clr" , "200 20 180 255" , FCVAR_DEVELOPMENTONLY, "Native materialsystem RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - - cl_conoverlay_netcon_clr = ConVar::Create("cl_conoverlay_netcon_clr" , "255 255 255 255", FCVAR_DEVELOPMENTONLY, "Net console RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_common_clr = ConVar::Create("cl_conoverlay_common_clr" , "255 140 80 255" , FCVAR_DEVELOPMENTONLY, "Common RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - - cl_conoverlay_warning_clr = ConVar::Create("cl_conoverlay_warning_clr", "180 180 20 255", FCVAR_DEVELOPMENTONLY, "Warning RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - cl_conoverlay_error_clr = ConVar::Create("cl_conoverlay_error_clr" , "225 20 20 255" , FCVAR_DEVELOPMENTONLY, "Error RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); - - cl_showhoststats = ConVar::Create("cl_showhoststats" , "0", FCVAR_DEVELOPMENTONLY, "Host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_hoststats_invert_rect_x = ConVar::Create("cl_hoststats_invert_rect_x", "0", FCVAR_DEVELOPMENTONLY, "Inverts the X rect for host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_hoststats_invert_rect_y = ConVar::Create("cl_hoststats_invert_rect_y", "0", FCVAR_DEVELOPMENTONLY, "Inverts the Y rect for host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_hoststats_offset_x = ConVar::Create("cl_hoststats_offset_x" , "10", FCVAR_DEVELOPMENTONLY, "X offset for host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_hoststats_offset_y = ConVar::Create("cl_hoststats_offset_y" , "10", FCVAR_DEVELOPMENTONLY, "Y offset for host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - - cl_showsimstats = ConVar::Create("cl_showsimstats" , "0" , FCVAR_DEVELOPMENTONLY, "Shows the tick counter for the server/client simulation and the render frame.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_simstats_invert_rect_x = ConVar::Create("cl_simstats_invert_rect_x", "1" , FCVAR_DEVELOPMENTONLY, "Inverts the X rect for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_simstats_invert_rect_y = ConVar::Create("cl_simstats_invert_rect_y", "1" , FCVAR_DEVELOPMENTONLY, "Inverts the Y rect for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_simstats_offset_x = ConVar::Create("cl_simstats_offset_x" , "650", FCVAR_DEVELOPMENTONLY, "X offset for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_simstats_offset_y = ConVar::Create("cl_simstats_offset_y" , "120", FCVAR_DEVELOPMENTONLY, "Y offset for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - - cl_showgpustats = ConVar::Create("cl_showgpustats" , "0", FCVAR_DEVELOPMENTONLY, "Texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_gpustats_invert_rect_x = ConVar::Create("cl_gpustats_invert_rect_x" , "1", FCVAR_DEVELOPMENTONLY, "Inverts the X rect for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_gpustats_invert_rect_y = ConVar::Create("cl_gpustats_invert_rect_y" , "1", FCVAR_DEVELOPMENTONLY, "Inverts the Y rect for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_gpustats_offset_x = ConVar::Create("cl_gpustats_offset_x" , "650", FCVAR_DEVELOPMENTONLY, "X offset for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); - cl_gpustats_offset_y = ConVar::Create("cl_gpustats_offset_y" , "105", FCVAR_DEVELOPMENTONLY, "Y offset for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_showgpustats = ConVar::Create("cl_showgpustats" , "0", FCVAR_DEVELOPMENTONLY, "Texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_gpustats_invert_x = ConVar::Create("cl_gpustats_invert_x", "1", FCVAR_DEVELOPMENTONLY, "Inverts the X offset for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_gpustats_invert_y = ConVar::Create("cl_gpustats_invert_y", "1", FCVAR_DEVELOPMENTONLY, "Inverts the Y offset for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_gpustats_offset_x = ConVar::Create("cl_gpustats_offset_x", "650", FCVAR_DEVELOPMENTONLY, "X offset for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + cl_gpustats_offset_y = ConVar::Create("cl_gpustats_offset_y", "105", FCVAR_DEVELOPMENTONLY, "Y offset for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr); cl_showmaterialinfo = ConVar::Create("cl_showmaterialinfo" , "0" , FCVAR_DEVELOPMENTONLY, "Draw info for the material under the crosshair on screen.", false, 0.f, false, 0.f, nullptr, nullptr); cl_materialinfo_offset_x = ConVar::Create("cl_materialinfo_offset_x", "0" , FCVAR_DEVELOPMENTONLY, "X offset for material debug info overlay.", false, 0.f, false, 0.f, nullptr, nullptr); cl_materialinfo_offset_y = ConVar::Create("cl_materialinfo_offset_y", "420", FCVAR_DEVELOPMENTONLY, "Y offset for material debug info overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + con_drawnotify = ConVar::Create("con_drawnotify", "0", FCVAR_RELEASE, "Draws the RUI console to the hud.", false, 0.f, false, 0.f, nullptr, nullptr); + con_notifylines = ConVar::Create("con_notifylines" , "3" , FCVAR_MATERIAL_SYSTEM_THREAD, "Number of console lines to overlay for debugging.", true, 1.f, false, 0.f, nullptr, nullptr); + con_notifytime = ConVar::Create("con_notifytime" , "6" , FCVAR_MATERIAL_SYSTEM_THREAD, "How long to display recent console text to the upper part of the game window.", false, 1.f, false, 50.f, nullptr, nullptr); + + con_notify_invert_x = ConVar::Create("con_notify_invert_x", "0" , FCVAR_MATERIAL_SYSTEM_THREAD, "Inverts the X offset for RUI console overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + con_notify_invert_y = ConVar::Create("con_notify_invert_y", "0" , FCVAR_MATERIAL_SYSTEM_THREAD, "Inverts the Y offset for RUI console overlay.", false, 0.f, false, 0.f, nullptr, nullptr); + con_notify_offset_x = ConVar::Create("con_notify_offset_x", "10", FCVAR_MATERIAL_SYSTEM_THREAD, "X offset for RUI console overlay.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_offset_y = ConVar::Create("con_notify_offset_y", "10", FCVAR_MATERIAL_SYSTEM_THREAD, "Y offset for RUI console overlay.", false, 1.f, false, 50.f, nullptr, nullptr); + + con_notify_script_server_clr = ConVar::Create("con_notify_script_server_clr", "130 120 245 255", FCVAR_MATERIAL_SYSTEM_THREAD, "Script SERVER VM RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_script_client_clr = ConVar::Create("con_notify_script_client_clr", "117 116 139 255", FCVAR_MATERIAL_SYSTEM_THREAD, "Script CLIENT VM RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_script_ui_clr = ConVar::Create("con_notify_script_ui_clr" , "200 110 110 255", FCVAR_MATERIAL_SYSTEM_THREAD, "Script UI VM RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + + con_notify_native_server_clr = ConVar::Create("con_notify_native_server_clr", "20 50 248 255" , FCVAR_MATERIAL_SYSTEM_THREAD, "Native SERVER RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_native_client_clr = ConVar::Create("con_notify_native_client_clr", "70 70 70 255" , FCVAR_MATERIAL_SYSTEM_THREAD, "Native CLIENT RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_native_ui_clr = ConVar::Create("con_notify_native_ui_clr" , "200 60 60 255" , FCVAR_MATERIAL_SYSTEM_THREAD, "Native UI RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_native_engine_clr = ConVar::Create("con_notify_native_engine_clr", "255 255 255 255", FCVAR_MATERIAL_SYSTEM_THREAD, "Native engine RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_native_fs_clr = ConVar::Create("con_notify_native_fs_clr" , "0 100 225 255" , FCVAR_MATERIAL_SYSTEM_THREAD, "Native filesystem RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_native_rtech_clr = ConVar::Create("con_notify_native_rtech_clr" , "25 100 100 255" , FCVAR_MATERIAL_SYSTEM_THREAD, "Native rtech RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_native_ms_clr = ConVar::Create("con_notify_native_ms_clr" , "200 20 180 255" , FCVAR_MATERIAL_SYSTEM_THREAD, "Native materialsystem RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + + con_notify_netcon_clr = ConVar::Create("con_notify_netcon_clr" , "255 255 255 255", FCVAR_MATERIAL_SYSTEM_THREAD, "Net console RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_common_clr = ConVar::Create("con_notify_common_clr" , "255 140 80 255" , FCVAR_MATERIAL_SYSTEM_THREAD, "Common RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + + con_notify_warning_clr = ConVar::Create("con_notify_warning_clr", "180 180 20 255", FCVAR_MATERIAL_SYSTEM_THREAD, "Warning RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_notify_error_clr = ConVar::Create("con_notify_error_clr" , "225 20 20 255" , FCVAR_MATERIAL_SYSTEM_THREAD, "Error RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr); + con_max_size_logvector = ConVar::Create("con_max_size_logvector" , "1024", FCVAR_DEVELOPMENTONLY, "Maximum number of logs in the console before cleanup starts.", true, 1.f, false, 0.f, nullptr, nullptr); con_max_size_history = ConVar::Create("con_max_size_history" , "512" , FCVAR_DEVELOPMENTONLY, "Maximum number of command history items before cleanup starts.", true, 0.f, false, 0.f, nullptr, nullptr); con_suggestion_limit = ConVar::Create("con_suggestion_limit" , "128" , FCVAR_DEVELOPMENTONLY, "Maximum number of suggestions the autocomplete window will show for the console.", true, 0.f, false, 0.f, nullptr, nullptr); diff --git a/r5dev/tier1/cvar.cpp b/r5dev/tier1/cvar.cpp index bdc40870..a6b0b0cb 100644 --- a/r5dev/tier1/cvar.cpp +++ b/r5dev/tier1/cvar.cpp @@ -88,45 +88,21 @@ ConVar* bhit_abs_origin = nullptr; #ifndef DEDICATED ConVar* cl_rcon_request_sendlogs = nullptr; -ConVar* con_drawnotify = nullptr; -ConVar* cl_consoleoverlay_lines = nullptr; -ConVar* cl_consoleoverlay_invert_rect_x = nullptr; -ConVar* cl_consoleoverlay_invert_rect_y = nullptr; -ConVar* cl_consoleoverlay_offset_x = nullptr; -ConVar* cl_consoleoverlay_offset_y = nullptr; - -ConVar* con_notifytime = nullptr; - -ConVar* cl_conoverlay_script_server_clr = nullptr; -ConVar* cl_conoverlay_script_client_clr = nullptr; -ConVar* cl_conoverlay_script_ui_clr = nullptr; -ConVar* cl_conoverlay_native_server_clr = nullptr; -ConVar* cl_conoverlay_native_client_clr = nullptr; -ConVar* cl_conoverlay_native_ui_clr = nullptr; -ConVar* cl_conoverlay_native_engine_clr = nullptr; -ConVar* cl_conoverlay_native_fs_clr = nullptr; -ConVar* cl_conoverlay_native_rtech_clr = nullptr; -ConVar* cl_conoverlay_native_ms_clr = nullptr; -ConVar* cl_conoverlay_netcon_clr = nullptr; -ConVar* cl_conoverlay_common_clr = nullptr; -ConVar* cl_conoverlay_warning_clr = nullptr; -ConVar* cl_conoverlay_error_clr = nullptr; - ConVar* cl_showhoststats = nullptr; -ConVar* cl_hoststats_invert_rect_x = nullptr; -ConVar* cl_hoststats_invert_rect_y = nullptr; +ConVar* cl_hoststats_invert_x = nullptr; +ConVar* cl_hoststats_invert_y = nullptr; ConVar* cl_hoststats_offset_x = nullptr; ConVar* cl_hoststats_offset_y = nullptr; ConVar* cl_showsimstats = nullptr; -ConVar* cl_simstats_invert_rect_x = nullptr; -ConVar* cl_simstats_invert_rect_y = nullptr; +ConVar* cl_simstats_invert_x = nullptr; +ConVar* cl_simstats_invert_y = nullptr; ConVar* cl_simstats_offset_x = nullptr; ConVar* cl_simstats_offset_y = nullptr; ConVar* cl_showgpustats = nullptr; -ConVar* cl_gpustats_invert_rect_x = nullptr; -ConVar* cl_gpustats_invert_rect_y = nullptr; +ConVar* cl_gpustats_invert_x = nullptr; +ConVar* cl_gpustats_invert_y = nullptr; ConVar* cl_gpustats_offset_x = nullptr; ConVar* cl_gpustats_offset_y = nullptr; @@ -136,6 +112,30 @@ ConVar* cl_materialinfo_offset_y = nullptr; ConVar* cl_threaded_bone_setup = nullptr; +ConVar* con_drawnotify = nullptr; +ConVar* con_notifylines = nullptr; +ConVar* con_notifytime = nullptr; + +ConVar* con_notify_invert_x = nullptr; +ConVar* con_notify_invert_y = nullptr; +ConVar* con_notify_offset_x = nullptr; +ConVar* con_notify_offset_y = nullptr; + +ConVar* con_notify_script_server_clr = nullptr; +ConVar* con_notify_script_client_clr = nullptr; +ConVar* con_notify_script_ui_clr = nullptr; +ConVar* con_notify_native_server_clr = nullptr; +ConVar* con_notify_native_client_clr = nullptr; +ConVar* con_notify_native_ui_clr = nullptr; +ConVar* con_notify_native_engine_clr = nullptr; +ConVar* con_notify_native_fs_clr = nullptr; +ConVar* con_notify_native_rtech_clr = nullptr; +ConVar* con_notify_native_ms_clr = nullptr; +ConVar* con_notify_netcon_clr = nullptr; +ConVar* con_notify_common_clr = nullptr; +ConVar* con_notify_warning_clr = nullptr; +ConVar* con_notify_error_clr = nullptr; + ConVar* con_max_size_logvector = nullptr; ConVar* con_max_size_history = nullptr; ConVar* con_suggestion_limit = nullptr; diff --git a/r5dev/tier1/cvar.h b/r5dev/tier1/cvar.h index a6f42923..d1a97721 100644 --- a/r5dev/tier1/cvar.h +++ b/r5dev/tier1/cvar.h @@ -83,45 +83,21 @@ extern ConVar* bhit_abs_origin; #ifndef DEDICATED extern ConVar* cl_rcon_request_sendlogs; -extern ConVar* con_drawnotify; -extern ConVar* cl_consoleoverlay_lines; -extern ConVar* cl_consoleoverlay_invert_rect_x; -extern ConVar* cl_consoleoverlay_invert_rect_y; -extern ConVar* cl_consoleoverlay_offset_x; -extern ConVar* cl_consoleoverlay_offset_y; - -extern ConVar* con_notifytime; - -extern ConVar* cl_conoverlay_script_server_clr; -extern ConVar* cl_conoverlay_script_client_clr; -extern ConVar* cl_conoverlay_script_ui_clr; -extern ConVar* cl_conoverlay_native_server_clr; -extern ConVar* cl_conoverlay_native_client_clr; -extern ConVar* cl_conoverlay_native_ui_clr; -extern ConVar* cl_conoverlay_native_engine_clr; -extern ConVar* cl_conoverlay_native_fs_clr; -extern ConVar* cl_conoverlay_native_rtech_clr; -extern ConVar* cl_conoverlay_native_ms_clr; -extern ConVar* cl_conoverlay_netcon_clr; -extern ConVar* cl_conoverlay_common_clr; -extern ConVar* cl_conoverlay_warning_clr; -extern ConVar* cl_conoverlay_error_clr; - extern ConVar* cl_showhoststats; -extern ConVar* cl_hoststats_invert_rect_x; -extern ConVar* cl_hoststats_invert_rect_y; +extern ConVar* cl_hoststats_invert_x; +extern ConVar* cl_hoststats_invert_y; extern ConVar* cl_hoststats_offset_x; extern ConVar* cl_hoststats_offset_y; extern ConVar* cl_showsimstats; -extern ConVar* cl_simstats_invert_rect_x; -extern ConVar* cl_simstats_invert_rect_y; +extern ConVar* cl_simstats_invert_x; +extern ConVar* cl_simstats_invert_y; extern ConVar* cl_simstats_offset_x; extern ConVar* cl_simstats_offset_y; extern ConVar* cl_showgpustats; -extern ConVar* cl_gpustats_invert_rect_x; -extern ConVar* cl_gpustats_invert_rect_y; +extern ConVar* cl_gpustats_invert_x; +extern ConVar* cl_gpustats_invert_y; extern ConVar* cl_gpustats_offset_x; extern ConVar* cl_gpustats_offset_y; @@ -131,6 +107,30 @@ extern ConVar* cl_materialinfo_offset_y; extern ConVar* cl_threaded_bone_setup; +extern ConVar* con_drawnotify; +extern ConVar* con_notifylines; +extern ConVar* con_notifytime; + +extern ConVar* con_notify_invert_x; +extern ConVar* con_notify_invert_y; +extern ConVar* con_notify_offset_x; +extern ConVar* con_notify_offset_y; + +extern ConVar* con_notify_script_server_clr; +extern ConVar* con_notify_script_client_clr; +extern ConVar* con_notify_script_ui_clr; +extern ConVar* con_notify_native_server_clr; +extern ConVar* con_notify_native_client_clr; +extern ConVar* con_notify_native_ui_clr; +extern ConVar* con_notify_native_engine_clr; +extern ConVar* con_notify_native_fs_clr; +extern ConVar* con_notify_native_rtech_clr; +extern ConVar* con_notify_native_ms_clr; +extern ConVar* con_notify_netcon_clr; +extern ConVar* con_notify_common_clr; +extern ConVar* con_notify_warning_clr; +extern ConVar* con_notify_error_clr; + extern ConVar* con_max_size_logvector; extern ConVar* con_max_size_history; extern ConVar* con_suggestion_limit; diff --git a/r5dev/vgui/vgui_debugpanel.cpp b/r5dev/vgui/vgui_debugpanel.cpp index 7bead9ce..a36bfb0c 100644 --- a/r5dev/vgui/vgui_debugpanel.cpp +++ b/r5dev/vgui/vgui_debugpanel.cpp @@ -72,7 +72,7 @@ void CLogSystem::AddLog(const EGlobalContext_t context, const string& svText) m_vNotifyText.push_back(CNotifyText{ context, con_notifytime->GetFloat() , svText }); while (m_vNotifyText.size() > 0 && - (m_vNotifyText.size() >= cl_consoleoverlay_lines->GetInt())) + (m_vNotifyText.size() > con_notifylines->GetInt())) { m_vNotifyText.erase(m_vNotifyText.begin()); } @@ -87,21 +87,21 @@ void CLogSystem::DrawNotify(void) { int x; int y; - if (cl_consoleoverlay_invert_rect_x->GetBool()) + if (con_notify_invert_x->GetBool()) { - x = g_nWindowWidth - cl_consoleoverlay_offset_x->GetInt(); + x = g_nWindowWidth - con_notify_offset_x->GetInt(); } else { - x = cl_consoleoverlay_offset_x->GetInt(); + x = con_notify_offset_x->GetInt(); } - if (cl_consoleoverlay_invert_rect_y->GetBool()) + if (con_notify_invert_y->GetBool()) { - y = g_nWindowHeight - cl_consoleoverlay_offset_y->GetInt(); + y = g_nWindowHeight - con_notify_offset_y->GetInt(); } else { - y = cl_consoleoverlay_offset_y->GetInt(); + y = con_notify_offset_y->GetInt(); } std::lock_guard l(m_Mutex); @@ -154,10 +154,10 @@ void CLogSystem::ShouldDraw(const float flFrameTime) int c = m_vNotifyText.size(); for (i = c - 1; i >= 0; i--) { - CNotifyText* notify = &m_vNotifyText[i]; - notify->m_flLifeRemaining -= flFrameTime; + CNotifyText* pNotify = &m_vNotifyText[i]; + pNotify->m_flLifeRemaining -= flFrameTime; - if (notify->m_flLifeRemaining <= 0.0f) + if (pNotify->m_flLifeRemaining <= 0.0f) { m_vNotifyText.erase(m_vNotifyText.begin() + i); continue; @@ -179,11 +179,11 @@ void CLogSystem::DrawHostStats(void) const int nHeight = cl_hoststats_offset_y->GetInt(); const static Color c = { 255, 255, 255, 255 }; - if (cl_hoststats_invert_rect_x->GetBool()) + if (cl_hoststats_invert_x->GetBool()) { nWidth = g_nWindowWidth - nWidth; } - if (cl_hoststats_invert_rect_y->GetBool()) + if (cl_hoststats_invert_y->GetBool()) { nHeight = g_nWindowHeight - nHeight; } @@ -205,11 +205,11 @@ void CLogSystem::DrawSimStats(void) const snprintf((char*)szLogbuf, 4096, "Server Frame: (%d) Client Frame: (%d) Render Frame: (%d)\n", g_pClientState->GetServerTickCount(), g_pClientState->GetClientTickCount(), *g_nRenderTickCount); - if (cl_simstats_invert_rect_x->GetBool()) + if (cl_simstats_invert_x->GetBool()) { nWidth = g_nWindowWidth - nWidth; } - if (cl_simstats_invert_rect_y->GetBool()) + if (cl_simstats_invert_y->GetBool()) { nHeight = g_nWindowHeight - nHeight; } @@ -230,11 +230,11 @@ void CLogSystem::DrawGPUStats(void) const snprintf((char*)szLogbuf, 4096, "%8d/%8d/%8dkiB unusable/unfree/total GPU Streaming Texture memory\n", *g_nUnusableStreamingTextureMemory / 1024, *g_nUnfreeStreamingTextureMemory / 1024, *g_nUnusableStreamingTextureMemory / 1024); - if (cl_gpustats_invert_rect_x->GetBool()) + if (cl_gpustats_invert_x->GetBool()) { nWidth = g_nWindowWidth - nWidth; } - if (cl_gpustats_invert_rect_y->GetBool()) + if (cl_gpustats_invert_y->GetBool()) { nHeight = g_nWindowHeight - nHeight; } @@ -247,19 +247,19 @@ void CLogSystem::DrawGPUStats(void) const //----------------------------------------------------------------------------- void CLogSystem::DrawCrosshairMaterial(void) const { - CMaterialGlue* material = GetMaterialAtCrossHair(); - if (!material) + CMaterialGlue* pMaterialGlue = GetMaterialAtCrossHair(); + if (!pMaterialGlue) return; static Color c = { 255, 255, 255, 255 }; static const char* szLogbuf[4096]{}; snprintf((char*)szLogbuf, 4096, "name: %s\nguid: %llx\ndimensions: %d x %d\nsurface: %s/%s\nstc: %i\ntc: %i", - material->m_pszName, - material->m_GUID, - material->m_iWidth, material->m_iHeight, - material->m_pszSurfaceName1, material->m_pszSurfaceName2, - material->m_nStreamableTextureCount, - material->m_pShaderGlue->m_nTextureInputCount); + pMaterialGlue->m_pszName, + pMaterialGlue->m_GUID, + pMaterialGlue->m_iWidth, pMaterialGlue->m_iHeight, + pMaterialGlue->m_pszSurfaceName1, pMaterialGlue->m_pszSurfaceName2, + pMaterialGlue->m_nStreamableTextureCount, + pMaterialGlue->m_pShaderGlue->m_nTextureInputCount); CMatSystemSurface_DrawColoredText(g_pMatSystemSurface, v_Rui_GetFontFace(), m_nFontHeight, cl_materialinfo_offset_x->GetInt(), cl_materialinfo_offset_y->GetInt(), c.r(), c.g(), c.b(), c.a(), (char*)szLogbuf); } @@ -283,35 +283,35 @@ Color CLogSystem::GetLogColorForType(const EGlobalContext_t context) const switch (context) { case EGlobalContext_t::SCRIPT_SERVER: - return { cl_conoverlay_script_server_clr->GetColor() }; + return { con_notify_script_server_clr->GetColor() }; case EGlobalContext_t::SCRIPT_CLIENT: - return { cl_conoverlay_script_client_clr->GetColor() }; + return { con_notify_script_client_clr->GetColor() }; case EGlobalContext_t::SCRIPT_UI: - return { cl_conoverlay_script_ui_clr->GetColor() }; + return { con_notify_script_ui_clr->GetColor() }; case EGlobalContext_t::NATIVE_SERVER: - return { cl_conoverlay_native_server_clr->GetColor() }; + return { con_notify_native_server_clr->GetColor() }; case EGlobalContext_t::NATIVE_CLIENT: - return { cl_conoverlay_native_client_clr->GetColor() }; + return { con_notify_native_client_clr->GetColor() }; case EGlobalContext_t::NATIVE_UI: - return { cl_conoverlay_native_ui_clr->GetColor() }; + return { con_notify_native_ui_clr->GetColor() }; case EGlobalContext_t::NATIVE_ENGINE: - return { cl_conoverlay_native_engine_clr->GetColor() }; + return { con_notify_native_engine_clr->GetColor() }; case EGlobalContext_t::NATIVE_FS: - return { cl_conoverlay_native_fs_clr->GetColor() }; + return { con_notify_native_fs_clr->GetColor() }; case EGlobalContext_t::NATIVE_RTECH: - return { cl_conoverlay_native_rtech_clr->GetColor() }; + return { con_notify_native_rtech_clr->GetColor() }; case EGlobalContext_t::NATIVE_MS: - return { cl_conoverlay_native_ms_clr->GetColor() }; + return { con_notify_native_ms_clr->GetColor() }; case EGlobalContext_t::NETCON_S: - return { cl_conoverlay_netcon_clr->GetColor() }; + return { con_notify_netcon_clr->GetColor() }; case EGlobalContext_t::COMMON_C: - return { cl_conoverlay_common_clr->GetColor() }; + return { con_notify_common_clr->GetColor() }; case EGlobalContext_t::WARNING_C: - return { cl_conoverlay_warning_clr->GetColor() }; + return { con_notify_warning_clr->GetColor() }; case EGlobalContext_t::ERROR_C: - return { cl_conoverlay_error_clr->GetColor() }; + return { con_notify_error_clr->GetColor() }; default: - return { cl_conoverlay_native_engine_clr->GetColor() }; + return { con_notify_native_engine_clr->GetColor() }; } }