zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: not loading t6 weapon camo shader consts from json

Browse Source
This commit is contained in:
Jan 2024-03-24 16:57:47 +01:00
parent b1ff653dc8
commit e62e4c873e
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ObjCommon/Game/T6/Json/JsonWeaponCamo.h
View File

@ -32,6 +32,8 @@ namespace T6
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(JsonWeaponCamoMaterialOverride, baseMaterial, camoMaterial); NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(JsonWeaponCamoMaterialOverride, baseMaterial, camoMaterial);
constexpr auto SHADER_CONST_COUNT = 8;
class JsonWeaponCamoMaterial class JsonWeaponCamoMaterial
{ {
public: public:
@ -39,9 +41,11 @@ namespace T6
bool useNormalMap; bool useNormalMap;
bool useSpecularMap; bool useSpecularMap;
std::vector<JsonWeaponCamoMaterialOverride> materialOverrides; std::vector<JsonWeaponCamoMaterialOverride> materialOverrides;
std::array<float, 8> shaderConsts; std::array<float, SHADER_CONST_COUNT> shaderConsts;
}; };
static_assert(SHADER_CONST_COUNT == std::extent_v<decltype(WeaponCamoMaterial::shaderConsts)>);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(JsonWeaponCamoMaterial, useColorMap, useNormalMap, useSpecularMap, materialOverrides, shaderConsts); NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(JsonWeaponCamoMaterial, useColorMap, useNormalMap, useSpecularMap, materialOverrides, shaderConsts);
class JsonWeaponCamoMaterialSet class JsonWeaponCamoMaterialSet

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

@ -132,6 +132,9 @@ namespace
weaponCamoMaterial.camoMaterials = nullptr; weaponCamoMaterial.camoMaterials = nullptr;
} }
for (auto i = 0u; i < std::extent_v<decltype(WeaponCamoMaterial::shaderConsts)>; i++)
weaponCamoMaterial.shaderConsts[i] = jWeaponCamoMaterial.shaderConsts[i];
return true; return true;
} }