Formatted EVERYTHING

This commit is contained in:
Dynamitos
2024-06-09 12:20:53 +02:00
parent f18bf8acbe
commit d95dab850c
265 changed files with 8002 additions and 12310 deletions
+13 -20
View File
@@ -1,19 +1,16 @@
#include "Vector.h"
#include <regex>
#include <fmt/core.h>
#include <sstream>
#include <nlohmann/json.hpp>
#include "Serialization/ArchiveBuffer.h"
#include <fmt/core.h>
#include <nlohmann/json.hpp>
#include <regex>
#include <sstream>
using namespace Seele;
void to_json(nlohmann::json& j, const Vector& vec)
{
j = nlohmann::json{fmt::format("({}, {}, {})", vec.x, vec.y, vec.z)};
}
void to_json(nlohmann::json& j, const Vector& vec) { j = nlohmann::json{fmt::format("({}, {}, {})", vec.x, vec.y, vec.z)}; }
void from_json(const nlohmann::json& j, Vector& vec)
{
void from_json(const nlohmann::json& j, Vector& vec) {
std::string str;
j.get_to(str);
auto newEnd = std::remove(str.begin(), str.end(), ' ');
@@ -28,29 +25,25 @@ void from_json(const nlohmann::json& j, Vector& vec)
vec.z = std::stof(temp);
}
std::ostream& operator<<(std::ostream& stream, const Vector2& vector)
{
std::ostream& operator<<(std::ostream& stream, const Vector2& vector) {
stream << "(" << vector.x << ", " << vector.y << ")";
return stream;
}
std::ostream& operator<<(std::ostream& stream, const Vector& vector)
{
std::ostream& operator<<(std::ostream& stream, const Vector& vector) {
stream << "(" << vector.x << ", " << vector.y << ", " << vector.z << ")";
return stream;
}
std::ostream& operator<<(std::ostream& stream, const Vector4& vector)
{
std::ostream& operator<<(std::ostream& stream, const Vector4& vector) {
stream << "(" << vector.x << ", " << vector.y << ", " << vector.z << ", " << vector.w << ")";
return stream;
}
Vector Seele::parseVector(const char* str)
{
//regex pattern consisting of 'float3(xComp, yComp, zComp)', more also matches for invalid floats, but that will throw later
Vector Seele::parseVector(const char* str) {
// regex pattern consisting of 'float3(xComp, yComp, zComp)', more also matches for invalid floats, but that will throw later
std::regex pattern("float3\\(\\s*([0-9.]+f?)\\s*,\\s*([0-9.]+f?)\\s*,\\s*([0-9.]+f?)\\s*\\)");
std::cmatch base_match;
std::regex_match(str, base_match, pattern);
//match 0 is the whole expression
// match 0 is the whole expression
float x = std::stof(base_match[1].str());
float y = std::stof(base_match[2].str());
float z = std::stof(base_match[3].str());