zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-05-16 23:11:42 +00:00
Code Activity

chore: reorder assignment of light def members slightly

Browse Source
This commit is contained in:
Jan Laupetin
2026-05-16 10:45:26 +02:00
parent 72dd51609f
commit 015544eb79
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Game/IW3/LightDef/LightDefLoaderIW3.cpp
+2 -1
View File
@@ -37,6 +37,8 @@ namespace
std::string imageName; std::string imageName;
int8_t samplerState; int8_t samplerState;
file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t));
lightDef->attenuation.samplerState = samplerState;
std::getline(*file.m_stream, imageName, '\0'); std::getline(*file.m_stream, imageName, '\0');
auto* imageDependency = context.LoadDependency<AssetImage>(imageName); auto* imageDependency = context.LoadDependency<AssetImage>(imageName);
@@ -47,7 +49,6 @@ namespace
} }
registration.AddDependency(imageDependency); registration.AddDependency(imageDependency);
lightDef->attenuation.samplerState = samplerState;
lightDef->attenuation.image = imageDependency->Asset(); lightDef->attenuation.image = imageDependency->Asset();
context.GetZoneAssetCreationState<LightDefAssetCreationState>().SetLightDefLookupStart(lightDef, context); context.GetZoneAssetCreationState<LightDefAssetCreationState>().SetLightDefLookupStart(lightDef, context);
src/ObjLoading/Game/IW4/LightDef/LightDefLoaderIW4.cpp
+2 -1
View File
@@ -37,6 +37,8 @@ namespace
std::string imageName; std::string imageName;
int8_t samplerState; int8_t samplerState;
file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t));
lightDef->attenuation.samplerState = samplerState;
std::getline(*file.m_stream, imageName, '\0'); std::getline(*file.m_stream, imageName, '\0');
auto* imageDependency = context.LoadDependency<AssetImage>(imageName); auto* imageDependency = context.LoadDependency<AssetImage>(imageName);
@@ -47,7 +49,6 @@ namespace
} }
registration.AddDependency(imageDependency); registration.AddDependency(imageDependency);
lightDef->attenuation.samplerState = samplerState;
lightDef->attenuation.image = imageDependency->Asset(); lightDef->attenuation.image = imageDependency->Asset();
context.GetZoneAssetCreationState<LightDefAssetCreationState>().SetLightDefLookupStart(lightDef, context); context.GetZoneAssetCreationState<LightDefAssetCreationState>().SetLightDefLookupStart(lightDef, context);
src/ObjLoading/Game/IW5/LightDef/LightDefLoaderIW5.cpp
+3 -3
View File
@@ -37,6 +37,7 @@ namespace
int8_t attenuationSamplerState; int8_t attenuationSamplerState;
file.m_stream->read(reinterpret_cast<char*>(&attenuationSamplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&attenuationSamplerState), sizeof(int8_t));
lightDef->attenuation.samplerState = attenuationSamplerState;
std::string attenuationName; std::string attenuationName;
std::getline(*file.m_stream, attenuationName, '\0'); std::getline(*file.m_stream, attenuationName, '\0');
@@ -47,9 +48,11 @@ namespace
return AssetCreationResult::Failure(); return AssetCreationResult::Failure();
} }
registration.AddDependency(attenuationImageDependency); registration.AddDependency(attenuationImageDependency);
lightDef->attenuation.image = attenuationImageDependency->Asset();
int8_t cucolorisSamplerState; int8_t cucolorisSamplerState;
file.m_stream->read(reinterpret_cast<char*>(&cucolorisSamplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&cucolorisSamplerState), sizeof(int8_t));
lightDef->cucoloris.samplerState = cucolorisSamplerState;
std::string cucolorisName; std::string cucolorisName;
std::getline(*file.m_stream, cucolorisName, '\0'); std::getline(*file.m_stream, cucolorisName, '\0');
@@ -64,9 +67,6 @@ namespace
registration.AddDependency(cucolorisImageDependency); registration.AddDependency(cucolorisImageDependency);
lightDef->cucoloris.image = cucolorisImageDependency->Asset(); lightDef->cucoloris.image = cucolorisImageDependency->Asset();
} }
lightDef->attenuation.samplerState = attenuationSamplerState;
lightDef->attenuation.image = attenuationImageDependency->Asset();
lightDef->cucoloris.samplerState = cucolorisSamplerState;
context.GetZoneAssetCreationState<LightDefAssetCreationState>().SetLightDefLookupStart(lightDef, context); context.GetZoneAssetCreationState<LightDefAssetCreationState>().SetLightDefLookupStart(lightDef, context);
src/ObjLoading/Game/T5/LightDef/LightDefLoaderT5.cpp
+2 -1
View File
@@ -36,6 +36,8 @@ namespace
std::string attenuationName; std::string attenuationName;
int8_t samplerState; int8_t samplerState;
file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t));
lightDef->attenuation.samplerState = samplerState;
std::getline(*file.m_stream, attenuationName, '\0'); std::getline(*file.m_stream, attenuationName, '\0');
auto* attenuationImageDependency = context.LoadDependency<AssetImage>(attenuationName); auto* attenuationImageDependency = context.LoadDependency<AssetImage>(attenuationName);
@@ -46,7 +48,6 @@ namespace
} }
registration.AddDependency(attenuationImageDependency); registration.AddDependency(attenuationImageDependency);
lightDef->attenuation.samplerState = samplerState;
lightDef->attenuation.image = attenuationImageDependency->Asset(); lightDef->attenuation.image = attenuationImageDependency->Asset();
lightDef->lmapLookupStart = 0; lightDef->lmapLookupStart = 0;
src/ObjLoading/Game/T6/LightDef/LightDefLoaderT6.cpp
+2 -1
View File
@@ -36,6 +36,8 @@ namespace
std::string attenuationName; std::string attenuationName;
int8_t samplerState; int8_t samplerState;
file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&samplerState), sizeof(int8_t));
lightDef->attenuation.samplerState = samplerState;
std::getline(*file.m_stream, attenuationName, '\0'); std::getline(*file.m_stream, attenuationName, '\0');
auto* attenuationImageDependency = context.LoadDependency<AssetImage>(attenuationName); auto* attenuationImageDependency = context.LoadDependency<AssetImage>(attenuationName);
@@ -46,7 +48,6 @@ namespace
} }
registration.AddDependency(attenuationImageDependency); registration.AddDependency(attenuationImageDependency);
lightDef->attenuation.samplerState = samplerState;
lightDef->attenuation.image = attenuationImageDependency->Asset(); lightDef->attenuation.image = attenuationImageDependency->Asset();
lightDef->lmapLookupStart = 0; lightDef->lmapLookupStart = 0;