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

Merge pull request #75427 from Chaosus/shader_fix_groups_ordering

Browse Source 
Fix shader uniform groups to prevent it sorting in alphabet order
This commit is contained in:
Clay John 2023-05-05 09:08:37 -07:00 committed by GitHub
commit 12e4323f17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scene/resources/material.cpp
View File

@ -211,6 +211,7 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
shader->get_shader_uniform_list(&list, true); shader->get_shader_uniform_list(&list, true);
HashMap<String, HashMap<String, List<PropertyInfo>>> groups; HashMap<String, HashMap<String, List<PropertyInfo>>> groups;
LocalVector<Pair<String, LocalVector<String>>> vgroups;
{ {
HashMap<String, List<PropertyInfo>> none_subgroup; HashMap<String, List<PropertyInfo>> none_subgroup;
none_subgroup.insert("<None>", List<PropertyInfo>()); none_subgroup.insert("<None>", List<PropertyInfo>());
@ -248,6 +249,7 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
subgroup_map.insert("<None>", none_subgroup); subgroup_map.insert("<None>", none_subgroup);
groups.insert(last_group, subgroup_map); groups.insert(last_group, subgroup_map);
vgroups.push_back(Pair<String, LocalVector<String>>(last_group, { "<None>" }));
} }
if (!groups[last_group].has(last_subgroup)) { if (!groups[last_group].has(last_subgroup)) {
@ -260,6 +262,12 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
subgroup.push_back(info); subgroup.push_back(info);
groups[last_group].insert(last_subgroup, subgroup); groups[last_group].insert(last_subgroup, subgroup);
for (Pair<String, LocalVector<String>> &group : vgroups) {
if (group.first == last_group) {
group.second.push_back(last_subgroup);
break;
}
}
} }
} else { } else {
last_group = "<None>"; last_group = "<None>";
@ -277,6 +285,8 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
info.name = "Shader Parameters"; info.name = "Shader Parameters";
info.hint_string = "shader_parameter/"; info.hint_string = "shader_parameter/";
groups["<None>"]["<None>"].push_back(info); groups["<None>"]["<None>"].push_back(info);
vgroups.push_back(Pair<String, LocalVector<String>>("<None>", { "<None>" }));
} }
PropertyInfo info = E->get(); PropertyInfo info = E->get();
@ -290,21 +300,10 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
groups[last_group][last_subgroup].push_back(info); groups[last_group][last_subgroup].push_back(info);
} }
List<String> group_names; for (const Pair<String, LocalVector<String>> &group_pair : vgroups) {
for (HashMap<String, HashMap<String, List<PropertyInfo>>>::Iterator group = groups.begin(); group; ++group) { String group = group_pair.first;
group_names.push_back(group->key); for (const String &subgroup : group_pair.second) {
} List<PropertyInfo> &prop_infos = groups[group][subgroup];
group_names.sort();
for (const String &group_name : group_names) {
List<String> subgroup_names;
HashMap<String, List<PropertyInfo>> &subgroups = groups[group_name];
for (HashMap<String, List<PropertyInfo>>::Iterator subgroup = subgroups.begin(); subgroup; ++subgroup) {
subgroup_names.push_back(subgroup->key);
}
subgroup_names.sort();
for (const String &subgroup_name : subgroup_names) {
List<PropertyInfo> &prop_infos = subgroups[subgroup_name];
for (List<PropertyInfo>::Element *item = prop_infos.front(); item; item = item->next()) { for (List<PropertyInfo>::Element *item = prop_infos.front(); item; item = item->next()) {
p_list->push_back(item->get()); p_list->push_back(item->get());
} }