zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-10 05:01:50 +00:00
Code Activity

chore: use std array for json constants

Browse Source
This commit is contained in:
Jan Laupetin
2025-07-07 18:13:47 +02:00
parent c53b17a3db
commit 30c6735ff5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjCommon/Material/JsonMaterial.h.template
View File

@ -218,7 +218,7 @@ namespace GAME
std::optional<std::string> name; std::optional<std::string> name;
std::optional<std::string> nameFragment; std::optional<std::string> nameFragment;
std::optional<unsigned> nameHash; std::optional<unsigned> nameHash;
std::vector<float> literal; std::array<float, 4> literal;
}; };
inline void to_json(nlohmann::json& out, const JsonConstant& in) inline void to_json(nlohmann::json& out, const JsonConstant& in)

4
src/ObjWriting/Material/JsonMaterialWriter.cpp.template
View File

@ -201,12 +201,12 @@ namespace
jConstantDef.nameFragment = nameFragment; jConstantDef.nameFragment = nameFragment;
} }
jConstantDef.literal = std::vector({ jConstantDef.literal = {
constantDef.literal.x, constantDef.literal.x,
constantDef.literal.y, constantDef.literal.y,
constantDef.literal.z, constantDef.literal.z,
constantDef.literal.w, constantDef.literal.w,
}); };
} }
static void CreateJsonStencil(JsonStencil& jStencil, const unsigned pass, const unsigned fail, const unsigned zFail, const unsigned func) static void CreateJsonStencil(JsonStencil& jStencil, const unsigned pass, const unsigned fail, const unsigned zFail, const unsigned func)