Point Cloud: Remove redundant custom data pointers

Similar to e9f82d3dc7eebadcc52, but for point clouds instead.

Differential Revision: https://developer.blender.org/D15487

4 files changed, 45 insertions, 20 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
index 3394a7cad62..3d0bc9cd462 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
@@ -149,12 +149,17 @@ static Mesh *compute_hull(const GeometrySet &geometry_set)
 
   if (geometry_set.has_pointcloud()) {
     count++;
-    span_count++;
     const PointCloudComponent *component =
         geometry_set.get_component_for_read<PointCloudComponent>();
     const PointCloud *pointcloud = component->get_for_read();
-    positions_span = {reinterpret_cast<const float3 *>(pointcloud->co), pointcloud->totpoint};
-    total_num += pointcloud->totpoint;
+    const bke::AttributeAccessor attributes = bke::pointcloud_attributes(*pointcloud);
+    const VArray<float3> positions = attributes.lookup_or_default<float3>(
+        "position", ATTR_DOMAIN_POINT, float3(0));
+    if (positions.is_span()) {
+      span_count++;
+      positions_span = positions.get_internal_span();
+    }
+    total_num += positions.size();
   }
 
   if (geometry_set.has_curves()) {
diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
index faf5b7f65fa..44793926bbd 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
@@ -497,8 +497,17 @@ static void point_distribution_calculate(GeometrySet &geometry_set,
   }
 
   PointCloud *pointcloud = BKE_pointcloud_new_nomain(positions.size());
-  memcpy(pointcloud->co, positions.data(), sizeof(float3) * positions.size());
-  uninitialized_fill_n(pointcloud->radius, pointcloud->totpoint, 0.05f);
+  bke::MutableAttributeAccessor point_attributes = bke::pointcloud_attributes_for_write(
+      *pointcloud);
+  bke::SpanAttributeWriter<float3> point_positions =
+      point_attributes.lookup_or_add_for_write_only_span<float3>("position", ATTR_DOMAIN_POINT);
+  bke::SpanAttributeWriter<float> point_radii =
+      point_attributes.lookup_or_add_for_write_only_span<float>("radius", ATTR_DOMAIN_POINT);
+  point_positions.span.copy_from(positions);
+  point_radii.span.fill(0.05f);
+  point_positions.finish();
+  point_radii.finish();
+
   geometry_set.replace_pointcloud(pointcloud);
 
   PointCloudComponent &point_component =
diff --git a/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc
index edbe6e1593f..b3f04186c63 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc
@@ -51,16 +51,24 @@ static void convert_instances_to_points(GeometrySet &geometry_set,
   if (selection.is_empty()) {
     return;
   }
+  const VArray<float3> &positions = evaluator.get_evaluated<float3>(0);
+  const VArray<float> radii = evaluator.get_evaluated<float>(1);
 
   PointCloud *pointcloud = BKE_pointcloud_new_nomain(selection.size());
   geometry_set.replace_pointcloud(pointcloud);
 
-  PointCloudComponent &points = geometry_set.get_component_for_write<PointCloudComponent>();
+  bke::MutableAttributeAccessor point_attributes = bke::pointcloud_attributes_for_write(
+      *pointcloud);
 
-  const VArray<float3> &positions = evaluator.get_evaluated<float3>(0);
-  copy_attribute_to_points(positions, selection, {(float3 *)pointcloud->co, pointcloud->totpoint});
-  const VArray<float> radii = evaluator.get_evaluated<float>(1);
-  copy_attribute_to_points(radii, selection, {pointcloud->radius, pointcloud->totpoint});
+  bke::SpanAttributeWriter<float3> point_positions =
+      point_attributes.lookup_or_add_for_write_only_span<float3>("position", ATTR_DOMAIN_POINT);
+  bke::SpanAttributeWriter<float> point_radii =
+      point_attributes.lookup_or_add_for_write_only_span<float>("radius", ATTR_DOMAIN_POINT);
+
+  copy_attribute_to_points(positions, selection, point_positions.span);
+  copy_attribute_to_points(radii, selection, point_radii.span);
+  point_positions.finish();
+  point_radii.finish();
 
   Map<AttributeIDRef, AttributeKind> attributes_to_propagate;
   geometry_set.gather_attributes_for_propagation({GEO_COMPONENT_TYPE_INSTANCES},
@@ -78,7 +86,7 @@ static void convert_instances_to_points(GeometrySet &geometry_set,
     const GVArray src = instances.attributes()->lookup_or_default(
         attribute_id, ATTR_DOMAIN_INSTANCE, attribute_kind.data_type);
     BLI_assert(src);
-    GSpanAttributeWriter dst = points.attributes_for_write()->lookup_or_add_for_write_only_span(
+    GSpanAttributeWriter dst = point_attributes.lookup_or_add_for_write_only_span(
         attribute_id, ATTR_DOMAIN_POINT, attribute_kind.data_type);
     BLI_assert(dst);
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
index e95db205920..8e65e73d1e2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_transform.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
@@ -47,21 +47,24 @@ static void transform_mesh(Mesh &mesh, const float4x4 &transform)
 
 static void translate_pointcloud(PointCloud &pointcloud, const float3 translation)
 {
-  CustomData_duplicate_referenced_layer(&pointcloud.pdata, CD_PROP_FLOAT3, pointcloud.totpoint);
-  BKE_pointcloud_update_customdata_pointers(&pointcloud);
-  for (const int i : IndexRange(pointcloud.totpoint)) {
-    add_v3_v3(pointcloud.co[i], translation);
+  MutableAttributeAccessor attributes = bke::pointcloud_attributes_for_write(pointcloud);
+  SpanAttributeWriter position = attributes.lookup_or_add_for_write_span<float3>(
+      "position", ATTR_DOMAIN_POINT);
+  for (const int i : position.span.index_range()) {
+    position.span[i] += translation;
   }
+  position.finish();
 }
 
 static void transform_pointcloud(PointCloud &pointcloud, const float4x4 &transform)
 {
-  CustomData_duplicate_referenced_layer(&pointcloud.pdata, CD_PROP_FLOAT3, pointcloud.totpoint);
-  BKE_pointcloud_update_customdata_pointers(&pointcloud);
-  for (const int i : IndexRange(pointcloud.totpoint)) {
-    float3 &co = *(float3 *)pointcloud.co[i];
-    co = transform * co;
+  MutableAttributeAccessor attributes = bke::pointcloud_attributes_for_write(pointcloud);
+  SpanAttributeWriter position = attributes.lookup_or_add_for_write_span<float3>(
+      "position", ATTR_DOMAIN_POINT);
+  for (const int i : position.span.index_range()) {
+    position.span[i] = transform * position.span[i];
   }
+  position.finish();
 }
 
 static void translate_instances(InstancesComponent &instances, const float3 translation)