Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 22:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #103267 from YeldhamDev/reality_got_too_extended

Browse source 
Allow to compile the engine without XR support
This commit is contained in:
Thaddeus Crews 2025-03-07 15:12:54 -06:00
commit 67d4a245d8
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
33 changed files with 77 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/android/java_godot_lib_jni.cpp
View file

@ -273,7 +273,7 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env,
if (step.get() == STEP_SHOW_LOGO) {
bool xr_enabled = false;
#ifndef _3D_DISABLED
#ifndef XR_DISABLED
// Unlike PCVR, there's no additional 2D screen onto which to render the boot logo,
// so we skip this step if xr is enabled.
if (XRServer::get_xr_mode() == XRServer::XRMODE_DEFAULT) {
@ -281,7 +281,7 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env,
} else {
xr_enabled = XRServer::get_xr_mode() == XRServer::XRMODE_ON;
}
#endif // _3D_DISABLED
#endif // XR_DISABLED
if (!xr_enabled) {
Main::setup_boot_logo();
}