ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12652 from iwubcode/json_util_update 

Common: add even more json utility functions
This commit is contained in:
Admiral H. Curtiss 2024-03-22 02:45:58 +01:00 committed by GitHub
parent b69122f3cf 146504d635
commit f535b61d5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/Common/JsonUtil.cpp
View File

@ -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>();
}

24
Source/Core/Common/JsonUtil.h
View File

@ -3,7 +3,9 @@
#pragma once
#include <optional>
#include <string>
#include <type_traits>
#include <picojson.h>
@ -17,28 +19,40 @@
template <typename Range>
picojson::array ToJsonArray(const Range& data)
{
using RangeUnderlyingType = typename Range::value_type;
picojson::array result;
result.reserve(std::size(data));
for (const auto& value : data)
{
result.emplace_back(static_cast<double>(value));
if constexpr (std::is_integral_v<RangeUnderlyingType> ||
std::is_floating_point_v<RangeUnderlyingType>)
{
result.emplace_back(static_cast<double>(value));
}
else
{
result.emplace_back(value);
}
}
return result;
}
template <typename Type>
Type ReadNumericOrDefault(const picojson::object& obj, const std::string& key,
Type default_value = Type{})
std::optional<Type> ReadNumericFromJson(const picojson::object& obj, const std::string& key)
{
const auto it = obj.find(key);
if (it == obj.end())
return default_value;
return std::nullopt;
if (!it->second.is<double>())
return default_value;
return std::nullopt;
return MathUtil::SaturatingCast<Type>(it->second.get<double>());
}
std::optional<std::string> ReadStringFromJson(const picojson::object& obj, const std::string& key);
std::optional<bool> ReadBoolFromJson(const picojson::object& obj, const std::string& key);
picojson::object ToJsonObject(const Common::Vec3& vec);
void FromJson(const picojson::object& obj, Common::Vec3& vec);