diff --git a/src/Components/Modules/Dvar.cpp b/src/Components/Modules/Dvar.cpp index d9bd07eb..9e849dda 100644 --- a/src/Components/Modules/Dvar.cpp +++ b/src/Components/Modules/Dvar.cpp @@ -39,7 +39,7 @@ namespace Components template <> int Dvar::Var::get() { - if (this->dvar && this->dvar->type == Game::dvar_type::DVAR_TYPE_INT) + if (this->dvar && this->dvar->type == Game::dvar_type::DVAR_TYPE_INT || this->dvar->type == Game::dvar_type::DVAR_TYPE_ENUM) { return this->dvar->current.integer; } diff --git a/src/Components/Modules/QuickPatch.cpp b/src/Components/Modules/QuickPatch.cpp index 59691749..edaafa42 100644 --- a/src/Components/Modules/QuickPatch.cpp +++ b/src/Components/Modules/QuickPatch.cpp @@ -964,204 +964,6 @@ namespace Components } }); - Scheduler::OnFrame([]() - { - if (!Game::CL_IsCgameInitialized() || !Dvar::Var("r_drawAabbTrees").get()) 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(0x7998E0); - //Game::GfxWorld* gameWorld = *reinterpret_cast(0x66DEE94); - if (!clipMap) return; - - for (unsigned short i = 0; i < clipMap->smodelNodeCount; ++i) - { - Game::R_AddDebugBounds(cyan, &clipMap->smodelNodes[i].bounds); - } - - for (unsigned int i = 0; i < clipMap->numStaticModels; i += 2) - { - Game::R_AddDebugBounds(red, &clipMap->staticModelList[i].absBounds); - } - }); - - Dvar::OnInit([] - { - Dvar::Register("r_drawSceneModelBoundingBoxes", false, Game::DVAR_FLAG_CHEAT, "Draw scene model bounding boxes"); - Dvar::Register("r_drawSceneModelCollisions", false, Game::DVAR_FLAG_CHEAT, "Draw scene model collisions"); - Dvar::Register("r_drawTriggers", false, Game::DVAR_FLAG_CHEAT, "Draw triggers"); - Dvar::Register("r_drawModelNames", false, Game::DVAR_FLAG_CHEAT, "Draw all model names"); - Dvar::Register("r_drawAabbTrees", false, Game::DVAR_FLAG_USERCREATED, "Draw aabb trees"); - }); - - Scheduler::OnFrame([]() - { - if (!Game::CL_IsCgameInitialized() || !Dvar::Var("r_drawModelNames").get()) return; - - float sceneModelsColor[4] = { 1.0f, 1.0f, 0.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 }; - - auto mapName = Dvar::Var("mapname").get(); - auto* scene = Game::scene; - auto world = Game::DB_FindXAssetEntry(Game::XAssetType::ASSET_TYPE_GFXWORLD, Utils::String::VA("maps/mp/%s.d3dbsp", mapName))->asset.header.gfxWorld; - - for (auto i = 0; i < scene->sceneModelCount; i++) - { - if (!scene->sceneModel[i].model) - continue; - - Game::R_AddDebugString(sceneModelsColor, scene->sceneModel[i].placement.base.origin, 1.0, scene->sceneModel[i].model->name); - } - - for (auto i = 0; i < scene->sceneDObjCount; i++) - { - if (scene->sceneDObj[i].obj) { - for (int j = 0; j < scene->sceneDObj[i].obj->numModels; j++) - { - Game::R_AddDebugString(dobjsColor, scene->sceneDObj[i].placement.origin, 1.0, scene->sceneDObj[i].obj->models[j]->name); - } - } - } - - // Static models - for (size_t i = 0; i < world->dpvs.smodelCount; i++) - { - auto staticModel = world->dpvs.smodelDrawInsts[i]; - if (staticModel.model) { - Game::R_AddDebugString(staticModelsColor, staticModel.placement.origin, 1.0, staticModel.model->name); - } - } - }); - - Scheduler::OnFrame([]() - { - if (!Game::CL_IsCgameInitialized() || !Dvar::Var("r_drawSceneModelBoundingBoxes").get()) return; - - float red[4] = { 1.0f, 0.0f, 0.0f, 1.0f }; - float blue[4] = { 0.0f, 0.0f, 1.0f, 1.0f }; - - auto* scene = Game::scene; - - for(auto i = 0; i < scene->sceneModelCount; i++) - { - if(!scene->sceneModel[i].model) - continue; - - auto b = scene->sceneModel[i].model->bounds; - b.midPoint[0] += scene->sceneModel[i].placement.base.origin[0]; - b.midPoint[1] += scene->sceneModel[i].placement.base.origin[1]; - b.midPoint[2] += scene->sceneModel[i].placement.base.origin[2]; - b.halfSize[0] *= scene->sceneModel[i].placement.scale; - b.halfSize[1] *= scene->sceneModel[i].placement.scale; - b.halfSize[2] *= scene->sceneModel[i].placement.scale; - Game::R_AddDebugBounds(red, &b, &scene->sceneModel[i].placement.base.quat); - } - - for(auto i = 0; i < scene->sceneDObjCount; i++) - { - 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[2] = std::abs(scene->sceneDObj[i].cull.bounds.halfSize[2]); - - if (scene->sceneDObj[i].cull.bounds.halfSize[0] < 0 || - scene->sceneDObj[i].cull.bounds.halfSize[1] < 0 || - scene->sceneDObj[i].cull.bounds.halfSize[2] < 0) { - - Components::Logger::Print("WARNING: Negative half size for DOBJ %s, this will cause culling issues!", scene->sceneDObj[i].obj->models[0]->name); - } - - Game::R_AddDebugBounds(blue, &scene->sceneDObj[i].cull.bounds); - } - }); - - Scheduler::OnFrame([]() - { - if (!Game::CL_IsCgameInitialized()) return; - if (!Dvar::Var("r_drawSceneModelCollisions").get()) return; - - float green[4] = { 0.0f, 1.0f, 0.0f, 1.0f }; - - auto* scene = Game::scene; - - for (auto i = 0; i < scene->sceneModelCount; i++) - { - if (!scene->sceneModel[i].model) - continue; - - for (auto j = 0; j < scene->sceneModel[i].model->numCollSurfs; j++) { - auto b = scene->sceneModel[i].model->collSurfs[j].bounds; - b.midPoint[0] += scene->sceneModel[i].placement.base.origin[0]; - b.midPoint[1] += scene->sceneModel[i].placement.base.origin[1]; - b.midPoint[2] += scene->sceneModel[i].placement.base.origin[2]; - b.halfSize[0] *= scene->sceneModel[i].placement.scale; - b.halfSize[1] *= scene->sceneModel[i].placement.scale; - b.halfSize[2] *= scene->sceneModel[i].placement.scale; - - Game::R_AddDebugBounds(green, &b, &scene->sceneModel[i].placement.base.quat); - } - } - }); - - Scheduler::OnFrame([]() - { - if (!Game::CL_IsCgameInitialized() || !Dvar::Var("r_drawTriggers").get()) 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; - for(auto i = 0u; i < 0x800; i++) - { - auto* ent = &entities[i]; - - if(ent->r.isInUse) - { - Game::Bounds b = ent->r.box; - b.midPoint[0] += ent->r.currentOrigin[0]; - b.midPoint[1] += ent->r.currentOrigin[1]; - b.midPoint[2] += ent->r.currentOrigin[2]; - - switch(ent->handler) - { - case Game::ENT_HANDLER_TRIGGER_HURT: - Game::R_AddDebugBounds(hurt, &b); - break; - - case Game::ENT_HANDLER_TRIGGER_HURT_TOUCH: - Game::R_AddDebugBounds(hurtTouch, &b); - break; - - case Game::ENT_HANDLER_TRIGGER_DAMAGE: - Game::R_AddDebugBounds(damage, &b); - break; - - case Game::ENT_HANDLER_TRIGGER_MULTIPLE: - if(ent->spawnflags & 0x40) - Game::R_AddDebugBounds(once, &b); - else - Game::R_AddDebugBounds(multiple, &b); - break; - - default: - float rv = std::min((float)ent->handler, (float)5) / 5; - float gv = std::clamp((float)ent->handler-5, (float)0, (float)5) / 5; - float bv = std::clamp((float)ent->handler - 10, (float)0, (float)5) / 5; - - float color[4] = { rv, gv, bv, 1.0f }; - - Game::R_AddDebugBounds(color, &b); - break; - } - } - } - }); - - // Dvars Dvar::Register("ui_streamFriendly", false, Game::DVAR_FLAG_SAVED, "Stream friendly UI"); diff --git a/src/Components/Modules/Renderer.cpp b/src/Components/Modules/Renderer.cpp index 984474b0..07cc2a65 100644 --- a/src/Components/Modules/Renderer.cpp +++ b/src/Components/Modules/Renderer.cpp @@ -8,6 +8,30 @@ namespace Components Utils::Signal Renderer::EndRecoverDeviceSignal; Utils::Signal Renderer::BeginRecoverDeviceSignal; + Dvar::Var Renderer::r_drawTriggers; + Dvar::Var Renderer::r_drawSceneModelCollisions; + Dvar::Var Renderer::r_drawModelBoundingBoxes; + Dvar::Var Renderer::r_drawModelNames; + 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 dobjsColor[4] = { 0.0f, 1.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 }; + + // 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() { __asm @@ -127,7 +151,7 @@ namespace Components // show error pushad; - push [esp + 24h + 20h]; + push[esp + 24h + 20h]; push eax; call R_TextureFromCodeError; add esp, 8; @@ -166,39 +190,319 @@ namespace Components return Utils::Hook::Call(0x005033E0)(a1, a2, a3, Utils::String::VA("%s (^3%s^7)", mat->info.name, mat->techniqueSet->name), color, a6); } + void Renderer::DebugDrawTriggers() + { + if (!r_drawTriggers.get()) return; + + auto entities = Game::g_entities; + + for (auto i = 0u; i < 0x800u; i++) + { + auto* ent = &entities[i]; + + if (ent->r.isInUse) + { + Game::Bounds b = ent->r.box; + b.midPoint[0] += ent->r.currentOrigin[0]; + b.midPoint[1] += ent->r.currentOrigin[1]; + b.midPoint[2] += ent->r.currentOrigin[2]; + + switch (ent->handler) + { + case Game::ENT_HANDLER_TRIGGER_HURT: + Game::R_AddDebugBounds(hurt, &b); + break; + + case Game::ENT_HANDLER_TRIGGER_HURT_TOUCH: + Game::R_AddDebugBounds(hurtTouch, &b); + break; + + case Game::ENT_HANDLER_TRIGGER_DAMAGE: + Game::R_AddDebugBounds(damage, &b); + break; + + case Game::ENT_HANDLER_TRIGGER_MULTIPLE: + if (ent->spawnflags & 0x40) + Game::R_AddDebugBounds(once, &b); + else + Game::R_AddDebugBounds(multiple, &b); + break; + + default: + auto rv = std::min(static_cast(ent->handler), 5.0f) / 5.0f; + auto gv = std::clamp(static_cast(ent->handler - 5), 0.f, 5.0f) / 5.0f; + auto bv = std::clamp(static_cast(ent->handler - 10), 0.f, 5.0f) / 5.0f; + + float color[4] = { rv, gv, bv, 1.0f }; + + Game::R_AddDebugBounds(color, &b); + break; + } + } + } + } + + void Renderer::DebugDrawSceneModelCollisions() + { + if (!r_drawSceneModelCollisions.get()) return; + + auto scene = Game::scene; + + for (auto i = 0; i < scene->sceneModelCount; i++) + { + if (!scene->sceneModel[i].model) + continue; + + for (auto j = 0; j < scene->sceneModel[i].model->numCollSurfs; j++) + { + auto b = scene->sceneModel[i].model->collSurfs[j].bounds; + b.midPoint[0] += scene->sceneModel[i].placement.base.origin[0]; + b.midPoint[1] += scene->sceneModel[i].placement.base.origin[1]; + b.midPoint[2] += scene->sceneModel[i].placement.base.origin[2]; + b.halfSize[0] *= scene->sceneModel[i].placement.scale; + b.halfSize[1] *= scene->sceneModel[i].placement.scale; + b.halfSize[2] *= scene->sceneModel[i].placement.scale; + + Game::R_AddDebugBounds(green, &b, &scene->sceneModel[i].placement.base.quat); + } + } + } + + void Renderer::DebugDrawModelBoundingBoxes() + { + auto val = r_drawModelBoundingBoxes.get(); + + if (!val) return; + + // Ingame only + int clientNum = Game::CG_GetClientNum(); + if (!Game::CL_IsCgameInitialized() || + clientNum >= 18 || + clientNum < 0 || + Game::g_entities[clientNum].client == nullptr) { + + return; + } + + Game::gentity_t* clientEntity = &Game::g_entities[clientNum]; + + float playerPosition[3]{ clientEntity->r.currentOrigin[0], clientEntity->r.currentOrigin[1], clientEntity->r.currentOrigin[2] }; + + const auto mapName = Dvar::Var("mapname").get(); + auto scene = Game::scene; + auto world = Game::DB_FindXAssetEntry(Game::XAssetType::ASSET_TYPE_GFXWORLD, Utils::String::VA("maps/mp/%s.d3dbsp", mapName))->asset.header.gfxWorld; + + auto drawDistance = r_playerDrawDebugDistance.get(); + auto sqrDist = drawDistance * drawDistance; + + switch (val) + { + case 1: + for (auto i = 0; i < scene->sceneModelCount; i++) + { + if (!scene->sceneModel[i].model) + continue; + + if (Utils::Vec3SqrDistance(playerPosition, scene->sceneModel[i].placement.base.origin) < sqrDist) + { + auto b = scene->sceneModel[i].model->bounds; + b.midPoint[0] += scene->sceneModel[i].placement.base.origin[0]; + b.midPoint[1] += scene->sceneModel[i].placement.base.origin[1]; + b.midPoint[2] += scene->sceneModel[i].placement.base.origin[2]; + b.halfSize[0] *= scene->sceneModel[i].placement.scale; + b.halfSize[1] *= scene->sceneModel[i].placement.scale; + b.halfSize[2] *= scene->sceneModel[i].placement.scale; + Game::R_AddDebugBounds(sceneModelsColor, &b, &scene->sceneModel[i].placement.base.quat); + } + } + break; + + case 2: + for (auto i = 0; i < scene->sceneDObjCount; i++) + { + + if (Utils::Vec3SqrDistance(playerPosition, scene->sceneDObj[i].cull.bounds.midPoint) < sqrDist) + { + 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[2] = std::abs(scene->sceneDObj[i].cull.bounds.halfSize[2]); + + if (scene->sceneDObj[i].cull.bounds.halfSize[0] < 0 || + scene->sceneDObj[i].cull.bounds.halfSize[1] < 0 || + scene->sceneDObj[i].cull.bounds.halfSize[2] < 0) + { + + Components::Logger::Print("WARNING: Negative half size for DOBJ %s, this will cause culling issues!", scene->sceneDObj[i].obj->models[0]->name); + } + + Game::R_AddDebugBounds(dobjsColor, &scene->sceneDObj[i].cull.bounds); + } + } + break; + + case 3: + // Static models + for (size_t i = 0; i < world->dpvs.smodelCount; i++) + { + auto staticModel = world->dpvs.smodelDrawInsts[i]; + + if (Utils::Vec3SqrDistance(playerPosition, staticModel.placement.origin) < sqrDist) + { + if (staticModel.model) + { + Game::Bounds b = staticModel.model->bounds; + b.midPoint[0] += staticModel.placement.origin[0]; + b.midPoint[1] += staticModel.placement.origin[1]; + b.midPoint[2] += staticModel.placement.origin[2]; + b.halfSize[0] *= staticModel.placement.scale; + b.halfSize[1] *= staticModel.placement.scale; + b.halfSize[2] *= staticModel.placement.scale; + + Game::R_AddDebugBounds(staticModelsColor, &b); + } + } + } + break; + } + } + + void Renderer::DebugDrawModelNames() + { + auto val = r_drawModelNames.get(); + + if (!val) return; + + // Ingame only + int clientNum = Game::CG_GetClientNum(); + if (!Game::CL_IsCgameInitialized() || + clientNum >= 18 || + clientNum < 0 || + Game::g_entities[clientNum].client == nullptr) { + + return; + } + + Game::gentity_t* clientEntity = &Game::g_entities[clientNum]; + + float playerPosition[3]{ clientEntity->r.currentOrigin[0], clientEntity->r.currentOrigin[1], clientEntity->r.currentOrigin[2] }; + + const auto mapName = Dvar::Var("mapname").get(); + auto scene = Game::scene; + auto world = Game::DB_FindXAssetEntry(Game::XAssetType::ASSET_TYPE_GFXWORLD, Utils::String::VA("maps/mp/%s.d3dbsp", mapName))->asset.header.gfxWorld; + + auto drawDistance = r_playerDrawDebugDistance.get(); + auto sqrDist = drawDistance * drawDistance; + + switch (val) { + case 1: + for (auto i = 0; i < scene->sceneModelCount; i++) + { + if (!scene->sceneModel[i].model) + continue; + + if (Utils::Vec3SqrDistance(playerPosition, scene->sceneModel[i].placement.base.origin) < sqrDist) + { + Game::R_AddDebugString(sceneModelsColor, scene->sceneModel[i].placement.base.origin, 1.0, scene->sceneModel[i].model->name); + } + } + break; + + case 2: + for (auto i = 0; i < scene->sceneDObjCount; i++) + { + if (scene->sceneDObj[i].obj) + { + for (int j = 0; j < scene->sceneDObj[i].obj->numModels; j++) + { + if (Utils::Vec3SqrDistance(playerPosition, scene->sceneDObj[i].placement.origin) < sqrDist) + { + Game::R_AddDebugString(dobjsColor, scene->sceneDObj[i].placement.origin, 1.0, scene->sceneDObj[i].obj->models[j]->name); + } + } + } + } + break; + + case 3: + // Static models + for (size_t i = 0; i < world->dpvs.smodelCount; i++) + { + auto staticModel = world->dpvs.smodelDrawInsts[i]; + if (staticModel.model) + { + auto dist = Utils::Vec3SqrDistance(playerPosition, staticModel.placement.origin); + if (dist < sqrDist) + { + Game::R_AddDebugString(staticModelsColor, staticModel.placement.origin, 1.0, staticModel.model->name); + } + } + } + break; + } + } + + void Renderer::DebugDrawAABBTrees() + { + if (!r_drawAABBTrees.get()) return; + + Game::clipMap_t* clipMap = *reinterpret_cast(0x7998E0); + if (!clipMap) return; + + for (unsigned short i = 0; i < clipMap->smodelNodeCount; ++i) + { + Game::R_AddDebugBounds(cyan, &clipMap->smodelNodes[i].bounds); + } + + for (unsigned int i = 0; i < clipMap->numStaticModels; i += 2) + { + Game::R_AddDebugBounds(red, &clipMap->staticModelList[i].absBounds); + } + } + Renderer::Renderer() { if (Dedicated::IsEnabled()) return; -// Renderer::OnBackendFrame([] (IDirect3DDevice9* device) -// { -// if (Game::Sys_Milliseconds() % 2) -// { -// device->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER | D3DCLEAR_STENCIL, 0, 0, 0); -// } -// -// return; -// -// IDirect3DSurface9* buffer = nullptr; -// -// device->CreateOffscreenPlainSurface(Renderer::Width(), Renderer::Height(), D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &buffer, nullptr); -// device->GetFrontBufferData(0, buffer); -// -// if (buffer) -// { -// D3DSURFACE_DESC desc; -// D3DLOCKED_RECT lockedRect; -// -// buffer->GetDesc(&desc); -// -// HRESULT res = buffer->LockRect(&lockedRect, NULL, D3DLOCK_READONLY); -// -// -// buffer->UnlockRect(); -// } -// }); + Scheduler::OnFrame([]() { + if (Game::CL_IsCgameInitialized()) + { + DebugDrawAABBTrees(); + DebugDrawModelNames(); + DebugDrawModelBoundingBoxes(); + DebugDrawSceneModelCollisions(); + DebugDrawTriggers(); + } + }); - // Log broken materials + // Renderer::OnBackendFrame([] (IDirect3DDevice9* device) + // { + // if (Game::Sys_Milliseconds() % 2) + // { + // device->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER | D3DCLEAR_STENCIL, 0, 0, 0); + // } + // + // return; + // + // IDirect3DSurface9* buffer = nullptr; + // + // device->CreateOffscreenPlainSurface(Renderer::Width(), Renderer::Height(), D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &buffer, nullptr); + // device->GetFrontBufferData(0, buffer); + // + // if (buffer) + // { + // D3DSURFACE_DESC desc; + // D3DLOCKED_RECT lockedRect; + // + // buffer->GetDesc(&desc); + // + // HRESULT res = buffer->LockRect(&lockedRect, NULL, D3DLOCK_READONLY); + // + // + // buffer->UnlockRect(); + // } + // }); + + // Log broken materials Utils::Hook(0x0054CAAA, Renderer::StoreGfxBufContextPtrStub1, HOOK_JUMP).install()->quick(); Utils::Hook(0x0054CF8D, Renderer::StoreGfxBufContextPtrStub2, HOOK_JUMP).install()->quick(); @@ -230,6 +534,25 @@ namespace Components // End vid_restart Utils::Hook(0x4CA3A7, Renderer::PostVidRestartStub, HOOK_CALL).install()->quick(); + + Dvar::OnInit([] + { + static const char* values[] = + { + "Disabled", + "Scene Models", + "Scene Dynamic Objects", + "GfxWorld Static Models", + nullptr + }; + + Renderer::r_drawModelBoundingBoxes = Game::Dvar_RegisterEnum("r_drawModelBoundingBoxes", values, 0, Game::DVAR_FLAG_CHEAT, "Draw scene model bounding boxes"); + Renderer::r_drawSceneModelCollisions = Game::Dvar_RegisterBool("r_drawSceneModelCollisions", false, Game::DVAR_FLAG_CHEAT, "Draw scene model collisions"); + Renderer::r_drawTriggers = Game::Dvar_RegisterBool("r_drawTriggers", false, Game::DVAR_FLAG_CHEAT, "Draw triggers"); + Renderer::r_drawModelNames = Game::Dvar_RegisterEnum("r_drawModelNames", values, 0, Game::DVAR_FLAG_CHEAT, "Draw all model names"); + Renderer::r_drawAABBTrees = Game::Dvar_RegisterBool("r_drawAabbTrees", false, Game::DVAR_FLAG_CHEAT, "Draw aabb trees"); + Renderer::r_playerDrawDebugDistance = Game::Dvar_RegisterInt("r_drawDebugDistance", 1000, 0, 50000, Game::DVAR_FLAG_SAVED, "r_draw debug functions draw distance, relative to the player"); + }); } Renderer::~Renderer() diff --git a/src/Components/Modules/Renderer.hpp b/src/Components/Modules/Renderer.hpp index 040eb6ba..553dd336 100644 --- a/src/Components/Modules/Renderer.hpp +++ b/src/Components/Modules/Renderer.hpp @@ -35,10 +35,23 @@ namespace Components static int DrawTechsetForMaterial(int a1, float a2, float a3, const char* material, Game::vec4_t* color, int a6); + static void DebugDrawTriggers(); + static void DebugDrawSceneModelCollisions(); + static void DebugDrawModelBoundingBoxes(); + static void DebugDrawModelNames(); + static void DebugDrawAABBTrees(); + static Utils::Signal EndRecoverDeviceSignal; static Utils::Signal BeginRecoverDeviceSignal; static Utils::Signal BackendFrameSignal; static Utils::Signal SingleBackendFrameSignal; + + static Dvar::Var r_drawTriggers; + static Dvar::Var r_drawSceneModelCollisions; + static Dvar::Var r_drawModelBoundingBoxes; + static Dvar::Var r_drawModelNames; + static Dvar::Var r_drawAABBTrees; + static Dvar::Var r_playerDrawDebugDistance; }; } diff --git a/src/Utils/Utils.cpp b/src/Utils/Utils.cpp index 3a16ee58..71d0af14 100644 --- a/src/Utils/Utils.cpp +++ b/src/Utils/Utils.cpp @@ -149,4 +149,15 @@ namespace Utils { return !(base1 + len1 <= base2 || base2 + len2 <= base1); } + + float Vec3SqrDistance(const float v1[3], const float v2[3]) + { + auto x = v2[0] - v1[0]; + auto y = v2[1] - v1[1]; + auto z = v2[2] - v1[2]; + + return x * x + y * y + z * z; + } + + } diff --git a/src/Utils/Utils.hpp b/src/Utils/Utils.hpp index f296f0e1..c33bbda3 100644 --- a/src/Utils/Utils.hpp +++ b/src/Utils/Utils.hpp @@ -24,6 +24,7 @@ namespace Utils void OpenUrl(const std::string& url); bool HasIntercection(unsigned int base1, unsigned int len1, unsigned int base2, unsigned int len2); + float Vec3SqrDistance(const float v1[3], const float v2[3]); template inline void RotLeft(T& object, size_t bits) {