diff options
author | Jacques Lucke <jacques@blender.org> | 2020-12-23 18:37:47 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-12-23 18:37:47 +0300 |
commit | d8dc4c5b32b4cb08e2d438d76f6a02e732d23220 (patch) | |
tree | ab504f1550e4d9e0843c79d1b1874b0898c528a4 /source | |
parent | 8a9dedf829544e30f822bcb016a9c134af6979e5 (diff) |
Geometry Nodes: new Rotate Points node
This node updates the "rotation" attribute on points.
Multiple ways to specify the rotation are supported.
Differential Revision: https://developer.blender.org/D9883
Ref T83668.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 22 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 23 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 65 | ||||
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/nodes/NOD_geometry.h | 1 | ||||
-rw-r--r-- | source/blender/nodes/NOD_static_types.h | 1 | ||||
-rw-r--r-- | source/blender/nodes/geometry/node_geometry_util.cc | 15 | ||||
-rw-r--r-- | source/blender/nodes/geometry/node_geometry_util.hh | 3 | ||||
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_rotate_points.cc | 207 |
11 files changed, 336 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index e18f46c9988..89a51afede9 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1356,6 +1356,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_ATTRIBUTE_COLOR_RAMP 1013 #define GEO_NODE_POINT_SEPARATE 1014 #define GEO_NODE_ATTRIBUTE_COMPARE 1015 +#define GEO_NODE_ROTATE_POINTS 1016 /** \} */ diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 676d0bf9385..5d3994068ec 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -4744,6 +4744,7 @@ static void registerGeometryNodes(void) register_node_type_geo_join_geometry(); register_node_type_geo_attribute_mix(); register_node_type_geo_attribute_color_ramp(); + register_node_type_geo_rotate_points(); } static void registerFunctionNodes(void) diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 0ce31707204..409327b0d1c 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -3260,6 +3260,25 @@ static void node_geometry_buts_attribute_color_ramp(uiLayout *layout, uiTemplateColorRamp(layout, ptr, "color_ramp", 0); } +static void node_geometry_buts_rotate_points(uiLayout *layout, + bContext *UNUSED(C), + PointerRNA *ptr) +{ + NodeGeometryRotatePoints *storage = (NodeGeometryRotatePoints *)((bNode *)ptr->data)->storage; + + uiItemR(layout, ptr, "type", DEFAULT_FLAGS | UI_ITEM_R_EXPAND, NULL, ICON_NONE); + uiItemR(layout, ptr, "space", DEFAULT_FLAGS | UI_ITEM_R_EXPAND, NULL, ICON_NONE); + + uiLayout *col = uiLayoutColumn(layout, false); + if (storage->type == GEO_NODE_ROTATE_POINTS_TYPE_AXIS_ANGLE) { + uiItemR(col, ptr, "input_type_axis", DEFAULT_FLAGS, IFACE_("Axis"), ICON_NONE); + uiItemR(col, ptr, "input_type_angle", DEFAULT_FLAGS, IFACE_("Angle"), ICON_NONE); + } + else { + uiItemR(col, ptr, "input_type_rotation", DEFAULT_FLAGS, IFACE_("Rotation"), ICON_NONE); + } +} + static void node_geometry_set_butfunc(bNodeType *ntype) { switch (ntype->type) { @@ -3296,6 +3315,9 @@ static void node_geometry_set_butfunc(bNodeType *ntype) case GEO_NODE_ATTRIBUTE_COLOR_RAMP: ntype->draw_buttons = node_geometry_buts_attribute_color_ramp; break; + case GEO_NODE_ROTATE_POINTS: + ntype->draw_buttons = node_geometry_buts_rotate_points; + break; } } diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 64dd489b850..3b655790de9 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -1111,6 +1111,19 @@ typedef struct NodeInputVector { float vector[3]; } NodeInputVector; +typedef struct NodeGeometryRotatePoints { + /* GeometryNodeRotatePointsType */ + uint8_t type; + /* GeometryNodeRotatePointsSpace */ + uint8_t space; + + /* GeometryNodeAttributeInputMode */ + uint8_t input_type_axis; + uint8_t input_type_angle; + uint8_t input_type_rotation; + char _pad[3]; +} NodeGeometryRotatePoints; + /* script node mode */ #define NODE_SCRIPT_INTERNAL 0 #define NODE_SCRIPT_EXTERNAL 1 @@ -1529,6 +1542,16 @@ typedef enum GeometryNodePointDistributeMethod { GEO_NODE_POINT_DISTRIBUTE_POISSON = 1, } GeometryNodePointDistributeMethod; +typedef enum GeometryNodeRotatePointsType { + GEO_NODE_ROTATE_POINTS_TYPE_EULER = 0, + GEO_NODE_ROTATE_POINTS_TYPE_AXIS_ANGLE = 1, +} GeometryNodeRotatePointsType; + +typedef enum GeometryNodeRotatePointsSpace { + GEO_NODE_ROTATE_POINTS_SPACE_OBJECT = 0, + GEO_NODE_ROTATE_POINTS_SPACE_POINT = 1, +} GeometryNodeRotatePointsSpace; + #ifdef __cplusplus } #endif diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index cbd677582a9..a625b671c98 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -452,6 +452,11 @@ static const EnumPropertyItem rna_node_geometry_attribute_input_type_items_float ITEM_FLOAT, {0, NULL, 0, NULL, NULL}, }; +static const EnumPropertyItem rna_node_geometry_attribute_input_type_items_vector[] = { + ITEM_ATTRIBUTE, + ITEM_VECTOR, + {0, NULL, 0, NULL, NULL}, +}; static const EnumPropertyItem rna_node_geometry_attribute_input_type_items_no_boolean[] = { ITEM_ATTRIBUTE, ITEM_FLOAT, @@ -8584,6 +8589,66 @@ static void def_geo_attribute_color_ramp(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } +static void def_geo_rotate_points(StructRNA *srna) +{ + static const EnumPropertyItem type_items[] = { + {GEO_NODE_ROTATE_POINTS_TYPE_AXIS_ANGLE, + "AXIS_ANGLE", + ICON_NONE, + "Axis Angle", + "Rotate around an axis by an angle"}, + {GEO_NODE_ROTATE_POINTS_TYPE_EULER, + "EULER", + ICON_NONE, + "Euler", + "Rotate around the x, y and z axis"}, + {0, NULL, 0, NULL, NULL}, + }; + + static const EnumPropertyItem space_items[] = { + {GEO_NODE_ROTATE_POINTS_SPACE_OBJECT, + "OBJECT", + ICON_NONE, + "Object", + "Rotate points in the local space of the object"}, + {GEO_NODE_ROTATE_POINTS_SPACE_POINT, + "POINT", + ICON_NONE, + "Point", + "Rotate every point in its local space (as defined by the 'rotation' attribute)"}, + {0, NULL, 0, NULL, NULL}, + }; + + PropertyRNA *prop; + + RNA_def_struct_sdna_from(srna, "NodeGeometryRotatePoints", "storage"); + + prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, type_items); + RNA_def_property_ui_text(prop, "Type", "Method used to describe the rotation"); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); + + prop = RNA_def_property(srna, "space", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, space_items); + RNA_def_property_ui_text(prop, "Space", "Base orientation of the points"); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); + + prop = RNA_def_property(srna, "input_type_axis", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, rna_node_geometry_attribute_input_type_items_vector); + RNA_def_property_ui_text(prop, "Input Type Axis", ""); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); + + prop = RNA_def_property(srna, "input_type_angle", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, rna_node_geometry_attribute_input_type_items_float); + RNA_def_property_ui_text(prop, "Input Type Angle", ""); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); + + prop = RNA_def_property(srna, "input_type_rotation", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, rna_node_geometry_attribute_input_type_items_vector); + RNA_def_property_ui_text(prop, "Input Type Rotation", ""); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); +} + /* -------------------------------------------------------------------------- */ static void rna_def_shader_node(BlenderRNA *brna) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 60d4ee8f7c4..00e5f8246f3 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -155,6 +155,7 @@ set(SRC geometry/nodes/node_geo_point_distribute_poisson_disk.cc geometry/nodes/node_geo_point_instance.cc geometry/nodes/node_geo_point_separate.cc + geometry/nodes/node_geo_rotate_points.cc geometry/nodes/node_geo_subdivision_surface.cc geometry/nodes/node_geo_transform.cc geometry/nodes/node_geo_triangulate.cc diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h index 19a7acf2299..4653c9aae3f 100644 --- a/source/blender/nodes/NOD_geometry.h +++ b/source/blender/nodes/NOD_geometry.h @@ -42,6 +42,7 @@ void register_node_type_geo_point_separate(void); void register_node_type_geo_attribute_compare(void); void register_node_type_geo_attribute_mix(void); void register_node_type_geo_attribute_color_ramp(void); +void register_node_type_geo_rotate_points(void); #ifdef __cplusplus } diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 5156bac0e73..d6ae98594a5 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -284,6 +284,7 @@ DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_MIX, def_geo_attribute_mix, "ATTRIBUTE_ DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_COLOR_RAMP, def_geo_attribute_color_ramp, "ATTRIBUTE_COLOR_RAMP", AttributeColorRamp, "Attribute Color Ramp", "") DefNode(GeometryNode, GEO_NODE_POINT_SEPARATE, 0, "POINT_SEPARATE", PointSeparate, "Point Separate", "") DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_COMPARE, def_geo_attribute_attribute_compare, "ATTRIBUTE_COMPARE", AttributeCompare, "Attribute Compare", "") +DefNode(GeometryNode, GEO_NODE_ROTATE_POINTS, def_geo_rotate_points, "ROTATE_POINTS", RotatePoints, "Rotate Points", "") /* undefine macros */ #undef DefNode diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc index bcebaa6a37b..eace75b46b6 100644 --- a/source/blender/nodes/geometry/node_geometry_util.cc +++ b/source/blender/nodes/geometry/node_geometry_util.cc @@ -19,19 +19,28 @@ namespace blender::nodes { +/** + * Update the availability of a group of input sockets with the same name, + * used for switching between attribute inputs or single values. + * + * \param mode: Controls which socket of the group to make available. + * \param name_is_available: If false, make all sockets with this name unavailable. + */ void update_attribute_input_socket_availabilities(bNode &node, const StringRef name, - const GeometryNodeAttributeInputMode mode) + const GeometryNodeAttributeInputMode mode, + const bool name_is_available) { const GeometryNodeAttributeInputMode mode_ = (GeometryNodeAttributeInputMode)mode; LISTBASE_FOREACH (bNodeSocket *, socket, &node.inputs) { if (name == socket->name) { - const bool is_available = + const bool socket_is_available = + name_is_available && ((socket->type == SOCK_STRING && mode_ == GEO_NODE_ATTRIBUTE_INPUT_ATTRIBUTE) || (socket->type == SOCK_FLOAT && mode_ == GEO_NODE_ATTRIBUTE_INPUT_FLOAT) || (socket->type == SOCK_VECTOR && mode_ == GEO_NODE_ATTRIBUTE_INPUT_VECTOR) || (socket->type == SOCK_RGBA && mode_ == GEO_NODE_ATTRIBUTE_INPUT_COLOR)); - nodeSetSocketAvailability(socket, is_available); + nodeSetSocketAvailability(socket, socket_is_available); } } } diff --git a/source/blender/nodes/geometry/node_geometry_util.hh b/source/blender/nodes/geometry/node_geometry_util.hh index 7c12611a898..d9c066d576f 100644 --- a/source/blender/nodes/geometry/node_geometry_util.hh +++ b/source/blender/nodes/geometry/node_geometry_util.hh @@ -41,7 +41,8 @@ bool geo_node_poll_default(struct bNodeType *ntype, struct bNodeTree *ntree); namespace blender::nodes { void update_attribute_input_socket_availabilities(bNode &node, const StringRef name, - const GeometryNodeAttributeInputMode mode); + const GeometryNodeAttributeInputMode mode, + const bool can_be_available = true); CustomDataType attribute_domain_highest_complexity(Span<CustomDataType>); diff --git a/source/blender/nodes/geometry/nodes/node_geo_rotate_points.cc b/source/blender/nodes/geometry/nodes/node_geo_rotate_points.cc new file mode 100644 index 00000000000..1272e36a216 --- /dev/null +++ b/source/blender/nodes/geometry/nodes/node_geo_rotate_points.cc @@ -0,0 +1,207 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "node_geometry_util.hh" + +#include "BLI_math_rotation.h" + +static bNodeSocketTemplate geo_node_rotate_points_in[] = { + {SOCK_GEOMETRY, N_("Geometry")}, + {SOCK_STRING, N_("Axis")}, + {SOCK_VECTOR, N_("Axis"), 0.0, 0.0, 1.0, 0.0, -FLT_MAX, FLT_MAX, PROP_XYZ}, + {SOCK_STRING, N_("Angle")}, + {SOCK_FLOAT, N_("Angle"), 0.0, 0.0, 0.0, 0.0, -FLT_MAX, FLT_MAX, PROP_ANGLE}, + {SOCK_STRING, N_("Rotation")}, + {SOCK_VECTOR, N_("Rotation"), 0.0, 0.0, 0.0, 0.0, -FLT_MAX, FLT_MAX, PROP_EULER}, + {-1, ""}, +}; + +static bNodeSocketTemplate geo_node_rotate_points_out[] = { + {SOCK_GEOMETRY, N_("Geometry")}, + {-1, ""}, +}; + +namespace blender::nodes { + +static void rotate_points__axis_angle__object_space(const int domain_size, + const Float3ReadAttribute &axis, + const FloatReadAttribute &angles, + MutableSpan<float3> rotations) +{ + for (const int i : IndexRange(domain_size)) { + float old_rotation[3][3]; + eul_to_mat3(old_rotation, rotations[i]); + float rotation[3][3]; + axis_angle_to_mat3(rotation, axis[i], angles[i]); + float new_rotation[3][3]; + mul_m3_m3m3(new_rotation, rotation, old_rotation); + mat3_to_eul(rotations[i], new_rotation); + } +} + +static void rotate_points__axis_angle__point_space(const int domain_size, + const Float3ReadAttribute &axis, + const FloatReadAttribute &angles, + MutableSpan<float3> rotations) +{ + for (const int i : IndexRange(domain_size)) { + float old_rotation[3][3]; + eul_to_mat3(old_rotation, rotations[i]); + float rotation[3][3]; + axis_angle_to_mat3(rotation, axis[i], angles[i]); + float new_rotation[3][3]; + mul_m3_m3m3(new_rotation, old_rotation, rotation); + mat3_to_eul(rotations[i], new_rotation); + } +} + +static void rotate_points__euler__object_space(const int domain_size, + const Float3ReadAttribute &eulers, + MutableSpan<float3> rotations) +{ + for (const int i : IndexRange(domain_size)) { + float old_rotation[3][3]; + eul_to_mat3(old_rotation, rotations[i]); + float rotation[3][3]; + eul_to_mat3(rotation, eulers[i]); + float new_rotation[3][3]; + mul_m3_m3m3(new_rotation, rotation, old_rotation); + mat3_to_eul(rotations[i], new_rotation); + } +} + +static void rotate_points__euler__point_space(const int domain_size, + const Float3ReadAttribute &eulers, + MutableSpan<float3> rotations) +{ + for (const int i : IndexRange(domain_size)) { + float old_rotation[3][3]; + eul_to_mat3(old_rotation, rotations[i]); + float rotation[3][3]; + eul_to_mat3(rotation, eulers[i]); + float new_rotation[3][3]; + mul_m3_m3m3(new_rotation, old_rotation, rotation); + mat3_to_eul(rotations[i], new_rotation); + } +} + +static void rotate_points_on_component(GeometryComponent &component, + const GeoNodeExecParams ¶ms) +{ + const bNode &node = params.node(); + const NodeGeometryRotatePoints &storage = *(const NodeGeometryRotatePoints *)node.storage; + + WriteAttributePtr rotation_attribute = component.attribute_try_ensure_for_write( + "rotation", ATTR_DOMAIN_POINT, CD_PROP_FLOAT3); + if (!rotation_attribute) { + return; + } + + MutableSpan<float3> rotations = rotation_attribute->get_span().typed<float3>(); + const int domain_size = rotations.size(); + + if (storage.type == GEO_NODE_ROTATE_POINTS_TYPE_AXIS_ANGLE) { + Float3ReadAttribute axis = params.get_input_attribute<float3>( + "Axis", component, ATTR_DOMAIN_POINT, {0, 0, 1}); + FloatReadAttribute angles = params.get_input_attribute<float>( + "Angle", component, ATTR_DOMAIN_POINT, 0); + + if (storage.space == GEO_NODE_ROTATE_POINTS_SPACE_OBJECT) { + rotate_points__axis_angle__object_space(domain_size, axis, angles, rotations); + } + else { + rotate_points__axis_angle__point_space(domain_size, axis, angles, rotations); + } + } + else { + Float3ReadAttribute eulers = params.get_input_attribute<float3>( + "Rotation", component, ATTR_DOMAIN_POINT, {0, 0, 0}); + + if (storage.space == GEO_NODE_ROTATE_POINTS_SPACE_OBJECT) { + rotate_points__euler__object_space(domain_size, eulers, rotations); + } + else { + rotate_points__euler__point_space(domain_size, eulers, rotations); + } + } + + rotation_attribute->apply_span(); +} + +static void geo_node_rotate_points_exec(GeoNodeExecParams params) +{ + GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry"); + + if (geometry_set.has<MeshComponent>()) { + rotate_points_on_component(geometry_set.get_component_for_write<MeshComponent>(), params); + } + if (geometry_set.has<PointCloudComponent>()) { + rotate_points_on_component(geometry_set.get_component_for_write<PointCloudComponent>(), + params); + } + + params.set_output("Geometry", geometry_set); +} + +static void geo_node_rotate_points_init(bNodeTree *UNUSED(ntree), bNode *node) +{ + NodeGeometryRotatePoints *node_storage = (NodeGeometryRotatePoints *)MEM_callocN( + sizeof(NodeGeometryRotatePoints), __func__); + + node_storage->type = GEO_NODE_ROTATE_POINTS_TYPE_EULER; + node_storage->space = GEO_NODE_ROTATE_POINTS_SPACE_OBJECT; + node_storage->input_type_axis = GEO_NODE_ATTRIBUTE_INPUT_VECTOR; + node_storage->input_type_angle = GEO_NODE_ATTRIBUTE_INPUT_FLOAT; + node_storage->input_type_rotation = GEO_NODE_ATTRIBUTE_INPUT_VECTOR; + + node->storage = node_storage; +} + +static void geo_node_rotate_points_update(bNodeTree *UNUSED(ntree), bNode *node) +{ + NodeGeometryRotatePoints *node_storage = (NodeGeometryRotatePoints *)node->storage; + update_attribute_input_socket_availabilities( + *node, + "Axis", + (GeometryNodeAttributeInputMode)node_storage->input_type_axis, + node_storage->type == GEO_NODE_ROTATE_POINTS_TYPE_AXIS_ANGLE); + update_attribute_input_socket_availabilities( + *node, + "Angle", + (GeometryNodeAttributeInputMode)node_storage->input_type_angle, + node_storage->type == GEO_NODE_ROTATE_POINTS_TYPE_AXIS_ANGLE); + update_attribute_input_socket_availabilities( + *node, + "Rotation", + (GeometryNodeAttributeInputMode)node_storage->input_type_rotation, + node_storage->type == GEO_NODE_ROTATE_POINTS_TYPE_EULER); +} + +} // namespace blender::nodes + +void register_node_type_geo_rotate_points() +{ + static bNodeType ntype; + + geo_node_type_base(&ntype, GEO_NODE_ROTATE_POINTS, "Rotate Points", NODE_CLASS_GEOMETRY, 0); + node_type_socket_templates(&ntype, geo_node_rotate_points_in, geo_node_rotate_points_out); + node_type_init(&ntype, blender::nodes::geo_node_rotate_points_init); + node_type_update(&ntype, blender::nodes::geo_node_rotate_points_update); + node_type_storage( + &ntype, "NodeGeometryRotatePoints", node_free_standard_storage, node_copy_standard_storage); + ntype.geometry_node_execute = blender::nodes::geo_node_rotate_points_exec; + nodeRegisterType(&ntype); +} |