From 4599cea15dcf7563bfbcb8be148ef5f89cf2dddd Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Tue, 4 May 2021 10:16:24 +0200
Subject: Geometry Nodes: refactor instances component

The main goal of this refactor is to not store Object/Collection
pointers for every individual instance. Instead instances now
store a handle for the referenced data. The actual Object/Collection
pointers are stored in a new `InstanceReference` class.

This refactor also allows for some better optimizations further down
the line, because one does not have to search through all instances
anymore to find what data is instanced.

Furthermore, this refactor makes it easier to support instancing
`GeometrySet` or any other data that has to be owned by the
`InstancesComponent`.

Differential Revision: https://developer.blender.org/D11125
---
 .../spreadsheet_data_source_geometry.cc            | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'source/blender/editors/space_spreadsheet')

diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index bd459944cff..02ffa1259fc 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@ -276,25 +276,31 @@ std::unique_ptr<ColumnValues> InstancesDataSource::get_column_values(
 
   const int size = this->tot_rows();
   if (STREQ(column_id.name, "Name")) {
-    Span<InstancedData> instance_data = component_->instanced_data();
+    Span<int> reference_handles = component_->instance_reference_handles();
+    Span<InstanceReference> references = component_->references();
     std::unique_ptr<ColumnValues> values = column_values_from_function(
-        "Name", size, [instance_data](int index, CellValue &r_cell_value) {
-          const InstancedData &data = instance_data[index];
-          if (data.type == INSTANCE_DATA_TYPE_OBJECT) {
-            if (data.data.object != nullptr) {
-              r_cell_value.value_object = ObjectCellValue{data.data.object};
+        "Name", size, [reference_handles, references](int index, CellValue &r_cell_value) {
+          const InstanceReference &reference = references[reference_handles[index]];
+          switch (reference.type()) {
+            case InstanceReference::Type::Object: {
+              Object &object = reference.object();
+              r_cell_value.value_object = ObjectCellValue{&object};
+              break;
             }
-          }
-          else if (data.type == INSTANCE_DATA_TYPE_COLLECTION) {
-            if (data.data.collection != nullptr) {
-              r_cell_value.value_collection = CollectionCellValue{data.data.collection};
+            case InstanceReference::Type::Collection: {
+              Collection &collection = reference.collection();
+              r_cell_value.value_collection = CollectionCellValue{&collection};
+              break;
+            }
+            case InstanceReference::Type::None: {
+              break;
             }
           }
         });
     values->default_width = 8.0f;
     return values;
   }
-  Span<float4x4> transforms = component_->transforms();
+  Span<float4x4> transforms = component_->instance_transforms();
   if (STREQ(column_id.name, "Position")) {
     return column_values_from_function(
         column_id.name,
@@ -322,7 +328,7 @@ std::unique_ptr<ColumnValues> InstancesDataSource::get_column_values(
         },
         default_float3_column_width);
   }
-  Span<int> ids = component_->ids();
+  Span<int> ids = component_->instance_ids();
   if (STREQ(column_id.name, "ID")) {
     /* Make the column a bit wider by default, since the IDs tend to be large numbers. */
     return column_values_from_function(
-- 
cgit v1.2.3