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

Add autocomplete for filter/repeat hints on uniform arrays 

(cherry picked from commit fc7063b2e2)
This commit is contained in:
Hayden Leete 2023-07-13 11:27:28 +12:00 committed by Yuri Sizov
parent 271e08e543
commit a9a27c7ea5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servers/rendering/shader_language.cpp
View File

@ -10549,11 +10549,6 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_
} }
} else if ((int(completion_base) > int(TYPE_MAT4) && int(completion_base) < int(TYPE_STRUCT))) { } else if ((int(completion_base) > int(TYPE_MAT4) && int(completion_base) < int(TYPE_STRUCT))) {
Vector<String> options; Vector<String> options;
if (completion_base_array) {
if (current_uniform_hint == ShaderNode::Uniform::HINT_NONE) {
options.push_back("source_color");
}
} else {
if (current_uniform_filter == FILTER_DEFAULT) { if (current_uniform_filter == FILTER_DEFAULT) {
options.push_back("filter_linear"); options.push_back("filter_linear");
options.push_back("filter_linear_mipmap"); options.push_back("filter_linear_mipmap");
@ -10562,6 +10557,15 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_
options.push_back("filter_nearest_mipmap"); options.push_back("filter_nearest_mipmap");
options.push_back("filter_nearest_mipmap_anisotropic"); options.push_back("filter_nearest_mipmap_anisotropic");
} }
if (current_uniform_repeat == REPEAT_DEFAULT) {
options.push_back("repeat_enable");
options.push_back("repeat_disable");
}
if (completion_base_array) {
if (current_uniform_hint == ShaderNode::Uniform::HINT_NONE) {
options.push_back("source_color");
}
} else {
if (current_uniform_hint == ShaderNode::Uniform::HINT_NONE) { if (current_uniform_hint == ShaderNode::Uniform::HINT_NONE) {
options.push_back("hint_anisotropy"); options.push_back("hint_anisotropy");
options.push_back("hint_default_black"); options.push_back("hint_default_black");
@ -10579,10 +10583,6 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_
options.push_back("hint_depth_texture"); options.push_back("hint_depth_texture");
options.push_back("source_color"); options.push_back("source_color");
} }
if (current_uniform_repeat == REPEAT_DEFAULT) {
options.push_back("repeat_enable");
options.push_back("repeat_disable");
}
} }
for (int i = 0; i < options.size(); i++) { for (int i = 0; i < options.size(); i++) {