R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug overlay QOL improvements + Con_NPrintf() hook

Browse Source 
* Added ability to invert rect to calculate offsets from bottom/right as well so debug text doesn't get out of view, or obstruct view when window is resized.
* Added Con_NPrintf() hook which shows detailed systems running times and VGUI panel debug information.
This commit is contained in:
Amos 2022-02-28 01:01:40 +01:00
parent 0774ebf9ff
commit 2719a85504
20 changed files with 287 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/common/opcodes.cpp
View File

@ -39,7 +39,7 @@ void Dedicated_Init()
// CGAME
//-------------------------------------------------------------------------
{
CVideoMode_Common__CreateGameWindow.Offset(0x2C).Patch({ 0xE9, 0x9A, 0x00, 0x00, 0x00 }); // PUS --> XOR | Prevent ShowWindow and CreateGameWindow from being initialized (STGS RPak datatype is registered here).
p_CVideoMode_Common__CreateGameWindow.Offset(0x2C).Patch({ 0xE9, 0x9A, 0x00, 0x00, 0x00 }); // PUS --> XOR | Prevent ShowWindow and CreateGameWindow from being initialized (STGS RPak datatype is registered here).
}
//-------------------------------------------------------------------------

8
r5dev/core/init.cpp
View File

@ -138,6 +138,10 @@ void Systems_Init()
SysDll_Attach();
SysUtils_Attach();
#ifndef DEDICATED
HCVideoMode_Common_Attach();
#endif // !DEDICATED
// Patch instructions
RuntimePtc_Init();
@ -218,6 +222,10 @@ void Systems_Shutdown()
SysDll_Detach();
SysUtils_Detach();
#ifndef DEDICATED
HCVideoMode_Common_Detach();
#endif // !DEDICATED
// Commit the transaction
DetourTransactionCommit();
}

28
r5dev/engine/sys_getmodes.cpp Normal file
View File

@ -0,0 +1,28 @@
//===========================================================================//
//
// Purpose:
//
//===========================================================================//
#include "core/stdafx.h"
#include "windows/id3dx.h"
#include "engine/sys_getmodes.h"
//-----------------------------------------------------------------------------
// Purpose: creates the game window, obtains the rect and plays the startup movie.
//-----------------------------------------------------------------------------
bool HCVideoMode_Common__CreateGameWindow(int* pnRect)
{
g_nWindowWidth = pnRect[0];
g_nWindowHeight = pnRect[1];
return CVideoMode_Common__CreateGameWindow(pnRect);
}
void HCVideoMode_Common_Attach()
{
DetourAttach((LPVOID*)&CVideoMode_Common__CreateGameWindow, &HCVideoMode_Common__CreateGameWindow);
}
void HCVideoMode_Common_Detach()
{
DetourDetach((LPVOID*)&CVideoMode_Common__CreateGameWindow, &HCVideoMode_Common__CreateGameWindow);
}

14
r5dev/engine/sys_getmodes.h
View File

@ -5,16 +5,24 @@ namespace
//-------------------------------------------------------------------------
// CGAME
//-------------------------------------------------------------------------
ADDRESS CVideoMode_Common__CreateGameWindow = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x56\x57\x48\x83\xEC\x28\x48\x8B\xF9\xE8\x00\x00\x00\x00\x48\x8B\xF0", "xxxxxxxxxxx????xxx");
// 0x140299100 // 40 56 57 48 83 EC 28 48 8B F9 E8 ? ? ? ? 48 8B F0 //
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
ADDRESS p_CVideoMode_Common__CreateGameWindow = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x56\x57\x48\x83\xEC\x38\x48\x8B\xF9\xE8\x00\x00\x00\x00", "xxxxxxxxxxx????");
bool (*CVideoMode_Common__CreateGameWindow)(int* pnRect) = (bool (*)(int*))p_CVideoMode_Common__CreateGameWindow.GetPtr(); /*40 56 57 48 83 EC 38 48 8B F9 E8 ? ? ? ?*/
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
ADDRESS p_CVideoMode_Common__CreateGameWindow = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x56\x57\x48\x83\xEC\x28\x48\x8B\xF9\xE8\x00\x00\x00\x00\x48\x8B\xF0", "xxxxxxxxxxx????xxx");
bool (*CVideoMode_Common__CreateGameWindow)(int* pnRect) = (bool (*)(int*))p_CVideoMode_Common__CreateGameWindow.GetPtr(); /*40 56 57 48 83 EC 28 48 8B F9 E8 ? ? ? ? 48 8B F0*/
#endif
}
void HCVideoMode_Common_Attach();
void HCVideoMode_Common_Detach();
///////////////////////////////////////////////////////////////////////////////
class HVideoMode_Common : public IDetour
{
virtual void debugp()
{
std::cout << "| FUN: CVideoMode_Common::CreateGameWindow : 0x" << std::hex << std::uppercase << CVideoMode_Common__CreateGameWindow.GetPtr() << std::setw(npad) << " |" << std::endl;
std::cout << "| FUN: CVideoMode_Common::CreateGameWindow : 0x" << std::hex << std::uppercase << p_CVideoMode_Common__CreateGameWindow.GetPtr() << std::setw(npad) << " |" << std::endl;
std::cout << "+----------------------------------------------------------------+" << std::endl;
}
};

