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

Merge pull request #55158 from m4gr3d/add_oculus_openxr_config_3x

Browse source
This commit is contained in:
Rémi Verschelde 2021-11-22 10:29:49 +01:00 • committed by GitHub
commit 451bba967a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 70 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/android/java/lib/src/org/godotengine/godot/Godot.java
View file

@ -620,6 +620,8 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
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("--translucent")) {

1
platform/android/java/lib/src/org/godotengine/godot/GodotView.java
View file

@ -128,6 +128,7 @@ public class GodotView extends GLSurfaceView {
setFocusableInTouchMode(true);
switch (xrMode) {
case OVR:
case OPENXR:
// Replace the default egl config chooser.
eglConfigChooser = new OvrConfigChooser();

3
platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java
View file

@ -35,7 +35,8 @@ 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", "");
OVR(1, "Oculus Mobile VrApi (Deprecated)", "--xr_mode_ovr", ""),
OPENXR(2, "OpenXR", "--xr_mode_openxr", "");
final int index;
final String label;