From 6ee714aab76e014062e309e827d5bf83398e5f00 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 9 Mar 2024 07:25:02 +0100 Subject: [PATCH] Updated all drop_data_fw method signatures. --- .../editor/layered_tile_map_layer_editor.cpp | 3 +++ .../editor/layered_tile_map_layer_editor.h | 2 ++ .../editor/layered_tile_set_editor.cpp | 10 +++++----- .../layered_tile_map/editor/layered_tile_set_editor.h | 4 ++-- ...ayered_tile_set_scenes_collection_source_editor.cpp | 10 +++++----- .../layered_tile_set_scenes_collection_source_editor.h | 4 ++-- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp index 1db985479..67f2f81b7 100644 --- a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp @@ -58,6 +58,9 @@ LayeredTileMapLayer *LayeredTileMapLayerSubEditorPlugin::_get_edited_layer() con return Object::cast_to(ObjectDB::get_instance(edited_tile_map_layer_id)); } +void LayeredTileMapLayerSubEditorPlugin::_bind_methods() { +} + void LayeredTileMapLayerEditorTilesPlugin::tile_set_changed() { _update_fix_selected_and_hovered(); _update_tile_set_sources_list(); diff --git a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h index 45b13be95..370627759 100644 --- a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h @@ -58,6 +58,8 @@ protected: ObjectID edited_tile_map_layer_id; LayeredTileMapLayer *_get_edited_layer() const; + static void _bind_methods(); + public: struct TabData { Control *toolbar = nullptr; diff --git a/modules/layered_tile_map/editor/layered_tile_set_editor.cpp b/modules/layered_tile_map/editor/layered_tile_set_editor.cpp index 6a9736bea..3b7e78d13 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_set_editor.cpp @@ -55,10 +55,10 @@ LayeredTileSetEditor *LayeredTileSetEditor::singleton = nullptr; -void LayeredTileSetEditor::_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { +void LayeredTileSetEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { ERR_FAIL_COND(!tile_set.is_valid()); - if (!_can_drop_data_fw(p_point, p_data, p_from)) { + if (!can_drop_data_fw(p_point, p_data, p_from)) { return; } @@ -70,7 +70,7 @@ void LayeredTileSetEditor::_drop_data_fw(const Point2 &p_point, const Variant &p } } -bool LayeredTileSetEditor::_can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { +bool LayeredTileSetEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { ERR_FAIL_COND_V(!tile_set.is_valid(), false); if (read_only) { @@ -379,8 +379,8 @@ void LayeredTileSetEditor::_bind_methods() { ClassDB::bind_method(D_METHOD("_pattern_preview_done"), &LayeredTileSetEditor::_pattern_preview_done); ClassDB::bind_method(D_METHOD("_tab_changed"), &LayeredTileSetEditor::_tab_changed); - ClassDB::bind_method(D_METHOD("_drop_data_fw"), &LayeredTileSetEditor::_drop_data_fw); - ClassDB::bind_method(D_METHOD("_can_drop_data_fw"), &LayeredTileSetEditor::_can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &LayeredTileSetEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &LayeredTileSetEditor::can_drop_data_fw); ClassDB::bind_method(D_METHOD("_set_source_sort"), &LayeredTileSetEditor::_set_source_sort); ClassDB::bind_method(D_METHOD("_source_selected"), &LayeredTileSetEditor::_source_selected); diff --git a/modules/layered_tile_map/editor/layered_tile_set_editor.h b/modules/layered_tile_map/editor/layered_tile_set_editor.h index 8c9a23f9b..a2725a636 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_set_editor.h @@ -68,8 +68,8 @@ private: LayeredTileSetAtlasSourceEditor *tile_set_atlas_source_editor = nullptr; LayeredTileSetScenesCollectionSourceEditor *tile_set_scenes_collection_source_editor = nullptr; - void _drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); - bool _can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; + void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); + bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; void _load_texture_files(const Vector &p_paths); void _update_sources_list(int force_selected_id = -1); diff --git a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.cpp b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.cpp index cbcea42ff..82b0440dc 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.cpp @@ -446,8 +446,8 @@ void LayeredTileSetScenesCollectionSourceEditor::edit(Ref p_tile _update_tile_inspector(); } -void LayeredTileSetScenesCollectionSourceEditor::_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { - if (!_can_drop_data_fw(p_point, p_data, p_from)) { +void LayeredTileSetScenesCollectionSourceEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { + if (!can_drop_data_fw(p_point, p_data, p_from)) { return; } @@ -473,7 +473,7 @@ void LayeredTileSetScenesCollectionSourceEditor::_drop_data_fw(const Point2 &p_p } } -bool LayeredTileSetScenesCollectionSourceEditor::_can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { +bool LayeredTileSetScenesCollectionSourceEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { if (p_from == scene_tiles_list) { Dictionary d = p_data; @@ -520,8 +520,8 @@ void LayeredTileSetScenesCollectionSourceEditor::_bind_methods() { ClassDB::bind_method(D_METHOD("_scene_file_selected"), &LayeredTileSetScenesCollectionSourceEditor::_scene_file_selected); ClassDB::bind_method(D_METHOD("_tile_set_scenes_collection_source_changed"), &LayeredTileSetScenesCollectionSourceEditor::_tile_set_scenes_collection_source_changed); - ClassDB::bind_method(D_METHOD("_drop_data_fw"), &LayeredTileSetScenesCollectionSourceEditor::_drop_data_fw); - ClassDB::bind_method(D_METHOD("_can_drop_data_fw"), &LayeredTileSetScenesCollectionSourceEditor::_can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &LayeredTileSetScenesCollectionSourceEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &LayeredTileSetScenesCollectionSourceEditor::can_drop_data_fw); ClassDB::bind_method(D_METHOD("_scenes_collection_source_proxy_object_changed"), &LayeredTileSetScenesCollectionSourceEditor::_scenes_collection_source_proxy_object_changed); ClassDB::bind_method(D_METHOD("_tile_proxy_object_changed"), &LayeredTileSetScenesCollectionSourceEditor::_tile_proxy_object_changed); diff --git a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h index 760f02022..41d96105a 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h @@ -133,8 +133,8 @@ private: void _update_scenes_list(); void _update_action_buttons(); - void _drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); - bool _can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; + void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); + bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; void _tile_proxy_object_changed(const String &p_what); void _scene_tiles_list_item_selected(int p_index);