Merge branch 'main' into feature/update-readme

Author: mimaraka

.editorconfig

@@ -3,6 +3,9 @@ charset = utf-8
 indent_size = 4
 indent_style = tab
 
+[*/resource.h]
+charset = utf-8-bom
+
 [*.rc]
 charset = utf-16le
 

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/curve_editor/ui" # Location of package manifests
+    target-branch: "develop"
+    schedule:
+      interval: "weekly"

.gitignore

@@ -360,4 +360,7 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+
+# Webpack build files
+curve_editor/ui/dist/

.gitmodules

@@ -2,9 +2,6 @@
 	path = curve_editor/external/json
 	url = https://github.com/nlohmann/json
 	branch = master
-[submodule "curve_editor/external/PerlinNoise"]
-	path = curve_editor/external/PerlinNoise
-	url = https://github.com/Reputeless/PerlinNoise
 [submodule "curve_editor/external/strconv"]
 	path = curve_editor/external/strconv
 	url = https://github.com/javacommons/strconv
@@ -15,3 +12,15 @@
 	path = curve_editor/external/aviutl-mkaul
 	url = https://github.com/mimaraka/aviutl-mkaul
 	branch = develop
+[submodule "curve_editor/external/cereal"]
+	path = curve_editor/external/cereal
+	url = https://github.com/USCiLab/cereal.git
+[submodule "curve_editor/external/FastNoiseLite"]
+	path = curve_editor/external/FastNoiseLite
+	url = https://github.com/Auburn/FastNoiseLite.git
+[submodule "curve_editor/external/sol2"]
+	path = curve_editor/external/sol2
+	url = https://github.com/ThePhD/sol2.git
+[submodule "curve_editor/external/magic_enum"]
+	path = curve_editor/external/magic_enum
+	url = https://github.com/Neargye/magic_enum

THIRD_PARTY_LICENSES.md

@@ -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 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 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 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.tra renamed to curve_editor/@Curve Editor.tra

@@ -1,16 +1,17 @@
-#include "actctx_manager.hpp"
-#include <WinBase.h>
+#include "actctx_helper.hpp"
 #include "resource.h"
+#include "util.hpp"
+#include <WinBase.h>
 
 
 
-namespace cved {
-	bool ActCtxManager::init(HINSTANCE hinst) noexcept {
+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 = hinst
+			.hModule = util::get_hinst()
 		};
 		HANDLE tmp = NULL;
 		::GetCurrentActCtx(&tmp);
@@ -28,7 +29,7 @@ namespace cved {
 	}
 
 
-	bool ActCtxManager::exit() {
+	bool ActCtxHelper::exit() {
 		HANDLE tmp;
 		bool ret = false;
 		::GetCurrentActCtx(&tmp);
@@ -38,4 +39,4 @@ namespace cved {
 		if (hactctx_) ::ReleaseActCtx(hactctx_);
 		return ret;
 	}
-}
+} // namespace curve_editor

curve_editor/actctx_manager.cpp renamed to curve_editor/actctx_helper.cpp

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

curve_editor/actctx_manager.hpp renamed to curve_editor/actctx_helper.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <mkaul/point.hpp>
+
+
+
+namespace cereal {
+	template <class Archive>
+	void save(Archive& archive, const mkaul::Point<double>& pt) {
+		archive(pt.x, pt.y);
+	}
+
+	template <class Archive>
+	void load(Archive& archive, mkaul::Point<double>& pt) {
+		archive(pt.x, pt.y);
+	}
+} // namespace cereal