53
r5dev/engine/sys_utils.cpp
View File

@ -1,5 +1,12 @@
//=============================================================================//
//
// Purpose: General system utilities.
//
//=============================================================================//
#include "core/stdafx.h"
#include "core/logdef.h"
#include "tier0/cvar.h"
#include "tier0/commandline.h"
#include "engine/common.h"
#include "engine/sys_utils.h"
@ -41,19 +48,47 @@ void HSys_Error(char* fmt, ...)
void* HSys_Warning(int level, char* fmt, ...)
{
static char buf[1024] = {};
{/////////////////////////////
va_list args{};
va_start(args, fmt);
va_list args{};
va_start(args, fmt);
vsnprintf(buf, sizeof(buf), fmt, args);
vsnprintf(buf, sizeof(buf), fmt, args);
buf[sizeof(buf) - 1] = 0;
va_end(args);
buf[sizeof(buf) - 1] = 0;
va_end(args);
}/////////////////////////////
DevMsg(eDLL_T::NONE, "Warning(%d):%s\n", level, buf); // TODO: Color
return Sys_Warning(level, buf);
}
#ifndef DEDICATED
//-----------------------------------------------------------------------------
// Purpose: Builds log to be displayed on the screen
// Input : pos -
// *fmt - ... -
// Output : void NPrintf
//-----------------------------------------------------------------------------
void HCon_NPrintf(int pos, const char* fmt, ...)
{
if (cl_showhoststats->GetBool())
{
static char buf[1024] = {};
{/////////////////////////////
va_list args{};
va_start(args, fmt);
vsnprintf(buf, sizeof(buf), fmt, args);
buf[sizeof(buf) - 1] = 0;
va_end(args);
}/////////////////////////////
snprintf((char*)g_pLogSystem.m_pszCon_NPrintf_Buf, 4096, buf);
}
}
#endif // !DEDICATED
//-----------------------------------------------------------------------------
// Purpose: Show logs to all console interfaces
// Input : idx -
@ -170,6 +205,9 @@ void SysUtils_Attach()
DetourAttach((LPVOID*)&Sys_Error, &HSys_Error);
DetourAttach((LPVOID*)&Sys_Warning, &HSys_Warning);
DetourAttach((LPVOID*)&Sys_LoadAssetHelper, &HSys_LoadAssetHelper);
#ifndef DEDICATED
DetourAttach((LPVOID*)&Con_NPrintf, &HCon_NPrintf);
#endif // !DEDICATED
}
void SysUtils_Detach()
@ -177,4 +215,7 @@ void SysUtils_Detach()
DetourDetach((LPVOID*)&Sys_Error, &HSys_Error);
DetourDetach((LPVOID*)&Sys_Warning, &HSys_Warning);
DetourDetach((LPVOID*)&Sys_LoadAssetHelper, &HSys_LoadAssetHelper);
#ifndef DEDICATED
DetourDetach((LPVOID*)&Con_NPrintf, &HCon_NPrintf);
#endif // !DEDICATED
}

6
r5dev/engine/sys_utils.h
View File

