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

Change manual CString reader to std::getline builtin. Don't require cucoloris be present.

Browse Source
This commit is contained in:
njohnson
2026-05-02 13:08:55 -04:00
committed by Jan Laupetin
parent e0c1ba1724
commit 7d3791a404
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Game/IW5/LightDef/LightDefLoaderIW5.cpp
+9 -22
View File
@@ -37,16 +37,8 @@ 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));
std::string attenuationName = ""; std::string attenuationName;
unsigned char letter; std::getline(*file.m_stream, attenuationName, '\0');
file.m_stream->read(reinterpret_cast<char*>(&letter), sizeof(int8_t));
while (letter != '\0')
{
attenuationName += letter;
file.m_stream->read(reinterpret_cast<char*>(&letter), sizeof(int8_t));
}
auto* attenuationImageDependency = context.LoadDependency<AssetImage>(attenuationName); auto* attenuationImageDependency = context.LoadDependency<AssetImage>(attenuationName);
if (!attenuationImageDependency) if (!attenuationImageDependency)
{ {
@@ -58,22 +50,17 @@ namespace
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));
std::string cucolorisName = ""; std::string cucolorisName;
file.m_stream->read(reinterpret_cast<char*>(&letter), sizeof(int8_t)); std::getline(*file.m_stream, cucolorisName, '\0');
while (letter != '\0')
{
cucolorisName += letter;
file.m_stream->read(reinterpret_cast<char*>(&cucolorisName), sizeof(int8_t));
}
auto* cucolorisImageDependency = context.LoadDependency<AssetImage>(cucolorisName); auto* cucolorisImageDependency = context.LoadDependency<AssetImage>(cucolorisName);
if (!cucolorisImageDependency) if (!cucolorisImageDependency)
{ {
con::error("Could not load GfxLightDef \"{}\" due to missing cucoloris image \"{}\"", assetName, cucolorisName); con::warn("Could not load GfxLightDef \"{}\" due to missing cucoloris image \"{}\"", assetName, cucolorisName);
return AssetCreationResult::Failure(); }
else
{
registration.AddDependency(cucolorisImageDependency);
} }
registration.AddDependency(cucolorisImageDependency);
int8_t lmapLookupStart; int8_t lmapLookupStart;
file.m_stream->read(reinterpret_cast<char*>(&lmapLookupStart), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&lmapLookupStart), sizeof(int8_t));