Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-02-01 22:07:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated all drop_data_fw method signatures.

Browse Source
This commit is contained in:
Relintai 2024-03-09 07:25:02 +01:00
parent 626998dc26
commit 6ee714aab7
6 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp
View File

@ -58,6 +58,9 @@ LayeredTileMapLayer *LayeredTileMapLayerSubEditorPlugin::_get_edited_layer() con
return Object::cast_to<LayeredTileMapLayer>(ObjectDB::get_instance(edited_tile_map_layer_id)); return Object::cast_to<LayeredTileMapLayer>(ObjectDB::get_instance(edited_tile_map_layer_id));
} }
void LayeredTileMapLayerSubEditorPlugin::_bind_methods() {
}
void LayeredTileMapLayerEditorTilesPlugin::tile_set_changed() { void LayeredTileMapLayerEditorTilesPlugin::tile_set_changed() {
_update_fix_selected_and_hovered(); _update_fix_selected_and_hovered();
_update_tile_set_sources_list(); _update_tile_set_sources_list();

2
modules/layered_tile_map/editor/layered_tile_map_layer_editor.h
View File

@ -58,6 +58,8 @@ protected:
ObjectID edited_tile_map_layer_id; ObjectID edited_tile_map_layer_id;
LayeredTileMapLayer *_get_edited_layer() const; LayeredTileMapLayer *_get_edited_layer() const;
static void _bind_methods();
public: public:
struct TabData { struct TabData {
Control *toolbar = nullptr; Control *toolbar = nullptr;

10
modules/layered_tile_map/editor/layered_tile_set_editor.cpp
View File

@ -55,10 +55,10 @@
LayeredTileSetEditor *LayeredTileSetEditor::singleton = nullptr; 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()); 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; 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); ERR_FAIL_COND_V(!tile_set.is_valid(), false);
if (read_only) { 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("_pattern_preview_done"), &LayeredTileSetEditor::_pattern_preview_done);
ClassDB::bind_method(D_METHOD("_tab_changed"), &LayeredTileSetEditor::_tab_changed); 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("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("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("_set_source_sort"), &LayeredTileSetEditor::_set_source_sort);
ClassDB::bind_method(D_METHOD("_source_selected"), &LayeredTileSetEditor::_source_selected); ClassDB::bind_method(D_METHOD("_source_selected"), &LayeredTileSetEditor::_source_selected);

4
modules/layered_tile_map/editor/layered_tile_set_editor.h
View File

@ -68,8 +68,8 @@ private:
LayeredTileSetAtlasSourceEditor *tile_set_atlas_source_editor = nullptr; LayeredTileSetAtlasSourceEditor *tile_set_atlas_source_editor = nullptr;
LayeredTileSetScenesCollectionSourceEditor *tile_set_scenes_collection_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); 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; bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
void _load_texture_files(const Vector<String> &p_paths); void _load_texture_files(const Vector<String> &p_paths);
void _update_sources_list(int force_selected_id = -1); void _update_sources_list(int force_selected_id = -1);

10
modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.cpp
View File

@ -446,8 +446,8 @@ void LayeredTileSetScenesCollectionSourceEditor::edit(Ref<LayeredTileSet> p_tile
_update_tile_inspector(); _update_tile_inspector();
} }
void LayeredTileSetScenesCollectionSourceEditor::_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *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)) { if (!can_drop_data_fw(p_point, p_data, p_from)) {
return; 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) { if (p_from == scene_tiles_list) {
Dictionary d = p_data; 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("_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("_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("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("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("_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); ClassDB::bind_method(D_METHOD("_tile_proxy_object_changed"), &LayeredTileSetScenesCollectionSourceEditor::_tile_proxy_object_changed);

4
modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h
View File

@ -133,8 +133,8 @@ private:
void _update_scenes_list(); void _update_scenes_list();
void _update_action_buttons(); void _update_action_buttons();
void _drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); 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; 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 _tile_proxy_object_changed(const String &p_what);
void _scene_tiles_list_item_selected(int p_index); void _scene_tiles_list_item_selected(int p_index);