Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix hybrid app support for recent Godot Android library changes #264

Merged
merged 1 commit into from
Feb 11, 2025
Merged

Fix hybrid app support for recent Godot Android library changes #264

merged 1 commit into from
Feb 11, 2025

Conversation

dsnopek
Copy link
Collaborator

@dsnopek dsnopek commented Feb 7, 2025

We're currently failing CI due to recent changes to Godot Android library, that affect our hybrid app support.

This PR is attempting to fix that!

This now compiles, however, I still have to test it, so keeping as a DRAFT for now

@dsnopek dsnopek added the bug Something isn't working label Feb 7, 2025
@dsnopek dsnopek added this to the 4.x milestone Feb 7, 2025
@dsnopek dsnopek requested a review from m4gr3d February 7, 2025 22:14
@dsnopek dsnopek marked this pull request as draft February 7, 2025 22:14
@dsnopek dsnopek force-pushed the hybrid-godot-44b3-android-lib branch from c54837b to 932e3fb Compare February 7, 2025 23:07
@dsnopek
Copy link
Collaborator Author

dsnopek commented Feb 7, 2025

Unfortunately, this isn't working. I'll keep debugging and take it out of DRAFT once it works

@m4gr3d
Copy link
Collaborator

m4gr3d commented Feb 8, 2025

@dsnopek I'll push a fix on the Godot side to address the issue.

@m4gr3d m4gr3d mentioned this pull request Feb 10, 2025
Merged
m4gr3d
m4gr3d reviewed Feb 10, 2025
View reviewed changes
plugin/src/main/java/org/godotengine/openxr/vendors/GodotPanelApp.kt Outdated
Comment on lines 63 to 68
override fun getCommandLine(): MutableList<String> {
@CallSuper
protected override fun updateCommandLineParams(args: Array<String>) {
// Force XR to be turned off.
return mutableListOf("--xr_mode_regular", "--xr-mode", "off")
val args = args + arrayOf("--xr_mode_regular", "--xr-mode", "off")
super.updateCommandLineParams(args);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be able to revert this once godotengine/godot#102669 is submitted.

@dsnopek dsnopek force-pushed the hybrid-godot-44b3-android-lib branch from 932e3fb to d8ad40a Compare February 11, 2025 16:16
@dsnopek dsnopek marked this pull request as ready for review February 11, 2025 16:17
@dsnopek
Copy link
Collaborator Author

dsnopek commented Feb 11, 2025

The latest version of this PR is actually working for me with Godot 4.4-beta3!

@dsnopek dsnopek force-pushed the hybrid-godot-44b3-android-lib branch from d8ad40a to b6d5fca Compare February 11, 2025 16:22
@dsnopek dsnopek requested a review from m4gr3d February 11, 2025 16:34
@dsnopek dsnopek mentioned this pull request Feb 11, 2025
Merged
m4gr3d
m4gr3d approved these changes Feb 11, 2025
View reviewed changes
Copy link
Collaborator

@m4gr3d m4gr3d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving to unblock work on the repo until the fix in Godot 4.4 beta 4 is propagated.

BastiaanOlij
BastiaanOlij approved these changes Feb 11, 2025
View reviewed changes
Copy link
Member

@BastiaanOlij BastiaanOlij left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, just to double check, the change to isNativeXRDevice and updateCommandLineParams, doesn't that also impact the other implementations? (as in needing a name change/parameter added)

@dsnopek
Copy link
Collaborator Author

dsnopek commented Feb 11, 2025

Looks good to me, just to double check, the change to isNativeXRDevice and updateCommandLineParams, doesn't that also impact the other implementations? (as in needing a name change/parameter added)

isNativeXRDevice() is new in Godot 4.4, so it changing is fine. And Fredia has PR godotengine/godot#102669 which rolls back the other changes. That'll be in Godot 4.4-beta4, so this PR will just get this repo building again until that comes out. I already have PR #266 which will roll back part of the changes once beta4 is out

@dsnopek dsnopek merged commit 31aa564 into GodotVR:master Feb 11, 2025
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@m4gr3d m4gr3d m4gr3d approved these changes

@BastiaanOlij BastiaanOlij BastiaanOlij approved these changes

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
4.x
Development

Successfully merging this pull request may close these issues.
3 participants
@dsnopek @m4gr3d @BastiaanOlij