diff options
Diffstat (limited to 'source/blender/blenkernel/intern/geometry_set.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/geometry_set.cc | 76 |
1 files changed, 67 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc index 01e2b841282..72ad93539b3 100644 --- a/source/blender/blenkernel/intern/geometry_set.cc +++ b/source/blender/blenkernel/intern/geometry_set.cc @@ -7,7 +7,6 @@ #include "BLT_translation.h" #include "BKE_attribute.h" -#include "BKE_attribute_access.hh" #include "BKE_curves.hh" #include "BKE_geometry_fields.hh" #include "BKE_geometry_set.hh" @@ -54,6 +53,8 @@ GeometryComponent *GeometryComponent::create(GeometryComponentType component_typ return new VolumeComponent(); case GEO_COMPONENT_TYPE_CURVE: return new CurveComponent(); + case GEO_COMPONENT_TYPE_EDIT: + return new GeometryComponentEditData(); case GEO_COMPONENT_TYPE_SIMULATION: return new SimulationComponent(); } @@ -61,6 +62,27 @@ GeometryComponent *GeometryComponent::create(GeometryComponentType component_typ return nullptr; } +int GeometryComponent::attribute_domain_size(const eAttrDomain domain) const +{ + if (this->is_empty()) { + return 0; + } + const std::optional<blender::bke::AttributeAccessor> attributes = this->attributes(); + if (attributes.has_value()) { + return attributes->domain_size(domain); + } + return 0; +} + +std::optional<blender::bke::AttributeAccessor> GeometryComponent::attributes() const +{ + return std::nullopt; +}; +std::optional<blender::bke::MutableAttributeAccessor> GeometryComponent::attributes_for_write() +{ + return std::nullopt; +} + void GeometryComponent::user_add() const { users_.fetch_add(1); @@ -157,6 +179,20 @@ void GeometrySet::keep_only(const blender::Span<GeometryComponentType> component } } +void GeometrySet::keep_only_during_modify( + const blender::Span<GeometryComponentType> component_types) +{ + Vector<GeometryComponentType> extended_types = component_types; + extended_types.append_non_duplicates(GEO_COMPONENT_TYPE_INSTANCES); + extended_types.append_non_duplicates(GEO_COMPONENT_TYPE_EDIT); + this->keep_only(extended_types); +} + +void GeometrySet::remove_geometry_during_modify() +{ + this->keep_only_during_modify({}); +} + void GeometrySet::add(const GeometryComponent &component) { BLI_assert(!components_[component.type()]); @@ -272,6 +308,13 @@ const Curves *GeometrySet::get_curves_for_read() const return (component == nullptr) ? nullptr : component->get_for_read(); } +const blender::bke::CurvesEditHints *GeometrySet::get_curve_edit_hints_for_read() const +{ + const GeometryComponentEditData *component = + this->get_component_for_read<GeometryComponentEditData>(); + return (component == nullptr) ? nullptr : component->curves_edit_hints_.get(); +} + bool GeometrySet::has_pointcloud() const { const PointCloudComponent *component = this->get_component_for_read<PointCloudComponent>(); @@ -440,6 +483,16 @@ Curves *GeometrySet::get_curves_for_write() return component == nullptr ? nullptr : component->get_for_write(); } +blender::bke::CurvesEditHints *GeometrySet::get_curve_edit_hints_for_write() +{ + if (!this->has<GeometryComponentEditData>()) { + return nullptr; + } + GeometryComponentEditData &component = + this->get_component_for_write<GeometryComponentEditData>(); + return component.curves_edit_hints_.get(); +} + void GeometrySet::attribute_foreach(const Span<GeometryComponentType> component_types, const bool include_instances, const AttributeForeachCallback callback) const @@ -451,11 +504,14 @@ void GeometrySet::attribute_foreach(const Span<GeometryComponentType> component_ continue; } const GeometryComponent &component = *this->get_component_for_read(component_type); - component.attribute_foreach( - [&](const AttributeIDRef &attribute_id, const AttributeMetaData &meta_data) { - callback(attribute_id, meta_data, component); - return true; - }); + const std::optional<AttributeAccessor> attributes = component.attributes(); + if (attributes.has_value()) { + attributes->for_all( + [&](const AttributeIDRef &attribute_id, const AttributeMetaData &meta_data) { + callback(attribute_id, meta_data, component); + return true; + }); + } } if (include_instances && this->has_instances()) { const InstancesComponent &instances = *this->get_component_for_read<InstancesComponent>(); @@ -469,7 +525,7 @@ void GeometrySet::gather_attributes_for_propagation( const Span<GeometryComponentType> component_types, const GeometryComponentType dst_component_type, bool include_instances, - blender::Map<blender::bke::AttributeIDRef, AttributeKind> &r_attributes) const + blender::Map<blender::bke::AttributeIDRef, blender::bke::AttributeKind> &r_attributes) const { using namespace blender; using namespace blender::bke; @@ -482,8 +538,8 @@ void GeometrySet::gather_attributes_for_propagation( [&](const AttributeIDRef &attribute_id, const AttributeMetaData &meta_data, const GeometryComponent &component) { - if (component.attribute_is_builtin(attribute_id)) { - if (!dummy_component->attribute_is_builtin(attribute_id)) { + if (component.attributes()->is_builtin(attribute_id)) { + if (!dummy_component->attributes()->is_builtin(attribute_id)) { /* Don't propagate built-in attributes that are not built-in on the destination * component. */ return; @@ -663,6 +719,8 @@ bool BKE_object_has_geometry_set_instances(const Object *ob) case GEO_COMPONENT_TYPE_CURVE: is_instance = !ELEM(ob->type, OB_CURVES_LEGACY, OB_FONT); break; + case GEO_COMPONENT_TYPE_EDIT: + break; } if (is_instance) { return true; |