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

Add support for OpenXR export configurations.

Browse Source
This commit is contained in:
Fredia Huya-Kouadio
2021-11-19 13:15:01 -08:00
parent c6d2768a19
commit 882ec0d611
7 changed files with 83 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/android/java/app/AndroidManifest.xml
View File

@@ -33,6 +33,11 @@
<!-- The following metadata values are replaced when Godot exports, modifying them here has no effect. -->
<!-- Do these changes in the export preset. Adding new ones is fine. -->
<!-- XR mode metadata. This is modified by the exporter based on the selected xr mode. DO NOT CHANGE the values here. -->
<meta-data
android:name="xr_mode_metadata_name"
android:value="xr_mode_metadata_value" />
<activity
android:name=".GodotApp"
android:label="@string/godot_project_name_string"

4
platform/android/java/lib/src/org/godotengine/godot/Godot.java
View File

@@ -502,8 +502,8 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
boolean has_extra = i < command_line.length - 1;
if (command_line[i].equals(XRMode.REGULAR.cmdLineArg)) {
xrMode = XRMode.REGULAR;
} else if (command_line[i].equals(XRMode.OVR.cmdLineArg)) {
xrMode = XRMode.OVR;
} else if (command_line[i].equals(XRMode.OPENXR.cmdLineArg)) {
xrMode = XRMode.OPENXR;
} else if (command_line[i].equals("--debug_opengl")) {
use_debug_opengl = true;
} else if (command_line[i].equals("--use_immersive")) {

2
platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java
View File

@@ -174,7 +174,7 @@ public class GodotGLRenderView extends GLSurfaceView implements GodotRenderView
setPreserveEGLContextOnPause(true);
setFocusableInTouchMode(true);
switch (xrMode) {
case OVR:
case OPENXR:
// Replace the default egl config chooser.
setEGLConfigChooser(new OvrConfigChooser());

2
platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java
View File

@@ -35,7 +35,7 @@ package org.godotengine.godot.xr;
*/
public enum XRMode {
REGULAR(0, "Regular", "--xr_mode_regular", "Default Android Gamepad"), // Regular/flatscreen
OVR(1, "Oculus Mobile VR", "--xr_mode_ovr", "");
OPENXR(1, "OpenXR", "--xr_mode_openxr", "");
final int index;
final String label;