Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-13 07:32:55 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Enhanced preview for a visual shader to show errors

Browse Source
This commit is contained in:
Yuri Roubinski 2019-08-25 08:42:21 +03:00
parent f2777c04c3
commit 7f350a2c71
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -41,6 +41,7 @@
#include "scene/gui/panel.h" #include "scene/gui/panel.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/visual_shader_nodes.h" #include "scene/resources/visual_shader_nodes.h"
#include "servers/visual/shader_types.h"
Control *VisualShaderNodePlugin::create_editor(const Ref<Resource> &p_parent_resource, const Ref<VisualShaderNode> &p_node) { Control *VisualShaderNodePlugin::create_editor(const Ref<Resource> &p_parent_resource, const Ref<VisualShaderNode> &p_node) {
@ -1598,6 +1599,9 @@ void VisualShaderEditor::_notification(int p_what) {
preview_text->add_color_override("symbol_color", symbol_color); preview_text->add_color_override("symbol_color", symbol_color);
preview_text->add_color_region("/*", "*/", comment_color, false); preview_text->add_color_region("/*", "*/", comment_color, false);
preview_text->add_color_region("//", "", comment_color, false); preview_text->add_color_region("//", "", comment_color, false);
error_text->add_font_override("font", get_font("status_source", "EditorFonts"));
error_text->add_color_override("font_color", get_color("error_color", "Editor"));
} }
tools->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("Tools", "EditorIcons")); tools->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("Tools", "EditorIcons"));
@ -2052,11 +2056,43 @@ void VisualShaderEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
void VisualShaderEditor::_show_preview_text() { void VisualShaderEditor::_show_preview_text() {
preview_showed = !preview_showed; preview_showed = !preview_showed;
preview_text->set_visible(preview_showed); preview_vbox->set_visible(preview_showed);
if (preview_showed) {
if (shader_error) {
error_text->set_visible(true);
} else {
error_text->set_visible(false);
}
}
} }
void VisualShaderEditor::_update_preview() { void VisualShaderEditor::_update_preview() {
preview_text->set_text(visual_shader->get_code());
String code = visual_shader->get_code();
preview_text->set_text(code);
ShaderLanguage sl;
Error err = sl.compile(code, ShaderTypes::get_singleton()->get_functions(VisualServer::ShaderMode(visual_shader->get_mode())), ShaderTypes::get_singleton()->get_modes(VisualServer::ShaderMode(visual_shader->get_mode())), ShaderTypes::get_singleton()->get_types());
for (int i = 0; i < preview_text->get_line_count(); i++) {
preview_text->set_line_as_marked(i, false);
}
if (err != OK) {
preview_text->set_line_as_marked(sl.get_error_line() - 1, true);
if (preview_showed) {
error_text->set_visible(true);
}
String text = "error(" + itos(sl.get_error_line()) + "): " + sl.get_error_text();
error_text->set_text(text);
shader_error = true;
} else {
if (preview_showed) {
error_text->set_visible(false);
}
shader_error = false;
}
} }
void VisualShaderEditor::_bind_methods() { void VisualShaderEditor::_bind_methods() {
@ -2127,6 +2163,7 @@ VisualShaderEditor::VisualShaderEditor() {
ShaderLanguage::get_keyword_list(&keyword_list); ShaderLanguage::get_keyword_list(&keyword_list);
preview_showed = false; preview_showed = false;
shader_error = false;
to_node = -1; to_node = -1;
to_slot = -1; to_slot = -1;
@ -2201,15 +2238,22 @@ VisualShaderEditor::VisualShaderEditor() {
// PREVIEW PANEL // PREVIEW PANEL
/////////////////////////////////////// ///////////////////////////////////////
preview_vbox = memnew(VBoxContainer);
preview_vbox->set_visible(preview_showed);
main_box->add_child(preview_vbox);
preview_text = memnew(TextEdit); preview_text = memnew(TextEdit);
main_box->add_child(preview_text); preview_vbox->add_child(preview_text);
preview_text->set_h_size_flags(SIZE_EXPAND_FILL); preview_text->set_h_size_flags(SIZE_EXPAND_FILL);
preview_text->set_v_size_flags(SIZE_EXPAND_FILL); preview_text->set_v_size_flags(SIZE_EXPAND_FILL);
preview_text->set_visible(preview_showed);
preview_text->set_custom_minimum_size(Size2(400 * EDSCALE, 0)); preview_text->set_custom_minimum_size(Size2(400 * EDSCALE, 0));
preview_text->set_syntax_coloring(true); preview_text->set_syntax_coloring(true);
preview_text->set_show_line_numbers(true);
preview_text->set_readonly(true); preview_text->set_readonly(true);
error_text = memnew(Label);
preview_vbox->add_child(error_text);
error_text->set_visible(false);
/////////////////////////////////////// ///////////////////////////////////////
// SHADER NODES TREE // SHADER NODES TREE
/////////////////////////////////////// ///////////////////////////////////////

3
editor/plugins/visual_shader_editor_plugin.h
View File

@ -70,7 +70,10 @@ class VisualShaderEditor : public VBoxContainer {
PanelContainer *error_panel; PanelContainer *error_panel;
Label *error_label; Label *error_label;
bool shader_error;
VBoxContainer *preview_vbox;
TextEdit *preview_text; TextEdit *preview_text;
Label *error_text;
UndoRedo *undo_redo; UndoRedo *undo_redo;
Point2 saved_node_pos; Point2 saved_node_pos;