Point Cloud: Remove redundant custom data pointers

Similar to e9f82d3dc7eebadcc52, but for point clouds instead.

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

2 files changed, 22 insertions, 14 deletions

diff --git a/source/blender/geometry/intern/point_merge_by_distance.cc b/source/blender/geometry/intern/point_merge_by_distance.cc
index 40bc02cbd34..ac10f4ef00c 100644
--- a/source/blender/geometry/intern/point_merge_by_distance.cc
+++ b/source/blender/geometry/intern/point_merge_by_distance.cc
@@ -18,8 +18,10 @@ PointCloud *point_merge_by_distance(const PointCloudComponent &src_points,
                                     const IndexMask selection)
 {
   const PointCloud &src_pointcloud = *src_points.get_for_read();
-  const int src_size = src_pointcloud.totpoint;
-  Span<float3> positions{reinterpret_cast<float3 *>(src_pointcloud.co), src_size};
+  bke::AttributeAccessor attributes = bke::pointcloud_attributes(src_pointcloud);
+  VArraySpan<float3> positions = attributes.lookup_or_default<float3>(
+      "position", ATTR_DOMAIN_POINT, float3(0));
+  const int src_size = positions.size();
 
   /* Create the KD tree based on only the selected points, to speed up merge detection and
    * balancing. */
@@ -106,10 +108,10 @@ PointCloud *point_merge_by_distance(const PointCloudComponent &src_points,
 
   const bke::AttributeAccessor src_attributes = *src_points.attributes();
   bke::MutableAttributeAccessor dst_attributes = *dst_points.attributes_for_write();
-  Set<bke::AttributeIDRef> attributes = src_attributes.all_ids();
+  Set<bke::AttributeIDRef> attribute_ids = src_attributes.all_ids();
 
   /* Transfer the ID attribute if it exists, using the ID of the first merged point. */
-  if (attributes.contains("id")) {
+  if (attribute_ids.contains("id")) {
     VArraySpan<int> src = src_attributes.lookup_or_default<int>("id", ATTR_DOMAIN_POINT, 0);
     bke::SpanAttributeWriter<int> dst = dst_attributes.lookup_or_add_for_write_only_span<int>(
         "id", ATTR_DOMAIN_POINT);
@@ -122,11 +124,11 @@ PointCloud *point_merge_by_distance(const PointCloudComponent &src_points,
     });
 
     dst.finish();
-    attributes.remove_contained("id");
+    attribute_ids.remove_contained("id");
   }
 
   /* Transfer all other attributes. */
-  for (const bke::AttributeIDRef &id : attributes) {
+  for (const bke::AttributeIDRef &id : attribute_ids) {
     if (!id.should_be_kept()) {
       continue;
     }
diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc
index 25bcead09b4..0544f304283 100644
--- a/source/blender/geometry/intern/realize_instances.cc
+++ b/source/blender/geometry/intern/realize_instances.cc
@@ -69,6 +69,7 @@ struct PointCloudRealizeInfo {
   /** Matches the order stored in #AllPointCloudsInfo.attributes. */
   Array<std::optional<GVArraySpan>> attributes;
   /** Id attribute on the point cloud. If there are no ids, this #Span is empty. */
+  Span<float3> positions;
   Span<int> stored_ids;
 };
 
@@ -665,6 +666,9 @@ static AllPointCloudsInfo preprocess_pointclouds(const GeometrySet &geometry_set
         pointcloud_info.stored_ids = ids_attribute.varray.get_internal_span().typed<int>();
       }
     }
+    const VArray<float3> position_attribute = attributes.lookup_or_default<float3>(
+        "position", ATTR_DOMAIN_POINT, float3(0));
+    pointcloud_info.positions = position_attribute.get_internal_span();
   }
   return info;
 }
@@ -673,18 +677,16 @@ static void execute_realize_pointcloud_task(
     const RealizeInstancesOptions &options,
     const RealizePointCloudTask &task,
     const OrderedAttributes &ordered_attributes,
-    PointCloud &dst_pointcloud,
     MutableSpan<GSpanAttributeWriter> dst_attribute_writers,
-    MutableSpan<int> all_dst_ids)
+    MutableSpan<int> all_dst_ids,
+    MutableSpan<float3> all_dst_positions)
 {
   const PointCloudRealizeInfo &pointcloud_info = *task.pointcloud_info;
   const PointCloud &pointcloud = *pointcloud_info.pointcloud;
-  const Span<float3> src_positions{(float3 *)pointcloud.co, pointcloud.totpoint};
   const IndexRange point_slice{task.start_index, pointcloud.totpoint};
-  MutableSpan<float3> dst_positions{(float3 *)dst_pointcloud.co + task.start_index,
-                                    pointcloud.totpoint};
 
-  copy_transformed_positions(src_positions, task.transform, dst_positions);
+  copy_transformed_positions(
+      pointcloud_info.positions, task.transform, all_dst_positions.slice(point_slice));
 
   /* Create point ids. */
   if (!all_dst_ids.is_empty()) {
@@ -726,6 +728,9 @@ static void execute_realize_pointcloud_tasks(const RealizeInstancesOptions &opti
   bke::MutableAttributeAccessor dst_attributes = bke::pointcloud_attributes_for_write(
       *dst_pointcloud);
 
+  SpanAttributeWriter<float3> positions = dst_attributes.lookup_or_add_for_write_only_span<float3>(
+      "position", ATTR_DOMAIN_POINT);
+
   /* Prepare id attribute. */
   SpanAttributeWriter<int> point_ids;
   if (all_pointclouds_info.create_id_attribute) {
@@ -748,9 +753,9 @@ static void execute_realize_pointcloud_tasks(const RealizeInstancesOptions &opti
       execute_realize_pointcloud_task(options,
                                       task,
                                       ordered_attributes,
-                                      *dst_pointcloud,
                                       dst_attribute_writers,
-                                      point_ids.span);
+                                      point_ids.span,
+                                      positions.span);
     }
   });
 
@@ -758,6 +763,7 @@ static void execute_realize_pointcloud_tasks(const RealizeInstancesOptions &opti
   for (GSpanAttributeWriter &dst_attribute : dst_attribute_writers) {
     dst_attribute.finish();
   }
+  positions.finish();
   if (point_ids) {
     point_ids.finish();
   }