v1.xのデータの読み込み処理を修正

Author: mimaraka

curve_editor/constants.hpp

@@ -21,7 +21,7 @@ namespace cved {
 		inline constexpr auto PLUGIN_VERSION = mkaul::Version{
 			mkaul::VersionNumber{2},
 			mkaul::PreviewType{mkaul::PreviewType::Type::Alpha},
-			mkaul::VersionNumber{2}
+			mkaul::VersionNumber{2, 0, 1}
 		};
 		inline constexpr auto PLUGIN_DEVELOPER = "mimaraka";
 		inline constexpr auto PLUGIN_TRANSLATOR = "Deepdive";

curve_editor/curve_editor_graph.cpp

@@ -178,8 +178,11 @@ namespace cved {
 					vec_tmp.emplace_back(std::move(curve));
 				}
 			}
-			vec_tmp.reserve(vec_tmp.capacity());
-			curves_normal_ = std::move(vec_tmp);
+			curves_normal_.clear();
+			for (auto it = vec_tmp.rbegin(); it != vec_tmp.rend(); it++) {
+				curves_normal_.emplace_back(std::move(*it));
+			}
+			
 			// インデックスをリセット
 			idx_normal_ = 0;
 			return true;

curve_editor/curve_graph.cpp

@@ -21,24 +21,24 @@ namespace cved {
 		}
 	}
 
