Merge branch 'main' into update-particles

src/presets/NotePreset.cpp

@@ -0,0 +1,54 @@
+#include "NotePreset.hpp"
+
+#include <map>
+#include <vector>
+
+#include "data/dv_util.hpp"
+
+std::string to_string(NoteDisplayMode mode) {
+    static std::vector<std::string> names = {
+        "static_billboard",
+        "y_free_billboard",
+        "xy_free_billboard",
+        "projected"
+    };
+    return names.at(static_cast<int>(mode));
+}
+
+std::optional<NoteDisplayMode> NoteDisplayMode_from(std::string_view s) {
+    static std::map<std::string_view, NoteDisplayMode, std::less<>> map {
+        {"static_billboard", NoteDisplayMode::STATIC_BILLBOARD},
+        {"y_free_billboard", NoteDisplayMode::Y_FREE_BILLBOARD},
+        {"xy_free_billboard", NoteDisplayMode::XY_FREE_BILLBOARD},
+        {"projected", NoteDisplayMode::PROJECTED}
+    };
+    const auto& found = map.find(s);
+    if (found == map.end()) {
+        return std::nullopt;
+    }
+    return found->second;
+}
+
+dv::value NotePreset::serialize() const {
+    return dv::object({
+        {"display", to_string(displayMode)},
+        {"color", dv::to_value(color)},
+        {"scale", scale},
+        {"render_distance", renderDistance},
+        {"xray_opacity", xrayOpacity},
+        {"perspective", perspective},
+    });
+}
+
+void NotePreset::deserialize(const dv::value& src) {
+    if (src.has("display")) {
+        displayMode = NoteDisplayMode_from(src["display"].asString()).value();
+    }
+    if (src.has("color")) {
+        dv::get_vec(src["color"], color);
+    }
+    src.at("scale").get(scale);
+    src.at("render_distance").get(renderDistance);
+    src.at("xray_opacity").get(xrayOpacity);
+    src.at("perspective").get(perspective);
+}

src/presets/NotePreset.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <glm/vec3.hpp>
+#include <glm/vec4.hpp>
+#include <optional>
+
+#include "interfaces/Serializable.hpp"
+
+enum class NoteDisplayMode {
+    STATIC_BILLBOARD,
+    Y_FREE_BILLBOARD,
+    XY_FREE_BILLBOARD,
+    PROJECTED
+};
+
+std::string to_string(NoteDisplayMode mode);
+std::optional<NoteDisplayMode> NoteDisplayMode_from(std::string_view s);
+
+struct NotePreset : public Serializable {
+    NoteDisplayMode displayMode = NoteDisplayMode::STATIC_BILLBOARD;
+    glm::vec4 color {1.0f};
+    float scale = 1.0f;
+    float renderDistance = 10.0f;
+    float xrayOpacity = 0.0f;
+    float perspective = 0.0f;
+
+    dv::value serialize() const override;
+    void deserialize(const dv::value& src) override;
+};