Geometry Nodes: Rename "Field on Domain" to "Interpolate Domain"

This name doesn't require understanding of fields, and
is phrased as an action which is consistent with other nodes.
Discussed in the latest geometry nodes sub-module meeting.

2 files changed, 14 insertions, 13 deletions

diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt
index 97353000b8a..ddd8c8949b1 100644
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -67,7 +67,6 @@ set(SRC
   nodes/node_geo_edge_split.cc
   nodes/node_geo_extrude_mesh.cc
   nodes/node_geo_field_at_index.cc
-  nodes/node_geo_field_on_domain.cc
   nodes/node_geo_flip_faces.cc
   nodes/node_geo_geometry_to_instance.cc
   nodes/node_geo_image_texture.cc
@@ -77,8 +76,8 @@ set(SRC
   nodes/node_geo_input_index.cc
   nodes/node_geo_input_instance_rotation.cc
   nodes/node_geo_input_instance_scale.cc
-  nodes/node_geo_input_material.cc
   nodes/node_geo_input_material_index.cc
+  nodes/node_geo_input_material.cc
   nodes/node_geo_input_mesh_edge_angle.cc
   nodes/node_geo_input_mesh_edge_neighbors.cc
   nodes/node_geo_input_mesh_edge_vertices.cc
@@ -100,6 +99,7 @@ set(SRC
   nodes/node_geo_input_tangent.cc
   nodes/node_geo_instance_on_points.cc
   nodes/node_geo_instances_to_points.cc
+  nodes/node_geo_interpolate_domain.cc
   nodes/node_geo_is_viewport.cc
   nodes/node_geo_join_geometry.cc
   nodes/node_geo_material_replace.cc
@@ -118,9 +118,9 @@ set(SRC
   nodes/node_geo_mesh_to_points.cc
   nodes/node_geo_mesh_to_volume.cc
   nodes/node_geo_object_info.cc
-  nodes/node_geo_points.cc
   nodes/node_geo_points_to_vertices.cc
   nodes/node_geo_points_to_volume.cc
+  nodes/node_geo_points.cc
   nodes/node_geo_proximity.cc
   nodes/node_geo_raycast.cc
   nodes/node_geo_realize_instances.cc
@@ -134,8 +134,8 @@ set(SRC
   nodes/node_geo_set_curve_radius.cc
   nodes/node_geo_set_curve_tilt.cc
   nodes/node_geo_set_id.cc
-  nodes/node_geo_set_material.cc
   nodes/node_geo_set_material_index.cc
+  nodes/node_geo_set_material.cc
   nodes/node_geo_set_point_radius.cc
   nodes/node_geo_set_position.cc
   nodes/node_geo_set_shade_smooth.cc
diff --git a/source/blender/nodes/geometry/nodes/node_geo_field_on_domain.cc b/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
index abebe5de893..93203988552 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_field_on_domain.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
@@ -11,7 +11,7 @@
 
 #include "NOD_socket_search_link.hh"
 
-namespace blender::nodes::node_geo_field_on_domain_cc {
+namespace blender::nodes::node_geo_interpolate_domain_cc {
 
 static void node_declare(NodeDeclarationBuilder &b)
 {
@@ -83,14 +83,14 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
   }
 }
 
-class FieldOnDomain final : public GeometryFieldInput {
+class InterpolateDomain final : public GeometryFieldInput {
  private:
   GField src_field_;
   eAttrDomain src_domain_;
 
  public:
-  FieldOnDomain(GField field, eAttrDomain domain)
-      : GeometryFieldInput(field.cpp_type(), "Field on Domain"),
+  InterpolateDomain(GField field, eAttrDomain domain)
+      : GeometryFieldInput(field.cpp_type(), "Interpolate Domain"),
         src_field_(std::move(field)),
         src_domain_(domain)
   {
@@ -140,20 +140,21 @@ static void node_geo_exec(GeoNodeExecParams params)
     using T = decltype(dummy);
     static const std::string identifier = "Value_" + identifier_suffix(data_type);
     Field<T> src_field = params.extract_input<Field<T>>(identifier);
-    Field<T> dst_field{std::make_shared<FieldOnDomain>(std::move(src_field), domain)};
+    Field<T> dst_field{std::make_shared<InterpolateDomain>(std::move(src_field), domain)};
     params.set_output(identifier, std::move(dst_field));
   });
 }
 
-}  // namespace blender::nodes::node_geo_field_on_domain_cc
+}  // namespace blender::nodes::node_geo_interpolate_domain_cc
 
-void register_node_type_geo_field_on_domain()
+void register_node_type_geo_interpolate_domain()
 {
-  namespace file_ns = blender::nodes::node_geo_field_on_domain_cc;
+  namespace file_ns = blender::nodes::node_geo_interpolate_domain_cc;
 
   static bNodeType ntype;
 
-  geo_node_type_base(&ntype, GEO_NODE_FIELD_ON_DOMAIN, "Field on Domain", NODE_CLASS_CONVERTER);
+  geo_node_type_base(
+      &ntype, GEO_NODE_INTERPOLATE_DOMAIN, "Interpolate Domain", NODE_CLASS_CONVERTER);
   ntype.geometry_node_execute = file_ns::node_geo_exec;
   ntype.declare = file_ns::node_declare;
   ntype.draw_buttons = file_ns::node_layout;