piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
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

Browse Source
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
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);
}