Skip to content

[Android editor] Ensure that the Android editor properly passes hybrid data when switching mode #112928

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

Merged
merged 1 commit into from
Nov 21, 2025
+9 −3
Merged

[Android editor] Ensure that the Android editor properly passes hybrid data when switching mode #112928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/android/java/app/config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ext.versions = [
splashscreenVersion: '1.0.1',
// 'openxrLoaderVersion' should be set to XR_CURRENT_API_VERSION, see 'thirdparty/openxr'
openxrLoaderVersion: '1.1.53',
openxrVendorsVersion: '4.2.0-stable',
openxrVendorsVersion: '4.2.1-stable',
junitVersion : '1.3.0',
espressoCoreVersion: '3.7.0',
kotlinTestVersion : '1.3.11',
Expand Down
10 changes: 8 additions & 2 deletions platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,11 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
newIntent.putExtra(EXTRA_NEW_LAUNCH, false)

godot?.runOnRenderThread {
// Look for the scene and xr-mode arguments
// Look for the scene, XR-mode, and hybrid data arguments.
var scene = ""
var xrMode = XR_MODE_DEFAULT
var path = ""
var base64HybridData = ""
if (params.isNotEmpty()) {
val sceneIndex = params.indexOf(SCENE_ARG)
if (sceneIndex != -1 && sceneIndex + 1 < params.size) {
Expand All @@ -289,9 +290,14 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
if (pathIndex != -1 && pathIndex + 1 < params.size) {
path = params[pathIndex + 1]
}

val hybridDataIndex = params.indexOf(HYBRID_DATA_ARG)
if (hybridDataIndex != -1 && hybridDataIndex + 1 < params.size) {
base64HybridData = params[hybridDataIndex + 1]
}
}

val sceneArgs = mutableSetOf(XR_MODE_ARG, xrMode).apply {
val sceneArgs = mutableSetOf(XR_MODE_ARG, xrMode, HYBRID_DATA_ARG, base64HybridData).apply {
if (path.isNotEmpty() && scene.isEmpty()) {
add(PATH_ARG)
add(path)
Expand Down