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

Common: update 'ReadNumericOrDefault' to 'ReadNumericFromJson' and have it return an optional, this provides the caller with more flexibility

This commit is contained in:
iwubcode 2024-03-20 17:27:02 -05:00
parent 85dee300b5
commit 69694494ce
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ 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);
}

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

@ -3,6 +3,7 @@
#pragma once
#include <optional>
#include <string>
#include <picojson.h>
@ -29,14 +30,13 @@ picojson::array ToJsonArray(const Range& data)
}
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>());
}