Skip to content

Commit 1611858

Browse files
committed
v2.0-alpha2.2.1
1 parent 5369019 commit 1611858

37 files changed

+786
-397
lines changed

curve_editor/constants.hpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@
55

66

77
namespace cved::global {
8-
inline constexpr size_t CURVE_ID_MAX = 524288u;
8+
inline constexpr size_t CURVE_ID_MAX = 524288u;
99

10-
inline constexpr auto CURVE_NAME_NORMAL = "normal";
11-
inline constexpr auto CURVE_NAME_VALUE = "value";
12-
inline constexpr auto CURVE_NAME_BEZIER = "bezier";
13-
inline constexpr auto CURVE_NAME_ELASTIC = "elastic";
14-
inline constexpr auto CURVE_NAME_BOUNCE = "bounce";
15-
inline constexpr auto CURVE_NAME_LINEAR = "linear";
16-
inline constexpr auto CURVE_NAME_SCRIPT = "script";
10+
inline constexpr auto CURVE_NAME_NORMAL = "normal";
11+
inline constexpr auto CURVE_NAME_VALUE = "value";
12+
inline constexpr auto CURVE_NAME_BEZIER = "bezier";
13+
inline constexpr auto CURVE_NAME_ELASTIC = "elastic";
14+
inline constexpr auto CURVE_NAME_BOUNCE = "bounce";
15+
inline constexpr auto CURVE_NAME_LINEAR = "linear";
16+
inline constexpr auto CURVE_NAME_SCRIPT = "script";
1717

18-
inline constexpr auto MODIFIER_NAME_DISCRETIZATION = "discretization";
19-
inline constexpr auto MODIFIER_NAME_NOISE = "noise";
20-
inline constexpr auto MODIFIER_NAME_SINE_WAVE = "sine_wave";
21-
inline constexpr auto MODIFIER_NAME_SQUARE_WAVE = "square_wave";
18+
inline constexpr auto MODIFIER_NAME_DISCRETIZATION = "discretization";
19+
inline constexpr auto MODIFIER_NAME_NOISE = "noise";
20+
inline constexpr auto MODIFIER_NAME_SINE_WAVE = "sine_wave";
21+
inline constexpr auto MODIFIER_NAME_SQUARE_WAVE = "square_wave";
2222

23-
inline constexpr auto PLUGIN_NAME = "Curve Editor";
24-
inline constexpr auto PLUGIN_DLL_NAME = "curve_editor.auf";
25-
inline constexpr auto PLUGIN_VERSION = mkaul::Version{
26-
mkaul::VersionNumber{2},
27-
mkaul::PreviewType{mkaul::PreviewType::Type::Alpha},
28-
mkaul::VersionNumber{2, 2}
29-
};
30-
inline constexpr auto PLUGIN_DEVELOPER = "mimaraka";
31-
inline constexpr auto PLUGIN_TRANSLATOR = "Deepdive";
32-
inline constexpr auto PLUGIN_GITHUB_URL = "https://github.com/mimaraka/aviutl-plugin-curve_editor";
23+
inline constexpr auto PLUGIN_NAME = "Curve Editor";
24+
inline constexpr auto PLUGIN_DLL_NAME = "curve_editor.auf";
25+
inline constexpr auto PLUGIN_VERSION = mkaul::Version{
26+
mkaul::VersionNumber{2},
27+
mkaul::PreviewType{mkaul::PreviewType::Type::Alpha},
28+
mkaul::VersionNumber{2, 2, 1}
29+
};
30+
inline constexpr auto PLUGIN_DEVELOPER = "mimaraka";
31+
inline constexpr auto PLUGIN_TRANSLATOR = "Deepdive";
32+
inline constexpr auto PLUGIN_GITHUB_URL = "https://github.com/mimaraka/aviutl-plugin-curve_editor";
3333
} // namespace cved

curve_editor/curve_base.hpp

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include "curve_id_manager.hpp"
4+
#include <cereal/cereal.hpp>
45
#include <mkaul/graphics.hpp>
56
#include <nlohmann/json.hpp>
67

@@ -33,14 +34,25 @@ namespace cved {
3334
[[nodiscard]] virtual double get_value(double progress, double start, double end) const noexcept;
3435
[[nodiscard]] double get_velocity(double progress, double start, double end) const noexcept;
3536
virtual void clear() noexcept = 0;
36-
virtual void lock() noexcept { locked_ = true; }
37-
virtual void unlock() noexcept { locked_ = false; }
3837
[[nodiscard]] auto is_locked() const noexcept { return locked_; }
38+
virtual void set_locked(bool locked) noexcept { locked_ = locked; }
3939
[[nodiscard]] virtual bool is_default() const noexcept = 0;
4040
[[nodiscard]] auto get_id() const noexcept { return id_; }
4141
[[nodiscard]] constexpr virtual std::string get_name() const noexcept = 0;
4242
[[nodiscard]] virtual std::string get_disp_name() const noexcept = 0;
4343
[[nodiscard]] virtual nlohmann::json create_json() const noexcept;
4444
virtual bool load_json(const nlohmann::json& data) noexcept = 0;
45+
46+
template <class Archive>
47+
void save(Archive& archive, const std::uint32_t) const {
48+
archive(locked_);
49+
}
50+
51+
template <class Archive>
52+
void load(Archive& archive, const std::uint32_t) {
53+
archive(locked_);
54+
}
4555
};
46-
} // namespace cved
56+
} // namespace cved
57+
58+
CEREAL_CLASS_VERSION(cved::Curve, 0)

0 commit comments

Comments
 (0)