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

Merge pull request #102669 from m4gr3d/fix_method_signature_change

Browse Source 
Revert finalizing `GodotHost#getCommandLine()` public API
This commit is contained in:
Rémi Verschelde
2025-02-11 23:59:15 +01:00
parent a8a1009468 2a66335ec2
commit 8d909f86d3
3 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
View File

@@ -300,14 +300,12 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
}
}
@CallSuper
override fun updateCommandLineParams(args: Array<String>) {
val args = if (BuildConfig.BUILD_TYPE == "dev") {
args + "--benchmark"
} else {
args
override fun getCommandLine(): MutableList<String> {
val params = super.getCommandLine()
if (BuildConfig.BUILD_TYPE == "dev" && !params.contains("--benchmark")) {
params.add("--benchmark")
}
super.updateCommandLineParams(args);
return params
}
protected fun retrieveEditorWindowInfo(args: Array<String>, gameEmbedMode: GameEmbedMode): EditorWindowInfo {

12
platform/android/java/editor/src/main/java/org/godotengine/editor/GodotXRGame.kt
View File

@@ -40,18 +40,16 @@ open class GodotXRGame: BaseGodotGame() {
override fun overrideOrientationRequest() = true
override fun updateCommandLineParams(args: Array<String>) {
val updatedArgs = ArrayList<String>()
if (!args.contains(XRMode.OPENXR.cmdLineArg)) {
override fun getCommandLine(): MutableList<String> {
val updatedArgs = super.getCommandLine()
if (!updatedArgs.contains(XRMode.OPENXR.cmdLineArg)) {
updatedArgs.add(XRMode.OPENXR.cmdLineArg)
}
if (!args.contains(XR_MODE_ARG)) {
if (!updatedArgs.contains(XR_MODE_ARG)) {
updatedArgs.add(XR_MODE_ARG)
updatedArgs.add("on")
}
updatedArgs.addAll(args)
super.updateCommandLineParams(updatedArgs.toTypedArray())
return updatedArgs
}
override fun getEditorWindowInfo() = XR_RUN_GAME_INFO

13
platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt
View File

@@ -75,7 +75,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost {
override fun onCreate(savedInstanceState: Bundle?) {
val params = intent.getStringArrayExtra(EXTRA_COMMAND_LINE_PARAMS)
Log.d(TAG, "Starting intent $intent with parameters ${params.contentToString()}")
updateCommandLineParams(params ?: emptyArray())
commandLineParams.addAll(params ?: emptyArray())
super.onCreate(savedInstanceState)
@@ -215,14 +215,5 @@ abstract class GodotActivity : FragmentActivity(), GodotHost {
return GodotFragment()
}
@CallSuper
protected open fun updateCommandLineParams(args: Array<String>) {
// Update the list of command line params with the new args
commandLineParams.clear()
if (args.isNotEmpty()) {
commandLineParams.addAll(args)
}
}
final override fun getCommandLine() = commandLineParams
override fun getCommandLine(): MutableList<String> = commandLineParams
}