浏览代码

Replaced operating system alert dialog with a warning log message,
toggled by a project setting.
Fixes #73141

(cherry picked from commit cb8e91924399948888d80d20c6112df473897183)

Chris Hutchinson 2 年之前
父节点
当前提交
4323c8b78b
共有 3 个文件被更改,包括 18 次插入4 次删除
  1. 3 0
      doc/classes/ProjectSettings.xml
  2. 1 0
      main/main.cpp
  3. 14 4
      modules/openxr/register_types.cpp

+ 3 - 0
doc/classes/ProjectSettings.xml

@@ -2431,6 +2431,9 @@
 		<member name="xr/openxr/reference_space" type="int" setter="" getter="" default="&quot;1&quot;">
 			Specify the default reference space.
 		</member>
+		<member name="xr/openxr/startup_alert" type="bool" setter="" getter="" default="true">
+			If [code]true[/code], Godot will display an alert modal when OpenXR initialization fails on startup.
+		</member>
 		<member name="xr/openxr/submit_depth_buffer" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], OpenXR will manage the depth buffer and use the depth buffer for advanced reprojection provided this is supported by the XR runtime. Note that some rendering features in Godot can't be used with this feature.
 		</member>

+ 1 - 0
main/main.cpp

@@ -1859,6 +1859,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "xr/openxr/reference_space", PROPERTY_HINT_ENUM, "Local,Stage"), "1");
 
 	GLOBAL_DEF_BASIC("xr/openxr/submit_depth_buffer", false);
+	GLOBAL_DEF_BASIC("xr/openxr/startup_alert", true);
 
 #ifdef TOOLS_ENABLED
 	// Disabled for now, using XR inside of the editor we'll be working on during the coming months.

+ 14 - 4
modules/openxr/register_types.cpp

@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "register_types.h"
+#include "core/config/project_settings.h"
 #include "main/main.h"
 
 #include "openxr_interface.h"
@@ -113,10 +114,19 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
 			ERR_FAIL_NULL(openxr_api);
 
 			if (!openxr_api->initialize(Main::get_rendering_driver_name())) {
-				OS::get_singleton()->alert("OpenXR was requested but failed to start.\n"
-										   "Please check if your HMD is connected.\n"
-										   "When using Windows MR please note that WMR only has DirectX support, make sure SteamVR is your default OpenXR runtime.\n"
-										   "Godot will start in normal mode.\n");
+				const char *init_error_message =
+						"OpenXR was requested but failed to start.\n"
+						"Please check if your HMD is connected.\n"
+						"When using Windows MR please note that WMR only has DirectX support, make sure SteamVR is your default OpenXR runtime.\n"
+						"Godot will start in normal mode.\n";
+
+				WARN_PRINT(init_error_message);
+
+				bool init_show_startup_alert = GLOBAL_GET("xr/openxr/startup_alert");
+				if (init_show_startup_alert) {
+					OS::get_singleton()->alert(init_error_message);
+				}
+
 				memdelete(openxr_api);
 				openxr_api = nullptr;
 				return;