CMaterialLoader: Formatting shenanigans

This commit is contained in:
Lioncache
2025-12-08 03:24:37 -05:00
parent 934bdaf889
commit d335465141

View File

@@ -232,8 +232,11 @@ std::unique_ptr<CMaterial> CMaterialLoader::ReadPrimeMaterial()
// Texture matrix is a reliable way to tell, because every UV anim mode generates a texture matrix // Texture matrix is a reliable way to tell, because every UV anim mode generates a texture matrix
const uint32 TexMtxIdx = ((TexGens[TexCoordIdx] & 0x3E00) >> 9) / 3; const uint32 TexMtxIdx = ((TexGens[TexCoordIdx] & 0x3E00) >> 9) / 3;
if (TexMtxIdx == 10) pPass->mAnimMode = EUVAnimMode::NoUVAnim; // 10 is identity matrix; indicates no UV anim for this pass // 10 is identity matrix; indicates no UV anim for this pass
if (TexMtxIdx == 10)
{
pPass->mAnimMode = EUVAnimMode::NoUVAnim;
}
else else
{ {
pPass->mAnimMode = static_cast<EUVAnimMode>(Anims[TexMtxIdx].Mode); pPass->mAnimMode = static_cast<EUVAnimMode>(Anims[TexMtxIdx].Mode);
@@ -264,62 +267,65 @@ void CMaterialLoader::ReadCorruptionMatSet()
} }
// Represent passes as contiguous integers for random-access storage in a fixed array. // Represent passes as contiguous integers for random-access storage in a fixed array.
EPASS PassFourCCToEnum(CFourCC fcc) static EPASS PassFourCCToEnum(CFourCC fcc)
{ {
if (fcc == "DIFF") if (fcc == "DIFF")
return EPASS::DIFF; return EPASS::DIFF;
else if (fcc == "RIML") if (fcc == "RIML")
return EPASS::RIML; return EPASS::RIML;
else if (fcc == "BLOL") if (fcc == "BLOL")
return EPASS::BLOL; return EPASS::BLOL;
else if (fcc == "CLR ") if (fcc == "CLR ")
return EPASS::CLR; return EPASS::CLR;
else if (fcc == "TRAN") if (fcc == "TRAN")
return EPASS::TRAN; return EPASS::TRAN;
else if (fcc == "INCA") if (fcc == "INCA")
return EPASS::INCA; return EPASS::INCA;
else if (fcc == "RFLV") if (fcc == "RFLV")
return EPASS::RFLV; return EPASS::RFLV;
else if (fcc == "RFLD") if (fcc == "RFLD")
return EPASS::RFLD; return EPASS::RFLD;
else if (fcc == "LRLD") if (fcc == "LRLD")
return EPASS::LRLD; return EPASS::LRLD;
else if (fcc == "LURD") if (fcc == "LURD")
return EPASS::LURD; return EPASS::LURD;
else if (fcc == "BLOD") if (fcc == "BLOD")
return EPASS::BLOD; return EPASS::BLOD;
else if (fcc == "BLOI") if (fcc == "BLOI")
return EPASS::BLOI; return EPASS::BLOI;
else if (fcc == "XRAY") if (fcc == "XRAY")
return EPASS::XRAY; return EPASS::XRAY;
else if (fcc == "TOON") if (fcc == "TOON")
return EPASS::TOON; return EPASS::TOON;
return EPASS::DIFF;
};
EINT IntFourCCToEnum(CFourCC fcc) return EPASS::DIFF;
}
static EINT IntFourCCToEnum(CFourCC fcc)
{ {
if (fcc == "OPAC") if (fcc == "OPAC")
return EINT::OPAC; return EINT::OPAC;
else if (fcc == "BLOD") if (fcc == "BLOD")
return EINT::BLOD; return EINT::BLOD;
else if (fcc == "BLOI") if (fcc == "BLOI")
return EINT::BLOI; return EINT::BLOI;
else if (fcc == "BNIF") if (fcc == "BNIF")
return EINT::BNIF; return EINT::BNIF;
else if (fcc == "XRBR") if (fcc == "XRBR")
return EINT::XRBR; return EINT::XRBR;
return EINT::OPAC;
};
ECLR ClrFourCCToEnum(CFourCC fcc) return EINT::OPAC;
}
static ECLR ClrFourCCToEnum(CFourCC fcc)
{ {
if (fcc == "CLR ") if (fcc == "CLR ")
return ECLR::CLR; return ECLR::CLR;
else if (fcc == "DIFB") if (fcc == "DIFB")
return ECLR::DIFB; return ECLR::DIFB;
return ECLR::CLR; return ECLR::CLR;
}; }
std::unique_ptr<CMaterial> CMaterialLoader::ReadCorruptionMaterial() std::unique_ptr<CMaterial> CMaterialLoader::ReadCorruptionMaterial()
{ {