@ -11,6 +11,9 @@ namespace
ADDRESS p_Sys_LoadAssetHelper = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x74\x24\x10\x48\x89\x7C\x24\x18\x41\x56\x48\x83\xEC\x40\x33", "xxxxxxxxxxxxxxxxx");
void*(*Sys_LoadAssetHelper)(const CHAR* lpFileName, std::int64_t a2, LARGE_INTEGER* a3) = (void*(*)(const CHAR*, std::int64_t, LARGE_INTEGER*))p_Sys_LoadAssetHelper.GetPtr();/*48 89 74 24 10 48 89 7C 24 18 41 56 48 83 EC 40 33*/
ADDRESS p_Con_NPrintf = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x4C\x24\x00\x48\x89\x54\x24\x00\x4C\x89\x44\x24\x00\x4C\x89\x4C\x24\x00\xC3", "xxxx?xxxx?xxxx?xxxx?x");
void (*Con_NPrintf)(int pos, const char* fmt, ...) = (void (*)(int, const char*, ...))p_Con_NPrintf.GetPtr(); /*48 89 4C 24 ? 48 89 54 24 ? 4C 89 44 24 ? 4C 89 4C 24 ? C3*/
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
ADDRESS p_MemAlloc_Wrapper = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x53\x48\x83\xEC\x20\x48\x8B\x05\x00\x00\x00\x00\x48\x8B\xD9\x48\x85\xC0\x75\x0C\xE8\x16", "xxxxxxxxx????xxxxxxxxxx");
void* (*MemAlloc_Wrapper)(std::int64_t size) = (void* (*)(std::int64_t))p_MemAlloc_Wrapper.GetPtr(); /*40 53 48 83 EC 20 48 8B 05 ?? ?? ?? ?? 48 8B D9 48 85 C0 75 0C E8 16*/
@ -75,8 +78,9 @@ class HSys_Utils : public IDetour
virtual void debugp()
{
std::cout << "| FUN: Sys_Error : 0x" << std::hex << std::uppercase << p_Sys_Error.GetPtr() << std::setw(npad) << " |" << std::endl;
std::cout << "| FUN: Sys_Warning : 0x" << std::hex << std::uppercase << p_Warning.GetPtr() << std::setw(npad) << " |" << std::endl;
std::cout << "| FUN: Sys_Warning : 0x" << std::hex << std::uppercase << p_Warning.GetPtr() << std::setw(npad) << " |" << std::endl;
std::cout << "| FUN: Sys_LoadAssetHelper : 0x" << std::hex << std::uppercase << p_Sys_LoadAssetHelper.GetPtr() << std::setw(npad) << " |" << std::endl;
std::cout << "| FUN: Con_NPrintf : 0x" << std::hex << std::uppercase << p_Con_NPrintf.GetPtr() << std::setw(npad) << " |" << std::endl;
std::cout << "| FUN: MemAlloc_Wrapper : 0x" << std::hex << std::uppercase << p_MemAlloc_Wrapper.GetPtr() << std::setw(npad) << " |" << std::endl;
std::cout << "+----------------------------------------------------------------+" << std::endl;
}

3
r5dev/resource/cfg/autoexec_client.cfg
View File

@ -1,3 +1,6 @@
/////////////////////// client configuration file.
// This file is executed automatically on startup.
//////////////////////////
//// CLIENT ////
//////////////////////////

75
r5dev/resource/cfg/autoexec_client_dev.cfg
View File

