From 69694494ce0a2b55da903a6bd274e0b5bc0d7cff Mon Sep 17 00:00:00 2001 From: iwubcode Date: Wed, 20 Mar 2024 17:27:02 -0500 Subject: Common: update 'ReadNumericOrDefault' to 'ReadNumericFromJson' and have it return an optional, this provides the caller with more flexibility --- Source/Core/Common/JsonUtil.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/Common/JsonUtil.cpp') diff --git a/Source/Core/Common/JsonUtil.cpp b/Source/Core/Common/JsonUtil.cpp index d16f37f4f3..9ba23b6e1e 100644 --- a/Source/Core/Common/JsonUtil.cpp +++ b/Source/Core/Common/JsonUtil.cpp @@ -14,7 +14,7 @@ picojson::object ToJsonObject(const Common::Vec3& vec) void FromJson(const picojson::object& obj, Common::Vec3& vec) { - vec.x = ReadNumericOrDefault(obj, "x"); - vec.y = ReadNumericOrDefault(obj, "y"); - vec.z = ReadNumericOrDefault(obj, "z"); + vec.x = ReadNumericFromJson(obj, "x").value_or(0.0f); + vec.y = ReadNumericFromJson(obj, "y").value_or(0.0f); + vec.z = ReadNumericFromJson(obj, "z").value_or(0.0f); } -- cgit v1.2.3 From 146504d6357513fded0eaf4edc77e0c2a1ee1640 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Tue, 19 Mar 2024 22:33:48 -0500 Subject: Common: add json utility functions 'ReadStringFromJson' and 'ReadBoolFromJson' to match 'ReadNumericFromJson' functionality for other data types, similarly support other data types for 'ToJsonArray' --- Source/Core/Common/JsonUtil.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'Source/Core/Common/JsonUtil.cpp') diff --git a/Source/Core/Common/JsonUtil.cpp b/Source/Core/Common/JsonUtil.cpp index 9ba23b6e1e..3e842c5c18 100644 --- a/Source/Core/Common/JsonUtil.cpp +++ b/Source/Core/Common/JsonUtil.cpp @@ -18,3 +18,23 @@ void FromJson(const picojson::object& obj, Common::Vec3& vec) vec.y = ReadNumericFromJson(obj, "y").value_or(0.0f); vec.z = ReadNumericFromJson(obj, "z").value_or(0.0f); } + +std::optional 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()) + return std::nullopt; + return it->second.to_str(); +} + +std::optional 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()) + return std::nullopt; + return it->second.get(); +} -- cgit v1.2.3