summaryrefslogtreecommitdiff
path: root/Source/Core/Common/JsonUtil.cpp
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2024-03-22 02:45:58 +0100
committerGitHub <noreply@github.com>2024-03-22 02:45:58 +0100
commitf535b61d5d4e14d3930eafba2ae94f488619090d (patch)
treed47486ba58ddf6d0656eb24823b2507d02c7c1d8 /Source/Core/Common/JsonUtil.cpp
parentb69122f3cfa932a04137a206e33537924bb78f4d (diff)
parent146504d6357513fded0eaf4edc77e0c2a1ee1640 (diff)
Merge pull request #12652 from iwubcode/json_util_update
Common: add even more json utility functions
Diffstat (limited to 'Source/Core/Common/JsonUtil.cpp')
-rw-r--r--Source/Core/Common/JsonUtil.cpp26
1 files changed, 23 insertions, 3 deletions
diff --git a/Source/Core/Common/JsonUtil.cpp b/Source/Core/Common/JsonUtil.cpp
index d16f37f4f3..3e842c5c18 100644
--- a/Source/Core/Common/JsonUtil.cpp
+++ b/Source/Core/Common/JsonUtil.cpp
@@ -14,7 +14,27 @@ picojson::object ToJsonObject(const Common::Vec3& vec)
void FromJson(const picojson::object& obj, Common::Vec3& vec)
{
- vec.x = ReadNumericOrDefault<float>(obj, "x");
- vec.y = ReadNumericOrDefault<float>(obj, "y");
- vec.z = ReadNumericOrDefault<float>(obj, "z");
+ vec.x = ReadNumericFromJson<float>(obj, "x").value_or(0.0f);
+ vec.y = ReadNumericFromJson<float>(obj, "y").value_or(0.0f);
+ vec.z = ReadNumericFromJson<float>(obj, "z").value_or(0.0f);
+}
+
+std::optional<std::string> ReadStringFromJson(const picojson::object& obj, const std::string& key)
+{
+ const auto it = obj.find(key);
+ if (it == obj.end())
+ return std::nullopt;
+ if (!it->second.is<std::string>())
+ return std::nullopt;
+ return it->second.to_str();
+}
+
+std::optional<bool> ReadBoolFromJson(const picojson::object& obj, const std::string& key)
+{
+ const auto it = obj.find(key);
+ if (it == obj.end())
+ return std::nullopt;
+ if (!it->second.is<bool>())
+ return std::nullopt;
+ return it->second.get<bool>();
}