@ -1,52 +1,75 @@
/////////////////// client_dev configuration file.
// This file is executed automatically on startup.
//////////////////////////
//// CLIENT ////
//////////////////////////
fps_max "120" // Frame rate limiter when vsync is enabled.
cl_noTimeoutLocalHost "1" // Do not time-out on local connections.
cl_threaded_bone_setup "0" // Has to be disabled on the client to prevent deadlock.
fps_max "120" // Frame rate limiter when vsync is enabled.
cl_noTimeoutLocalHost "1" // Do not time-out on local connections.
cl_threaded_bone_setup "0" // Has to be disabled on the client to prevent deadlock.
//////////////////////////
//// SIMULATION //// !!WARNING!!: CHANGING THESE CAN CAUSE SIMULATION ISSUES. DO NOT CHANGE FOR NON-DEBUG ACTIVITY!
//////////////////////////
cl_predict_cmdlimit "5000" // Num client frames since last valid snapshot before pauzing simulation.
cl_updaterate_mp "20" // Sets the num delta ticks per second.
base_tickinterval_mp "0.0500" // Sets the num simulation frames per second.
cl_predict_cmdlimit "5000" // Num client frames since last valid snapshot before pauzing simulation.
cl_updaterate_mp "20" // Sets the num delta ticks per second.
base_tickinterval_mp "0.0500" // Sets the num simulation frames per second.
//////////////////////////
//// PLATFORM ////
//////////////////////////
origin_disconnectWhenOffline "0" // Whether the client disconnect itself from the server if Origin is offline.
origin_disconnectWhenOffline "0" // Whether the client disconnect itself from the server if Origin is offline.
//////////////////////////
//// DEBUG TEXT ////
//////////////////////////
cl_showfps "1" // Shows detailed client/server data.
cl_showpos "1" // Shows detailed position data.
cl_showfps "1" // Shows detailed client/server data.
cl_showpos "1" // Shows detailed position data.
cl_showsimstats "1" // Shows detailed simulation stats.
cl_showgpustats "1" // Shows detailed GPU memory stats.
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_offset_x "0" // Host stats 'X' offset.
cl_hoststats_offset_y "0" // Host stats 'Y' offset.
cl_drawconsoleoverlay "1" // Shows DevMsg RUI console overlay.
cl_consoleoverlay_lines "5" // Num log lines for RUI console overlay.
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_offset_x "650" // Simulation stats 'X' offset.
cl_simstats_offset_y "120" // Simulation stats '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.
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_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.
//////////////////////////
//// DEBUG DRAW ////
//////////////////////////
r_drawrenderboxes "1" // Enable render boxes.
r_visualizetraces_duration "25" // Duration before code overlays get decayed.
r_debug_overlay_nodecay "0" // If set, don't decay any overlay.
cl_ent_bbox "1" // Display entity bounding boxes.
cl_ent_rbox "1" // Display entity render boxes.
cl_ent_absbox "1" // Display entity abs boxes.
r_drawrenderboxes "1" // Enable render boxes.
r_visualizetraces_duration "25" // Duration before code overlays get decayed.
r_debug_overlay_nodecay "0" // If set, don't decay any overlay.
cl_ent_bbox "1" // Display entity bounding boxes.
cl_ent_rbox "1" // Display entity render boxes.
cl_ent_absbox "1" // Display entity abs boxes.
//////////////////////////
//// MATSYS ////
//////////////////////////
mat_showdxoutput "1" // Shows debug information from the DirectX hook system.
gl_clear_color_buffer "1" // Enable or disable the clearing of the main color buffer.
//mat_sync_rt "1" // Enable to debug render threads more easily (!slower!).
//mat_sync_rt_flushes_gpu "1" // Enable to debug render threads more easily (!slower!).
mat_showdxoutput "1" // Shows debug information from the DirectX hook system.
gl_clear_color_buffer "1" // Enable or disable the clearing of the main color buffer.
//mat_sync_rt "1" // Enable to debug render threads more easily (!slower!).
//mat_sync_rt_flushes_gpu "1" // Enable to debug render threads more easily (!slower!).

3
r5dev/resource/cfg/autoexec_server.cfg
View File

@ -1,3 +1,6 @@
/////////////////////// server configuration file.
// This file is executed automatically on startup.
//////////////////////////
//// SERVER ////
//////////////////////////

3
r5dev/resource/cfg/autoexec_server_dev.cfg
View File

@ -1,3 +1,6 @@
/////////////////// server_dev configuration file.
// This file is executed automatically on startup.
//////////////////////////
//// SERVER ////
//////////////////////////

37
r5dev/tier0/IConVar.cpp
View File

