diff options
Diffstat (limited to 'Source/Core/Common/JsonUtil.cpp')
| -rw-r--r-- | Source/Core/Common/JsonUtil.cpp | 26 |
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>(); } |
