1 files changed, 51 insertions, 19 deletions

diff --git a/source/blender/nodes/geometry/node_geometry_util.hh b/source/blender/nodes/geometry/node_geometry_util.hh
index 015ac0de002..dddc3527124 100644
--- a/source/blender/nodes/geometry/node_geometry_util.hh
+++ b/source/blender/nodes/geometry/node_geometry_util.hh
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "BLI_float3.hh"
+#include "BLI_math_vec_types.hh"
 #include "BLI_utildefines.h"
 
 #include "MEM_guardedalloc.h"
@@ -32,41 +32,59 @@
 #include "NOD_geometry.h"
 #include "NOD_geometry_exec.hh"
 #include "NOD_socket_declarations.hh"
+#include "NOD_socket_declarations_geometry.hh"
 
 #include "node_util.h"
 
-void geo_node_type_base(
-    struct bNodeType *ntype, int type, const char *name, short nclass, short flag);
+void geo_node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass);
 bool geo_node_poll_default(struct bNodeType *ntype,
                            struct bNodeTree *ntree,
                            const char **r_disabled_hint);
 
 namespace blender::nodes {
-void update_attribute_input_socket_availabilities(bNode &node,
+/**
+ * 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(bNodeTree &ntree,
+                                                  bNode &node,
                                                   const StringRef name,
-                                                  const GeometryNodeAttributeInputMode mode,
-                                                  const bool name_is_available = true);
+                                                  GeometryNodeAttributeInputMode mode,
+                                                  bool name_is_available = true);
 
 Array<uint32_t> get_geometry_element_ids_as_uints(const GeometryComponent &component,
-                                                  const AttributeDomain domain);
+                                                  AttributeDomain domain);
 
-void transform_mesh(Mesh *mesh,
+void transform_mesh(Mesh &mesh,
                     const float3 translation,
                     const float3 rotation,
                     const float3 scale);
 
-Mesh *create_line_mesh(const float3 start, const float3 delta, const int count);
+void transform_geometry_set(GeometrySet &geometry,
+                            const float4x4 &transform,
+                            const Depsgraph &depsgraph);
 
-Mesh *create_grid_mesh(const int verts_x,
-                       const int verts_y,
-                       const float size_x,
-                       const float size_y);
+Mesh *create_line_mesh(const float3 start, const float3 delta, int count);
 
-Mesh *create_cylinder_or_cone_mesh(const float radius_top,
-                                   const float radius_bottom,
-                                   const float depth,
-                                   const int verts_num,
-                                   const GeometryNodeMeshCircleFillType fill_type);
+Mesh *create_grid_mesh(int verts_x, int verts_y, float size_x, float size_y);
+
+struct ConeAttributeOutputs {
+  StrongAnonymousAttributeID top_id;
+  StrongAnonymousAttributeID bottom_id;
+  StrongAnonymousAttributeID side_id;
+};
+
+Mesh *create_cylinder_or_cone_mesh(float radius_top,
+                                   float radius_bottom,
+                                   float depth,
+                                   int circle_segments,
+                                   int side_segments,
+                                   int fill_segments,
+                                   GeometryNodeMeshCircleFillType fill_type,
+                                   ConeAttributeOutputs &attribute_outputs);
 
 Mesh *create_cuboid_mesh(float3 size, int verts_x, int verts_y, int verts_z);
 
@@ -76,7 +94,18 @@ Mesh *create_cuboid_mesh(float3 size, int verts_x, int verts_y, int verts_z);
 void copy_point_attributes_based_on_mask(const GeometryComponent &in_component,
                                          GeometryComponent &result_component,
                                          Span<bool> masks,
-                                         const bool invert);
+                                         bool invert);
+/**
+ * Returns the parts of the geometry that are on the selection for the given domain. If the domain
+ * is not applicable for the component, e.g. face domain for point cloud, nothing happens to that
+ * component. If no component can work with the domain, then `error_message` is set to true.
+ */
+void separate_geometry(GeometrySet &geometry_set,
+                       AttributeDomain domain,
+                       GeometryNodeDeleteGeometryMode mode,
+                       const Field<bool> &selection_field,
+                       bool invert,
+                       bool &r_is_error);
 
 struct CurveToPointsResults {
   int result_size;
@@ -100,4 +129,7 @@ void curve_create_default_rotation_attribute(Span<float3> tangents,
                                              Span<float3> normals,
                                              MutableSpan<float3> rotations);
 
+std::optional<CustomDataType> node_data_type_to_custom_data_type(eNodeSocketDatatype type);
+std::optional<CustomDataType> node_socket_to_custom_data_type(const bNodeSocket &socket);
+
 }  // namespace blender::nodes