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

Add ConVar's and hooks for disabling the rendering of world brush entity

Browse Source 
This is mainly for development only and in the event so many models/textures/shaders are missing, the engine would effectively crash otherwise (if some of these aren't disabled).
This commit is contained in:
Kawe Mazidjatari 2022-04-29 20:12:54 +02:00
parent 827641b9b1
commit 30ce3e949f
11 changed files with 164 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
r5dev/core/init.cpp
View File

@ -82,6 +82,7 @@
#include "engine/gl_matsysiface.h"
#include "engine/gl_screen.h"
#ifndef DEDICATED
#include "engine/gl_rsurf.h"
#include "engine/debugoverlay.h"
#endif // !DEDICATED
#ifndef CLIENT_DLL
@ -196,6 +197,7 @@ void Systems_Init()
#ifndef DEDICATED
HCVideoMode_Common_Attach();
//DebugOverlays_Attach();
RSurf_Attach();
#endif // !DEDICATED
#ifndef CLIENT_DLL
@ -305,6 +307,7 @@ void Systems_Shutdown()
#ifndef DEDICATED
HCVideoMode_Common_Detach();
//DebugOverlays_Detach();
RSurf_Detach();
#endif // !DEDICATED
#ifndef CLIENT_DLL

47
r5dev/engine/gl_rsurf.cpp Normal file
View File

@ -0,0 +1,47 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose: render surface
//
// $NoKeywords: $
//===========================================================================//
#include "core/stdafx.h"
#include "tier1/cvar.h"
#include "engine/gl_rsurf.h"
void* R_DrawWorldMeshes(void* baseEntity, void* renderContext, DrawWorldLists_t worldLists)
{
if (r_drawWorldMeshes->GetBool())
return V_DrawWorldMeshes(baseEntity, renderContext, worldLists);
else
return nullptr;
}
void* R_DrawWorldMeshesDepthOnly(void* renderContext, DrawWorldLists_t worldLists)
{
if (r_drawWorldMeshesDepthOnly->GetBool())
return V_DrawWorldMeshesDepthOnly(renderContext, worldLists);
else
return nullptr;
}
void* R_DrawWorldMeshesDepthAtTheEnd(void* ptr1, void* ptr2, void* ptr3, DrawWorldLists_t worldLists)
{
if (r_drawWorldMeshesDepthAtTheEnd->GetBool())
return V_DrawWorldMeshesDepthAtTheEnd(ptr1, ptr2, ptr3, worldLists);
else
return nullptr;
}
void RSurf_Attach()
{
DetourAttach((LPVOID*)&V_DrawWorldMeshes, &R_DrawWorldMeshes);
DetourAttach((LPVOID*)&V_DrawWorldMeshesDepthOnly, &R_DrawWorldMeshesDepthOnly);
DetourAttach((LPVOID*)&V_DrawWorldMeshesDepthAtTheEnd, &R_DrawWorldMeshesDepthAtTheEnd);
}
void RSurf_Detach()
{
DetourDetach((LPVOID*)&V_DrawWorldMeshes, &R_DrawWorldMeshes);
DetourDetach((LPVOID*)&V_DrawWorldMeshesDepthOnly, &R_DrawWorldMeshesDepthOnly);
DetourDetach((LPVOID*)&V_DrawWorldMeshesDepthAtTheEnd, &R_DrawWorldMeshesDepthAtTheEnd);
}

49
r5dev/engine/gl_rsurf.h Normal file
View File

@ -0,0 +1,49 @@
#ifndef GL_RSURF_H
#define GL_RSURF_H
#include "public/include/ivrenderview.h"
inline CMemory P_DrawWorldMeshes;
inline auto V_DrawWorldMeshes = P_DrawWorldMeshes.RCast<void* (*)(void* baseEntity, void* renderContext, DrawWorldLists_t worldLists)>();
inline CMemory P_DrawWorldMeshesDepthOnly;
inline auto V_DrawWorldMeshesDepthOnly = P_DrawWorldMeshesDepthOnly.RCast<void*(*)(void* renderContext, DrawWorldLists_t worldLists)>();
inline CMemory P_DrawWorldMeshesDepthAtTheEnd;
inline auto V_DrawWorldMeshesDepthAtTheEnd = P_DrawWorldMeshesDepthAtTheEnd.RCast<void* (*)(void* ptr1, void* ptr2, void* ptr3, DrawWorldLists_t worldLists)>();
void RSurf_Attach();
void RSurf_Detach();
///////////////////////////////////////////////////////////////////////////////
class HGL_RSurf : public IDetour
{
virtual void GetAdr(void) const
{
std::cout << "| FUN: R_DrawWorldMeshes : 0x" << std::hex << std::uppercase << P_DrawWorldMeshes.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| FUN: R_DrawWorldMeshesDepthOnly : 0x" << std::hex << std::uppercase << P_DrawWorldMeshesDepthOnly.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "| FUN: R_DrawWorldMeshesDepthAtTheEnd : 0x" << std::hex << std::uppercase << P_DrawWorldMeshesDepthAtTheEnd.GetPtr() << std::setw(nPad) << " |" << std::endl;
std::cout << "+----------------------------------------------------------------+" << std::endl;
}
virtual void GetFun(void) const
{
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
P_DrawWorldMeshes = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8B\xC4\x48\x89\x48\x08\x53\x48\x83\xEC\x70"), "xxxxxxxxxxxx");
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
P_DrawWorldMeshes = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x56\x57\xB8\x00\x00\x00\x00"), "xxxx????");
#endif
P_DrawWorldMeshesDepthOnly = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x56\x57\xB8\x00\x00\x00\x00"), "xxxx????");
P_DrawWorldMeshesDepthAtTheEnd = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x57\x48\x83\xEC\x20\x48\x8B\x0D\x00\x00\x00\x00\x41\x8B\xF9"), "xxxx?xxxx?xxxxxxxx????xxx");
V_DrawWorldMeshes = P_DrawWorldMeshes.RCast<void* (*)(void*, void*, DrawWorldLists_t)>();
V_DrawWorldMeshesDepthOnly = P_DrawWorldMeshesDepthOnly.RCast<void* (*)(void*, DrawWorldLists_t)>();
V_DrawWorldMeshesDepthAtTheEnd = P_DrawWorldMeshesDepthAtTheEnd.RCast<void* (*)(void*, void*, void*, DrawWorldLists_t)>();
}
virtual void GetVar(void) const { }
virtual void GetCon(void) const { }
virtual void Attach(void) const { }
virtual void Detach(void) const { }
};
///////////////////////////////////////////////////////////////////////////////
REGISTER(HGL_RSurf);
#endif // GL_RSURF_H

26
r5dev/public/include/ivrenderview.h Normal file
View File

@ -0,0 +1,26 @@
#ifndef IVRENDERVIEW_H
#define IVRENDERVIEW_H
//-----------------------------------------------------------------------------
// Flags used by DrawWorldLists
//-----------------------------------------------------------------------------
enum class DrawWorldLists_t : int
{
DRAWWORLDLISTS_DRAW_STRICTLYABOVEWATER = 0x001,
DRAWWORLDLISTS_DRAW_STRICTLYUNDERWATER = 0x002,
DRAWWORLDLISTS_DRAW_INTERSECTSWATER = 0x004,
DRAWWORLDLISTS_DRAW_WATERSURFACE = 0x008,
DRAWWORLDLISTS_DRAW_SKYBOX = 0x010,
DRAWWORLDLISTS_DRAW_CLIPSKYBOX = 0x020,
DRAWWORLDLISTS_DRAW_SHADOWDEPTH = 0x040,
DRAWWORLDLISTS_DRAW_REFRACTION = 0x080,
DRAWWORLDLISTS_DRAW_REFLECTION = 0x100,
DRAWWORLDLISTS_DRAW_WORLD_GEOMETRY = 0x200,
DRAWWORLDLISTS_DRAW_DECALS_AND_OVERLAYS = 0x400,
DRAWWORLDLISTS_DRAW_SIMPLE_WORLD_MODEL = 0x800,
DRAWWORLDLISTS_DRAW_SIMPLE_WORLD_MODEL_WATER = 0x1000,
DRAWWORLDLISTS_DRAW_SKIP_DISPLACEMENTS = 0x2000,
DRAWWORLDLISTS_DRAW_SSAO = 0x4000,
};
#endif // !IVRENDERVIEW_H

6
r5dev/tier1/IConVar.cpp
View File

@ -51,11 +51,15 @@ void ConVar::Init(void) const
cm_unset_all_cmdquery = new ConVar("cm_unset_all_cmdquery" , "0", FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED, "Returns false on every ConVar/ConCommand query ( !warning! ).", false, 0.f, false, 0.f, nullptr, nullptr);
cm_unset_dev_cmdquery = new ConVar("cm_unset_dev_cmdquery" , "1", FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED, "Returns false on all FCVAR_DEVELOPMENTONLY ConVar/ConCommand queries ( !warning! ).", false, 0.f, false, 0.f, nullptr, nullptr);
cm_unset_cheat_cmdquery = new ConVar("cm_unset_cheat_cmdquery", "0", FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED, "Returns false on all FCVAR_DEVELOPMENTONLY and FCVAR_CHEAT ConVar/ConCommand queries ( !warning! ).", false, 0.f, false, 0.f, nullptr, nullptr);
r_debug_overlay_nodecay = new ConVar("r_debug_overlay_nodecay", "0", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT , "Keeps all debug overlays alive regardless of their lifetime. Use command 'clear_debug_overlays' to clear everything.", false, 0.f, false, 0.f, nullptr, nullptr);
// TODO: RconPasswordChanged_f
rcon_address = new ConVar("rcon_address", "::", FCVAR_SERVER_CANNOT_QUERY | FCVAR_DONTRECORD | FCVAR_RELEASE, "Remote server access address.", false, 0.f, false, 0.f, nullptr, nullptr);
rcon_password = new ConVar("rcon_password", "" , FCVAR_SERVER_CANNOT_QUERY | FCVAR_DONTRECORD | FCVAR_RELEASE, "Remote server access password (rcon is disabled if empty).", false, 0.f, false, 0.f, nullptr, nullptr);
r_debug_overlay_nodecay = new ConVar("r_debug_overlay_nodecay" , "0", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT, "Keeps all debug overlays alive regardless of their lifetime. Use command 'clear_debug_overlays' to clear everything.", false, 0.f, false, 0.f, nullptr, nullptr);
r_drawWorldMeshes = new ConVar("r_drawWorldMeshes" , "1", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT, "Render world meshes.", false, 0.f, false, 0.f, nullptr, nullptr);
r_drawWorldMeshesDepthOnly = new ConVar("r_drawWorldMeshesDepthOnly" , "1", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT, "Render world meshes (depth only).", false, 0.f, false, 0.f, nullptr, nullptr);
r_drawWorldMeshesDepthAtTheEnd = new ConVar("r_drawWorldMeshesDepthAtTheEnd", "1", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT, "Render world meshes (depth at the end).", false, 0.f, false, 0.f, nullptr, nullptr);
//-------------------------------------------------------------------------
// SERVER |
ai_ainDumpOnLoad = new ConVar("ai_ainDumpOnLoad" , "0", FCVAR_DEVELOPMENTONLY, "Dumps AIN data from node graphs loaded from the disk on load.", false, 0.f, false, 0.f, nullptr, nullptr);

6
r5dev/tier1/cvar.cpp
View File

@ -16,10 +16,14 @@ ConVar* cm_debug_cmdquery = nullptr;
ConVar* cm_unset_all_cmdquery = nullptr;
ConVar* cm_unset_dev_cmdquery = nullptr;
ConVar* cm_unset_cheat_cmdquery = nullptr;
ConVar* r_debug_overlay_nodecay = nullptr;
ConVar* rcon_address = nullptr;
ConVar* rcon_password = nullptr;
ConVar* r_debug_overlay_nodecay = nullptr;
ConVar* r_drawWorldMeshes = nullptr;
ConVar* r_drawWorldMeshesDepthOnly = nullptr;
ConVar* r_drawWorldMeshesDepthAtTheEnd = nullptr;
//-----------------------------------------------------------------------------
// SERVER |
ConVar* ai_ainDumpOnLoad = nullptr;

6
r5dev/tier1/cvar.h
View File

@ -15,10 +15,14 @@ extern ConVar* cm_debug_cmdquery;
extern ConVar* cm_unset_all_cmdquery;
extern ConVar* cm_unset_dev_cmdquery;
extern ConVar* cm_unset_cheat_cmdquery;
extern ConVar* r_debug_overlay_nodecay;
extern ConVar* rcon_address;
extern ConVar* rcon_password;
extern ConVar* r_debug_overlay_nodecay;
extern ConVar* r_drawWorldMeshes;
extern ConVar* r_drawWorldMeshesDepthOnly;
extern ConVar* r_drawWorldMeshesDepthAtTheEnd;
//-------------------------------------------------------------------------
// SERVER |
extern ConVar* ai_ainDumpOnLoad;

3
r5dev/vproj/clientsdk.vcxproj
View File

@ -31,6 +31,7 @@
<ClCompile Include="..\engine\cl_rcon.cpp" />
<ClCompile Include="..\engine\cmodel_bsp.cpp" />
<ClCompile Include="..\engine\common.cpp" />
<ClCompile Include="..\engine\gl_rsurf.cpp" />
<ClCompile Include="..\engine\gl_screen.cpp" />
<ClCompile Include="..\engine\host_cmd.cpp" />
<ClCompile Include="..\engine\host_state.cpp" />
@ -142,6 +143,7 @@
<ClInclude Include="..\engine\debugoverlay.h" />
<ClInclude Include="..\engine\gl_matsysiface.h" />
<ClInclude Include="..\engine\gl_model_private.h" />
<ClInclude Include="..\engine\gl_rsurf.h" />
<ClInclude Include="..\engine\gl_screen.h" />
<ClInclude Include="..\engine\host.h" />
<ClInclude Include="..\engine\host_cmd.h" />
@ -189,6 +191,7 @@
<ClInclude Include="..\public\include\edict.h" />
<ClInclude Include="..\public\include\globalvars_base.h" />
<ClInclude Include="..\public\include\inetchannel.h" />
<ClInclude Include="..\public\include\ivrenderview.h" />
<ClInclude Include="..\public\include\memaddr.h" />
<ClInclude Include="..\public\include\bansystem.h" />
<ClInclude Include="..\public\include\binstream.h" />

9
r5dev/vproj/clientsdk.vcxproj.filters
View File

@ -441,6 +441,9 @@
<ClCompile Include="..\game\client\spritemodel.cpp">
<Filter>sdk\game\client</Filter>
</ClCompile>
<ClCompile Include="..\engine\gl_rsurf.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -1256,6 +1259,12 @@
<ClInclude Include="..\public\include\const.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\engine\gl_rsurf.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\public\include\ivrenderview.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">

3
r5dev/vproj/gamesdk.vcxproj
View File

@ -32,6 +32,7 @@
<ClCompile Include="..\engine\cl_rcon.cpp" />
<ClCompile Include="..\engine\cmodel_bsp.cpp" />
<ClCompile Include="..\engine\common.cpp" />
<ClCompile Include="..\engine\gl_rsurf.cpp" />
<ClCompile Include="..\engine\gl_screen.cpp" />
<ClCompile Include="..\engine\host_cmd.cpp" />
<ClCompile Include="..\engine\host_state.cpp" />
@ -151,6 +152,7 @@
<ClInclude Include="..\engine\debugoverlay.h" />
<ClInclude Include="..\engine\gl_matsysiface.h" />
<ClInclude Include="..\engine\gl_model_private.h" />
<ClInclude Include="..\engine\gl_rsurf.h" />
<ClInclude Include="..\engine\gl_screen.h" />
<ClInclude Include="..\engine\host.h" />
<ClInclude Include="..\engine\host_cmd.h" />
@ -206,6 +208,7 @@
<ClInclude Include="..\public\include\edict.h" />
<ClInclude Include="..\public\include\globalvars_base.h" />
<ClInclude Include="..\public\include\inetchannel.h" />
<ClInclude Include="..\public\include\ivrenderview.h" />
<ClInclude Include="..\public\include\memaddr.h" />
<ClInclude Include="..\public\include\bansystem.h" />
<ClInclude Include="..\public\include\binstream.h" />

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

@ -471,6 +471,9 @@
<ClCompile Include="..\game\client\spritemodel.cpp">
<Filter>sdk\game\client</Filter>
</ClCompile>
<ClCompile Include="..\engine\gl_rsurf.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -1316,6 +1319,12 @@
<ClInclude Include="..\game\client\hud.h">
<Filter>sdk\game\client</Filter>
</ClInclude>
<ClInclude Include="..\engine\gl_rsurf.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\public\include\ivrenderview.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">