asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add _resource_changed() helper method to EditorResourcePicker

Browse source
This commit is contained in:
kobewi 2024-08-31 13:00:43 +02:00
parent 3576e840c7
commit 4a747bdef9
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
editor/editor_resource_picker.cpp
View file

@ -132,6 +132,11 @@ void EditorResourcePicker::_resource_selected() {
emit_signal(SNAME("resource_selected"), edited_resource, false); emit_signal(SNAME("resource_selected"), edited_resource, false);
} }
void EditorResourcePicker::_resource_changed() {
emit_signal(SNAME("resource_changed"), edited_resource);
_update_resource();
}
void EditorResourcePicker::_file_selected(const String &p_path) { void EditorResourcePicker::_file_selected(const String &p_path) {
Ref<Resource> loaded_resource = ResourceLoader::load(p_path); Ref<Resource> loaded_resource = ResourceLoader::load(p_path);
ERR_FAIL_COND_MSG(loaded_resource.is_null(), "Cannot load resource from path '" + p_path + "'."); ERR_FAIL_COND_MSG(loaded_resource.is_null(), "Cannot load resource from path '" + p_path + "'.");
@ -167,8 +172,7 @@ void EditorResourcePicker::_file_selected(const String &p_path) {
} }
edited_resource = loaded_resource; edited_resource = loaded_resource;
emit_signal(SNAME("resource_changed"), edited_resource); _resource_changed();
_update_resource();
} }
void EditorResourcePicker::_resource_saved(Object *p_resource) { void EditorResourcePicker::_resource_saved(Object *p_resource) {
@ -353,8 +357,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
case OBJ_MENU_CLEAR: { case OBJ_MENU_CLEAR: {
edited_resource = Ref<Resource>(); edited_resource = Ref<Resource>();
emit_signal(SNAME("resource_changed"), edited_resource); _resource_changed();
_update_resource();
} break; } break;
case OBJ_MENU_MAKE_UNIQUE: { case OBJ_MENU_MAKE_UNIQUE: {
@ -366,8 +369,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
ERR_FAIL_COND(unique_resource.is_null()); // duplicate() may fail. ERR_FAIL_COND(unique_resource.is_null()); // duplicate() may fail.
edited_resource = unique_resource; edited_resource = unique_resource;
emit_signal(SNAME("resource_changed"), edited_resource); _resource_changed();
_update_resource();
} break; } break;
case OBJ_MENU_MAKE_UNIQUE_RECURSIVE: { case OBJ_MENU_MAKE_UNIQUE_RECURSIVE: {
@ -432,9 +434,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
_edit_menu_cbk(OBJ_MENU_MAKE_UNIQUE); _edit_menu_cbk(OBJ_MENU_MAKE_UNIQUE);
return; return;
} }
_resource_changed();
emit_signal(SNAME("resource_changed"), edited_resource);
_update_resource();
} break; } break;
case OBJ_MENU_SHOW_IN_FILE_SYSTEM: { case OBJ_MENU_SHOW_IN_FILE_SYSTEM: {
@ -453,8 +453,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
ERR_FAIL_INDEX(to_type, conversions.size()); ERR_FAIL_INDEX(to_type, conversions.size());
edited_resource = conversions[to_type]->convert(edited_resource); edited_resource = conversions[to_type]->convert(edited_resource);
emit_signal(SNAME("resource_changed"), edited_resource); _resource_changed();
_update_resource();
break; break;
} }
@ -481,8 +480,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
// Prevent freeing of the object until the end of the update of the resource (GH-88286). // Prevent freeing of the object until the end of the update of the resource (GH-88286).
Ref<Resource> old_edited_resource = edited_resource; Ref<Resource> old_edited_resource = edited_resource;
edited_resource = Ref<Resource>(resp); edited_resource = Ref<Resource>(resp);
emit_signal(SNAME("resource_changed"), edited_resource); _resource_changed();
_update_resource();
} break; } break;
} }
} }
@ -778,8 +776,7 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_
} }
edited_resource = dropped_resource; edited_resource = dropped_resource;
emit_signal(SNAME("resource_changed"), edited_resource); _resource_changed();
_update_resource();
} }
} }
@ -1046,8 +1043,7 @@ void EditorResourcePicker::_duplicate_selected_resources() {
if (meta.size() == 1) { // Root. if (meta.size() == 1) { // Root.
edited_resource = unique_resource; edited_resource = unique_resource;
emit_signal(SNAME("resource_changed"), edited_resource); _resource_changed();
_update_resource();
} else { } else {
Array parent_meta = item->get_parent()->get_metadata(0); Array parent_meta = item->get_parent()->get_metadata(0);
Ref<Resource> parent = parent_meta[0]; Ref<Resource> parent = parent_meta[0];

1
editor/editor_resource_picker.h
View file

@ -86,6 +86,7 @@ class EditorResourcePicker : public HBoxContainer {
void _update_resource_preview(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, ObjectID p_obj); void _update_resource_preview(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, ObjectID p_obj);
void _resource_selected(); void _resource_selected();
void _resource_changed();
void _file_selected(const String &p_path); void _file_selected(const String &p_path);
void _resource_saved(Object *p_resource); void _resource_saved(Object *p_resource);