diff options
author | Jacques Lucke <jacques@blender.org> | 2021-04-08 18:35:06 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-04-08 18:35:37 +0300 |
commit | c6ff722a1fcc632eacebcfc94417df466742ce5f (patch) | |
tree | 0b86327190d845c1d6b6975434caf5e2d3ac2528 /source/blender/blenkernel/intern | |
parent | 5e77ff79ccdaffb2df4d54c97f17359c017c9b85 (diff) |
Spreadsheet: support showing data of specific node
Previously, the spreadsheet editor could only show data of the original
and of the final evaluated object. Now it is possible to show the data
at some intermediate stages too.
For that the mode has to be set to "Node" in the spreadsheet editor.
Furthermore, the preview of a specific node has to be activated by
clicking the new icon in the header of geometry nodes.
The exact ui of this feature might be refined in upcoming commits.
It is already very useful for debugging node groups in it's current
state though.
Differential Revision: https://developer.blender.org/D10875
Diffstat (limited to 'source/blender/blenkernel/intern')
6 files changed, 83 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/geometry_component_instances.cc b/source/blender/blenkernel/intern/geometry_component_instances.cc index 68c551645d2..11526eda762 100644 --- a/source/blender/blenkernel/intern/geometry_component_instances.cc +++ b/source/blender/blenkernel/intern/geometry_component_instances.cc @@ -108,6 +108,18 @@ bool InstancesComponent::is_empty() const return transforms_.size() == 0; } +bool InstancesComponent::owns_direct_data() const +{ + /* The object and collection instances are not direct data. Instance transforms are direct data + * and are always owned. Therefore, instance components always own all their direct data. */ + return true; +} + +void InstancesComponent::ensure_owns_direct_data() +{ + BLI_assert(this->is_mutable()); +} + static blender::Array<int> generate_unique_instance_ids(Span<int> original_ids) { using namespace blender; diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc index f0f46717744..df451b5db1d 100644 --- a/source/blender/blenkernel/intern/geometry_component_mesh.cc +++ b/source/blender/blenkernel/intern/geometry_component_mesh.cc @@ -157,6 +157,20 @@ bool MeshComponent::is_empty() const return mesh_ == nullptr; } +bool MeshComponent::owns_direct_data() const +{ + return ownership_ == GeometryOwnershipType::Owned; +} + +void MeshComponent::ensure_owns_direct_data() +{ + BLI_assert(this->is_mutable()); + if (ownership_ != GeometryOwnershipType::Owned) { + mesh_ = BKE_mesh_copy_for_eval(mesh_, false); + ownership_ = GeometryOwnershipType::Owned; + } +} + /** \} */ /* -------------------------------------------------------------------- */ diff --git a/source/blender/blenkernel/intern/geometry_component_pointcloud.cc b/source/blender/blenkernel/intern/geometry_component_pointcloud.cc index 32c4ee8a6a6..135de14b4f7 100644 --- a/source/blender/blenkernel/intern/geometry_component_pointcloud.cc +++ b/source/blender/blenkernel/intern/geometry_component_pointcloud.cc @@ -107,6 +107,20 @@ bool PointCloudComponent::is_empty() const return pointcloud_ == nullptr; } +bool PointCloudComponent::owns_direct_data() const +{ + return ownership_ == GeometryOwnershipType::Owned; +} + +void PointCloudComponent::ensure_owns_direct_data() +{ + BLI_assert(this->is_mutable()); + if (ownership_ != GeometryOwnershipType::Owned) { + pointcloud_ = BKE_pointcloud_copy_for_eval(pointcloud_, false); + ownership_ = GeometryOwnershipType::Owned; + } +} + /** \} */ /* -------------------------------------------------------------------- */ diff --git a/source/blender/blenkernel/intern/geometry_component_volume.cc b/source/blender/blenkernel/intern/geometry_component_volume.cc index fd2327e0bf5..94ed07a63de 100644 --- a/source/blender/blenkernel/intern/geometry_component_volume.cc +++ b/source/blender/blenkernel/intern/geometry_component_volume.cc @@ -97,4 +97,18 @@ Volume *VolumeComponent::get_for_write() return volume_; } +bool VolumeComponent::owns_direct_data() const +{ + return ownership_ == GeometryOwnershipType::Owned; +} + +void VolumeComponent::ensure_owns_direct_data() +{ + BLI_assert(this->is_mutable()); + if (ownership_ != GeometryOwnershipType::Owned) { + volume_ = BKE_volume_copy_for_eval(volume_, false); + ownership_ = GeometryOwnershipType::Owned; + } +} + /** \} */ diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc index 3b027c05f39..fd86f4e550c 100644 --- a/source/blender/blenkernel/intern/geometry_set.cc +++ b/source/blender/blenkernel/intern/geometry_set.cc @@ -207,6 +207,19 @@ void GeometrySet::clear() components_.clear(); } +/* Make sure that the geometry can be cached. This does not ensure ownership of object/collection + * instances. */ +void GeometrySet::ensure_owns_direct_data() +{ + for (GeometryComponentType type : components_.keys()) { + const GeometryComponent *component = this->get_component_for_read(type); + if (!component->owns_direct_data()) { + GeometryComponent &component_for_write = this->get_component_for_write(type); + component_for_write.ensure_owns_direct_data(); + } + } +} + /* Returns a read-only mesh or null. */ const Mesh *GeometrySet::get_mesh_for_read() const { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 1c56312b38b..002071fac30 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1756,6 +1756,10 @@ void BKE_object_free_derived_caches(Object *ob) BKE_geometry_set_free(ob->runtime.geometry_set_eval); ob->runtime.geometry_set_eval = NULL; } + if (ob->runtime.geometry_set_preview != NULL) { + BKE_geometry_set_free(ob->runtime.geometry_set_preview); + ob->runtime.geometry_set_preview = NULL; + } } void BKE_object_free_caches(Object *object) @@ -1806,6 +1810,18 @@ void BKE_object_free_caches(Object *object) } } +/* Can be called from multiple threads. */ +void BKE_object_set_preview_geometry_set(Object *ob, struct GeometrySet *geometry_set) +{ + static ThreadMutex mutex = BLI_MUTEX_INITIALIZER; + BLI_mutex_lock(&mutex); + if (ob->runtime.geometry_set_preview != NULL) { + BKE_geometry_set_free(ob->runtime.geometry_set_preview); + } + ob->runtime.geometry_set_preview = geometry_set; + BLI_mutex_unlock(&mutex); +} + /** * Actual check for internal data, not context or flags. */ |