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

Merge pull request #86710 from KoBeWi/do_not_the_shaders

Browse Source 
Handle built-in shaders when closing scene
This commit is contained in:
Rémi Verschelde 2024-01-02 18:06:25 +01:00
commit 2158f88a88
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
editor/plugins/shader_editor_plugin.cpp
View File

@ -84,7 +84,8 @@ void ShaderEditorPlugin::_update_shader_list() {
Ref<Texture2D> icon = shader_list->get_editor_theme_icon(_class);
shader_list->add_item(text, icon);
shader_list->set_item_tooltip(shader_list->get_item_count() - 1, path);
shader_list->set_item_tooltip(-1, path);
edited_shader.name = text;
}
if (shader_tabs->get_tab_count()) {
@ -292,11 +293,6 @@ void ShaderEditorPlugin::get_window_layout(Ref<ConfigFile> p_layout) {
}
String ShaderEditorPlugin::get_unsaved_status(const String &p_for_scene) const {
if (!p_for_scene.is_empty()) {
// TODO: handle built-in shaders.
return String();
}
// TODO: This should also include visual shaders and shader includes, but save_external_data() doesn't seem to save them...
PackedStringArray unsaved_shaders;
for (uint32_t i = 0; i < edited_shaders.size(); i++) {
@ -305,10 +301,30 @@ String ShaderEditorPlugin::get_unsaved_status(const String &p_for_scene) const {
if (unsaved_shaders.is_empty()) {
unsaved_shaders.append(TTR("Save changes to the following shaders(s) before quitting?"));
}
unsaved_shaders.append(edited_shaders[i].shader_editor->get_name());
unsaved_shaders.append(edited_shaders[i].name.trim_suffix("(*)"));
}
}
}
if (!p_for_scene.is_empty()) {
PackedStringArray unsaved_built_in_shaders;
const String scene_file = p_for_scene.get_file();
for (const String &E : unsaved_shaders) {
if (!E.is_resource_file() && E.contains(scene_file)) {
if (unsaved_built_in_shaders.is_empty()) {
unsaved_built_in_shaders.append(TTR("There are unsaved changes in the following built-in shaders(s):"));
}
unsaved_built_in_shaders.append(E);
}
}
if (!unsaved_built_in_shaders.is_empty()) {
return String("\n").join(unsaved_built_in_shaders);
}
return String();
}
return String("\n").join(unsaved_shaders);
}

1
editor/plugins/shader_editor_plugin.h
View File

@ -55,6 +55,7 @@ class ShaderEditorPlugin : public EditorPlugin {
TextShaderEditor *shader_editor = nullptr;
VisualShaderEditor *visual_shader_editor = nullptr;
String path;
String name;
};
LocalVector<EditedShader> edited_shaders;