Merge pull request #61 from mimaraka/develop

v2.0-beta1.0

Author: mimaraka

THIRD_PARTY_LICENSES.md

@@ -1,17 +1,17 @@
 #include "actctx_helper.hpp"
-#include "constants.hpp"
 #include "resource.h"
+#include "util.hpp"
 #include <WinBase.h>
 
 
 
-namespace cved {
+namespace curve_editor {
 	bool ActCtxHelper::init() noexcept {
 		ACTCTXA actctx{
 			.cbSize = sizeof(ACTCTXA),
 			.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_HMODULE_VALID,
 			.lpResourceName = MAKEINTRESOURCEA(ID_MANIFEST_VISUALSTYLE),
-			.hModule = ::GetModuleHandleA(global::PLUGIN_DLL_NAME)
+			.hModule = util::get_hinst()
 		};
 		HANDLE tmp = NULL;
 		::GetCurrentActCtx(&tmp);
@@ -39,4 +39,4 @@ namespace cved {
 		if (hactctx_) ::ReleaseActCtx(hactctx_);
 		return ret;
 	}
-} // namespace cved
+} // namespace curve_editor

curve_editor/actctx_helper.cpp

@@ -4,7 +4,7 @@
 
 
 
-namespace cved {
+namespace curve_editor {
     class ActCtxHelper {
         ULONG_PTR cookie_ = 0ul;
         HANDLE hactctx_ = NULL;
@@ -13,4 +13,4 @@ namespace cved {
         bool init() noexcept;
         bool exit();
     };
-} // namespace cved
+} // namespace curve_editor

curve_editor/actctx_helper.hpp

@@ -1,13 +1,14 @@
 #include "config.hpp"
-#include "constants.hpp"
 #include "curve_editor.hpp"
 #include "global.hpp"
+#include "preset_manager.hpp"
 #include "string_table.hpp"
+#include "util.hpp"
 #include <fstream>
 
 
 
-namespace cved::global {
+namespace curve_editor::global {
 	Config::Config() noexcept :
 		edit_mode_{ EditMode::Normal },
 		layout_mode_{ LayoutMode::Horizontal },
@@ -36,9 +37,9 @@ namespace cved::global {
 		::GetModuleFileNameA(NULL, path_str, MAX_PATH);
 		std::filesystem::path path_aviutl{ path_str };
 		dir_aviutl_ = path_aviutl.parent_path();
-		::GetModuleFileNameA(::GetModuleHandleA(global::PLUGIN_DLL_NAME), path_str, MAX_PATH);
+		::GetModuleFileNameA(util::get_hinst(), path_str, MAX_PATH);
 		std::filesystem::path path_plugin{ path_str };
-		dir_plugin_ = path_plugin.parent_path() / "curve_editor";
+		dir_plugin_ = path_plugin.parent_path() / global::PLUGIN_NAME;
 	}
 
 	bool Config::set_language(Language language) noexcept {
@@ -154,28 +155,31 @@ namespace cved::global {
 			if (data.contains("preferences")) {
 				pref_.from_json(data["preferences"]);
 			}
-			set_from_json(this, data, GET_KEY(edit_mode_), &Config::set_edit_mode);
-			set_from_json(this, data, GET_KEY(layout_mode_), &Config::set_layout_mode);
+			if (data.contains("preset_list_config")) {
+				global::preset_manager.list_config_from_json(data["preset_list_config"]);
+			}
+			util::set_from_json(this, data, GET_KEY(edit_mode_), &Config::set_edit_mode);
+			util::set_from_json(this, data, GET_KEY(layout_mode_), &Config::set_layout_mode);
 			if (data[GET_KEY(apply_mode_)].is_array()) {
 				size_t count = 0u;
 				for (const auto& el : data[GET_KEY(apply_mode_)]) {
 					if (count >= apply_mode_.size()) break;
 					set_apply_mode((EditMode)count++, (ApplyMode)el);
 				}
 			}
-			set_from_json(data, GET_KEY(curve_code_bezier_), curve_code_bezier_);
-			set_from_json(data, GET_KEY(curve_code_elastic_), curve_code_elastic_);
-			set_from_json(data, GET_KEY(curve_code_bounce_), curve_code_bounce_);
-			set_from_json(this, data, GET_KEY(show_library_), &Config::set_show_library);
-			set_from_json(this, data, GET_KEY(show_velocity_graph_), &Config::set_show_velocity_graph);
-			set_from_json(this, data, GET_KEY(show_x_label_), &Config::set_show_x_label);
-			set_from_json(this, data, GET_KEY(show_y_label_), &Config::set_show_y_label);
-			set_from_json(this, data, GET_KEY(align_handle_), &Config::set_align_handle);
-			set_from_json(this, data, GET_KEY(ignore_autosaver_warning_), &Config::set_ignore_autosaver_warning);
-			set_from_json(this, data, GET_KEY(separator_pos_), &Config::set_separator_pos);
-			set_from_json(this, data, GET_KEY(preset_size_), &Config::set_preset_size);
-			set_from_json(data, "select_window_width", select_window_size_.width);
-			set_from_json(data, "select_window_height", select_window_size_.height);
+			util::set_from_json(data, GET_KEY(curve_code_bezier_), curve_code_bezier_);
+			util::set_from_json(data, GET_KEY(curve_code_elastic_), curve_code_elastic_);
+			util::set_from_json(data, GET_KEY(curve_code_bounce_), curve_code_bounce_);
+			util::set_from_json(this, data, GET_KEY(show_library_), &Config::set_show_library);
+			util::set_from_json(this, data, GET_KEY(show_velocity_graph_), &Config::set_show_velocity_graph);
+			util::set_from_json(this, data, GET_KEY(show_x_label_), &Config::set_show_x_label);
+			util::set_from_json(this, data, GET_KEY(show_y_label_), &Config::set_show_y_label);
+			util::set_from_json(this, data, GET_KEY(align_handle_), &Config::set_align_handle);
+			util::set_from_json(this, data, GET_KEY(ignore_autosaver_warning_), &Config::set_ignore_autosaver_warning);
+			util::set_from_json(this, data, GET_KEY(separator_pos_), &Config::set_separator_pos);
+			util::set_from_json(this, data, GET_KEY(preset_size_), &Config::set_preset_size);
+			util::set_from_json(data, "select_window_width", select_window_size_.width);
+			util::set_from_json(data, "select_window_height", select_window_size_.height);
 		}
 		catch (const nlohmann::json::exception&) {
 			return false;
@@ -185,17 +189,20 @@ namespace cved::global {
 
 	// jsonファイルを保存
 	bool Config::save_json() {
-		nlohmann::json data_pref;
-		pref_.to_json(&data_pref);
-
-		nlohmann::json data = {
-			{"preferences", data_pref},
+		nlohmann::json json_pref;
+		pref_.to_json(json_pref);
+		nlohmann::json json_preset_list_config;
+		global::preset_manager.list_config_to_json(json_preset_list_config);
+
+		nlohmann::json json = {
+			{"preferences", json_pref},
+			{"preset_list_config", json_preset_list_config},
 			{GET_KEY(edit_mode_), edit_mode_},
 			{GET_KEY(layout_mode_), layout_mode_},
 			{GET_KEY(apply_mode_), apply_mode_},
-			{"curve_code_bezier", editor.editor_graph().curve_bezier()->encode()},
-			{"curve_code_elastic", editor.editor_graph().curve_elastic()->encode()},
-			{"curve_code_bounce", editor.editor_graph().curve_bounce()->encode()},
+			{"curve_code_bezier", editor.editor_graph().curve_bezier().encode()},
+			{"curve_code_elastic", editor.editor_graph().curve_elastic().encode()},
+			{"curve_code_bounce", editor.editor_graph().curve_bounce().encode()},
 			{GET_KEY(show_library_), show_library_},
 			{GET_KEY(show_x_label_), show_x_label_},
 			{GET_KEY(show_y_label_), show_y_label_},
@@ -210,9 +217,9 @@ namespace cved::global {
 
 		std::ofstream ofs{ dir_plugin_ / CONFIG_FILE_NAME };
 		if (!ofs) return false;
-		ofs << data.dump(2);
+		ofs << json.dump(2);
 		return true;
 	}
 
 #undef GET_KEY
-} // namespace cved::global
+} // namespace curve_editor::global

curve_editor/config.cpp

@@ -9,7 +9,7 @@
 
 
 
-namespace cved::global {
+namespace curve_editor::global {
 	inline class Config {
 	private:
 		static constexpr char CONFIG_FILE_NAME[] = "config.json";
@@ -110,8 +110,8 @@ namespace cved::global {
 		auto get_notify_update() const noexcept { return pref_.notify_update; }
 		void set_notify_update(bool notify_update) noexcept { pref_.notify_update = notify_update; }
 
-		auto get_set_bg_image() const noexcept { return pref_.set_bg_image; }
-		void set_set_bg_image(bool set_bg_image) noexcept { pref_.set_bg_image = set_bg_image; }
+		auto get_show_bg_image() const noexcept { return pref_.show_bg_image; }
+		void set_show_bg_image(bool show_bg_image) noexcept { pref_.show_bg_image = show_bg_image; }
 
 		auto get_bg_image_path() const noexcept { return pref_.bg_image_path; }
 		void set_bg_image_path(const std::filesystem::path& bg_image_path) noexcept { pref_.bg_image_path = bg_image_path; }
@@ -148,4 +148,4 @@ namespace cved::global {
 		bool load_json();
 		bool save_json();
 	} config;
-} // namespace cved::global
+} // namespace curve_editor::global

curve_editor/config.hpp

@@ -4,7 +4,7 @@
 
 
 
-namespace cved::global {
+namespace curve_editor::global {
 	inline constexpr size_t CURVE_ID_MAX = 524288u;
 
 	inline constexpr auto CURVE_NAME_NORMAL = "normal";
@@ -20,14 +20,15 @@ namespace cved::global {
 	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_DLL_NAME = "curve_editor.auf";
+	inline constexpr auto PLUGIN_NAME = "curve_editor";
+	inline constexpr auto PLUGIN_DISPLAY_NAME = "Curve Editor";
+	inline constexpr auto PLUGIN_EXT = "auf";
 	inline constexpr auto PLUGIN_VERSION = mkaul::Version{
 		mkaul::VersionNumber{2},
-		mkaul::PreviewType{mkaul::PreviewType::Type::Alpha},
-		mkaul::VersionNumber{2, 2, 1}
+		mkaul::PreviewType{mkaul::PreviewType::Type::Beta},
+		mkaul::VersionNumber{1}
 	};
 	inline constexpr auto PLUGIN_DEVELOPER = "mimaraka";
 	inline constexpr auto PLUGIN_TRANSLATOR = "Deepdive";
 	inline constexpr auto PLUGIN_GITHUB_URL = "https://github.com/mimaraka/aviutl-plugin-curve_editor";
-} // namespace cved
+} // namespace curve_editor

curve_editor/constants.hpp

@@ -3,7 +3,7 @@
 
 
 
-namespace cved {
+namespace curve_editor {
 	void ContextMenu::init() noexcept {
 		menu_ = ::CreatePopupMenu();
 		for (size_t i = 1; auto & item : items_) {
@@ -46,4 +46,4 @@ namespace cved {
 			return false;
 		}
 	}
-} // namespace cved
+} // namespace curve_editor

curve_editor/context_menu.cpp

@@ -5,7 +5,7 @@
 
 
 
-namespace cved {
+namespace curve_editor {
 	class ContextMenu {
 		HMENU menu_;
 		std::vector<MenuItem> items_;
@@ -25,4 +25,4 @@ namespace cved {
 			const mkaul::Point<LONG>* p_custom_pt_screen = nullptr
 		) noexcept;
 	};
-} // namespace cved
+} // namespace curve_editor

curve_editor/context_menu.hpp

@@ -2,7 +2,7 @@
 
 
 
-namespace cved {
+namespace curve_editor {
 	double Curve::get_value(double progress, double start, double end) const noexcept {
 		return curve_function(progress, start, end);
 	}
@@ -27,4 +27,4 @@ namespace cved {
 		data["type"] = get_name();
 		return data;
 	}
-} // namespace cved
+} // namespace curve_editor

curve_editor/curve_base.cpp

@@ -2,12 +2,11 @@
 
 #include "curve_id_manager.hpp"
 #include <cereal/cereal.hpp>
-#include <mkaul/graphics.hpp>
 #include <nlohmann/json.hpp>
 
 
 
-namespace cved {
+namespace curve_editor {
 	// カーブ(抽象クラス)
 	class Curve {
 		bool locked_;
@@ -21,14 +20,22 @@ namespace cved {
 		{}
 		// コピーコンストラクタ
 		Curve(const Curve& curve) noexcept :
-			id_{global::id_manager.create_id(this)},
+			id_{ global::id_manager.create_id(this) },
 			locked_{ curve.locked_ }
 		{}
 		// 仮想デストラクタ
 		virtual ~Curve() noexcept {
 			global::id_manager.remove_id(id_);
 		}
 
+		// コピー代入演算子
+		Curve& operator=(const Curve& curve) noexcept {
+			locked_ = curve.locked_;
+			return *this;
+		}
+
+		virtual std::unique_ptr<Curve> clone() const noexcept = 0;
+
 		// カーブの値を取得
 		[[nodiscard]] virtual double curve_function(double progress, double start, double end) const noexcept = 0;
 		[[nodiscard]] virtual double get_value(double progress, double start, double end) const noexcept;
@@ -53,6 +60,6 @@ namespace cved {
 			archive(locked_);
 		}
 	};
-} // namespace cved
+} // namespace curve_editor
 
-CEREAL_CLASS_VERSION(cved::Curve, 0)
+CEREAL_CLASS_VERSION(curve_editor::Curve, 0)