blender
/
blender
136
418
Fork 600
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

Geometry Nodes: new repeat zone #109164

Merged
Jacques Lucke merged 98 commits from JacquesLucke/blender:serial-loop into main 2023-07-11 22:36:17 +02:00
Conversation 25 Commits 98 Files Changed 47 +32
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a3e50ca4c6 - Show all commits

32
source/blender/nodes/intern/geometry_nodes_lazy_function.cc
View File

@ -1726,12 +1726,44 @@ struct GeometryNodesLazyFunctionGraphBuilder {
graph_params.lf_inputs_by_bsocket.add(&bsocket, &lf_socket);
}
lf::Node &lf_main_input_usage_node = this->build_dummy_node_for_socket_usages(
"Input Usages", zone.input_node->output_sockets(), {}, lf_graph);
lf::Node &lf_main_output_usage_node = this->build_dummy_node_for_socket_usages(
"Output Usages", {}, zone.output_node->input_sockets(), lf_graph);
for (const int i : zone.output_node->input_sockets().index_range()) {
const bNodeSocket &bsocket = zone.output_node->input_socket(i);
lf::OutputSocket &lf_usage = lf_main_output_usage_node.output(i);
graph_params.usage_by_bsocket.add(&bsocket, &lf_usage);
}
lf::Node &lf_border_link_input_node = this->build_zone_border_links_input_node(zone, lf_graph);
lf::Node &lf_border_link_usage_node = this->build_border_link_input_usage_node(zone, lf_graph);
this->insert_nodes_and_zones(zone.child_nodes, zone.child_zones, graph_params);
this->build_output_socket_usages(*zone.input_node, graph_params);
for (const int i : zone.input_node->output_sockets().index_range()) {
const bNodeSocket &bsocket = zone.input_node->output_socket(i);
lf::OutputSocket *lf_usage = graph_params.usage_by_bsocket.lookup_default(&bsocket, nullptr);
lf::InputSocket &lf_usage_output = lf_main_input_usage_node.input(i);
if (lf_usage) {
lf_graph.add_link(*lf_usage, lf_usage_output);
}
else {
static const bool static_false = false;
lf_usage_output.set_default_value(&static_false);
}
}
for (const auto item : graph_params.lf_output_by_bsocket.items()) {
this->insert_links_from_socket(*item.key, *item.value, graph_params);
}
this->link_border_link_inputs_and_usages(
zone, lf_border_link_input_node, lf_border_link_usage_node, graph_params);
this->add_default_inputs(graph_params);
auto &fn = scope_.construct<LazyFunctionForSerialLoopZone>(zone, zone_info);
zone_info.lazy_function = &fn;