From 015544eb793c109a87e907f7a44c0ef5c4a07617 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sat, 16 May 2026 10:45:26 +0200 Subject: [PATCH] chore: reorder assignment of light def members slightly --- src/ObjLoading/Game/IW3/LightDef/LightDefLoaderIW3.cpp | 3 ++- src/ObjLoading/Game/IW4/LightDef/LightDefLoaderIW4.cpp | 3 ++- src/ObjLoading/Game/IW5/LightDef/LightDefLoaderIW5.cpp | 6 +++--- src/ObjLoading/Game/T5/LightDef/LightDefLoaderT5.cpp | 3 ++- src/ObjLoading/Game/T6/LightDef/LightDefLoaderT6.cpp | 3 ++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ObjLoading/Game/IW3/LightDef/LightDefLoaderIW3.cpp b/src/ObjLoading/Game/IW3/LightDef/LightDefLoaderIW3.cpp index 11ecfcc8..1746d50f 100644 --- a/src/ObjLoading/Game/IW3/LightDef/LightDefLoaderIW3.cpp +++ b/src/ObjLoading/Game/IW3/LightDef/LightDefLoaderIW3.cpp @@ -37,6 +37,8 @@ namespace std::string imageName; int8_t samplerState; file.m_stream->read(reinterpret_cast(&samplerState), sizeof(int8_t)); + lightDef->attenuation.samplerState = samplerState; + std::getline(*file.m_stream, imageName, '\0'); auto* imageDependency = context.LoadDependency(imageName); @@ -47,7 +49,6 @@ namespace } registration.AddDependency(imageDependency); - lightDef->attenuation.samplerState = samplerState; lightDef->attenuation.image = imageDependency->Asset(); context.GetZoneAssetCreationState().SetLightDefLookupStart(lightDef, context); diff --git a/src/ObjLoading/Game/IW4/LightDef/LightDefLoaderIW4.cpp b/src/ObjLoading/Game/IW4/LightDef/LightDefLoaderIW4.cpp index ef638766..fafe6660 100644 --- a/src/ObjLoading/Game/IW4/LightDef/LightDefLoaderIW4.cpp +++ b/src/ObjLoading/Game/IW4/LightDef/LightDefLoaderIW4.cpp @@ -37,6 +37,8 @@ namespace std::string imageName; int8_t samplerState; file.m_stream->read(reinterpret_cast(&samplerState), sizeof(int8_t)); + lightDef->attenuation.samplerState = samplerState; + std::getline(*file.m_stream, imageName, '\0'); auto* imageDependency = context.LoadDependency(imageName); @@ -47,7 +49,6 @@ namespace } registration.AddDependency(imageDependency); - lightDef->attenuation.samplerState = samplerState; lightDef->attenuation.image = imageDependency->Asset(); context.GetZoneAssetCreationState().SetLightDefLookupStart(lightDef, context); diff --git a/src/ObjLoading/Game/IW5/LightDef/LightDefLoaderIW5.cpp b/src/ObjLoading/Game/IW5/LightDef/LightDefLoaderIW5.cpp index fe0d27ea..cae04945 100644 --- a/src/ObjLoading/Game/IW5/LightDef/LightDefLoaderIW5.cpp +++ b/src/ObjLoading/Game/IW5/LightDef/LightDefLoaderIW5.cpp @@ -37,6 +37,7 @@ namespace int8_t attenuationSamplerState; file.m_stream->read(reinterpret_cast(&attenuationSamplerState), sizeof(int8_t)); + lightDef->attenuation.samplerState = attenuationSamplerState; std::string attenuationName; std::getline(*file.m_stream, attenuationName, '\0'); @@ -47,9 +48,11 @@ namespace return AssetCreationResult::Failure(); } registration.AddDependency(attenuationImageDependency); + lightDef->attenuation.image = attenuationImageDependency->Asset(); int8_t cucolorisSamplerState; file.m_stream->read(reinterpret_cast(&cucolorisSamplerState), sizeof(int8_t)); + lightDef->cucoloris.samplerState = cucolorisSamplerState; std::string cucolorisName; std::getline(*file.m_stream, cucolorisName, '\0'); @@ -64,9 +67,6 @@ namespace registration.AddDependency(cucolorisImageDependency); lightDef->cucoloris.image = cucolorisImageDependency->Asset(); } - lightDef->attenuation.samplerState = attenuationSamplerState; - lightDef->attenuation.image = attenuationImageDependency->Asset(); - lightDef->cucoloris.samplerState = cucolorisSamplerState; context.GetZoneAssetCreationState().SetLightDefLookupStart(lightDef, context); diff --git a/src/ObjLoading/Game/T5/LightDef/LightDefLoaderT5.cpp b/src/ObjLoading/Game/T5/LightDef/LightDefLoaderT5.cpp index acd68b55..6da541d5 100644 --- a/src/ObjLoading/Game/T5/LightDef/LightDefLoaderT5.cpp +++ b/src/ObjLoading/Game/T5/LightDef/LightDefLoaderT5.cpp @@ -36,6 +36,8 @@ namespace std::string attenuationName; int8_t samplerState; file.m_stream->read(reinterpret_cast(&samplerState), sizeof(int8_t)); + lightDef->attenuation.samplerState = samplerState; + std::getline(*file.m_stream, attenuationName, '\0'); auto* attenuationImageDependency = context.LoadDependency(attenuationName); @@ -46,7 +48,6 @@ namespace } registration.AddDependency(attenuationImageDependency); - lightDef->attenuation.samplerState = samplerState; lightDef->attenuation.image = attenuationImageDependency->Asset(); lightDef->lmapLookupStart = 0; diff --git a/src/ObjLoading/Game/T6/LightDef/LightDefLoaderT6.cpp b/src/ObjLoading/Game/T6/LightDef/LightDefLoaderT6.cpp index 4a59c6a4..04aab6e7 100644 --- a/src/ObjLoading/Game/T6/LightDef/LightDefLoaderT6.cpp +++ b/src/ObjLoading/Game/T6/LightDef/LightDefLoaderT6.cpp @@ -36,6 +36,8 @@ namespace std::string attenuationName; int8_t samplerState; file.m_stream->read(reinterpret_cast(&samplerState), sizeof(int8_t)); + lightDef->attenuation.samplerState = samplerState; + std::getline(*file.m_stream, attenuationName, '\0'); auto* attenuationImageDependency = context.LoadDependency(attenuationName); @@ -46,7 +48,6 @@ namespace } registration.AddDependency(attenuationImageDependency); - lightDef->attenuation.samplerState = samplerState; lightDef->attenuation.image = attenuationImageDependency->Asset(); lightDef->lmapLookupStart = 0;