From cc8ba3b6f3bdf6ab74907dee3138f6b36044ed94 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 1 Oct 2023 22:11:05 +0200 Subject: [PATCH] Simplify code --- src/rendering/hwrenderer/doom_levelmesh.cpp | 39 ++++++++++----------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/rendering/hwrenderer/doom_levelmesh.cpp b/src/rendering/hwrenderer/doom_levelmesh.cpp index 34fa84339..ba6dbefe1 100644 --- a/src/rendering/hwrenderer/doom_levelmesh.cpp +++ b/src/rendering/hwrenderer/doom_levelmesh.cpp @@ -708,35 +708,32 @@ void DoomLevelSubmesh::CreateSideSurfaces(FLevelLocals& doomMap, side_t* side) { CreateLineHorizonSurface(doomMap, side); } + else if (!back) + { + CreateFrontWallSurface(doomMap, side); + } else { - if (back == nullptr) - { - CreateFrontWallSurface(doomMap, side); - } - else if (side->textures[side_t::mid].texture.isValid()) + if (side->textures[side_t::mid].texture.isValid()) { CreateMidWallSurface(doomMap, side); } - if (back) + Create3DFloorWallSurfaces(doomMap, side); + + float v1TopBack = (float)back->ceilingplane.ZatPoint(v1); + float v1BottomBack = (float)back->floorplane.ZatPoint(v1); + float v2TopBack = (float)back->ceilingplane.ZatPoint(v2); + float v2BottomBack = (float)back->floorplane.ZatPoint(v2); + + if (v1Bottom < v1BottomBack || v2Bottom < v2BottomBack) { - Create3DFloorWallSurfaces(doomMap, side); + CreateBottomWallSurface(doomMap, side); + } - float v1TopBack = (float)back->ceilingplane.ZatPoint(v1); - float v1BottomBack = (float)back->floorplane.ZatPoint(v1); - float v2TopBack = (float)back->ceilingplane.ZatPoint(v2); - float v2BottomBack = (float)back->floorplane.ZatPoint(v2); - - if (v1Bottom < v1BottomBack || v2Bottom < v2BottomBack) - { - CreateBottomWallSurface(doomMap, side); - } - - if (v1Top > v1TopBack || v2Top > v2TopBack) - { - CreateTopWallSurface(doomMap, side); - } + if (v1Top > v1TopBack || v2Top > v2TopBack) + { + CreateTopWallSurface(doomMap, side); } } }