-	void GraphCurve::set_anchor_start(double x, double y) noexcept {
-		if (anchor_fixed_ or !prev_) {
+	void GraphCurve::set_anchor_start(double x, double y, bool forced) noexcept {
+		if ((anchor_fixed_ or !prev_) and !forced) {
 			return;
 		}
 		auto ret = mkaul::Point{
-			mkaul::clamp(x, prev_->anchor_start_.x, anchor_end_.x),
+			mkaul::clamp(x, prev_ ? prev_->anchor_start_.x : 0., anchor_end_.x),
 			y
 		};
 		anchor_start_ = ret;
 		//prev_->anchor_end_ = ret;
 	}
 
-	void GraphCurve::set_anchor_end(double x, double y) noexcept {
-		if (anchor_fixed_ or !next_) {
+	void GraphCurve::set_anchor_end(double x, double y, bool forced) noexcept {
+		if ((anchor_fixed_ or !next_) and !forced) {
 			return;
 		}
 		auto ret = mkaul::Point{
-			mkaul::clamp(x, anchor_start_.x, next_->anchor_end_.x),
+			mkaul::clamp(x, anchor_start_.x, next_ ? next_->anchor_end_.x : 1.),
 			y
 		};
 		anchor_end_ = ret;

curve_editor/curve_graph.hpp

@@ -92,10 +92,10 @@ namespace cved {
 		double get_anchor_start_y() const noexcept { return anchor_start_.y; }
 		double get_anchor_end_x() const noexcept { return anchor_end_.x; }
 		double get_anchor_end_y() const noexcept { return anchor_end_.y; }
-		void set_anchor_start(double x, double y) noexcept;
-		void set_anchor_start(const mkaul::Point<double>& pt) noexcept { set_anchor_start(pt.x, pt.y); }
-		void set_anchor_end(double x, double y) noexcept;
-		void set_anchor_end(const mkaul::Point<double>& pt) noexcept { set_anchor_end(pt.x, pt.y); }
+		void set_anchor_start(double x, double y, bool forced = false) noexcept;
+		void set_anchor_start(const mkaul::Point<double>& pt, bool forced = false) noexcept { set_anchor_start(pt.x, pt.y, forced); }
+		void set_anchor_end(double x, double y, bool forced = false) noexcept;
+		void set_anchor_end(const mkaul::Point<double>& pt, bool forced = false) noexcept { set_anchor_end(pt.x, pt.y, forced); }
 
 		virtual void reverse(bool fix_pt = false) noexcept;
 

curve_editor/curve_normal.cpp

@@ -173,28 +173,29 @@ namespace cved {
 					return false;
 				}
 
-				std::unique_ptr<GraphCurve> new_curve = std::make_unique<BezierCurve>();
+				auto new_curve = std::make_unique<BezierCurve>();
 				// ポイントの移動
 				new_curve->set_anchor_start(
 					pts[i].pt_center.x / (double)GRAPH_RESOLUTION,
-					pts[i].pt_center.y / (double)GRAPH_RESOLUTION
+					pts[i].pt_center.y / (double)GRAPH_RESOLUTION,
+					true
 				);
 				new_curve->set_anchor_end(
 					pts[i + 1u].pt_center.x / (double)GRAPH_RESOLUTION,
-					pts[i + 1u].pt_center.y / (double)GRAPH_RESOLUTION
+					pts[i + 1u].pt_center.y / (double)GRAPH_RESOLUTION,
+					true
 				);
 
 				// ハンドルの移動
-				auto p_curve_bezier = dynamic_cast<BezierCurve*>(new_curve.get());
-				p_curve_bezier->set_handle_left(
-					(pts[i].pt_right.x - pts[i].pt_center.x) / (double)GRAPH_RESOLUTION,
-					(pts[i].pt_right.y - pts[i].pt_center.y) / (double)GRAPH_RESOLUTION
+				new_curve->set_handle_left(
+					new_curve->anchor_start().x + (pts[i].pt_right.x - pts[i].pt_center.x) / (double)GRAPH_RESOLUTION,
+					new_curve->anchor_start().y + (pts[i].pt_right.y - pts[i].pt_center.y) / (double)GRAPH_RESOLUTION
 				);
-				p_curve_bezier->set_handle_right(
-					(pts[i + 1u].pt_left.x - pts[i + 1u].pt_center.x) / (double)GRAPH_RESOLUTION,
-					(pts[i + 1u].pt_left.y - pts[i + 1u].pt_center.y) / (double)GRAPH_RESOLUTION
+				new_curve->set_handle_right(
+					new_curve->anchor_end().x + (pts[i + 1u].pt_left.x - pts[i + 1u].pt_center.x) / (double)GRAPH_RESOLUTION,
+					new_curve->anchor_end().y + (pts[i + 1u].pt_left.y - pts[i + 1u].pt_center.y) / (double)GRAPH_RESOLUTION
 				);
-
+				// prev, nextの設定
 				if (!vec_tmp.empty()) {
 					new_curve->set_prev(vec_tmp.back().get());
 					vec_tmp.back()->set_next(new_curve.get());

curve_editor/filter_project_load.cpp

@@ -46,7 +46,7 @@ namespace cved {
 				}
 			}
 			// ウィンドウの更新
-			//global::window_main.send_command((WPARAM)WindowCommand::Update);
+			global::webview_main.post_message(L"panel-editor", L"updateEditor");
 		}
 		return ret;
 	}

curve_editor/ui/js/editor_graph.js

@@ -131,6 +131,7 @@ window.addEventListener('message', function(event) {
             updateVelocityPath();
             break;
 
+        case 'updateEditor':
         case 'updateHandles':
             updateHandles();
             updateCurvePath();

curve_editor/ui/js/editor_text.js

@@ -15,7 +15,10 @@ window.editor.getModel().onDidChangeContent(event => {
 });
 
 window.addEventListener('message', event => {
-    if (event.data.command == 'changeId') {
+    switch (event.data.command) {
+        case 'updateEditor':
+        case 'changeId':
         window.editor.setValue(scriptEditor.script);
+            break;
     }
 });

curve_editor/ui/js/panel_editor.js

@@ -9,6 +9,12 @@ window.addEventListener('message', event => {
                 updateParamButton();
                 break;
 
+            case 'updateEditor':
+                $('#editor')[0].contentWindow.postMessage(event.data, '*');
+                updateIdButtons();
+                updateParamButton();
+                break;
+
             case 'goBackId':
                 goBackId();
                 break;