[3.x] Add rotary input support for Android platform #88490
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AlekseyKapustyanenko
force-pushed
the
Rotary-input-3.x
branch
2 times, most recently
from
aae49f4 to
d926eb6
Compare
m4gr3d
requested changes
Feb 18, 2024
| @@ -352,6 +352,8 @@ protected void onGodotSetupCompleted() { | |||
| if (godotHost != null) { | |||
| godotHost.onGodotSetupCompleted(); | |||
| } | |||
| int rotaryInputAxis = java.lang.Integer.parseInt(GodotLib.getGlobal("input_devices/pointing/android/rotary_input_scroll_axis")); | |||
There was a problem hiding this comment.
Can you move this below boolean panScaleEnabled = ...
| @@ -352,6 +352,8 @@ protected void onGodotSetupCompleted() { | |||
| if (godotHost != null) { | |||
| godotHost.onGodotSetupCompleted(); | |||
| } | |||
| int rotaryInputAxis = java.lang.Integer.parseInt(GodotLib.getGlobal("input_devices/pointing/android/rotary_input_scroll_axis")); | |||
| GodotInputHandler.setRotaryInputAxis(rotaryInputAxis); | |||
There was a problem hiding this comment.
Can you move this logic within the runOnUiThread(... block
main/main.cpp
Outdated
Comment on lines
1332
to
1337
| GLOBAL_DEF("input_devices/pointing/android/rotary_input_scroll_axis", 1); | ||
| ProjectSettings::get_singleton()->set_custom_property_info("input_devices/pointing/android/rotary_input_scroll_axis", | ||
| PropertyInfo(Variant::INT, | ||
| "input_devices/pointing/android/rotary_input_scroll_axis", | ||
| PROPERTY_HINT_ENUM, "Horizontal,Vertical")); | ||
|
|
There was a problem hiding this comment.
Can you keep this with the other set of input_devices/pointing/android settings
AlekseyKapustyanenko
force-pushed
the
Rotary-input-3.x
branch
from
d926eb6 to
19c85cc
Compare
m4gr3d
requested changes
Feb 18, 2024
| @@ -342,6 +342,8 @@ protected void onGodotSetupCompleted() { | |||
| if (inputHandler != null) { | |||
| inputHandler.enableLongPress(longPressEnabled); | |||
| inputHandler.enablePanningAndScalingGestures(panScaleEnabled); | |||
| int rotaryInputAxis = java.lang.Integer.parseInt(GodotLib.getGlobal("input_devices/pointing/android/rotary_input_scroll_axis")); | |||
There was a problem hiding this comment.
This logic should be outside of the runOnUiThread block (and below boolean panScaleEnabled = ...) because the settings are being retrieved on the render thread.
Only the line below should remain within this block.
| @@ -342,6 +342,8 @@ protected void onGodotSetupCompleted() { | |||
| if (inputHandler != null) { | |||
| inputHandler.enableLongPress(longPressEnabled); | |||
| inputHandler.enablePanningAndScalingGestures(panScaleEnabled); | |||
| int rotaryInputAxis = java.lang.Integer.parseInt(GodotLib.getGlobal("input_devices/pointing/android/rotary_input_scroll_axis")); | |||
| GodotInputHandler.setRotaryInputAxis(rotaryInputAxis); | |||
There was a problem hiding this comment.
You can move this outside of the if block since it's setting a static variable using a static method.
AlekseyKapustyanenko
force-pushed
the
Rotary-input-3.x
branch
from
19c85cc to
99c8cd2
Compare
akien-mga
changed the title
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds Rotary input support for wear os devices. It converts RotaryInput to vertical mouse wheel event. Without it Godot does not recognise this event at all. The same feature wich implemented #88130 , but for Godot 3.x.
Proposal: godotengine/godot-proposals#9062