1 files changed, 44 insertions, 38 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
index 2c55a255b5d..8322de20d20 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_transform.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
@@ -35,15 +35,6 @@
 
 namespace blender::nodes {
 
-static void geo_node_transform_declare(NodeDeclarationBuilder &b)
-{
-  b.add_input<decl::Geometry>(N_("Geometry"));
-  b.add_input<decl::Vector>(N_("Translation")).subtype(PROP_TRANSLATION);
-  b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER);
-  b.add_input<decl::Vector>(N_("Scale")).default_value({1, 1, 1}).subtype(PROP_XYZ);
-  b.add_output<decl::Geometry>(N_("Geometry"));
-}
-
 static bool use_translate(const float3 rotation, const float3 scale)
 {
   if (compare_ff(rotation.length_squared(), 0.0f, 1e-9f) != 1) {
@@ -69,15 +60,6 @@ static void transform_mesh(Mesh &mesh, const float4x4 &transform)
   BKE_mesh_normals_tag_dirty(&mesh);
 }
 
-void transform_mesh(Mesh &mesh,
-                    const float3 translation,
-                    const float3 rotation,
-                    const float3 scale)
-{
-  const float4x4 matrix = float4x4::from_loc_eul_scale(translation, rotation, scale);
-  transform_mesh(mesh, matrix);
-}
-
 static void translate_pointcloud(PointCloud &pointcloud, const float3 translation)
 {
   CustomData_duplicate_referenced_layer(&pointcloud.pdata, CD_PROP_FLOAT3, pointcloud.totpoint);
@@ -153,49 +135,71 @@ static void translate_volume(Volume &volume, const float3 translation, const Dep
   transform_volume(volume, float4x4::from_location(translation), depsgraph);
 }
 
-void transform_geometry_set(GeometrySet &geometry,
-                            const float4x4 &transform,
-                            const Depsgraph &depsgraph)
+static void translate_geometry_set(GeometrySet &geometry,
+                                   const float3 translation,
+                                   const Depsgraph &depsgraph)
 {
   if (CurveEval *curve = geometry.get_curve_for_write()) {
-    curve->transform(transform);
+    curve->translate(translation);
   }
   if (Mesh *mesh = geometry.get_mesh_for_write()) {
-    transform_mesh(*mesh, transform);
+    translate_mesh(*mesh, translation);
   }
   if (PointCloud *pointcloud = geometry.get_pointcloud_for_write()) {
-    transform_pointcloud(*pointcloud, transform);
+    translate_pointcloud(*pointcloud, translation);
   }
   if (Volume *volume = geometry.get_volume_for_write()) {
-    transform_volume(*volume, transform, depsgraph);
+    translate_volume(*volume, translation, depsgraph);
   }
   if (geometry.has_instances()) {
-    transform_instances(geometry.get_component_for_write<InstancesComponent>(), transform);
+    translate_instances(geometry.get_component_for_write<InstancesComponent>(), translation);
   }
 }
 
-static void translate_geometry_set(GeometrySet &geometry,
-                                   const float3 translation,
-                                   const Depsgraph &depsgraph)
+void transform_geometry_set(GeometrySet &geometry,
+                            const float4x4 &transform,
+                            const Depsgraph &depsgraph)
 {
   if (CurveEval *curve = geometry.get_curve_for_write()) {
-    curve->translate(translation);
+    curve->transform(transform);
   }
   if (Mesh *mesh = geometry.get_mesh_for_write()) {
-    translate_mesh(*mesh, translation);
+    transform_mesh(*mesh, transform);
   }
   if (PointCloud *pointcloud = geometry.get_pointcloud_for_write()) {
-    translate_pointcloud(*pointcloud, translation);
+    transform_pointcloud(*pointcloud, transform);
   }
   if (Volume *volume = geometry.get_volume_for_write()) {
-    translate_volume(*volume, translation, depsgraph);
+    transform_volume(*volume, transform, depsgraph);
   }
   if (geometry.has_instances()) {
-    translate_instances(geometry.get_component_for_write<InstancesComponent>(), translation);
+    transform_instances(geometry.get_component_for_write<InstancesComponent>(), transform);
   }
 }
 
-static void geo_node_transform_exec(GeoNodeExecParams params)
+void transform_mesh(Mesh &mesh,
+                    const float3 translation,
+                    const float3 rotation,
+                    const float3 scale)
+{
+  const float4x4 matrix = float4x4::from_loc_eul_scale(translation, rotation, scale);
+  transform_mesh(mesh, matrix);
+}
+
+}  // namespace blender::nodes
+
+namespace blender::nodes::node_geo_transform_cc {
+
+static void node_declare(NodeDeclarationBuilder &b)
+{
+  b.add_input<decl::Geometry>(N_("Geometry"));
+  b.add_input<decl::Vector>(N_("Translation")).subtype(PROP_TRANSLATION);
+  b.add_input<decl::Vector>(N_("Rotation")).subtype(PROP_EULER);
+  b.add_input<decl::Vector>(N_("Scale")).default_value({1, 1, 1}).subtype(PROP_XYZ);
+  b.add_output<decl::Geometry>(N_("Geometry"));
+}
+
+static void node_geo_exec(GeoNodeExecParams params)
 {
   GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
   const float3 translation = params.extract_input<float3>("Translation");
@@ -214,14 +218,16 @@ static void geo_node_transform_exec(GeoNodeExecParams params)
 
   params.set_output("Geometry", std::move(geometry_set));
 }
-}  // namespace blender::nodes
+}  // namespace blender::nodes::node_geo_transform_cc
 
 void register_node_type_geo_transform()
 {
+  namespace file_ns = blender::nodes::node_geo_transform_cc;
+
   static bNodeType ntype;
 
   geo_node_type_base(&ntype, GEO_NODE_TRANSFORM, "Transform", NODE_CLASS_GEOMETRY, 0);
-  ntype.declare = blender::nodes::geo_node_transform_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_transform_exec;
+  ntype.declare = file_ns::node_declare;
+  ntype.geometry_node_execute = file_ns::node_geo_exec;
   nodeRegisterType(&ntype);
 }