godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements to EditorResourcePicker

Browse Source
This commit is contained in:
kobewi 2022-01-01 13:51:42 +01:00
parent bc2445d0eb
commit 9568789a9d
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
editor/editor_resource_picker.cpp
View File

@ -49,6 +49,7 @@ void EditorResourcePicker::_update_resource() {
if (edited_resource == RES()) { if (edited_resource == RES()) {
assign_button->set_icon(Ref<Texture2D>()); assign_button->set_icon(Ref<Texture2D>());
assign_button->set_text(TTR("[empty]")); assign_button->set_text(TTR("[empty]"));
assign_button->set_tooltip("");
} else { } else {
assign_button->set_icon(EditorNode::get_singleton()->get_object_icon(edited_resource.operator->(), "Object")); assign_button->set_icon(EditorNode::get_singleton()->get_object_icon(edited_resource.operator->(), "Object"));
@ -56,14 +57,15 @@ void EditorResourcePicker::_update_resource() {
assign_button->set_text(edited_resource->get_name()); assign_button->set_text(edited_resource->get_name());
} else if (edited_resource->get_path().is_resource_file()) { } else if (edited_resource->get_path().is_resource_file()) {
assign_button->set_text(edited_resource->get_path().get_file()); assign_button->set_text(edited_resource->get_path().get_file());
assign_button->set_tooltip(edited_resource->get_path());
} else { } else {
assign_button->set_text(edited_resource->get_class()); assign_button->set_text(edited_resource->get_class());
} }
String resource_path;
if (edited_resource->get_path().is_resource_file()) { if (edited_resource->get_path().is_resource_file()) {
assign_button->set_tooltip(edited_resource->get_path()); resource_path = edited_resource->get_path() + "\n";
} }
assign_button->set_tooltip(resource_path + TTR("Type:") + " " + edited_resource->get_class());
// Preview will override the above, so called at the end. // Preview will override the above, so called at the end.
EditorResourcePreview::get_singleton()->queue_edited_resource_preview(edited_resource, this, "_update_resource_preview", edited_resource->get_instance_id()); EditorResourcePreview::get_singleton()->queue_edited_resource_preview(edited_resource, this, "_update_resource_preview", edited_resource->get_instance_id());
@ -514,12 +516,14 @@ void EditorResourcePicker::_get_allowed_types(bool p_with_convert, Set<String> *
} }
if (p_with_convert) { if (p_with_convert) {
if (base == "StandardMaterial3D") { if (base == "BaseMaterial3D") {
p_vector->insert("Texture2D"); p_vector->insert("Texture2D");
} else if (base == "ShaderMaterial") { } else if (base == "ShaderMaterial") {
p_vector->insert("Shader"); p_vector->insert("Shader");
} else if (base == "Font") { } else if (base == "Font") {
p_vector->insert("FontData"); p_vector->insert("FontData");
} else if (base == "Texture2D") {
p_vector->insert("Image");
} }
} }
} }
@ -636,26 +640,46 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_
for (Set<String>::Element *E = allowed_types.front(); E; E = E->next()) { for (Set<String>::Element *E = allowed_types.front(); E; E = E->next()) {
String at = E->get().strip_edges(); String at = E->get().strip_edges();
if (at == "StandardMaterial3D" && ClassDB::is_parent_class(dropped_resource->get_class(), "Texture2D")) { if (at == "BaseMaterial3D" && ClassDB::is_parent_class(dropped_resource->get_class(), "Texture2D")) {
Ref<StandardMaterial3D> mat = memnew(StandardMaterial3D); // Use existing resource if possible and only replace its data.
Ref<StandardMaterial3D> mat = edited_resource;
if (!mat.is_valid()) {
mat.instantiate();
}
mat->set_texture(StandardMaterial3D::TextureParam::TEXTURE_ALBEDO, dropped_resource); mat->set_texture(StandardMaterial3D::TextureParam::TEXTURE_ALBEDO, dropped_resource);
dropped_resource = mat; dropped_resource = mat;
break; break;
} }
if (at == "ShaderMaterial" && ClassDB::is_parent_class(dropped_resource->get_class(), "Shader")) { if (at == "ShaderMaterial" && ClassDB::is_parent_class(dropped_resource->get_class(), "Shader")) {
Ref<ShaderMaterial> mat = memnew(ShaderMaterial); Ref<ShaderMaterial> mat = edited_resource;
if (!mat.is_valid()) {
mat.instantiate();
}
mat->set_shader(dropped_resource); mat->set_shader(dropped_resource);
dropped_resource = mat; dropped_resource = mat;
break; break;
} }
if (at == "Font" && ClassDB::is_parent_class(dropped_resource->get_class(), "FontData")) { if (at == "Font" && ClassDB::is_parent_class(dropped_resource->get_class(), "FontData")) {
Ref<Font> font = memnew(Font); Ref<Font> font = edited_resource;
if (!font.is_valid()) {
font.instantiate();
}
font->add_data(dropped_resource); font->add_data(dropped_resource);
dropped_resource = font; dropped_resource = font;
break; break;
} }
if (at == "Texture2D" && ClassDB::is_parent_class(dropped_resource->get_class(), "Image")) {
Ref<ImageTexture> texture = edited_resource;
if (!texture.is_valid()) {
texture.instantiate();
}
texture->create_from_image(dropped_resource);
dropped_resource = texture;
break;
}
} }
} }