diff options
| author | Fredia Huya-Kouadio <fhuyakou@gmail.com> | 2024-07-07 14:16:29 -0700 |
|---|---|---|
| committer | Fredia Huya-Kouadio <fhuyakou@gmail.com> | 2024-07-09 09:15:18 -0700 |
| commit | 5e598197274d983c4b8460d58158a77a94bdd4a2 (patch) | |
| tree | 9e63c75f6d38d63d7263c339ff2a209ac2000c04 /editor | |
| parent | f3af22b10b1e64146d48be7726f6395c9a4185e9 (diff) | |
| download | redot-engine-5e598197274d983c4b8460d58158a77a94bdd4a2.tar.gz | |
Cleanup Android input on render thread settings
Follow up to https://github.com/godotengine/godot/pull/93933
Clean up the set of settings use to control whether Android input should be dispatched on the render thread.
Addresses comments in https://github.com/godotengine/godot/pull/93933#issuecomment-2210437977
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 9 | ||||
| -rw-r--r-- | editor/editor_settings.cpp | 8 | ||||
| -rw-r--r-- | editor/project_manager.cpp | 8 |
3 files changed, 19 insertions, 6 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 632b36c705..85847c6d48 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -6431,7 +6431,6 @@ EditorNode::EditorNode() { // No scripting by default if in editor (except for tool). ScriptServer::set_scripting_enabled(false); - Input::get_singleton()->set_use_accumulated_input(true); if (!DisplayServer::get_singleton()->is_touchscreen_available()) { // Only if no touchscreen ui hint, disable emulation just in case. Input::get_singleton()->set_emulate_touch_from_mouse(false); @@ -6481,6 +6480,14 @@ EditorNode::EditorNode() { } { + bool agile_input_event_flushing = EDITOR_GET("input/buffering/agile_event_flushing"); + bool use_accumulated_input = EDITOR_GET("input/buffering/use_accumulated_input"); + + Input::get_singleton()->set_agile_input_event_flushing(agile_input_event_flushing); + Input::get_singleton()->set_use_accumulated_input(use_accumulated_input); + } + + { int display_scale = EDITOR_GET("interface/editor/display_scale"); switch (display_scale) { diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 5d3cc80da9..d96e2b7196 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -474,11 +474,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/vsync_mode", 1, "Disabled,Enabled,Adaptive,Mailbox") EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/update_continuously", false, "") -#ifdef ANDROID_ENABLED - EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/android/use_accumulated_input", true, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) - EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/android/use_input_buffering", true, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) -#endif - // Inspector EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/inspector/max_array_dictionary_items_per_page", 20, "10,100,1") EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/inspector/show_low_level_opentype_features", false, "") @@ -866,6 +861,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { /* Extra config */ + EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "input/buffering/agile_event_flushing", false, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) + EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "input/buffering/use_accumulated_input", true, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) + // TRANSLATORS: Project Manager here refers to the tool used to create/manage Godot projects. EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "project_manager/sorting_order", 0, "Last Edited,Name,Path") EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "project_manager/directory_naming_convention", 1, "No convention,kebab-case,snake_case,camelCase,PascalCase,Title Case") diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 52d7b14b65..59f45ef5db 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -1053,6 +1053,14 @@ ProjectManager::ProjectManager() { } EditorSettings::get_singleton()->set_optimize_save(false); // Just write settings as they come. + { + bool agile_input_event_flushing = EDITOR_GET("input/buffering/agile_event_flushing"); + bool use_accumulated_input = EDITOR_GET("input/buffering/use_accumulated_input"); + + Input::get_singleton()->set_agile_input_event_flushing(agile_input_event_flushing); + Input::get_singleton()->set_use_accumulated_input(use_accumulated_input); + } + int display_scale = EDITOR_GET("interface/editor/display_scale"); switch (display_scale) { |