dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge eae0d8d99a into ed2fe134aa

Browse Source
This commit is contained in:
iwubcode 2025-12-15 17:14:34 -06:00 committed by GitHub
commit c2e2856319
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,33 @@
#include <fstream>
#include <fmt/format.h>
#include "Common/FileUtil.h"
namespace
{
template <typename M>
picojson::object MatrixToJson(const M& mat)
{
picojson::object obj;
for (std::size_t i = 0; i < mat.data.size(); i++)
{
obj.emplace(fmt::format("m{}", i), mat.data[i]);
}
return obj;
}
template <typename M>
void MatrixFromJson(const picojson::object& obj, M& mat)
{
for (std::size_t i = 0; i < mat.data.size(); i++)
{
mat.data[i] = ReadNumericFromJson<float>(obj, fmt::format("m{}", i)).value_or(0.0f);
}
}
} // namespace
picojson::object ToJsonObject(const Common::Vec3& vec)
{
picojson::object obj;
@ -23,6 +48,26 @@ void FromJson(const picojson::object& obj, Common::Vec3& vec)
vec.z = ReadNumericFromJson<float>(obj, "z").value_or(0.0f);
}
picojson::object ToJsonObject(const Common::Matrix44& mat)
{
return MatrixToJson(mat);
}
void FromJson(const picojson::object& obj, Common::Matrix44& mat)
{
MatrixFromJson(obj, mat);
}
picojson::object ToJsonObject(const Common::Matrix33& mat)
{
return MatrixToJson(mat);
}
void FromJson(const picojson::object& obj, Common::Matrix33& mat)
{
MatrixFromJson(obj, mat);
}
std::optional<std::string> ReadStringFromJson(const picojson::object& obj, const std::string& key)
{
const auto it = obj.find(key);

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

@ -56,5 +56,11 @@ std::optional<bool> ReadBoolFromJson(const picojson::object& obj, const std::str
picojson::object ToJsonObject(const Common::Vec3& vec);
void FromJson(const picojson::object& obj, Common::Vec3& vec);
picojson::object ToJsonObject(const Common::Matrix44& mat);
void FromJson(const picojson::object& obj, Common::Matrix44& mat);
picojson::object ToJsonObject(const Common::Matrix33& mat);
void FromJson(const picojson::object& obj, Common::Matrix33& mat);
bool JsonToFile(const std::string& filename, const picojson::value& root, bool prettify = false);
bool JsonFromFile(const std::string& filename, picojson::value* root, std::string* error);