Merge pull request #143 from chinosk6/main

增加 CutIn 第一人称开关
MinamiChiwa · Jun 30, 2023 · 8b9dce3 · 8b9dce3
2 parents e47f81e + 2328031
commit 8b9dce3
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 3 deletions.
diff --git a/resources/config.json b/resources/config.json
@@ -48,6 +48,7 @@
             "z": 0
         }
     },
+    "cutin_first_persion": false,
     "externalPlugin": {
         "hotkey": "u",
         "path": "legend_g_plugin.exe",

diff --git a/resources/config.schema.json b/resources/config.schema.json
@@ -229,6 +229,11 @@
             },
             "additionalProperties": false
         },
+        "cutin_first_persion": {
+            "description": "CutIn 第一人称（使用 F 键切换）",
+            "type": "boolean",
+            "default": false
+        },
         "externalPlugin": {
             "description": "外部插件配置",
             "type": "object",

diff --git a/resources/config_en.schema.json b/resources/config_en.schema.json
@@ -229,6 +229,11 @@
             },
             "additionalProperties": false
         },
+        "cutin_first_persion": {
+            "description": "CutIn first persion (perss F to switch).",
+            "type": "boolean",
+            "default": false
+        },
         "externalPlugin": {
             "description": "Set external plugin.",
             "type": "object",

diff --git a/resources/config_zh_tw.schema.json b/resources/config_zh_tw.schema.json
@@ -229,6 +229,11 @@
             },
             "additionalProperties": false
         },
+        "cutin_first_persion": {
+            "description": "CutIn 第一人稱（F 鍵切換）",
+            "type": "boolean",
+            "default": false
+        },
         "externalPlugin": {
             "description": "外部插件配置",
             "type": "object",

diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp
@@ -1119,8 +1119,10 @@ namespace UmaCamera {
 			}
 		}
 		else if (cameraType == CAMERA_CUTIN) {
-			g_cutin_first_persion = !g_cutin_first_persion;
-			printf("CutIn camera first person %s.\n", g_cutin_first_persion ? "enabled" : "disabled");
+			if (g_enable_cutin_first_persion) {
+				g_cutin_first_persion = !g_cutin_first_persion;
+				printf("CutIn camera first person %s.\n", g_cutin_first_persion ? "enabled" : "disabled");
+			}
 		}
 
 	}

diff --git a/src/hook.cpp b/src/hook.cpp
@@ -3397,7 +3397,7 @@ namespace
 	bool CutInTimelineController_AlterLateUpdate_hook(void* _this) {
 		UmaCamera::setUmaCameraType(CAMERA_CUTIN);
 		auto ret = reinterpret_cast<decltype(CutInTimelineController_AlterLateUpdate_hook)*>(CutInTimelineController_AlterLateUpdate_orig)(_this);
-		if (!g_cutin_first_persion) {
+		if (!(g_cutin_first_persion && g_enable_cutin_first_persion)) {
 			return ret;
 		}
 		init_cutin();

diff --git a/src/main.cpp b/src/main.cpp
@@ -83,6 +83,7 @@ std::wstring g_convert_url;
 bool g_enable_self_server = false;
 std::wstring g_self_server_url;
 
+bool g_enable_cutin_first_persion = false;
 bool g_cutin_first_persion = false;
 
 std::string g_text_data_dict_path;
@@ -592,6 +593,10 @@ namespace
 				UmaCamera::loadGlobalData();
 			}
 
+			if (document.HasMember("cutin_first_persion")) {
+				g_enable_cutin_first_persion = document["cutin_first_persion"].GetBool();
+			}
+
 			if (document.HasMember("aspect_ratio_new")) {
 				auto& asp = document["aspect_ratio_new"];
 				auto asp_w = asp["w"].GetFloat();

diff --git a/src/stdinclude.hpp b/src/stdinclude.hpp
@@ -187,4 +187,5 @@ extern std::string dumpGameAssemblyPath;
 extern bool g_enable_live_dof_controller;
 extern bool guiStarting;
 extern bool g_cutin_first_persion;
+extern bool g_enable_cutin_first_persion;
 extern bool g_enable_better60fps;