luaスクリプト用のgetcurve()関数の第一引数を文字列指定でも呼び出せるようにした

mimaraka · mimaraka · commit 47a27811d430 · 2024-10-10T18:24:43.000+09:00
diff --git a/curve_editor/constants.hpp b/curve_editor/constants.hpp
@@ -6,20 +6,16 @@
 
 namespace cved {
 	namespace global {
-		inline constexpr int MARGIN = 6;
-		inline constexpr int MARGIN_PRESET = 8;
-		inline constexpr int MIN_WIDTH = 100;
-		inline constexpr int MIN_HEIGHT = 200;
 		inline constexpr int SEPARATOR_WIDTH = 8;
-		inline constexpr int MENU_HEIGHT = 75;
 		inline constexpr size_t IDCURVE_MAX_N = 524288u;
-		inline constexpr float ROUND_RADIUS = 4.f;
-		inline constexpr float SEPARATOR_LINE_WIDTH = 3.6f;
-		inline constexpr float SEPARATOR_LINE_LENGTH = 32.f;
-		inline constexpr float HANDLE_THICKNESS_PRESET = 0.8f;
-		inline constexpr float HANDLE_SIZE_PRESET = 0.7f;
-		inline constexpr float HANDLE_BORDER_THICKNESS_PRESET = 0.5f;
-		inline constexpr float POINT_SIZE_PREEST = 2.f;
+
+		inline constexpr auto CURVE_NAME_NORMAL = "normal";
+		inline constexpr auto CURVE_NAME_VALUE = "value";
+		inline constexpr auto CURVE_NAME_BEZIER = "bezier";
+		inline constexpr auto CURVE_NAME_ELASTIC = "elastic";
+		inline constexpr auto CURVE_NAME_BOUNCE = "bounce";
+		inline constexpr auto CURVE_NAME_LINEAR = "linear";
+		inline constexpr auto CURVE_NAME_SCRIPT = "script";
 
 		inline constexpr auto PLUGIN_NAME = "Curve Editor";
 		inline constexpr auto PLUGIN_VERSION = mkaul::Version{
diff --git a/curve_editor/curve.hpp b/curve_editor/curve.hpp
@@ -21,6 +21,6 @@ namespace cved {
 		virtual void unlock() noexcept { locked_ = false; }
 		auto is_locked() const noexcept { return locked_; }
 		virtual bool is_default() const noexcept = 0;
-		virtual std::string get_type() const noexcept = 0;
+		constexpr virtual std::string get_type() const noexcept = 0;
 	};
 } // namespace cved
diff --git a/curve_editor/curve_bezier.hpp b/curve_editor/curve_bezier.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "constants.hpp"
 #include "curve_graph_numeric.hpp"
 
 
@@ -25,7 +26,7 @@ namespace cved {
 		// コピーコンストラクタ
 		BezierCurve(const BezierCurve& curve) noexcept;
 
-		std::string get_type() const noexcept override { return "bezier"; }
+		constexpr std::string get_type() const noexcept override { return global::CURVE_NAME_BEZIER; }
 
 		double get_handle_left_x() const noexcept { return anchor_start().x + handle_left_.x; }
 		double get_handle_left_y() const noexcept { return anchor_start().y + handle_left_.y; }
diff --git a/curve_editor/curve_bounce.hpp b/curve_editor/curve_bounce.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "constants.hpp"
 #include "curve_graph_numeric.hpp"
 
 
@@ -30,7 +31,7 @@ namespace cved {
 		// コピーコンストラクタ
 		BounceCurve(const BounceCurve& curve) noexcept;
 
-		std::string get_type() const noexcept override { return "bounce"; }
+		constexpr std::string get_type() const noexcept override { return global::CURVE_NAME_BOUNCE; }
 
 		// カーブの値を生成
 		double curve_function(double progress, double start, double end) const noexcept override;
diff --git a/curve_editor/curve_elastic.hpp b/curve_editor/curve_elastic.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "constants.hpp"
 #include "curve_graph_numeric.hpp"
 
 
@@ -32,7 +33,7 @@ namespace cved {
 		// コピーコンストラクタ
 		ElasticCurve(const ElasticCurve& curve) noexcept;
 
-		std::string get_type() const noexcept override { return "elastic"; }
+		constexpr std::string get_type() const noexcept override { return global::CURVE_NAME_ELASTIC; }
 
 		// カーブの値を取得
 		double curve_function(double progress, double start, double end) const noexcept override;
diff --git a/curve_editor/curve_linear.hpp b/curve_editor/curve_linear.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "constants.hpp"
 #include "curve_graph.hpp"
 
 
@@ -18,7 +19,7 @@ namespace cved {
 			GraphCurve{ anchor_start, anchor_end, pt_fixed, prev, next }
 		{}
 
-		std::string get_type() const noexcept override { return "linear"; }
+		constexpr std::string get_type() const noexcept override { return global::CURVE_NAME_LINEAR; }
 
 		// カーブの値を取得
 		double curve_function(double progress, double start, double end) const noexcept override;
diff --git a/curve_editor/curve_normal.hpp b/curve_editor/curve_normal.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "constants.hpp"
 #include "curve_graph.hpp"
 #include "enum.hpp"
 #include <cereal/types/vector.hpp>
@@ -21,7 +22,7 @@ namespace cved {
 		// コピーコンストラクタ
 		NormalCurve(const NormalCurve& curve) noexcept;
 
-		std::string get_type() const noexcept override { return "normal"; }
+		constexpr std::string get_type() const noexcept override { return global::CURVE_NAME_NORMAL; }
 
 		// セグメント数を取得
 		auto segment_n() const noexcept { return curve_segments_.size(); }
diff --git a/curve_editor/curve_script.hpp b/curve_editor/curve_script.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "constants.hpp"
 #include "curve.hpp"
 #include <cereal/archives/binary.hpp>
 #include <cereal/types/polymorphic.hpp>
@@ -17,7 +18,7 @@ namespace cved {
 		ScriptCurve() : script_{DEFAULT_SCRIPT}
 		{}
 
-		std::string get_type() const noexcept override { return "script"; }
+		constexpr std::string get_type() const noexcept override { return global::CURVE_NAME_SCRIPT; }
 		double curve_function(double, double start, double) const noexcept override;
 		void clear() noexcept override { script_ = DEFAULT_SCRIPT; }
 		bool is_default() const noexcept override { return true; }
diff --git a/curve_editor/curve_value.hpp b/curve_editor/curve_value.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "constants.hpp"
 #include "curve_graph.hpp"
 #include "enum.hpp"
 
@@ -18,7 +19,7 @@ namespace cved {
 
 		ValueCurve(const ValueCurve& curve) noexcept;
 
-		std::string get_type() const noexcept override { return "value"; }
+		constexpr std::string get_type() const noexcept override { return global::CURVE_NAME_VALUE; }
 
 		double curve_function(double progress, double start, double end) const noexcept override;
 		void clear() noexcept override;
diff --git a/curve_editor/lua_export.cpp b/curve_editor/lua_export.cpp
@@ -1,3 +1,4 @@
+#include "config.hpp"
 #include "constants.hpp"
 #include "curve_bezier.hpp"
 #include "curve_editor.hpp"
@@ -9,35 +10,81 @@
 namespace cved {
 	// カーブの値を取得
 	int get_curve(::lua_State* L) {
-		// mode:		編集モード
+		// mode:		編集モード(数値または文字列)
 		// parameter:	カーブのコードまたはID
 		// progress:	進捗(0~1)
 		// start:		トラックバーでの開始時の値
 		// end:			トラックバーでの終了時の値
-		const int mode = ::lua_tointeger(L, 1);
 		const int parameter = ::lua_tointeger(L, 2);
 		const double progress = ::lua_tonumber(L, 3);
 		const double start = ::lua_tonumber(L, 4);
 		const double end = ::lua_tonumber(L, 5);
 		double ret = 0.;
+		EditMode mode;
+
+		if (::lua_isnumber(L, 1)) {
+			int mode_int = ::lua_tointeger(L, 1);
+			switch (mode_int) {
+			case 0:
+				mode = EditMode::Bezier;
+				break;
+			case 1:
+				mode = EditMode::Normal;
+				break;
+			case 2:
+				mode = EditMode::Value;
+				break;
+			case 3:
+				mode = EditMode::Elastic;
+				break;
+			case 4:
+				mode = EditMode::Bounce;
+				break;
+			case 5:
+				mode = EditMode::Script;
+				break;
+			default:
+				::lua_pushnil(L);
+				return 1;
+			}
+		}
+		else if (::lua_isstring(L, 1)) {
+			auto mode_str = ::lua_tolstring(L, 1, NULL);
+			if (::strcmp(mode_str, global::CURVE_NAME_NORMAL) == 0) {
+				mode = EditMode::Normal;
+			}
+			else if (::strcmp(mode_str, global::CURVE_NAME_VALUE) == 0) {
+				mode = EditMode::Value;
+			}
+			else if (::strcmp(mode_str, global::CURVE_NAME_BEZIER) == 0) {
+				mode = EditMode::Bezier;
+			}
+			else if (::strcmp(mode_str, global::CURVE_NAME_ELASTIC) == 0) {
+				mode = EditMode::Elastic;
+			}
+			else if (::strcmp(mode_str, global::CURVE_NAME_BOUNCE) == 0) {
+				mode = EditMode::Bounce;
+			}
+			else if (::strcmp(mode_str, global::CURVE_NAME_SCRIPT) == 0) {
+				mode = EditMode::Script;
+			}
+			else {
+				::lua_pushnil(L);
+				return 1;
+			}
+		}
+		else {
+			::lua_pushnil(L);
+			return 1;
+		}
 
 		// Numeric Typeのカーブのオブジェクトを用意しておく
 		static BezierCurve curve_bezier;
 		static ElasticCurve curve_elastic;
 		static BounceCurve curve_bounce;
 
 		switch (mode) {
-			// ベジェ
-		case 0:
-			if (!curve_bezier.decode(parameter)) {
-				::lua_pushnil(L);
-				return 1;
-			}
-			ret = curve_bezier.get_value(progress, start, end);
-			break;
-
-			// 標準
-		case 1:
+		case EditMode::Normal:
 		{
 			int idx = parameter - 1;
 			if (idx < 0) {
@@ -55,32 +102,36 @@ namespace cved {
 			break;
 		}
 
-			// 値指定
-		case 2:
+		case EditMode::Value:
 			::lua_pushnil(L);
 			return 1;
 			break;
 
-			// 振動
-		case 3:
+		case EditMode::Bezier:
+			if (!curve_bezier.decode(parameter)) {
+				::lua_pushnil(L);
+				return 1;
+			}
+			ret = curve_bezier.get_value(progress, start, end);
+			break;
+
+		case EditMode::Elastic:
 			if (!curve_elastic.decode(parameter)) {
 				::lua_pushnil(L);
 				return 1;
 			}
 			ret = curve_elastic.get_value(progress, start, end);
 			break;
 
-			// バウンス
-		case 4:
+		case EditMode::Bounce:
 			if (!curve_bounce.decode(parameter)) {
 				::lua_pushnil(L);
 				return 1;
 			}
 			ret = curve_bounce.get_value(progress, start, end);
 			break;
 
-			// スクリプト
-		case 5:
+		case EditMode::Script:
 		{
 			int idx = parameter - global::IDCURVE_MAX_N - 1;
 			if (idx < 0) {
@@ -108,17 +159,24 @@ namespace cved {
 	}
 
 
+	int get_edit_mode(::lua_State* L) {
+		::lua_pushstring(L, global::config.get_edit_mode_str());
+		return 1;
+	}
+
+
 	int get_version_str(::lua_State* L) {
 		::lua_pushstring(L, cved::global::PLUGIN_VERSION.str().c_str());
 		return 1;
 	}
 }
 
 
-extern "C" __declspec(dllexport) int luaopen_curve_editor(::lua_State * L)
+extern "C" __declspec(dllexport) int luaopen_curve_editor(::lua_State* L)
 {
 	static ::luaL_Reg functions[] = {
 		{ "getcurve", cved::get_curve },
+		{ "geteditmode", cved::get_edit_mode },
 		{ "getversionstr", cved::get_version_str },
 		{ nullptr, nullptr }
 	};
