From 90cc7dacbb6ed97440ce6783907ba19035879ec9 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Mon, 7 Jul 2025 20:16:59 +0200 Subject: [PATCH] chore: use http schema url --- src/ObjCommon/Material/JsonMaterial.h.template | 6 +++--- src/ObjWriting/Material/JsonMaterialWriter.cpp.template | 2 +- .../Game/IW3/Material/DumperMaterialIW3Test.cpp | 2 +- .../Game/IW4/Material/DumperMaterialIW4Test.cpp | 2 +- .../Game/IW5/Material/DumperMaterialIW5Test.cpp | 2 +- .../Game/T5/Material/DumperMaterialT5Test.cpp | 2 +- .../Game/T6/Material/DumperMaterialT6Test.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ObjCommon/Material/JsonMaterial.h.template b/src/ObjCommon/Material/JsonMaterial.h.template index de0559c7..091fec76 100644 --- a/src/ObjCommon/Material/JsonMaterial.h.template +++ b/src/ObjCommon/Material/JsonMaterial.h.template @@ -325,9 +325,9 @@ namespace GAME #endif NLOHMANN_JSON_SERIALIZE_ENUM(TextureSemantic, { - {TS_2D, "2D" }, - {TS_FUNCTION, "function" }, - {TS_COLOR_MAP, "colorMap" }, + {TS_2D, "2D" }, + {TS_FUNCTION, "function" }, + {TS_COLOR_MAP, "colorMap" }, #if defined(FEATURE_IW3) || defined(FEATURE_T5) || defined(FEATURE_T6) {TS_UNUSED_1, "unused1" }, #else diff --git a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template index 3692970b..918402fd 100644 --- a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template +++ b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template @@ -64,7 +64,7 @@ namespace CreateJsonMaterial(jsonMaterial, material); json jRoot = jsonMaterial; - jRoot["$schema"] = "https://openassettools.dev/schema/material.v1.json"; + jRoot["$schema"] = "http://openassettools.dev/schema/material.v1.json"; jRoot["_type"] = "material"; jRoot["_version"] = 1; jRoot["_game"] = GAME_LOWER; diff --git a/test/ObjWritingTests/Game/IW3/Material/DumperMaterialIW3Test.cpp b/test/ObjWritingTests/Game/IW3/Material/DumperMaterialIW3Test.cpp index cc9d34c1..077cbe13 100644 --- a/test/ObjWritingTests/Game/IW3/Material/DumperMaterialIW3Test.cpp +++ b/test/ObjWritingTests/Game/IW3/Material/DumperMaterialIW3Test.cpp @@ -317,7 +317,7 @@ namespace { std::string expected(R"MATERIAL( { - "$schema": "https://openassettools.dev/schema/material.v1.json", + "$schema": "http://openassettools.dev/schema/material.v1.json", "_game": "iw3", "_type": "material", "_version": 1, diff --git a/test/ObjWritingTests/Game/IW4/Material/DumperMaterialIW4Test.cpp b/test/ObjWritingTests/Game/IW4/Material/DumperMaterialIW4Test.cpp index ca7e7881..39b264a7 100644 --- a/test/ObjWritingTests/Game/IW4/Material/DumperMaterialIW4Test.cpp +++ b/test/ObjWritingTests/Game/IW4/Material/DumperMaterialIW4Test.cpp @@ -295,7 +295,7 @@ namespace { std::string expected(R"MATERIAL( { - "$schema": "https://openassettools.dev/schema/material.v1.json", + "$schema": "http://openassettools.dev/schema/material.v1.json", "_game": "iw4", "_type": "material", "_version": 1, diff --git a/test/ObjWritingTests/Game/IW5/Material/DumperMaterialIW5Test.cpp b/test/ObjWritingTests/Game/IW5/Material/DumperMaterialIW5Test.cpp index e2f0ec73..f8c15582 100644 --- a/test/ObjWritingTests/Game/IW5/Material/DumperMaterialIW5Test.cpp +++ b/test/ObjWritingTests/Game/IW5/Material/DumperMaterialIW5Test.cpp @@ -324,7 +324,7 @@ namespace { std::string expected(R"MATERIAL( { - "$schema": "https://openassettools.dev/schema/material.v1.json", + "$schema": "http://openassettools.dev/schema/material.v1.json", "_game": "iw5", "_type": "material", "_version": 1, diff --git a/test/ObjWritingTests/Game/T5/Material/DumperMaterialT5Test.cpp b/test/ObjWritingTests/Game/T5/Material/DumperMaterialT5Test.cpp index e69b73bc..b6136ebc 100644 --- a/test/ObjWritingTests/Game/T5/Material/DumperMaterialT5Test.cpp +++ b/test/ObjWritingTests/Game/T5/Material/DumperMaterialT5Test.cpp @@ -297,7 +297,7 @@ namespace { std::string expected(R"MATERIAL( { - "$schema": "https://openassettools.dev/schema/material.v1.json", + "$schema": "http://openassettools.dev/schema/material.v1.json", "_game": "t5", "_type": "material", "_version": 1, diff --git a/test/ObjWritingTests/Game/T6/Material/DumperMaterialT6Test.cpp b/test/ObjWritingTests/Game/T6/Material/DumperMaterialT6Test.cpp index 7ad4f077..c04e3458 100644 --- a/test/ObjWritingTests/Game/T6/Material/DumperMaterialT6Test.cpp +++ b/test/ObjWritingTests/Game/T6/Material/DumperMaterialT6Test.cpp @@ -261,7 +261,7 @@ namespace { std::string expected(R"MATERIAL( { - "$schema": "https://openassettools.dev/schema/material.v1.json", + "$schema": "http://openassettools.dev/schema/material.v1.json", "_game": "t6", "_type": "material", "_version": 1,