godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-18 14:21:41 +00:00
Code Releases Wiki Activity

Add dedicated macros for property name extraction

Browse Source 
* Replace case-by-case extraction with PNAME & GNAME
* Fix group handling when group hint begins with property name
* Exclude properties that are PROPERTY_USAGE_NOEDITOR
This commit is contained in:
Haoyu Qiu
2022-05-18 12:43:36 +08:00
parent d8650fb182
commit b657d0c76c
23 changed files with 211 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scene/resources/visual_shader.cpp
View File

@@ -896,13 +896,13 @@ String VisualShader::validate_uniform_name(const String &p_name, const Ref<Visua
}
VisualShader::RenderModeEnums VisualShader::render_mode_enums[] = {
{ Shader::MODE_SPATIAL, "blend" },
{ Shader::MODE_SPATIAL, "depth_draw" },
{ Shader::MODE_SPATIAL, "cull" },
{ Shader::MODE_SPATIAL, "diffuse" },
{ Shader::MODE_SPATIAL, "specular" },
{ Shader::MODE_SPATIAL, "async" },
{ Shader::MODE_CANVAS_ITEM, "blend" },
{ Shader::MODE_SPATIAL, PNAME("blend") },
{ Shader::MODE_SPATIAL, PNAME("depth_draw") },
{ Shader::MODE_SPATIAL, PNAME("cull") },
{ Shader::MODE_SPATIAL, PNAME("diffuse") },
{ Shader::MODE_SPATIAL, PNAME("specular") },
{ Shader::MODE_SPATIAL, PNAME("async") },
{ Shader::MODE_CANVAS_ITEM, PNAME("blend") },
{ Shader::MODE_CANVAS_ITEM, nullptr }
};
@@ -1051,7 +1051,7 @@ bool VisualShader::_get(const StringName &p_name, Variant &r_ret) const {
}
void VisualShader::_get_property_list(List<PropertyInfo> *p_list) const {
//mode
p_list->push_back(PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Spatial,CanvasItem,Particles"));
p_list->push_back(PropertyInfo(Variant::INT, PNAME("mode"), PROPERTY_HINT_ENUM, "Spatial,CanvasItem,Particles"));
//render modes
Map<String, String> blend_mode_enums;
@@ -1082,11 +1082,11 @@ void VisualShader::_get_property_list(List<PropertyInfo> *p_list) const {
}
for (Map<String, String>::Element *E = blend_mode_enums.front(); E; E = E->next()) {
p_list->push_back(PropertyInfo(Variant::INT, "modes/" + E->key(), PROPERTY_HINT_ENUM, E->get()));
p_list->push_back(PropertyInfo(Variant::INT, vformat("%s/%s", PNAME("modes"), E->key()), PROPERTY_HINT_ENUM, E->get()));
}
for (Set<String>::Element *E = toggles.front(); E; E = E->next()) {
p_list->push_back(PropertyInfo(Variant::BOOL, "flags/" + E->get()));
p_list->push_back(PropertyInfo(Variant::BOOL, vformat("%s/%s", PNAME("flags"), E->get())));
}
for (int i = 0; i < TYPE_MAX; i++) {