godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #111185 from WhalesState/vp-disable-xr

Browse Source 
More XR disable for Viewport and export.
This commit is contained in:
Thaddeus Crews
2025-10-13 19:28:56 -05:00
parent c6df8d3253 9894256e3a
commit d3285f5468
9 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/export/export_plugin.cpp
View File

@@ -2177,7 +2177,9 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "shader_baker/enabled"), false));
#ifndef XR_DISABLED
r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "xr_features/xr_mode", PROPERTY_HINT_ENUM, "Regular,OpenXR"), XR_MODE_REGULAR, false, true));
#endif // XR_DISABLED
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "gesture/swipe_to_dismiss"), false));
@@ -3087,6 +3089,7 @@ void EditorExportPlatformAndroid::get_command_line_flags(const Ref<EditorExportP
command_line_strings.push_back(apk_expansion_public_key.strip_edges());
}
#ifndef XR_DISABLED
int xr_mode_index = p_preset->get("xr_features/xr_mode");
if (xr_mode_index == XR_MODE_OPENXR) {
command_line_strings.push_back("--xr_mode_openxr");
@@ -3100,6 +3103,7 @@ void EditorExportPlatformAndroid::get_command_line_flags(const Ref<EditorExportP
command_line_strings.push_back("--xr-mode");
command_line_strings.push_back("off");
}
#endif // XR_DISABLED
bool immersive = p_preset->get("screen/immersive_mode");
if (immersive) {