[Bf-blender-cvs] [3d2ce25afd7] master: Geometry Nodes: support creating new attributes in modifier
Jacques Lucke
noreply at git.blender.org
Mon Sep 27 15:39:58 CEST 2021
Commit: 3d2ce25afd7e8ed823277f34f370fb1fb49a739e
Author: Jacques Lucke
Date: Mon Sep 27 15:33:48 2021 +0200
Branches: master
https://developer.blender.org/rB3d2ce25afd7e8ed823277f34f370fb1fb49a739e
Geometry Nodes: support creating new attributes in modifier
This patch allows passing a field to the modifier as output. In the
modifier, the user can choose an attribute name. The attribute
will be filled with values computed by the field. This only works
for realized mesh/curve/point data. As mentioned in T91376, the
output domain is selected in the node group itself. We might want
to add this functionality to the modifier later as well, but not now.
Differential Revision: https://developer.blender.org/D12644
===================================================================
M release/scripts/startup/bl_ui/space_node.py
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/modifiers/intern/MOD_nodes.cc
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 5f36009901a..f806fc345d1 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -754,6 +754,11 @@ class NodeTreeInterfacePanel:
# Display descriptions only for Geometry Nodes, since it's only used in the modifier panel.
if tree.type == 'GEOMETRY':
layout.prop(active_socket, "description")
+ field_socket_prefixes = {
+ "NodeSocketInt", "NodeSocketColor", "NodeSocketVector", "NodeSocketBool", "NodeSocketFloat"}
+ is_field_type = any(active_socket.bl_socket_idname.startswith(prefix) for prefix in field_socket_prefixes)
+ if in_out == "OUT" and is_field_type:
+ layout.prop(active_socket, "attribute_domain")
active_socket.draw(context, layout)
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 38f38b4ba1e..34c74e5bd88 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -120,7 +120,10 @@ typedef struct bNodeSocket {
/* XXX deprecated, kept for forward compatibility */
short stack_type DNA_DEPRECATED;
char display_shape;
- char _pad[1];
+
+ /* #AttributeDomain used when the geometry nodes modifier creates an attribute for a group
+ * output. */
+ char attribute_domain;
/* Runtime-only cache of the number of input links, for multi-input sockets. */
short total_inputs;
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index c06ff7715b3..04f60c0d229 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -10833,6 +10833,14 @@ static void rna_def_node_socket_interface(BlenderRNA *brna)
prop, "Hide Value", "Hide the socket input value even when the socket is not connected");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocketInterface_update");
+ prop = RNA_def_property(srna, "attribute_domain", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, rna_enum_attribute_domain_items);
+ RNA_def_property_ui_text(
+ prop,
+ "Attribute Domain",
+ "Attribute domain used by the geometry nodes modifier to create an attribute output");
+ RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocketInterface_update");
+
/* registration */
prop = RNA_def_property(srna, "bl_socket_idname", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "typeinfo->idname");
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 8c02c83d479..c39beb63eb3 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -103,6 +103,8 @@ using blender::Span;
using blender::StringRef;
using blender::StringRefNull;
using blender::Vector;
+using blender::bke::OutputAttribute;
+using blender::fn::GField;
using blender::fn::GMutablePointer;
using blender::fn::GPointer;
using blender::nodes::GeoNodeExecParams;
@@ -589,6 +591,35 @@ void MOD_nodes_update_interface(Object *object, NodesModifierData *nmd)
}
}
+ LISTBASE_FOREACH (bNodeSocket *, socket, &nmd->node_group->outputs) {
+ if (!socket_type_has_attribute_toggle(*socket)) {
+ continue;
+ }
+
+ const std::string idprop_name = socket->identifier + attribute_name_suffix;
+ IDProperty *new_prop = IDP_NewString("", idprop_name.c_str(), MAX_NAME);
+ if (socket->description[0] != '\0') {
+ IDPropertyUIData *ui_data = IDP_ui_data_ensure(new_prop);
+ ui_data->description = BLI_strdup(socket->description);
+ }
+ IDP_AddToGroup(nmd->settings.properties, new_prop);
+
+ if (old_properties != nullptr) {
+ IDProperty *old_prop = IDP_GetPropertyFromGroup(old_properties, idprop_name.c_str());
+ if (old_prop != nullptr) {
+ /* #IDP_CopyPropertyContent replaces the UI data as well, which we don't (we only
+ * want to replace the values). So release it temporarily and replace it after. */
+ IDPropertyUIData *ui_data = new_prop->ui_data;
+ new_prop->ui_data = nullptr;
+ IDP_CopyPropertyContent(new_prop, old_prop);
+ if (new_prop->ui_data != nullptr) {
+ IDP_ui_data_free(new_prop);
+ }
+ new_prop->ui_data = ui_data;
+ }
+ }
+ }
+
if (old_properties != nullptr) {
IDP_FreeProperty(old_properties);
}
@@ -778,6 +809,72 @@ static void clear_runtime_data(NodesModifierData *nmd)
}
}
+static void store_field_on_geometry_component(GeometryComponent &component,
+ const StringRef attribute_name,
+ AttributeDomain domain,
+ const GField &field)
+{
+ /* If the attribute name corresponds to a built-in attribute, use the domain of the built-in
+ * attribute instead. */
+ if (component.attribute_is_builtin(attribute_name)) {
+ component.attribute_try_create_builtin(attribute_name, AttributeInitDefault());
+ std::optional<AttributeMetaData> meta_data = component.attribute_get_meta_data(attribute_name);
+ if (meta_data.has_value()) {
+ domain = meta_data->domain;
+ }
+ else {
+ return;
+ }
+ }
+ const CustomDataType data_type = blender::bke::cpp_type_to_custom_data_type(field.cpp_type());
+ OutputAttribute attribute = component.attribute_try_get_for_output_only(
+ attribute_name, domain, data_type);
+ if (attribute) {
+ /* In the future we could also evaluate all output fields at once. */
+ const int domain_size = component.attribute_domain_size(domain);
+ blender::bke::GeometryComponentFieldContext field_context{component, domain};
+ blender::fn::FieldEvaluator field_evaluator{field_context, domain_size};
+ field_evaluator.add_with_destination(field, attribute.varray());
+ field_evaluator.evaluate();
+ attribute.save();
+ }
+}
+
+static void store_output_value_in_geometry(GeometrySet &geometry_set,
+ NodesModifierData *nmd,
+ const InputSocketRef &socket,
+ const GPointer value)
+{
+ if (!socket_type_has_attribute_toggle(*socket.bsocket())) {
+ return;
+ }
+ const std::string prop_name = socket.identifier() + attribute_name_suffix;
+ const IDProperty *prop = IDP_GetPropertyFromGroup(nmd->settings.properties, prop_name.c_str());
+ if (prop == nullptr) {
+ return;
+ }
+ const StringRefNull attribute_name = IDP_String(prop);
+ if (attribute_name.is_empty()) {
+ return;
+ }
+ const GField &field = *(const GField *)value.get();
+ const bNodeSocket *interface_socket = (bNodeSocket *)BLI_findlink(&nmd->node_group->outputs,
+ socket.index());
+ const AttributeDomain domain = (AttributeDomain)interface_socket->attribute_domain;
+ if (geometry_set.has_mesh()) {
+ MeshComponent &component = geometry_set.get_component_for_write<MeshComponent>();
+ store_field_on_geometry_component(component, attribute_name, domain, field);
+ }
+ if (geometry_set.has_pointcloud()) {
+ PointCloudComponent &component = geometry_set.get_component_for_write<PointCloudComponent>();
+ store_field_on_geometry_component(component, attribute_name, domain, field);
+ }
+ if (geometry_set.has_curve()) {
+ CurveComponent &component = geometry_set.get_component_for_write<CurveComponent>();
+ store_field_on_geometry_component(component, attribute_name, domain, field);
+ }
+}
+
/**
* Evaluate a node group to compute the output geometry.
* Currently, this uses a fairly basic and inefficient algorithm that might compute things more
@@ -785,7 +882,7 @@ static void clear_runtime_data(NodesModifierData *nmd)
*/
static GeometrySet compute_geometry(const DerivedNodeTree &tree,
Span<const NodeRef *> group_input_nodes,
- const InputSocketRef &socket_to_compute,
+ const NodeRef &output_node,
GeometrySet input_geometry_set,
NodesModifierData *nmd,
const ModifierEvalContext *ctx)
@@ -828,7 +925,9 @@ static GeometrySet compute_geometry(const DerivedNodeTree &tree,
input_geometry_set.clear();
Vector<DInputSocket> group_outputs;
- group_outputs.append({root_context, &socket_to_compute});
+ for (const InputSocketRef *socket_ref : output_node.inputs().drop_back(1)) {
+ group_outputs.append({root_context, socket_ref});
+ }
std::optional<geo_log::GeoLogger> geo_logger;
@@ -856,9 +955,15 @@ static GeometrySet compute_geometry(const DerivedNodeTree &tree,
nmd_orig->runtime_eval_log = new geo_log::ModifierLog(*geo_logger);
}
- BLI_assert(eval_params.r_output_values.size() == 1);
- GMutablePointer result = eval_params.r_output_values[0];
- return result.relocate_out<GeometrySet>();
+ GeometrySet output_geometry_set = eval_params.r_output_values[0].relocate_out<GeometrySet>();
+
+ for (const InputSocketRef *socket : output_node.inputs().drop_front(1).drop_back(1)) {
+ GMutablePointer socket_value = eval_params.r_output_values[socket->index()];
+ store_output_value_in_geometry(output_geometry_set, nmd, *socket, socket_value);
+ socket_value.destruct();
+ }
+
+ return output_geometry_set;
}
/**
@@ -928,24 +1033,23 @@ static void modifyGeometry(ModifierData *md,
const NodeTreeRef &root_tree_ref = tree.root_context().tree();
Span<const NodeRef *> input_nodes = root_tree_ref.nodes_by_type("NodeGroupInput");
Span<const NodeRef *> output_nodes = root_tree_ref.nodes_by_type("NodeGroupOutput");
-
if (output_nodes.size() != 1) {
return;
}
- Span<const InputSocketRef *> group_outputs = output_nodes[0]->inputs().drop_back(1);
-
- if (group_outputs.size() == 0) {
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list