From c3d9f91a2abb1c9b0f0f45e3941f76800dcb0fa5 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Thu, 6 Nov 2025 18:18:29 +0100 Subject: [PATCH] chore: use available methods from Utils component --- src/ObjLoading/Game/T6/BSP/BSPUtil.cpp | 5 --- src/ObjLoading/Game/T6/BSP/BSPUtil.h | 1 - .../Game/T6/BSP/Linker/GfxWorldLinker.cpp | 31 ++++++++++--------- .../SequenceZoneDefinitionMetaData.cpp | 10 ++---- 4 files changed, 18 insertions(+), 29 deletions(-) diff --git a/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp b/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp index ee0ed3d2..7f60d536 100644 --- a/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp +++ b/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp @@ -88,11 +88,6 @@ namespace BSP return result; } - size_t BSPUtil::allignBy128(size_t size) - { - return ((size + 127) & 0xFFFFFF80); - } - float BSPUtil::distBetweenPoints(vec3_t& p1, vec3_t& p2) { float x = p2.x - p1.x; diff --git a/src/ObjLoading/Game/T6/BSP/BSPUtil.h b/src/ObjLoading/Game/T6/BSP/BSPUtil.h index 54bdd0a5..f1196667 100644 --- a/src/ObjLoading/Game/T6/BSP/BSPUtil.h +++ b/src/ObjLoading/Game/T6/BSP/BSPUtil.h @@ -14,7 +14,6 @@ namespace BSP static void updateAABBWithPoint(vec3_t& point, vec3_t& AABBMins, vec3_t& AABBMaxs); static vec3_t calcMiddleOfAABB(vec3_t& mins, vec3_t& maxs); static vec3_t calcHalfSizeOfAABB(vec3_t& mins, vec3_t& maxs); - static size_t allignBy128(size_t size); static float distBetweenPoints(vec3_t& p1, vec3_t& p2); static void convertAnglesToAxis(vec3_t* angles, vec3_t* axis); static void matrixTranspose3x3(const vec3_t* in, vec3_t* out); diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp index a9ecae32..dbc63064 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp @@ -1,6 +1,7 @@ #include "GfxWorldLinker.h" #include "../BSPUtil.h" +#include "Utils/Alignment.h" #include "Utils/Pack.h" namespace BSP @@ -138,14 +139,14 @@ namespace BSP // visdata is written to by the game // all visdata is alligned by 128 - size_t allignedSurfaceCount = BSPUtil::allignBy128(surfaceCount); - gfxWorld->dpvs.surfaceVisDataCount = static_cast(allignedSurfaceCount); - gfxWorld->dpvs.surfaceVisData[0] = m_memory.Alloc(allignedSurfaceCount); - gfxWorld->dpvs.surfaceVisData[1] = m_memory.Alloc(allignedSurfaceCount); - gfxWorld->dpvs.surfaceVisData[2] = m_memory.Alloc(allignedSurfaceCount); - gfxWorld->dpvs.surfaceVisDataCameraSaved = m_memory.Alloc(allignedSurfaceCount); - gfxWorld->dpvs.surfaceCastsShadow = m_memory.Alloc(allignedSurfaceCount); - gfxWorld->dpvs.surfaceCastsSunShadow = m_memory.Alloc(allignedSurfaceCount); + auto alignedSurfaceCount = utils::Align(surfaceCount, 128uz); + gfxWorld->dpvs.surfaceVisDataCount = static_cast(alignedSurfaceCount); + gfxWorld->dpvs.surfaceVisData[0] = m_memory.Alloc(alignedSurfaceCount); + gfxWorld->dpvs.surfaceVisData[1] = m_memory.Alloc(alignedSurfaceCount); + gfxWorld->dpvs.surfaceVisData[2] = m_memory.Alloc(alignedSurfaceCount); + gfxWorld->dpvs.surfaceVisDataCameraSaved = m_memory.Alloc(alignedSurfaceCount); + gfxWorld->dpvs.surfaceCastsShadow = m_memory.Alloc(alignedSurfaceCount); + gfxWorld->dpvs.surfaceCastsSunShadow = m_memory.Alloc(alignedSurfaceCount); return true; } @@ -226,13 +227,13 @@ namespace BSP // visdata is written to by the game // all visdata is alligned by 128 - size_t allignedModelCount = BSPUtil::allignBy128(modelCount); - gfxWorld->dpvs.smodelVisDataCount = static_cast(allignedModelCount); - gfxWorld->dpvs.smodelVisData[0] = m_memory.Alloc(allignedModelCount); - gfxWorld->dpvs.smodelVisData[1] = m_memory.Alloc(allignedModelCount); - gfxWorld->dpvs.smodelVisData[2] = m_memory.Alloc(allignedModelCount); - gfxWorld->dpvs.smodelVisDataCameraSaved = m_memory.Alloc(allignedModelCount); - gfxWorld->dpvs.smodelCastsShadow = m_memory.Alloc(allignedModelCount); + const auto alignedModelCount = utils::Align(modelCount, 128u); + gfxWorld->dpvs.smodelVisDataCount = static_cast(alignedModelCount); + gfxWorld->dpvs.smodelVisData[0] = m_memory.Alloc(alignedModelCount); + gfxWorld->dpvs.smodelVisData[1] = m_memory.Alloc(alignedModelCount); + gfxWorld->dpvs.smodelVisData[2] = m_memory.Alloc(alignedModelCount); + gfxWorld->dpvs.smodelVisDataCameraSaved = m_memory.Alloc(alignedModelCount); + gfxWorld->dpvs.smodelCastsShadow = m_memory.Alloc(alignedModelCount); for (unsigned int i = 0; i < modelCount; i++) { if ((gfxWorld->dpvs.smodelDrawInsts[i].flags & STATIC_MODEL_FLAG_NO_SHADOW) == 0) diff --git a/src/ZoneCommon/Zone/Definition/Parsing/Sequence/SequenceZoneDefinitionMetaData.cpp b/src/ZoneCommon/Zone/Definition/Parsing/Sequence/SequenceZoneDefinitionMetaData.cpp index b435bef8..8ee1fc68 100644 --- a/src/ZoneCommon/Zone/Definition/Parsing/Sequence/SequenceZoneDefinitionMetaData.cpp +++ b/src/ZoneCommon/Zone/Definition/Parsing/Sequence/SequenceZoneDefinitionMetaData.cpp @@ -138,14 +138,8 @@ void SequenceZoneDefinitionMetaData::ProcessMatch(ZoneDefinitionParserState* sta } else if (key == METADATA_MAP_TYPE) { - std::string valueLowerCase = value; - std::transform(valueLowerCase.begin(), - valueLowerCase.end(), - valueLowerCase.begin(), - [](unsigned char c) - { - return std::tolower(c); - }); + std::string valueLowerCase(value); + utils::MakeStringLowerCase(valueLowerCase); if (valueLowerCase == "sp") state->SetMapType(ZoneDefinitionMapType::SP);