From 30c6735ff5708fe8c6a9cd0d642560e27b2f3e19 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Mon, 7 Jul 2025 18:13:47 +0200 Subject: [PATCH] chore: use std array for json constants --- src/ObjCommon/Material/JsonMaterial.h.template | 2 +- src/ObjWriting/Material/JsonMaterialWriter.cpp.template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ObjCommon/Material/JsonMaterial.h.template b/src/ObjCommon/Material/JsonMaterial.h.template index 1ff77dcb..de0559c7 100644 --- a/src/ObjCommon/Material/JsonMaterial.h.template +++ b/src/ObjCommon/Material/JsonMaterial.h.template @@ -218,7 +218,7 @@ namespace GAME std::optional name; std::optional nameFragment; std::optional nameHash; - std::vector literal; + std::array literal; }; inline void to_json(nlohmann::json& out, const JsonConstant& in) diff --git a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template index 56434fe3..3692970b 100644 --- a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template +++ b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template @@ -201,12 +201,12 @@ namespace jConstantDef.nameFragment = nameFragment; } - jConstantDef.literal = std::vector({ + jConstantDef.literal = { constantDef.literal.x, constantDef.literal.y, constantDef.literal.z, constantDef.literal.w, - }); + }; } static void CreateJsonStencil(JsonStencil& jStencil, const unsigned pass, const unsigned fail, const unsigned zFail, const unsigned func)