@ -71,10 +71,12 @@ void ConVar::Init(void) const
//-------------------------------------------------------------------------
// CLIENT |
#ifndef DEDICATED
cl_drawconsoleoverlay = new ConVar("cl_drawconsoleoverlay" , "0" , FCVAR_DEVELOPMENTONLY, "Draw the console overlay at the top of the screen.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_consoleoverlay_lines = new ConVar("cl_consoleoverlay_lines" , "3" , FCVAR_DEVELOPMENTONLY, "Number of lines of console output to draw.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_consoleoverlay_offset_x = new ConVar("cl_consoleoverlay_offset_x", "10", FCVAR_DEVELOPMENTONLY, "X offset for console overlay.", false, 1.f, false, 50.f, nullptr, nullptr);
cl_consoleoverlay_offset_y = new ConVar("cl_consoleoverlay_offset_y", "10", FCVAR_DEVELOPMENTONLY, "Y offset for console overlay.", false, 1.f, false, 50.f, nullptr, nullptr);
cl_drawconsoleoverlay = new ConVar("cl_drawconsoleoverlay" , "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 = new ConVar("cl_consoleoverlay_lines" , "3" , FCVAR_DEVELOPMENTONLY, "Number of lines of console output to draw.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_consoleoverlay_invert_rect_x = new ConVar("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 = new ConVar("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 = new ConVar("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 = new ConVar("cl_consoleoverlay_offset_y" , "10", FCVAR_DEVELOPMENTONLY, "Y offset for RUI console overlay.", false, 1.f, false, 50.f, nullptr, nullptr);
cl_conoverlay_script_server_clr = new ConVar("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 = new ConVar("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);
@ -88,18 +90,27 @@ void ConVar::Init(void) const
cl_conoverlay_native_rtech_clr = new ConVar("cl_conoverlay_native_rtech_clr" , "025 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 = new ConVar("cl_conoverlay_native_ms_clr" , "200 020 180 255", FCVAR_DEVELOPMENTONLY, "Native materialsystem RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr);
cl_conoverlay_netcon_clr = new ConVar("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_netcon_clr = new ConVar("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_warning_clr = new ConVar("cl_conoverlay_warning_clr", "180 180 020 255", FCVAR_DEVELOPMENTONLY, "Warning RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr);
cl_conoverlay_error_clr = new ConVar("cl_conoverlay_error_clr" , "225 050 050 255", FCVAR_DEVELOPMENTONLY, "Error RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr);
cl_conoverlay_warning_clr = new ConVar("cl_conoverlay_warning_clr" , "180 180 020 255", FCVAR_DEVELOPMENTONLY, "Warning RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr);
cl_conoverlay_error_clr = new ConVar("cl_conoverlay_error_clr" , "225 050 050 255", FCVAR_DEVELOPMENTONLY, "Error RUI console overlay log color.", false, 1.f, false, 50.f, nullptr, nullptr);
cl_showhoststats = new ConVar("cl_showhoststats" , "0", FCVAR_DEVELOPMENTONLY, "Host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_hoststats_invert_rect_x = new ConVar("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 = new ConVar("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 = new ConVar("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 = new ConVar("cl_hoststats_offset_y" , "10", FCVAR_DEVELOPMENTONLY, "Y offset for host speeds debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_showsimstats = new ConVar("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_offset_x = new ConVar("cl_simstats_offset_x", "1250", FCVAR_DEVELOPMENTONLY, "X offset for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_simstats_offset_y = new ConVar("cl_simstats_offset_y", "885" , FCVAR_DEVELOPMENTONLY, "Y offset for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_showsimstats = new ConVar("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 = new ConVar("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 = new ConVar("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 = new ConVar("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 = new ConVar("cl_simstats_offset_y" , "120", FCVAR_DEVELOPMENTONLY, "Y offset for simulation debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_showgpustats = new ConVar("cl_showgpustats" , "0" , FCVAR_DEVELOPMENTONLY, "Texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_gpustats_offset_x = new ConVar("cl_gpustats_offset_x", "1250", FCVAR_DEVELOPMENTONLY, "X offset for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_gpustats_offset_y = new ConVar("cl_gpustats_offset_y", "900" , FCVAR_DEVELOPMENTONLY, "Y offset for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_showgpustats = new ConVar("cl_showgpustats" , "0", FCVAR_DEVELOPMENTONLY, "Texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_gpustats_invert_rect_x = new ConVar("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 = new ConVar("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 = new ConVar("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 = new ConVar("cl_gpustats_offset_y" , "105", FCVAR_DEVELOPMENTONLY, "Y offset for texture streaming debug overlay.", false, 0.f, false, 0.f, nullptr, nullptr);
con_max_size_logvector = new ConVar("con_max_size_logvector", "1000", FCVAR_DEVELOPMENTONLY, "Maximum number of logs in the console until cleanup starts.", false, 0.f, false, 0.f, nullptr, nullptr);
con_suggestion_limit = new ConVar("con_suggestion_limit" , "120" , FCVAR_DEVELOPMENTONLY, "Maximum number of suggestions the autocomplete window will show for the console.", false, 0.f, false, 0.f, nullptr, nullptr);

12
r5dev/tier0/cvar.cpp
View File

@ -31,6 +31,8 @@ ConVar* sv_rcon_whitelist_address = nullptr;
#ifndef DEDICATED
ConVar* cl_drawconsoleoverlay = 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;
@ -48,11 +50,21 @@ ConVar* cl_conoverlay_netcon_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_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_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_offset_x = nullptr;
ConVar* cl_gpustats_offset_y = nullptr;

14
r5dev/tier0/cvar.h
View File

@ -42,6 +42,8 @@ extern ConVar* sv_rcon_whitelist_address;
#ifndef DEDICATED
extern ConVar* cl_drawconsoleoverlay;
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;
@ -59,11 +61,21 @@ extern ConVar* cl_conoverlay_netcon_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_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_offset_x;
extern ConVar* cl_simstats_offset_y;
extern ConVar* cl_showgpustats;;
extern ConVar* cl_showgpustats;
extern ConVar* cl_gpustats_invert_rect_x;
extern ConVar* cl_gpustats_invert_rect_y;
extern ConVar* cl_gpustats_offset_x;
extern ConVar* cl_gpustats_offset_y;

2
r5dev/vgui/vgui_baseui_interface.cpp
View File

@ -6,6 +6,8 @@
//===========================================================================//
#include <core/stdafx.h>
#include "tier0/cvar.h"
#include <engine/sys_utils.h>
#include <vgui/vgui_debugpanel.h>
#include <vgui/vgui_baseui_interface.h>

69
r5dev/vgui/vgui_debugpanel.cpp
View File

@ -7,6 +7,8 @@
#include <core/stdafx.h>
#include <tier0/cvar.h>
#include <windows/id3dx.h>
#include <vpc/keyvalues.h>
#include <mathlib/color.h>
#include <vgui/vgui_debugpanel.h>
#include <vguimatsurface/MatSystemSurface.h>
@ -36,6 +38,10 @@ void CLogSystem::Update(void)
{
DrawGPUStats();
}
if (cl_showhoststats->GetBool())
{
DrawHostStats();
}
}
//-----------------------------------------------------------------------------
@ -64,10 +70,20 @@ void CLogSystem::DrawLog(void)
float fadepct = fminf(static_cast<float>(m_vLogs[i].m_nTicks) / 255.f, 4.f); // TODO [ AMOS ]: register a ConVar for this!
float ptc = static_cast<int>(ceilf(fadepct * 100.f));
int alpha = static_cast<int>(ptc);
int y = (cl_consoleoverlay_offset_y->GetInt() + (m_nFontHeight * i));
int x = cl_consoleoverlay_offset_x->GetInt();
int y = cl_consoleoverlay_offset_y->GetInt() + (m_nFontHeight * i);
Color c = GetLogColorForType(m_vLogs[i].m_type);
if (cl_consoleoverlay_invert_rect_x->GetBool())
{
x = g_nWindowWidth - cl_consoleoverlay_offset_x->GetInt();
}
if (cl_consoleoverlay_invert_rect_y->GetBool())
{
y = g_nWindowHeight - cl_consoleoverlay_offset_y->GetInt();
y += m_nFontHeight * i;
}
CMatSystemSurface_DrawColoredText(g_pMatSystemSurface, 0x13, m_nFontHeight, x, y, c.r(), c.g(), c.b(), alpha, m_vLogs[i].m_svMessage.c_str());
}
else
@ -85,17 +101,50 @@ void CLogSystem::DrawLog(void)
}
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CLogSystem::DrawHostStats(void) const
{
int nWidth = cl_hoststats_offset_x->GetInt();
int nHeight = cl_hoststats_offset_y->GetInt();
static Color c = { 255, 255, 255, 255 };
if (cl_hoststats_invert_rect_x->GetBool())
{
nWidth = g_nWindowWidth - nWidth;
}
if (cl_hoststats_invert_rect_y->GetBool())
{
nHeight = g_nWindowHeight - nHeight;
}
CMatSystemSurface_DrawColoredText(g_pMatSystemSurface, 0x13, m_nFontHeight, nWidth, nHeight, c.r(), c.g(), c.b(), c.a(), (char*)m_pszCon_NPrintf_Buf);
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CLogSystem::DrawSimStats(void) const
{
int nWidth = cl_simstats_offset_x->GetInt();
int nHeight = cl_simstats_offset_y->GetInt();
static Color c = { 255, 255, 255, 255 };
static const char* szLogbuf[4096]{};
snprintf((char*)szLogbuf, 4096, "Server Frame: (%d) Client Frame: (%d) Render Frame: (%d)\n",
*sv_m_nTickCount, *cl_host_tickcount, *render_tickcount);
CMatSystemSurface_DrawColoredText(g_pMatSystemSurface, 0x13, m_nFontHeight, cl_simstats_offset_x->GetInt(), cl_simstats_offset_y->GetInt(), c.r(), c.g(), c.b(), c.a(), (char*)szLogbuf);
if (cl_simstats_invert_rect_x->GetBool())
{
nWidth = g_nWindowWidth - nWidth;
}
if (cl_simstats_invert_rect_y->GetBool())
{
nHeight = g_nWindowHeight - nHeight;
}
CMatSystemSurface_DrawColoredText(g_pMatSystemSurface, 0x13, m_nFontHeight, nWidth, nHeight, c.r(), c.g(), c.b(), c.a(), (char*)szLogbuf);
}
//-----------------------------------------------------------------------------
@ -103,12 +152,24 @@ void CLogSystem::DrawSimStats(void) const
//-----------------------------------------------------------------------------
void CLogSystem::DrawGPUStats(void) const
{
int nWidth = cl_gpustats_offset_x->GetInt();
int nHeight = cl_gpustats_offset_y->GetInt();
static Color c = { 255, 255, 255, 255 };
static const char* szLogbuf[4096]{};
snprintf((char*)szLogbuf, 4096, "%8d/%8d/%8dkiB unusable/unfree/total GPU Streaming Texture memory\n",
*unusable_streaming_tex_memory / 1024, *unfree_streaming_tex_memory / 1024, *unusable_streaming_tex_memory / 1024);
CMatSystemSurface_DrawColoredText(g_pMatSystemSurface, 0x13, m_nFontHeight, cl_gpustats_offset_x->GetInt(), cl_gpustats_offset_y->GetInt(), c.r(), c.g(), c.b(), c.a(), (char*)szLogbuf);
if (cl_gpustats_invert_rect_x->GetBool())
{
nWidth = g_nWindowWidth - nWidth;
}
if (cl_gpustats_invert_rect_y->GetBool())
{
nHeight = g_nWindowHeight - nHeight;
}
CMatSystemSurface_DrawColoredText(g_pMatSystemSurface, 0x13, m_nFontHeight, nWidth, nHeight, c.r(), c.g(), c.b(), c.a(), (char*)szLogbuf);
}
//-----------------------------------------------------------------------------

4
r5dev/vgui/vgui_debugpanel.h
View File

@ -39,6 +39,7 @@ public:
void Update(void);
void AddLog(LogType_t type, std::string svText);
void DrawLog(void);
void DrawHostStats(void) const;
void DrawSimStats(void) const;
void DrawGPUStats(void) const;
@ -46,6 +47,9 @@ private:
Color GetLogColorForType(LogType_t type) const;
std::vector<LogMsg_t> m_vLogs{};
int m_nFontHeight = 16;
public:
char* m_pszCon_NPrintf_Buf[4096]{};
};
///////////////////////////////////////////////////////////////////////////////

1
r5dev/vproj/gamesdk.vcxproj
View File

@ -46,6 +46,7 @@
<ClCompile Include="..\engine\sys_dll.cpp" />
<ClCompile Include="..\engine\sys_dll2.cpp" />
<ClCompile Include="..\engine\sys_engine.cpp" />
<ClCompile Include="..\engine\sys_getmodes.cpp" />
<ClCompile Include="..\engine\sys_utils.cpp" />
<ClCompile Include="..\gameui\IConsole.cpp" />
<ClCompile Include="..\gameui\IBrowser.cpp" />

3
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -381,6 +381,9 @@
<ClCompile Include="..\game\server\ai_networkmanager.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
<ClCompile Include="..\engine\sys_getmodes.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">

3
r5dev/windows/id3dx.cpp
View File

@ -372,6 +372,9 @@ HRESULT __stdcall GetResizeBuffers(IDXGISwapChain* pSwapChain, UINT nBufferCount
g_bInitialized = false;
g_bPresentHooked = false;
g_nWindowWidth = nWidth;
g_nWindowHeight = nHeight;
///////////////////////////////////////////////////////////////////////////////
DestroyRenderTarget();

2
r5dev/windows/id3dx.h
View File

@ -28,6 +28,8 @@ typedef HRESULT(__stdcall* IDXGIResizeBuffers) (IDXGISwapChain* pSwapChain, UI
/////////////////////////////////////////////////////////////////////////////
// Globals
extern DWORD g_dThreadId;
inline INT g_nWindowWidth;
inline INT g_nWindowHeight;
/////////////////////////////////////////////////////////////////////////////
// Enums