Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Added a dvar for player draw debug distance, use array for dvar enums, a bit of formatting

Browse Source
This commit is contained in:
Louvenarde 2021-11-11 14:00:46 +01:00
parent b57a780051
commit 892f521728
2 changed files with 66 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/Components/Modules/Renderer.cpp
View File

@ -8,17 +8,29 @@ namespace Components
Utils::Signal<Scheduler::Callback> Renderer::EndRecoverDeviceSignal; Utils::Signal<Scheduler::Callback> Renderer::EndRecoverDeviceSignal;
Utils::Signal<Scheduler::Callback> Renderer::BeginRecoverDeviceSignal; Utils::Signal<Scheduler::Callback> Renderer::BeginRecoverDeviceSignal;
Dvar::Var Renderer::DrawTriggers; Dvar::Var Renderer::r_drawTriggers;
Dvar::Var Renderer::DrawSceneModelCollisions; Dvar::Var Renderer::r_drawSceneModelCollisions;
Dvar::Var Renderer::DrawModelBoundingBoxes; Dvar::Var Renderer::r_drawModelBoundingBoxes;
Dvar::Var Renderer::DrawModelNames; Dvar::Var Renderer::r_drawModelNames;
Dvar::Var Renderer::DrawAABBTrees; Dvar::Var Renderer::r_drawAABBTrees;
Dvar::Var Renderer::r_playerDrawDebugDistance;
float cyan[4] = { 0.0f, 0.5f, 0.5f, 1.0f };
float red[4] = { 1.0f, 0.0f, 0.0f, 1.0f };
float green[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
// R_draw model names & collisions colors
float sceneModelsColor[4] = { 1.0f, 1.0f, 0.0f, 1.0f }; float sceneModelsColor[4] = { 1.0f, 1.0f, 0.0f, 1.0f };
float dobjsColor[4] = { 0.0f, 1.0f, 1.0f, 1.0f }; float dobjsColor[4] = { 0.0f, 1.0f, 1.0f, 1.0f };
float staticModelsColor[4] = { 1.0f, 0.0f, 1.0f, 1.0f }; float staticModelsColor[4] = { 1.0f, 0.0f, 1.0f, 1.0f };
float gentitiesColor[4] = { 1.0f, 0.5f, 0.5f, 1.0f }; float gentitiesColor[4] = { 1.0f, 0.5f, 0.5f, 1.0f };
int drawDistance = 80000;
// Trigger colors
float hurt[4] = { 1.0f, 0.0f, 0.0f, 1.0f };
float hurtTouch[4] = { 0.75f, 0.0f, 0.0f, 1.0f };
float damage[4] = { 0.0f, 0.0f, 1.0f, 1.0f };
float once[4] = { 0.0f, 1.0f, 1.0f, 1.0f };
float multiple[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
__declspec(naked) void Renderer::FrameStub() __declspec(naked) void Renderer::FrameStub()
{ {
@ -180,17 +192,11 @@ namespace Components
void Renderer::DebugDrawTriggers() void Renderer::DebugDrawTriggers()
{ {
if (!DrawTriggers.get<bool>()) return; if (!r_drawTriggers.get<bool>()) return;
float hurt[4] = { 1.0f, 0.0f, 0.0f, 1.0f };
float hurtTouch[4] = { 0.75f, 0.0f, 0.0f, 1.0f };
float damage[4] = { 0.0f, 0.0f, 1.0f, 1.0f };
float once[4] = { 0.0f, 1.0f, 1.0f, 1.0f };
float multiple[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
auto* entities = Game::g_entities; auto* entities = Game::g_entities;
for (auto i = 0u; i < 0x800; i++) for (auto i = 0u; i < 0x800u; i++)
{ {
auto* ent = &entities[i]; auto* ent = &entities[i];
@ -223,9 +229,9 @@ namespace Components
break; break;
default: default:
float rv = std::min((float)ent->handler, (float)5) / 5; auto rv = std::min(static_cast<float>(ent->handler), 5.0f) / 5.0f;
float gv = std::clamp((float)ent->handler - 5, (float)0, (float)5) / 5; auto gv = std::clamp(static_cast<float>(ent->handler - 5), 0.f, 5.f) / 5.f;
float bv = std::clamp((float)ent->handler - 10, (float)0, (float)5) / 5; auto bv = std::clamp(static_cast<float>(ent->handler - 10), 0.f, 5.f) / 5.f;
float color[4] = { rv, gv, bv, 1.0f }; float color[4] = { rv, gv, bv, 1.0f };
@ -238,9 +244,7 @@ namespace Components
void Renderer::DebugDrawSceneModelCollisions() void Renderer::DebugDrawSceneModelCollisions()
{ {
if (!DrawSceneModelCollisions.get<bool>()) return; if (!r_drawSceneModelCollisions.get<bool>()) return;
float green[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
auto* scene = Game::scene; auto* scene = Game::scene;
@ -266,12 +270,19 @@ namespace Components
void Renderer::DebugDrawModelBoundingBoxes() void Renderer::DebugDrawModelBoundingBoxes()
{ {
auto val = DrawModelBoundingBoxes.get<Game::dvar_t*>()->current.integer; auto val = r_drawModelBoundingBoxes.get<int>();
if (!val) return; if (!val) return;
// Ingame only
int clientNum = Game::CG_GetClientNum(); int clientNum = Game::CG_GetClientNum();
if (!Game::CL_IsCgameInitialized() || clientNum >= 18 || clientNum < 0 || !Game::g_entities[clientNum].client) return; if (!Game::CL_IsCgameInitialized() ||
clientNum >= 18 ||
clientNum < 0 ||
!Game::g_entities[clientNum].client) {
return;
}
Game::gentity_t* clientEntity = &Game::g_entities[clientNum]; Game::gentity_t* clientEntity = &Game::g_entities[clientNum];
@ -288,7 +299,7 @@ namespace Components
if (!scene->sceneModel[i].model) if (!scene->sceneModel[i].model)
continue; continue;
if (Utils::Vec3SqrDistance(playerPosition, &scene->sceneModel[i].placement.base.origin) < drawDistance) if (Utils::Vec3SqrDistance(playerPosition, &scene->sceneModel[i].placement.base.origin) < r_playerDrawDebugDistance.get<int>())
{ {
auto b = scene->sceneModel[i].model->bounds; auto b = scene->sceneModel[i].model->bounds;
b.midPoint[0] += scene->sceneModel[i].placement.base.origin[0]; b.midPoint[0] += scene->sceneModel[i].placement.base.origin[0];
@ -306,7 +317,7 @@ namespace Components
for (auto i = 0; i < scene->sceneDObjCount; i++) for (auto i = 0; i < scene->sceneDObjCount; i++)
{ {
if (Utils::Vec3SqrDistance(playerPosition, &scene->sceneDObj[i].cull.bounds.midPoint) < drawDistance) if (Utils::Vec3SqrDistance(playerPosition, &scene->sceneDObj[i].cull.bounds.midPoint) < r_playerDrawDebugDistance.get<int>())
{ {
scene->sceneDObj[i].cull.bounds.halfSize[0] = std::abs(scene->sceneDObj[i].cull.bounds.halfSize[0]); scene->sceneDObj[i].cull.bounds.halfSize[0] = std::abs(scene->sceneDObj[i].cull.bounds.halfSize[0]);
scene->sceneDObj[i].cull.bounds.halfSize[1] = std::abs(scene->sceneDObj[i].cull.bounds.halfSize[1]); scene->sceneDObj[i].cull.bounds.halfSize[1] = std::abs(scene->sceneDObj[i].cull.bounds.halfSize[1]);
@ -331,7 +342,7 @@ namespace Components
{ {
auto staticModel = world->dpvs.smodelDrawInsts[i]; auto staticModel = world->dpvs.smodelDrawInsts[i];
if (Utils::Vec3SqrDistance(playerPosition, &staticModel.placement.origin) < drawDistance) if (Utils::Vec3SqrDistance(playerPosition, &staticModel.placement.origin) < r_playerDrawDebugDistance.get<int>())
{ {
if (staticModel.model) if (staticModel.model)
{ {
@ -353,12 +364,19 @@ namespace Components
void Renderer::DebugDrawModelNames() void Renderer::DebugDrawModelNames()
{ {
auto val = DrawModelNames.get<Game::dvar_t*>()->current.integer; auto val = r_drawModelNames.get<int>();
if (!val) return; if (!val) return;
// Ingame only
int clientNum = Game::CG_GetClientNum(); int clientNum = Game::CG_GetClientNum();
if (!Game::CL_IsCgameInitialized() || clientNum >= 18 || clientNum < 0 || !Game::g_entities[clientNum].client) return; if (!Game::CL_IsCgameInitialized() ||
clientNum >= 18 ||
clientNum < 0 ||
!Game::g_entities[clientNum].client) {
return;
}
Game::gentity_t* clientEntity = &Game::g_entities[clientNum]; Game::gentity_t* clientEntity = &Game::g_entities[clientNum];
@ -375,7 +393,7 @@ namespace Components
if (!scene->sceneModel[i].model) if (!scene->sceneModel[i].model)
continue; continue;
if (Utils::Vec3SqrDistance(playerPosition, &scene->sceneModel[i].placement.base.origin) < drawDistance) if (Utils::Vec3SqrDistance(playerPosition, &scene->sceneModel[i].placement.base.origin) < r_playerDrawDebugDistance.get<int>())
{ {
Game::R_AddDebugString(sceneModelsColor, scene->sceneModel[i].placement.base.origin, 1.0, scene->sceneModel[i].model->name); Game::R_AddDebugString(sceneModelsColor, scene->sceneModel[i].placement.base.origin, 1.0, scene->sceneModel[i].model->name);
} }
@ -389,7 +407,7 @@ namespace Components
{ {
for (int j = 0; j < scene->sceneDObj[i].obj->numModels; j++) for (int j = 0; j < scene->sceneDObj[i].obj->numModels; j++)
{ {
if (Utils::Vec3SqrDistance(playerPosition, &scene->sceneDObj[i].placement.origin) < drawDistance) if (Utils::Vec3SqrDistance(playerPosition, &scene->sceneDObj[i].placement.origin) < r_playerDrawDebugDistance.get<int>())
{ {
Game::R_AddDebugString(dobjsColor, scene->sceneDObj[i].placement.origin, 1.0, scene->sceneDObj[i].obj->models[j]->name); Game::R_AddDebugString(dobjsColor, scene->sceneDObj[i].placement.origin, 1.0, scene->sceneDObj[i].obj->models[j]->name);
} }
@ -406,7 +424,7 @@ namespace Components
if (staticModel.model) if (staticModel.model)
{ {
auto dist = Utils::Vec3SqrDistance(playerPosition, &staticModel.placement.origin); auto dist = Utils::Vec3SqrDistance(playerPosition, &staticModel.placement.origin);
if (dist < drawDistance) if (dist < r_playerDrawDebugDistance.get<int>())
{ {
Game::R_AddDebugString(staticModelsColor, staticModel.placement.origin, 1.0, staticModel.model->name); Game::R_AddDebugString(staticModelsColor, staticModel.placement.origin, 1.0, staticModel.model->name);
} }
@ -418,10 +436,7 @@ namespace Components
void Renderer::DebugDrawAABBTrees() void Renderer::DebugDrawAABBTrees()
{ {
if (!DrawAABBTrees.get<bool>()) return; if (!r_drawAABBTrees.get<bool>()) return;
float cyan[4] = { 0.0f, 0.5f, 0.5f, 1.0f };
float red[4] = { 1.0f, 0.0f, 0.0f, 1.0f };
Game::clipMap_t* clipMap = *reinterpret_cast<Game::clipMap_t**>(0x7998E0); Game::clipMap_t* clipMap = *reinterpret_cast<Game::clipMap_t**>(0x7998E0);
//Game::GfxWorld* gameWorld = *reinterpret_cast<Game::GfxWorld**>(0x66DEE94); //Game::GfxWorld* gameWorld = *reinterpret_cast<Game::GfxWorld**>(0x66DEE94);
@ -516,20 +531,21 @@ namespace Components
Dvar::OnInit([] Dvar::OnInit([]
{ {
static std::vector < char* > values = char* values[5] =
{ {
const_cast<char*>("Disabled"), "Disabled",
const_cast<char*>("Scene Models"), "Scene Models",
const_cast<char*>("Scene Dynamic Objects"), "Scene Dynamic Objects",
const_cast<char*>("GfxWorld Static Models"), "GfxWorld Static Models",
nullptr nullptr
}; };
Renderer::DrawModelBoundingBoxes = Game::Dvar_RegisterEnum("r_drawModelBoundingBoxes", values.data(), 0, Game::DVAR_FLAG_CHEAT, "Draw scene model bounding boxes"); Renderer::r_drawModelBoundingBoxes = Game::Dvar_RegisterEnum("r_drawModelBoundingBoxes", values, 0, Game::DVAR_FLAG_CHEAT, "Draw scene model bounding boxes");
Renderer::DrawSceneModelCollisions = Game::Dvar_RegisterEnum("r_drawSceneModelCollisions", values.data(), 0, Game::DVAR_FLAG_CHEAT, "Draw scene model collisions"); Renderer::r_drawSceneModelCollisions = Game::Dvar_RegisterEnum("r_drawSceneModelCollisions", values, 0, Game::DVAR_FLAG_CHEAT, "Draw scene model collisions");
Renderer::DrawTriggers = Game::Dvar_RegisterBool("r_drawTriggers", false, Game::DVAR_FLAG_CHEAT, "Draw triggers"); Renderer::r_drawTriggers = Game::Dvar_RegisterBool("r_drawTriggers", false, Game::DVAR_FLAG_CHEAT, "Draw triggers");
Renderer::DrawModelNames = Game::Dvar_RegisterEnum("r_drawModelNames", values.data(), 0, Game::DVAR_FLAG_CHEAT, "Draw all model names"); Renderer::r_drawModelNames = Game::Dvar_RegisterEnum("r_drawModelNames", values, 0, Game::DVAR_FLAG_CHEAT, "Draw all model names");
Renderer::DrawAABBTrees = Game::Dvar_RegisterBool("r_drawAabbTrees", false, Game::DVAR_FLAG_CHEAT, "Draw aabb trees"); Renderer::r_drawAABBTrees = Game::Dvar_RegisterBool("r_drawAabbTrees", false, Game::DVAR_FLAG_CHEAT, "Draw aabb trees");
Renderer::r_playerDrawDebugDistance = Game::Dvar_RegisterInt("r_drawDebugProximity", 100000, 0, 500000, Game::DVAR_FLAG_SAVED, "r_draw debug functions draw distance, relative to the player");
}); });
} }

11
src/Components/Modules/Renderer.hpp
View File

@ -47,10 +47,11 @@ namespace Components
static Utils::Signal<BackendCallback> BackendFrameSignal; static Utils::Signal<BackendCallback> BackendFrameSignal;
static Utils::Signal<BackendCallback> SingleBackendFrameSignal; static Utils::Signal<BackendCallback> SingleBackendFrameSignal;
static Dvar::Var DrawTriggers; static Dvar::Var r_drawTriggers;
static Dvar::Var DrawSceneModelCollisions; static Dvar::Var r_drawSceneModelCollisions;
static Dvar::Var DrawModelBoundingBoxes; static Dvar::Var r_drawModelBoundingBoxes;
static Dvar::Var DrawModelNames; static Dvar::Var r_drawModelNames;
static Dvar::Var DrawAABBTrees; static Dvar::Var r_drawAABBTrees;
static Dvar::Var r_playerDrawDebugDistance;
}; };
} }