Merge pull request #37 from mimaraka/develop

v2.0-alpha2.1.1

Author: mimaraka

.gitignore

@@ -362,8 +362,5 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
-# JavaScript library files
-curve_editor/ui/js/libs/
-
-# Font Awesome
-curve_editor/ui/fontawesome/
+# Webpack build files
+curve_editor/ui/dist/

curve_editor/config.cpp

@@ -2,14 +2,11 @@
 #include "constants.hpp"
 #include "curve_editor.hpp"
 #include "global.hpp"
-#include "json_loader.hpp"
 #include "string_table.hpp"
 #include <fstream>
 
 
 
-using json = nlohmann::json;
-
 namespace cved {
 	namespace global {
 		void Config::init(HINSTANCE hinst) noexcept {
@@ -151,43 +148,45 @@ namespace cved {
 		bool Config::load_json() {
 			std::ifstream ifs{ dir_plugin_ / CONFIG_FILE_NAME };
 			if (!ifs) return false;
-			json data;
+			nlohmann::json data;
 			try {
-				data = json::parse(ifs);
-				if (data.contains("preferences")) pref_.from_json(data["preferences"]);
-				if (data.contains(GET_KEY(edit_mode_))) set_edit_mode(data[GET_KEY(edit_mode_)]);
-				if (data.contains(GET_KEY(layout_mode_))) set_layout_mode(data[GET_KEY(layout_mode_)]);
+				data = nlohmann::json::parse(ifs);
+				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[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);
 					}
 				}
-				JsonLoader::get_value(data, GET_KEY(curve_code_bezier_), curve_code_bezier_);
-				JsonLoader::get_value(data, GET_KEY(curve_code_elastic_), curve_code_elastic_);
-				JsonLoader::get_value(data, GET_KEY(curve_code_bounce_), curve_code_bounce_);
-				if (data.contains(GET_KEY(show_library_))) set_show_library(data[GET_KEY(show_library_)]);
-				if (data.contains(GET_KEY(show_velocity_graph_))) set_show_velocity_graph(data[GET_KEY(show_velocity_graph_)]);
-				if (data.contains(GET_KEY(show_x_label_))) set_show_x_label(data[GET_KEY(show_x_label_)]);
-				if (data.contains(GET_KEY(show_y_label_))) set_show_y_label(data[GET_KEY(show_y_label_)]);
-				if (data.contains(GET_KEY(align_handle_))) set_align_handle(data[GET_KEY(align_handle_)]);
-				if (data.contains(GET_KEY(ignore_autosaver_warning_))) set_ignore_autosaver_warning(data[GET_KEY(ignore_autosaver_warning_)]);
-				if (data.contains(GET_KEY(separator_pos_))) set_separator_pos(data[GET_KEY(separator_pos_)]);
-				if (data.contains(GET_KEY(preset_size_))) set_preset_size(data[GET_KEY(preset_size_)]);
+				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);
 			}
-			catch (const json::exception&) {
+			catch (const nlohmann::json::exception&) {
 				return false;
 			}
 			return true;
 		}
 
 		// jsonファイルを保存
 		bool Config::save_json() {
-			json data_pref;
+			nlohmann::json data_pref;
 			pref_.to_json(&data_pref);
 
-			json data = {
+			nlohmann::json data = {
 				{"preferences", data_pref},
 				{GET_KEY(edit_mode_), edit_mode_},
 				{GET_KEY(layout_mode_), layout_mode_},

curve_editor/config.hpp

@@ -2,6 +2,7 @@
 
 #include "enum.hpp"
 #include "preferences.hpp"
+#include "util_json.hpp"
 #include <mkaul/color.hpp>
 #include <mkaul/util.hpp>
 

curve_editor/constants.hpp

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

curve_editor/curve_editor.rc

@@ -137,10 +137,16 @@ xcopy /y "$(ProjectDir)@Curve Editor.tra" "$(OutDir)"</Command>
     </Link>
     <PostBuildEvent>
       <Command>xcopy /y "$(ProjectDir)curve_editor.lua" "$(OutDir)"
+
 xcopy /y "$(ProjectDir)@Curve Editor.tra" "$(OutDir)"
+
 rd /s /q "$(OutDir)ui"
-xcopy /s /y /i "$(ProjectDir)ui" "$(OutDir)ui"
-node "$(ProjectDir)minify.js" "$(OutDir)ui"</Command>
+rd /s /q "$(ProjectDir)ui\dist\js"
+cd "$(ProjectDir)ui"
+call npx webpack --mode production
+cd $(SolutionDir)
+xcopy /s /y /i "$(ProjectDir)ui\dist\js" "$(OutDir)ui\js"
+xcopy /y "$(ProjectDir)ui\src\index.html" "$(OutDir)ui"</Command>
     </PostBuildEvent>
     <Manifest>
       <AdditionalManifestFiles>
@@ -239,10 +245,8 @@ node "$(ProjectDir)minify.js" "$(OutDir)ui"</Command>
     <ClInclude Include="host_object_curve_bounce.hpp" />
     <ClInclude Include="host_object_curve_graph.hpp" />
     <ClInclude Include="host_object_curve_linear.hpp" />
-    <ClInclude Include="host_object_editor.hpp" />
     <ClInclude Include="host_object_editor_graph.hpp" />
     <ClInclude Include="host_object_config.hpp" />
-    <ClInclude Include="json_loader.hpp" />
     <ClInclude Include="menu.hpp" />
     <ClInclude Include="menu_bezier_handle.hpp" />
     <ClInclude Include="menu_curve_segment.hpp" />
@@ -261,6 +265,8 @@ node "$(ProjectDir)minify.js" "$(OutDir)ui"</Command>
     <ClInclude Include="string_table.hpp" />
     <ClInclude Include="util.hpp" />
     <ClInclude Include="my_webview2.hpp" />
+    <ClInclude Include="util_json.hpp" />
+    <ClInclude Include="my_webview2_reference.hpp" />
     <ClInclude Include="window_select_curve.hpp" />
   </ItemGroup>
   <ItemGroup>
@@ -300,6 +306,7 @@ node "$(ProjectDir)minify.js" "$(OutDir)ui"</Command>
     <ClCompile Include="host_object_config.cpp" />
     <ClCompile Include="host_object_curve_normal.cpp" />
     <ClCompile Include="host_object_curve_graph_numeric.cpp" />
+    <ClCompile Include="host_object_editor_script.cpp" />
     <ClCompile Include="modifier_base.cpp" />
     <ClCompile Include="modifier_discretization.cpp" />
     <ClCompile Include="drag_and_drop.cpp" />
@@ -336,7 +343,6 @@ node "$(ProjectDir)minify.js" "$(OutDir)ui"</Command>
     </ClCompile>
     <ClCompile Include="host_object_editor_graph.cpp" />
     <ClCompile Include="host_object_curve_graph.cpp" />
-    <ClCompile Include="json_loader.cpp" />
     <ClCompile Include="menu.cpp" />
     <ClCompile Include="menu_bezier_handle.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -399,30 +405,28 @@ node "$(ProjectDir)minify.js" "$(OutDir)ui"</Command>
     <None Include="minify.js" />
     <None Include="packages.config" />
     <None Include="resources\cursor\drag.cur" />
-    <None Include="ui\css\editor_graph.css" />
-    <None Include="ui\css\editor_text.css" />
-    <None Include="ui\css\panel_editor.css" />
-    <None Include="ui\css\panel_main.css" />
-    <None Include="ui\css\preset.css" />
-    <None Include="ui\css\select_dialog.css" />
-    <None Include="ui\css\toolbar.css" />
-    <None Include="ui\css\variables.css" />
-    <None Include="ui\editor_graph.html" />
-    <None Include="ui\editor_text.html" />
-    <None Include="ui\js\curve.js" />
-    <None Include="ui\js\editor_graph.js" />
-    <None Include="ui\js\editor_text.js" />
-    <None Include="ui\js\handles.js" />
-    <None Include="ui\js\panel_editor.js" />
-    <None Include="ui\js\panel_main.js" />
-    <None Include="ui\js\preset.js" />
-    <None Include="ui\js\select_dialog.js" />
-    <None Include="ui\js\toolbar.js" />
-    <None Include="ui\panel_editor.html" />
-    <None Include="ui\panel_main.html" />
-    <None Include="ui\preset.html" />
-    <None Include="ui\select_dialog.html" />
-    <None Include="ui\toolbar.html" />
+    <None Include="ui\src\button.tsx" />
+    <None Include="ui\src\curve.ts" />
+    <None Include="ui\src\editor_graph.tsx" />
+    <None Include="ui\src\editor_text.tsx" />
+    <None Include="ui\src\handles.ts" />
+    <None Include="ui\src\host_object.ts" />
+    <None Include="ui\src\index.tsx" />
+    <None Include="ui\src\panel_editor.tsx" />
+    <None Include="ui\src\panel_main.tsx" />
+    <None Include="ui\src\preset.tsx" />
+    <None Include="ui\src\scss\button.scss" />
+    <None Include="ui\src\scss\common.scss" />
+    <None Include="ui\src\scss\editor_graph.scss" />
+    <None Include="ui\src\scss\editor_text.scss" />
+    <None Include="ui\src\scss\panel_editor.scss" />
+    <None Include="ui\src\scss\panel_main.scss" />
+    <None Include="ui\src\scss\preset.scss" />
+    <None Include="ui\src\scss\select_dialog.scss" />
+    <None Include="ui\src\scss\toolbar.scss" />
+    <None Include="ui\src\scss\variables.scss" />
+    <None Include="ui\src\select_dialog.tsx" />
+    <None Include="ui\src\toolbar.tsx" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="curve_editor.rc" />