v2.0-beta1.0.1

mimaraka · Feb 14, 2025 · c31306c · c31306c
1 parent a81312e
commit c31306c
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 16 deletions.
diff --git a/curve_editor/constants.hpp b/curve_editor/constants.hpp
@@ -26,7 +26,7 @@ namespace curve_editor::global {
 	inline constexpr auto PLUGIN_VERSION = mkaul::Version{
 		mkaul::VersionNumber{2},
 		mkaul::PreviewType{mkaul::PreviewType::Type::Beta},
-		mkaul::VersionNumber{1}
+		mkaul::VersionNumber{1, 0, 1}
 	};
 	inline constexpr auto PLUGIN_DEVELOPER = "mimaraka";
 	inline constexpr auto PLUGIN_TRANSLATOR = "Deepdive";

diff --git a/curve_editor/curve_base.hpp b/curve_editor/curve_base.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "curve_id_manager.hpp"
+#include "enum.hpp"
 #include <cereal/cereal.hpp>
 #include <nlohmann/json.hpp>
 
@@ -45,6 +46,8 @@ namespace curve_editor {
 		virtual void set_locked(bool locked) noexcept { locked_ = locked; }
 		[[nodiscard]] virtual bool is_default() const noexcept = 0;
 		[[nodiscard]] auto get_id() const noexcept { return id_; }
+		// TODO: CurveTypeというenumにする
+		[[nodiscard]] constexpr virtual EditMode get_type() const noexcept = 0;
 		[[nodiscard]] constexpr virtual std::string get_name() const noexcept = 0;
 		[[nodiscard]] virtual std::string get_disp_name() const noexcept = 0;
 		[[nodiscard]] virtual nlohmann::json create_json() const noexcept;

diff --git a/curve_editor/curve_bezier.hpp b/curve_editor/curve_bezier.hpp
@@ -43,7 +43,7 @@ namespace curve_editor {
 		[[nodiscard]] std::unique_ptr<GraphCurve> clone_graph() const noexcept override { return std::make_unique<BezierCurve>(*this); }
 		[[nodiscard]] std::unique_ptr<Curve> clone() const noexcept override { return clone_graph(); }
 
-		// カーブの名前を取得する
+		[[nodiscard]] constexpr EditMode get_type() const noexcept override { return EditMode::Bezier; }
 		[[nodiscard]] constexpr std::string get_name() const noexcept override { return global::CURVE_NAME_BEZIER; }
 		[[nodiscard]] std::string get_disp_name() const noexcept override { return global::string_table[global::StringTable::StringId::LabelEditModeBezier]; }
 

diff --git a/curve_editor/curve_bounce.hpp b/curve_editor/curve_bounce.hpp
@@ -38,6 +38,7 @@ namespace curve_editor {
 		[[nodiscard]] std::unique_ptr<GraphCurve> clone_graph() const noexcept override { return std::make_unique<BounceCurve>(*this); }
 		[[nodiscard]] std::unique_ptr<Curve> clone() const noexcept override { return clone_graph(); }
 
+		[[nodiscard]] constexpr EditMode get_type() const noexcept override { return EditMode::Bounce; }
 		[[nodiscard]] constexpr std::string get_name() const noexcept override { return global::CURVE_NAME_BOUNCE; }
 		[[nodiscard]] std::string get_disp_name() const noexcept override { return global::string_table[global::StringTable::StringId::LabelEditModeBounce]; }
 

diff --git a/curve_editor/curve_elastic.hpp b/curve_editor/curve_elastic.hpp
@@ -40,6 +40,7 @@ namespace curve_editor {
 		[[nodiscard]] std::unique_ptr<GraphCurve> clone_graph() const noexcept override { return std::make_unique<ElasticCurve>(*this); }
 		[[nodiscard]] std::unique_ptr<Curve> clone() const noexcept override { return clone_graph(); }
 
+		[[nodiscard]] constexpr EditMode get_type() const noexcept override { return EditMode::Elastic; }
 		[[nodiscard]] constexpr std::string get_name() const noexcept override { return global::CURVE_NAME_ELASTIC; }
 		[[nodiscard]] std::string get_disp_name() const noexcept override { return global::string_table[global::StringTable::StringId::LabelEditModeElastic]; }
 

diff --git a/curve_editor/curve_linear.hpp b/curve_editor/curve_linear.hpp
@@ -36,6 +36,8 @@ namespace curve_editor {
 		[[nodiscard]] std::unique_ptr<GraphCurve> clone_graph() const noexcept override { return std::make_unique<LinearCurve>(*this); }
 		[[nodiscard]] std::unique_ptr<Curve> clone() const noexcept override { return clone_graph(); }
 
+		// TODO: CurveTypeに直す際にここも直す
+		[[nodiscard]] constexpr EditMode get_type() const noexcept override { return EditMode::Normal; }
 		[[nodiscard]] constexpr std::string get_name() const noexcept override { return global::CURVE_NAME_LINEAR; }
 		[[nodiscard]] std::string get_disp_name() const noexcept override { return global::string_table[global::StringTable::StringId::LabelCurveSegmentTypeLinear]; }
 

diff --git a/curve_editor/curve_normal.hpp b/curve_editor/curve_normal.hpp
@@ -32,6 +32,7 @@ namespace curve_editor {
 		[[nodiscard]] std::unique_ptr<GraphCurve> clone_graph() const noexcept override { return std::make_unique<NormalCurve>(*this); }
 		[[nodiscard]] std::unique_ptr<Curve> clone() const noexcept override { return clone_graph(); }
 
+		[[nodiscard]] constexpr EditMode get_type() const noexcept override { return EditMode::Normal; }
 		[[nodiscard]] constexpr std::string get_name() const noexcept override { return global::CURVE_NAME_NORMAL; }
 		[[nodiscard]] std::string get_disp_name() const noexcept override { return global::string_table[global::StringTable::StringId::LabelEditModeNormal]; }
 

diff --git a/curve_editor/curve_script.hpp b/curve_editor/curve_script.hpp
@@ -37,6 +37,7 @@ namespace curve_editor {
 
 		[[nodiscard]] std::unique_ptr<Curve> clone() const noexcept override { return std::make_unique<ScriptCurve>(*this); }
 
+		[[nodiscard]] constexpr EditMode get_type() const noexcept override { return EditMode::Script; }
 		[[nodiscard]] constexpr std::string get_name() const noexcept override { return global::CURVE_NAME_SCRIPT; }
 		[[nodiscard]] std::string get_disp_name() const noexcept override { return global::string_table[global::StringTable::StringId::LabelEditModeScript]; }
 		[[nodiscard]] double curve_function(double, double start, double) const noexcept override;

diff --git a/curve_editor/curve_value.hpp b/curve_editor/curve_value.hpp
@@ -28,6 +28,7 @@ namespace curve_editor {
 		[[nodiscard]] std::unique_ptr<GraphCurve> clone_graph() const noexcept override { return std::make_unique<ValueCurve>(*this); }
 		[[nodiscard]] std::unique_ptr<Curve> clone() const noexcept override { return clone_graph(); }
 
+		[[nodiscard]] constexpr EditMode get_type() const noexcept override { return EditMode::Value; }
 		[[nodiscard]] constexpr std::string get_name() const noexcept override { return global::CURVE_NAME_VALUE; }
 		[[nodiscard]] std::string get_disp_name() const noexcept override { return global::string_table[global::StringTable::StringId::LabelEditModeValue]; }
 

diff --git a/curve_editor/drag_and_drop.cpp b/curve_editor/drag_and_drop.cpp
@@ -52,16 +52,7 @@ namespace curve_editor {
 
 		auto curve = global::id_manager.get_curve<NumericGraphCurve>(curve_id_);
 		if (curve) {
-			// TODO: get_type()を実装し次第変更
-			if (curve->get_name() == global::CURVE_NAME_BEZIER) {
-				mode = EditMode::Bezier;
-			}
-			else if (curve->get_name() == global::CURVE_NAME_ELASTIC) {
-				mode = EditMode::Elastic;
-			}
-			else if (curve->get_name() == global::CURVE_NAME_BOUNCE) {
-				mode = EditMode::Bounce;
-			}
+			mode = curve->get_type();
 			param = curve->encode();
 		}
 		else {
@@ -165,7 +156,7 @@ namespace curve_editor {
 								buttons_[idx].unhighlight();
 							}
 							for (const auto idx : track_idcs) {
-								buttons_[idx].highlight(p_render_target_);
+								buttons_[idx].highlight(p_render_target_, curve_id_);
 							}
 							track_idcs_buffer_ = track_idcs;
 						}

diff --git a/curve_editor/trackbar_button.cpp b/curve_editor/trackbar_button.cpp
@@ -1,4 +1,5 @@
 #include "config.hpp"
+#include "curve.hpp"
 #include "trackbar_button.hpp"
 
 
@@ -37,7 +38,7 @@ namespace curve_editor {
 		return false;
 	}
 
-	void TrackbarButton::highlight(ID2D1DCRenderTarget* p_render_target) const noexcept {
+	void TrackbarButton::highlight(ID2D1DCRenderTarget* p_render_target, uint32_t curve_id) const noexcept {
 		constexpr float ROUND_RADIUS = 1.5f;
 		constexpr mkaul::ColorF COLOR_NORMAL{ 45, 140, 235 };
 		constexpr mkaul::ColorF COLOR_IGNORE_MID_POINT = { 243, 123, 52 };
@@ -52,8 +53,11 @@ namespace curve_editor {
 			static ID2D1SolidColorBrush* p_brush = nullptr;
 			RECT rect_wnd;
 
+			auto curve = global::id_manager.get_curve<Curve>(curve_id);
+			if (!curve) return;
+
 			// ApplyModeに応じた色の設定
-			switch (global::config.get_apply_mode(global::config.get_edit_mode())) {
+			switch (global::config.get_apply_mode(curve->get_type())) {
 			case ApplyMode::Normal:
 				color = COLOR_NORMAL;
 				break;

diff --git a/curve_editor/trackbar_button.hpp b/curve_editor/trackbar_button.hpp
@@ -18,7 +18,7 @@ namespace curve_editor {
 		auto track_idx() const noexcept { return track_idx_; }
 		bool is_hovered() const noexcept;
 		bool is_visible() const noexcept { return ::IsWindowVisible(hwnd_); }
-		void highlight(ID2D1DCRenderTarget* p_render_target) const noexcept;
+		void highlight(ID2D1DCRenderTarget* p_render_target, uint32_t curve_id) const noexcept;
 		void unhighlight() const noexcept;
 	};
 } // namespace curve_editor