From 17efc38e35a37bd26d7784f4dc31b6cbd897e7f0 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 19 Dec 2020 12:27:16 +0300 Subject: [PATCH] removed cullzones stuff from renderer --- src/core/re3.cpp | 2 -- src/render/Renderer.cpp | 49 ----------------------------------------- src/render/Renderer.h | 2 -- 3 files changed, 53 deletions(-) diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 2b3b8e6d..3f5e8f7d 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -655,8 +655,6 @@ extern bool gbRenderWorld2; DebugMenuAddCmd("Debug", "Parse Heap", ParseHeap); #endif #endif - DebugMenuAddVarBool8("Debug", "Show cullzone debug stuff", &gbShowCullZoneDebugStuff, nil); - DebugMenuAddVarBool8("Debug", "Disable zone cull", &gbDisableZoneCull, nil); DebugMenuAddVarBool8("Debug", "pad 1 -> pad 2", &CPad::m_bMapPadOneToPadTwo, nil); #ifdef GTA_SCENE_EDIT diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 4e94e75d..1ce88c28 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -24,7 +24,6 @@ #include "Occlusion.h" #include "Renderer.h" #include "custompipes.h" -#include "Debug.h" //--MIAMI: file done @@ -32,8 +31,6 @@ bool gbShowPedRoadGroups; bool gbShowCarRoadGroups; bool gbShowCollisionPolys; bool gbShowCollisionLines; -bool gbShowCullZoneDebugStuff; -bool gbDisableZoneCull; // not original bool gbBigWhiteDebugLightSwitchedOn; bool gbDontRenderBuildings; @@ -42,21 +39,6 @@ bool gbDontRenderPeds; bool gbDontRenderObjects; bool gbDontRenderVehicles; -int32 EntitiesRendered; -int32 EntitiesNotRendered; -int32 RenderedBigBuildings; -int32 RenderedBuildings; -int32 RenderedCars; -int32 RenderedPeds; -int32 RenderedObjects; -int32 RenderedDummies; -int32 TestedBigBuildings; -int32 TestedBuildings; -int32 TestedCars; -int32 TestedPeds; -int32 TestedObjects; -int32 TestedDummies; - // unused int16 TestCloseThings; int16 TestBigThings; @@ -1308,24 +1290,6 @@ CRenderer::ScanWorld(void) RwMatrix *cammatrix; RwV2d poly[3]; -#ifndef MASTER - // missing in game but has to be done somewhere - EntitiesRendered = 0; - EntitiesNotRendered = 0; - RenderedBigBuildings = 0; - RenderedBuildings = 0; - RenderedCars = 0; - RenderedPeds = 0; - RenderedObjects = 0; - RenderedDummies = 0; - TestedBigBuildings = 0; - TestedBuildings = 0; - TestedCars = 0; - TestedPeds = 0; - TestedObjects = 0; - TestedDummies = 0; -#endif - memset(vectors, 0, sizeof(vectors)); vectors[CORNER_FAR_TOPLEFT].x = -vw.x * f; vectors[CORNER_FAR_TOPLEFT].y = vw.y * f; @@ -1445,19 +1409,6 @@ CRenderer::ScanWorld(void) ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_GENERIC)); } } - -#ifndef MASTER - if(gbShowCullZoneDebugStuff){ - sprintf(gString, "Rejected: %d/%d.", EntitiesNotRendered, EntitiesNotRendered + EntitiesRendered); - CDebug::PrintAt(gString, 10, 10); - sprintf(gString, "Tested:BBuild:%d Build:%d Peds:%d Cars:%d Obj:%d Dummies:%d", - TestedBigBuildings, TestedBuildings, TestedPeds, TestedCars, TestedObjects, TestedDummies); - CDebug::PrintAt(gString, 10, 11); - sprintf(gString, "Rendered:BBuild:%d Build:%d Peds:%d Cars:%d Obj:%d Dummies:%d", - RenderedBigBuildings, RenderedBuildings, RenderedPeds, RenderedCars, RenderedObjects, RenderedDummies); - CDebug::PrintAt(gString, 10, 12); - } -#endif } void diff --git a/src/render/Renderer.h b/src/render/Renderer.h index 8b68d4ee..5c8f43ce 100644 --- a/src/render/Renderer.h +++ b/src/render/Renderer.h @@ -14,8 +14,6 @@ extern bool gbShowPedRoadGroups; extern bool gbShowCarRoadGroups; extern bool gbShowCollisionPolys; extern bool gbShowCollisionLines; -extern bool gbShowCullZoneDebugStuff; -extern bool gbDisableZoneCull; // not original extern bool gbBigWhiteDebugLightSwitchedOn; extern bool gbDontRenderBuildings;