INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-10 23:08:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: restructure t6 weapon camo json

Browse Source
This commit is contained in:
Jan
2024-03-24 15:38:46 +01:00
parent c881cd6fd3
commit 742b8d5bc6
4 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ObjLoading/Game/T6/WeaponCamo/JsonWeaponCamoLoader.cpp
View File

@ -86,16 +86,15 @@ namespace
WeaponCamoMaterial& weaponCamoMaterial,
const WeaponCamo& weaponCamo) const
{
weaponCamoMaterial.replaceFlags = static_cast<uint16_t>(jWeaponCamoMaterial.replaceFlags);
if (jWeaponCamoMaterial.useColorMap)
weaponCamoMaterial.replaceFlags |= WCM_REPLACE_COLOR;
if (jWeaponCamoMaterial.useNormalMap)
weaponCamoMaterial.replaceFlags |= WCM_REPLACE_NORMAL;
if (jWeaponCamoMaterial.useSpecularMap)
weaponCamoMaterial.replaceFlags |= WCM_REPLACE_SPECULAR;
if (jWeaponCamoMaterial.baseMaterials.size() != jWeaponCamoMaterial.camoMaterials.size())
{
PrintError(weaponCamo, "baseMaterials and camoMaterials arrays must have the same amount of entries");
return false;
}
weaponCamoMaterial.numBaseMaterials = static_cast<uint16_t>(jWeaponCamoMaterial.baseMaterials.size());
if (weaponCamoMaterial.numBaseMaterials > 0)
weaponCamoMaterial.numBaseMaterials = static_cast<uint16_t>(jWeaponCamoMaterial.materialOverrides.size());
if (!jWeaponCamoMaterial.materialOverrides.empty())
{
weaponCamoMaterial.baseMaterials = static_cast<Material**>(m_memory.Alloc(sizeof(Material*) * weaponCamoMaterial.numBaseMaterials));
weaponCamoMaterial.camoMaterials = static_cast<Material**>(m_memory.Alloc(sizeof(Material*) * weaponCamoMaterial.numBaseMaterials));
@ -104,10 +103,9 @@ namespace
for (auto i = 0u; i < weaponCamoMaterial.numBaseMaterials; i++)
{
auto* baseMaterial =
static_cast<XAssetInfo<Material>*>(m_manager.LoadDependency(ASSET_TYPE_MATERIAL, jWeaponCamoMaterial.baseMaterials[i]));
auto* camoMaterial =
static_cast<XAssetInfo<Material>*>(m_manager.LoadDependency(ASSET_TYPE_MATERIAL, jWeaponCamoMaterial.camoMaterials[i]));
const auto& materialOverride = jWeaponCamoMaterial.materialOverrides[i];
auto* baseMaterial = static_cast<XAssetInfo<Material>*>(m_manager.LoadDependency(ASSET_TYPE_MATERIAL, materialOverride.baseMaterial));
auto* camoMaterial = static_cast<XAssetInfo<Material>*>(m_manager.LoadDependency(ASSET_TYPE_MATERIAL, materialOverride.camoMaterial));
if (!baseMaterial)
{