Merge pull request #36 from mimaraka/develop

v2.0-alpha2.1

Author: mimaraka

curve_editor/@Curve Editor.tra

@@ -6,7 +6,7 @@ local idx,t=math.modf(gp"index")
 local st=gp(idx)
 local ed=gp(idx+1)
 local par=gp"param"
-return ce.getcurve(0,par,t,st,ed) or ce.getcurve(1,par,t,st,ed) or ce.getcurve(2,par,t,st,ed) or ce.getcurve(5,par,t,st,ed) or gp"default"
+return ce.getcurve(0,par,t,st,ed) or ce.getcurve(1,par,t,st,ed) or ce.getcurve(2,-par,t,st,ed) or ce.getcurve(5,par-524288,t,st,ed) or gp"default"
 
 
 @Type1(中間点無視)
@@ -15,7 +15,7 @@ return ce.getcurve(0,par,t,st,ed) or ce.getcurve(1,par,t,st,ed) or ce.getcurve(2
 local ce=require"curve_editor"
 local gp=obj.getpoint
 local par=gp"param"
-return ce.getcurve(0,par,gp"totalindex",gp(0),gp(1)) or ce.getcurve(1,par,gp"totalindex",gp(0),gp(1)) or ce.getcurve(2,par,gp"totalindex",gp(0),gp(1)) or ce.getcurve(5,par,gp"totalindex",gp(0),gp(1)) or gp"default"
+return ce.getcurve(0,par,gp"totalindex",gp(0),gp(1)) or ce.getcurve(1,par,gp"totalindex",gp(0),gp(1)) or ce.getcurve(2,-par,gp"totalindex",gp(0),gp(1)) or ce.getcurve(5,par-524288,gp"totalindex",gp(0),gp(1)) or gp"default"
 
 
 @Type1(補間)
@@ -24,7 +24,7 @@ local ce=require"curve_editor"
 local gp=obj.getpoint
 local par=gp"param"
 local prog=gp"totalindex"
-prog=ce.getcurve(0,par,prog,0,1) or ce.getcurve(1,par,prog,0,1) or ce.getcurve(2,par,prog,0,1) or ce.getcurve(5,par,t,st,ed) or prog
+prog=ce.getcurve(0,par,prog,0,1) or ce.getcurve(1,par,prog,0,1) or ce.getcurve(2,-par,prog,0,1) or ce.getcurve(5,par-524288,t,st,ed) or prog
 local num=gp"num"
 
 local function interpolate(idx,t)

curve_editor/config.cpp

@@ -28,7 +28,7 @@ namespace cved {
 			show_velocity_graph_ = false;
 			align_handle_ = true;
 			ignore_autosaver_warning_ = false;
-			separator_ = global::SEPARATOR_WIDTH;
+			separator_pos_ = 1.;
 			preset_size_ = 50;
 
 			// AviUtlのディレクトリの取得
@@ -55,20 +55,20 @@ namespace cved {
 			}
 		}
 
-		bool Config::set_theme_id(ThemeId theme_id) noexcept {
-			switch (theme_id) {
+		bool Config::set_theme(ThemeId theme) noexcept {
+			switch (theme) {
 			case ThemeId::System:
 			case ThemeId::Dark:
 			case ThemeId::Light:
-				pref_.theme_id = theme_id;
+				pref_.theme = theme;
 				return true;
 
 			default:
 				return false;
 			}
 		}
 
-		const char* Config::get_edit_mode_str(EditMode edit_mode) const noexcept {
+		const char* Config::get_edit_mode_dispname(EditMode edit_mode) const noexcept {
 			using StringId = StringTable::StringId;
 
 			if (!string_table.loaded()) return nullptr;
@@ -97,12 +97,12 @@ namespace cved {
 			}
 		}
 
-		const char* Config::get_edit_mode_str() const noexcept {
-			return get_edit_mode_str(edit_mode_);
+		const char* Config::get_edit_mode_dispname() const noexcept {
+			return get_edit_mode_dispname(edit_mode_);
 		}
 
 		bool Config::set_apply_mode(EditMode edit_mode, ApplyMode apply_mode) noexcept {
-			if (mkaul::in_range((size_t)apply_mode, 0u, (size_t)ApplyMode::NumApplyMode - 1u, true)) {
+			if (mkaul::in_range((size_t)apply_mode, 0u, (size_t)ApplyMode::NumApplyMode - 1u)) {
 				apply_mode_[(size_t)edit_mode] = apply_mode;
 				return true;
 			}
@@ -130,15 +130,15 @@ namespace cved {
 		}
 
 		bool Config::set_edit_mode(EditMode edit_mode) noexcept {
-			if (mkaul::in_range((uint32_t)edit_mode, 0u, (uint32_t)EditMode::NumEditMode - 1u, true)) {
+			if (mkaul::in_range((uint32_t)edit_mode, 0u, (uint32_t)EditMode::NumEditMode - 1u)) {
 				edit_mode_ = edit_mode;
 				return true;
 			}
 			else return false;
 		}
 
-		void Config::set_separator(int separator) noexcept {
-			separator_ = std::max(separator, global::SEPARATOR_WIDTH);
+		void Config::set_separator_pos(double separator_pos) noexcept {
+			separator_pos_ = mkaul::clamp(separator_pos, 0., 1.);
 		}
 
 		void Config::set_preset_size(int) noexcept {
@@ -173,7 +173,7 @@ namespace cved {
 				if (data.contains(GET_KEY(show_y_label_))) set_show_y_label(data[GET_KEY(show_y_label_)]);
 				if (data.contains(GET_KEY(align_handle_))) set_align_handle(data[GET_KEY(align_handle_)]);
 				if (data.contains(GET_KEY(ignore_autosaver_warning_))) set_ignore_autosaver_warning(data[GET_KEY(ignore_autosaver_warning_)]);
-				if (data.contains(GET_KEY(separator_))) set_separator(data[GET_KEY(separator_)]);
+				if (data.contains(GET_KEY(separator_pos_))) set_separator_pos(data[GET_KEY(separator_pos_)]);
 				if (data.contains(GET_KEY(preset_size_))) set_preset_size(data[GET_KEY(preset_size_)]);
 			}
 			catch (const json::exception&) {
@@ -201,7 +201,7 @@ namespace cved {
 				{GET_KEY(show_velocity_graph_), show_velocity_graph_},
 				{GET_KEY(align_handle_), align_handle_},
 				{GET_KEY(ignore_autosaver_warning_), ignore_autosaver_warning_},
-				{GET_KEY(separator_), separator_},
+				{GET_KEY(separator_pos_), separator_pos_},
 				{GET_KEY(preset_size_), preset_size_}
 			};
 

curve_editor/config.hpp

@@ -30,7 +30,7 @@ namespace cved {
 			bool show_velocity_graph_ = false;
 			bool align_handle_ = false;
 			bool ignore_autosaver_warning_ = false;
-			int separator_ = 0;
+			double separator_pos_ = 0.;
 			int preset_size_ = 0;
 
 			std::filesystem::path dir_aviutl_;
@@ -42,14 +42,14 @@ namespace cved {
 			auto get_language() const noexcept { return pref_.language; }
 			bool set_language(Language language) noexcept;
 
-			auto get_theme_id() const noexcept { return pref_.theme_id; }
-			bool set_theme_id(ThemeId theme_id) noexcept;
+			auto get_theme() const noexcept { return pref_.theme; }
+			bool set_theme(ThemeId theme) noexcept;
 
 			auto get_edit_mode() const noexcept { return edit_mode_; }
 			bool set_edit_mode(EditMode edit_mode) noexcept;
 
-			const char* get_edit_mode_str(EditMode edit_mode) const noexcept;
-			const char* get_edit_mode_str() const noexcept;
+			const char* get_edit_mode_dispname(EditMode edit_mode) const noexcept;
+			const char* get_edit_mode_dispname() const noexcept;
 
 			auto get_layout_mode() const noexcept { return layout_mode_; }
 			bool set_layout_mode(LayoutMode layout_mode) noexcept;
@@ -123,11 +123,14 @@ namespace cved {
 			auto get_enable_animation() const noexcept { return pref_.enable_animation; }
 			void set_enable_animation(bool enable_animation) noexcept { pref_.enable_animation = enable_animation; }
 
+			auto get_word_wrap() const noexcept { return pref_.word_wrap; }
+			void set_word_wrap(bool word_wrap) noexcept { pref_.word_wrap = word_wrap; }
+
 			auto get_ignore_autosaver_warning() const noexcept { return ignore_autosaver_warning_; }
 			void set_ignore_autosaver_warning(bool ignore_autosaver_warning) noexcept { ignore_autosaver_warning_ = ignore_autosaver_warning; }
 
-			auto get_separator() const noexcept { return separator_; }
-			void set_separator(int separator) noexcept;
+			auto get_separator_pos() const noexcept { return separator_pos_; }
+			void set_separator_pos(double separator_pos) noexcept;
 
 			auto get_preset_size() const noexcept { return preset_size_; }
 			void set_preset_size(int preset_size) noexcept;

curve_editor/constants.hpp

@@ -6,8 +6,7 @@
 
 namespace cved {
 	namespace global {
-		inline constexpr int SEPARATOR_WIDTH = 8;
-		inline constexpr size_t IDCURVE_MAX_N = 524288u;
+		inline constexpr size_t CURVE_ID_MAX = 524288u;
 
 		inline constexpr auto CURVE_NAME_NORMAL = "normal";
 		inline constexpr auto CURVE_NAME_VALUE = "value";
@@ -17,11 +16,16 @@ namespace cved {
 		inline constexpr auto CURVE_NAME_LINEAR = "linear";
 		inline constexpr auto CURVE_NAME_SCRIPT = "script";
 
+		inline constexpr auto MODIFIER_NAME_DISCRETIZATION = "discretization";
+		inline constexpr auto MODIFIER_NAME_NOISE = "noise";
+		inline constexpr auto MODIFIER_NAME_SINE_WAVE = "sine_wave";
+		inline constexpr auto MODIFIER_NAME_SQUARE_WAVE = "square_wave";
+
 		inline constexpr auto PLUGIN_NAME = "Curve Editor";
 		inline constexpr auto PLUGIN_VERSION = mkaul::Version{
 			mkaul::VersionNumber{2},
 			mkaul::PreviewType{mkaul::PreviewType::Type::Alpha},
-			mkaul::VersionNumber{2, 0, 1}
+			mkaul::VersionNumber{2, 1}
 		};
 		inline constexpr auto PLUGIN_DEVELOPER = "mimaraka";
 		inline constexpr auto PLUGIN_TRANSLATOR = "Deepdive";

curve_editor/curve.hpp

@@ -1,26 +1,9 @@
 #pragma once
 
-#include <mkaul/graphics.hpp>
-
-
-
-namespace cved {
-	// カーブ(抽象クラス)
-	class Curve {
-		bool locked_ = false;
-
-	public:
-		virtual ~Curve() noexcept = default;
-
-		// カーブの値を取得
-		virtual double curve_function(double progress, double start, double end) const noexcept = 0;
-		virtual double get_value(double progress, double start, double end) const noexcept;
-		double get_velocity(double progress, double start, double end) const noexcept;
-		virtual void clear() noexcept = 0;
-		virtual void lock() noexcept { locked_ = true; }
-		virtual void unlock() noexcept { locked_ = false; }
-		auto is_locked() const noexcept { return locked_; }
-		virtual bool is_default() const noexcept = 0;
-		constexpr virtual std::string get_type() const noexcept = 0;
-	};
-} // namespace cved
+#include "curve_normal.hpp"
+#include "curve_value.hpp"
+#include "curve_bezier.hpp"
+#include "curve_elastic.hpp"
+#include "curve_bounce.hpp"
+#include "curve_linear.hpp"
+#include "curve_script.hpp"

curve_editor/curve.cpp renamed to curve_editor/curve_base.cpp

@@ -1,4 +1,4 @@
-#include "curve.hpp"
+#include "curve_base.hpp"
 
 
 
@@ -21,4 +21,10 @@ namespace cved {
 		}
 		return (get_value(prog_after, start, end) - get_value(prog_before, start, end)) * TMP;
 	}
+
+	nlohmann::json Curve::create_json() const noexcept {
+		nlohmann::json data;
+		data["type"] = get_type();
+		return data;
+	}
 }

curve_editor/curve_base.hpp

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "curve_id_manager.hpp"
+#include <mkaul/graphics.hpp>
+#include <nlohmann/json.hpp>
+
+
+
+namespace cved {
+	// カーブ(抽象クラス)
+	class Curve {
+		bool locked_;
+		const uint32_t id_;
+
+	public:
+		Curve() noexcept :
+			id_{global::id_manager.create_id(this)},
+			locked_{false}
+		{}
+		virtual ~Curve() noexcept {
+			global::id_manager.remove_id(id_);
+		}
+
+		// カーブの値を取得
+		virtual double curve_function(double progress, double start, double end) const noexcept = 0;
+		virtual double get_value(double progress, double start, double end) const noexcept;
+		double get_velocity(double progress, double start, double end) const noexcept;
+		virtual void clear() noexcept = 0;
+		virtual void lock() noexcept { locked_ = true; }
+		virtual void unlock() noexcept { locked_ = false; }
+		auto is_locked() const noexcept { return locked_; }
+		virtual bool is_default() const noexcept = 0;
+		auto get_id() const noexcept { return id_; }
+		constexpr virtual std::string get_type() const noexcept = 0;
+		virtual nlohmann::json create_json() const noexcept;
+		virtual bool load_json(const nlohmann::json& data) noexcept = 0;
+	};
+} // namespace cved

curve_editor/curve_bezier.cpp

@@ -60,10 +60,10 @@ namespace cved {
 				const double inside_sqrt = 9. * tmp3 * tmp3 - 12. * tmp4 * tmp2;
 				const double t_1 = (-3. * tmp3 + std::sqrt(inside_sqrt)) / (6. * tmp2);
 				const double t_2 = (-3. * tmp3 - std::sqrt(inside_sqrt)) / (6. * tmp2);
-				if (mkaul::real_in_range(t_1, 0., 1., true)) {
+				if (mkaul::real_in_range(t_1, 0., 1.)) {
 					t = t_1;
 				}
-				else if (mkaul::real_in_range(t_2, 0., 1., true)) {
+				else if (mkaul::real_in_range(t_2, 0., 1.)) {
 					t = t_2;
 				}
 			}
@@ -86,13 +86,13 @@ namespace cved {
 				double re_t1 = r_2 * std::cos(theta + std::numbers::pi * 2. / 3.) - tmp5;
 				double re_t2 = r_2 * std::cos(theta + std::numbers::pi * 4. / 3.) - tmp5;
 
-				if (mkaul::real_in_range(re_t0, 0., 1., true)) {
+				if (mkaul::real_in_range(re_t0, 0., 1.)) {
 					t = re_t0;
 				}
-				else if (mkaul::real_in_range(re_t1, 0., 1., true)) {
+				else if (mkaul::real_in_range(re_t1, 0., 1.)) {
 					t = re_t1;
 				}
-				else if (mkaul::real_in_range(re_t2, 0., 1., true)) {
+				else if (mkaul::real_in_range(re_t2, 0., 1.)) {
 					t = re_t2;
 				}
 			}
@@ -102,10 +102,10 @@ namespace cved {
 				double t0 = -tmp7 - tmp5;
 				double t1 = 2. * tmp7 - tmp5;
 
-				if (mkaul::real_in_range(t0, 0., 1., true)) {
+				if (mkaul::real_in_range(t0, 0., 1.)) {
 					t = t0;
 				}
-				else if (mkaul::real_in_range(t1, 0., 1., true)) {
+				else if (mkaul::real_in_range(t1, 0., 1.)) {
 					t = t1;
 				}
 			}
@@ -175,7 +175,7 @@ namespace cved {
 			DEFAULT_HANDLE_XY * width, DEFAULT_HANDLE_XY * height 
 		};
 		handle_right_ = {
-			 - DEFAULT_HANDLE_XY * width, - DEFAULT_HANDLE_XY * height
+			- DEFAULT_HANDLE_XY * width, - DEFAULT_HANDLE_XY * height
 		};
 	}
 
@@ -298,4 +298,37 @@ namespace cved {
 
 		return std::format("{:.2f}, {:.2f}, {:.2f}, {:.2f}", x1, y1, x2, y2);
 	}
+
+	nlohmann::json BezierCurve::create_json() const noexcept {
+		auto data = GraphCurve::create_json();
+		data["handle_left"] = {
+			handle_left_.x, handle_left_.y
+		};
+		data["handle_right"] = {
+			handle_right_.x, handle_right_.y
+		};
+		return data;
+	}
+
+	bool BezierCurve::load_json(const nlohmann::json& data) noexcept {
+		if (!GraphCurve::load_json(data)) {
+			return false;
+		}
+		try {
+			auto left_x = data.at("handle_left")[0].get<double>();
+			auto left_y = data.at("handle_left")[1].get<double>();
+			auto right_x = data.at("handle_right")[0].get<double>();
+			auto right_y = data.at("handle_right")[1].get<double>();
+			auto width = anchor_end().x - anchor_start().x;
+			if (!mkaul::real_in_range(left_x, 0., width) or !mkaul::real_in_range(right_x, -width, 0.)) {
+				return false;
+			}
+			handle_left_ = mkaul::Point{ left_x, left_y };
+			handle_right_ = mkaul::Point{ right_x, right_y };
+		}
+		catch (const nlohmann::json::exception&) {
+			return false;
+		}
+		return true;
+	}
 }

curve_editor/curve_bezier.hpp

@@ -19,8 +19,8 @@ namespace cved {
 			bool pt_fixed = false,
 			GraphCurve* prev = nullptr,
 			GraphCurve* next = nullptr,
-			mkaul::Point<double> handle_left = mkaul::Point{ 0., 0. },
-			mkaul::Point<double> handle_right = mkaul::Point{ 0., 0. }
+			mkaul::Point<double> handle_left = mkaul::Point{ DEFAULT_HANDLE_XY, DEFAULT_HANDLE_XY },
+			mkaul::Point<double> handle_right = mkaul::Point{ -DEFAULT_HANDLE_XY, -DEFAULT_HANDLE_XY }
 		) noexcept;
 
 		// コピーコンストラクタ
@@ -49,6 +49,9 @@ namespace cved {
 
 		std::string make_param() const noexcept;
 
+		nlohmann::json create_json() const noexcept override;
+		bool load_json(const nlohmann::json& data) noexcept override;
+
 		template <class Archive>
 		void save(Archive& archive, const std::uint32_t) const {
 			archive(