Jacques Lucke
4130f1e674
This refactors the geometry nodes evaluation system. No changes for the user are expected. At a high level the goals are: * Support using geometry nodes outside of the geometry nodes modifier. * Support using the evaluator infrastructure for other purposes like field evaluation. * Support more nodes, especially when many of them are disabled behind switch nodes. * Support doing preprocessing on node groups. For more details see T98492. There are fairly detailed comments in the code, but here is a high level overview for how it works now: * There is a new "lazy-function" system. It is similar in spirit to the multi-function system but with different goals. Instead of optimizing throughput for highly parallelizable work, this system is designed to compute only the data that is actually necessary. What data is necessary can be determined dynamically during evaluation. Many lazy-functions can be composed in a graph to form a new lazy-function, which can again be used in a graph etc. * Each geometry node group is converted into a lazy-function graph prior to evaluation. To evaluate geometry nodes, one then just has to evaluate that graph. Node groups are no longer inlined into their parents. Next steps for the evaluation system is to reduce the use of threads in some situations to avoid overhead. Many small node groups don't benefit from multi-threading at all. This is much easier to do now because not everything has to be inlined in one huge node tree anymore. Differential Revision: https://developer.blender.org/D15914
122 lines
3.7 KiB
C++
122 lines
3.7 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup edinterface
|
|
*/
|
|
|
|
#include "BLI_string_ref.hh"
|
|
#include "BLI_string_search.h"
|
|
|
|
#include "DNA_customdata_types.h"
|
|
|
|
#include "RNA_access.h"
|
|
#include "RNA_enum_types.h"
|
|
|
|
#include "BLT_translation.h"
|
|
|
|
#include "BKE_attribute.hh"
|
|
|
|
#include "NOD_geometry_nodes_log.hh"
|
|
|
|
#include "UI_interface.h"
|
|
#include "UI_interface.hh"
|
|
#include "UI_resources.h"
|
|
|
|
using blender::nodes::geo_eval_log::GeometryAttributeInfo;
|
|
|
|
namespace blender::ui {
|
|
|
|
static StringRef attribute_data_type_string(const eCustomDataType type)
|
|
{
|
|
const char *name = nullptr;
|
|
RNA_enum_name_from_value(rna_enum_attribute_type_items, type, &name);
|
|
return StringRef(IFACE_(name));
|
|
}
|
|
|
|
static StringRef attribute_domain_string(const eAttrDomain domain)
|
|
{
|
|
const char *name = nullptr;
|
|
RNA_enum_name_from_value(rna_enum_attribute_domain_items, domain, &name);
|
|
return StringRef(IFACE_(name));
|
|
}
|
|
|
|
static bool attribute_search_item_add(uiSearchItems *items, const GeometryAttributeInfo &item)
|
|
{
|
|
const StringRef data_type_name = attribute_data_type_string(*item.data_type);
|
|
const StringRef domain_name = attribute_domain_string(*item.domain);
|
|
std::string search_item_text = domain_name + " " + UI_MENU_ARROW_SEP + item.name + UI_SEP_CHAR +
|
|
data_type_name;
|
|
|
|
return UI_search_item_add(
|
|
items, search_item_text.c_str(), (void *)&item, ICON_NONE, UI_BUT_HAS_SEP_CHAR, 0);
|
|
}
|
|
|
|
void attribute_search_add_items(StringRefNull str,
|
|
const bool can_create_attribute,
|
|
Span<const GeometryAttributeInfo *> infos,
|
|
uiSearchItems *seach_items,
|
|
const bool is_first)
|
|
{
|
|
static GeometryAttributeInfo dummy_info;
|
|
|
|
/* Any string may be valid, so add the current search string along with the hints. */
|
|
if (str[0] != '\0') {
|
|
bool contained = false;
|
|
for (const GeometryAttributeInfo *attribute_info : infos) {
|
|
if (attribute_info->name == str) {
|
|
contained = true;
|
|
break;
|
|
}
|
|
}
|
|
if (!contained) {
|
|
dummy_info.name = str;
|
|
UI_search_item_add(seach_items,
|
|
str.c_str(),
|
|
&dummy_info,
|
|
can_create_attribute ? ICON_ADD : ICON_NONE,
|
|
0,
|
|
0);
|
|
}
|
|
}
|
|
|
|
if (str[0] == '\0' && !is_first) {
|
|
/* Allow clearing the text field when the string is empty, but not on the first pass,
|
|
* or opening an attribute field for the first time would show this search item. */
|
|
dummy_info.name = str;
|
|
UI_search_item_add(seach_items, str.c_str(), &dummy_info, ICON_X, 0, 0);
|
|
}
|
|
|
|
/* Don't filter when the menu is first opened, but still run the search
|
|
* so the items are in the same order they will appear in while searching. */
|
|
const char *string = is_first ? "" : str.c_str();
|
|
|
|
StringSearch *search = BLI_string_search_new();
|
|
for (const GeometryAttributeInfo *item : infos) {
|
|
|
|
/* Don't show the legacy "normal" attribute. */
|
|
if (item->name == "normal" && item->domain == ATTR_DOMAIN_FACE) {
|
|
continue;
|
|
}
|
|
if (!bke::allow_procedural_attribute_access(item->name)) {
|
|
continue;
|
|
}
|
|
|
|
BLI_string_search_add(search, item->name.c_str(), (void *)item, 0);
|
|
}
|
|
|
|
GeometryAttributeInfo **filtered_items;
|
|
const int filtered_amount = BLI_string_search_query(search, string, (void ***)&filtered_items);
|
|
|
|
for (const int i : IndexRange(filtered_amount)) {
|
|
const GeometryAttributeInfo *item = filtered_items[i];
|
|
if (!attribute_search_item_add(seach_items, *item)) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
MEM_freeN(filtered_items);
|
|
BLI_string_search_free(search);
|
|
}
|
|
|
|
} // namespace blender::ui
|