Currently attribute names are often added to a hash map that doesn't maintain the original order. This is convenient for developers but it's better for users if attributes aren't arbitrarily reordered. Instead, use `VectorSet` which gives the benefit of a hash map but maintains the insertion order. The main downside is the loss of O(1) removal which we benefited from in a few cases. I used string comparison instead for now. Fixes #144491, #122994 Pull Request: https://projects.blender.org/blender/blender/pulls/145668
227 lines
8.5 KiB
C++
227 lines
8.5 KiB
C++
/* SPDX-FileCopyrightText: 2023 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
#include "BLI_array_utils.hh"
|
|
|
|
#include "GEO_join_geometries.hh"
|
|
#include "GEO_realize_instances.hh"
|
|
|
|
#include "BKE_instances.hh"
|
|
|
|
namespace blender::geometry {
|
|
|
|
using bke::AttributeDomainAndType;
|
|
using bke::GeometryComponent;
|
|
using bke::GeometrySet;
|
|
|
|
static GeometrySet::GatheredAttributes get_final_attribute_info(
|
|
const Span<const GeometryComponent *> components, const Span<StringRef> ignored_attributes)
|
|
{
|
|
GeometrySet::GatheredAttributes info;
|
|
|
|
for (const GeometryComponent *component : components) {
|
|
component->attributes()->foreach_attribute([&](const bke::AttributeIter &iter) {
|
|
if (ignored_attributes.contains(iter.name)) {
|
|
return;
|
|
}
|
|
if (iter.data_type == bke::AttrType::String) {
|
|
return;
|
|
}
|
|
info.add(iter.name, AttributeDomainAndType{iter.domain, iter.data_type});
|
|
});
|
|
}
|
|
|
|
return info;
|
|
}
|
|
|
|
static void fill_new_attribute(const Span<const GeometryComponent *> src_components,
|
|
const StringRef attribute_id,
|
|
const bke::AttrType data_type,
|
|
const bke::AttrDomain domain,
|
|
GMutableSpan dst_span)
|
|
{
|
|
const CPPType &cpp_type = bke::attribute_type_to_cpp_type(data_type);
|
|
|
|
int offset = 0;
|
|
for (const GeometryComponent *component : src_components) {
|
|
const int domain_num = component->attribute_domain_size(domain);
|
|
if (domain_num == 0) {
|
|
continue;
|
|
}
|
|
GVArray read_attribute = *component->attributes()->lookup_or_default(
|
|
attribute_id, domain, data_type, nullptr);
|
|
|
|
GVArraySpan src_span{read_attribute};
|
|
const void *src_buffer = src_span.data();
|
|
void *dst_buffer = dst_span[offset];
|
|
cpp_type.copy_assign_n(src_buffer, dst_buffer, domain_num);
|
|
|
|
offset += domain_num;
|
|
}
|
|
}
|
|
|
|
void join_attributes(const Span<const GeometryComponent *> src_components,
|
|
GeometryComponent &result,
|
|
const Span<StringRef> ignored_attributes)
|
|
{
|
|
const GeometrySet::GatheredAttributes info = get_final_attribute_info(src_components,
|
|
ignored_attributes);
|
|
|
|
for (const int i : info.names.index_range()) {
|
|
const StringRef attribute_id = info.names[i];
|
|
const AttributeDomainAndType &meta_data = info.kinds[i];
|
|
|
|
bke::GSpanAttributeWriter write_attribute =
|
|
result.attributes_for_write()->lookup_or_add_for_write_only_span(
|
|
attribute_id, meta_data.domain, meta_data.data_type);
|
|
if (!write_attribute) {
|
|
continue;
|
|
}
|
|
fill_new_attribute(
|
|
src_components, attribute_id, meta_data.data_type, meta_data.domain, write_attribute.span);
|
|
write_attribute.finish();
|
|
}
|
|
}
|
|
|
|
static void join_instances(const Span<const GeometryComponent *> src_components,
|
|
const bool allow_merging_instance_references,
|
|
GeometrySet &result)
|
|
{
|
|
Array<int> offsets_data(src_components.size() + 1);
|
|
for (const int i : src_components.index_range()) {
|
|
const auto &src_component = static_cast<const bke::InstancesComponent &>(*src_components[i]);
|
|
offsets_data[i] = src_component.get()->instances_num();
|
|
}
|
|
const OffsetIndices offsets = offset_indices::accumulate_counts_to_offsets(offsets_data);
|
|
|
|
std::unique_ptr<bke::Instances> dst_instances = std::make_unique<bke::Instances>();
|
|
dst_instances->resize(offsets.total_size());
|
|
|
|
MutableSpan<int> all_handles = dst_instances->reference_handles_for_write();
|
|
|
|
Map<std::reference_wrapper<const bke::InstanceReference>, int> new_handle_by_src_reference_cache;
|
|
|
|
for (const int i : src_components.index_range()) {
|
|
const auto &src_component = static_cast<const bke::InstancesComponent &>(*src_components[i]);
|
|
const bke::Instances &src_instances = *src_component.get();
|
|
|
|
const Span<bke::InstanceReference> src_references = src_instances.references();
|
|
Array<int> handle_map(src_references.size());
|
|
for (const int src_handle : src_references.index_range()) {
|
|
const bke::InstanceReference &src_reference = src_references[src_handle];
|
|
if (allow_merging_instance_references) {
|
|
handle_map[src_handle] = new_handle_by_src_reference_cache.lookup_or_add_cb(
|
|
src_reference, [&]() { return dst_instances->add_new_reference(src_reference); });
|
|
}
|
|
else {
|
|
handle_map[src_handle] = dst_instances->add_new_reference(src_reference);
|
|
}
|
|
}
|
|
|
|
const IndexRange dst_range = offsets[i];
|
|
|
|
const Span<int> src_handles = src_instances.reference_handles();
|
|
array_utils::gather(handle_map.as_span(), src_handles, all_handles.slice(dst_range));
|
|
}
|
|
|
|
result.replace_instances(dst_instances.release());
|
|
auto &dst_component = result.get_component_for_write<bke::InstancesComponent>();
|
|
join_attributes(src_components, dst_component, {".reference_index"});
|
|
}
|
|
|
|
static void join_volumes(const Span<const GeometryComponent *> /*src_components*/,
|
|
GeometrySet & /*result*/)
|
|
{
|
|
/* Not yet supported. Joining volume grids with the same name requires resampling of at least one
|
|
* of the grids. The cell size of the resulting volume has to be determined somehow. */
|
|
}
|
|
|
|
static void join_component_type(const bke::GeometryComponent::Type component_type,
|
|
const Span<GeometrySet> src_geometry_sets,
|
|
const bke::AttributeFilter &attribute_filter,
|
|
const bool allow_merging_instance_references,
|
|
GeometrySet &result)
|
|
{
|
|
Vector<const GeometryComponent *> components;
|
|
for (const GeometrySet &geometry_set : src_geometry_sets) {
|
|
const GeometryComponent *component = geometry_set.get_component(component_type);
|
|
if (component != nullptr && !component->is_empty()) {
|
|
components.append(component);
|
|
}
|
|
}
|
|
|
|
if (components.is_empty()) {
|
|
return;
|
|
}
|
|
if (components.size() == 1) {
|
|
result.add(*components.first());
|
|
return;
|
|
}
|
|
|
|
switch (component_type) {
|
|
case bke::GeometryComponent::Type::Instance:
|
|
join_instances(components, allow_merging_instance_references, result);
|
|
return;
|
|
case bke::GeometryComponent::Type::Volume:
|
|
join_volumes(components, result);
|
|
return;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
std::unique_ptr<bke::Instances> instances = std::make_unique<bke::Instances>();
|
|
instances->resize(components.size());
|
|
instances->transforms_for_write().fill(float4x4::identity());
|
|
MutableSpan<int> handles = instances->reference_handles_for_write();
|
|
Map<const GeometryComponent *, int> handle_by_component;
|
|
for (const int i : components.index_range()) {
|
|
const GeometryComponent *component = components[i];
|
|
handles[i] = handle_by_component.lookup_or_add_cb(component, [&]() {
|
|
GeometrySet tmp_geo;
|
|
tmp_geo.add(*components[i]);
|
|
return instances->add_new_reference(bke::InstanceReference{tmp_geo});
|
|
});
|
|
}
|
|
|
|
RealizeInstancesOptions options;
|
|
options.keep_original_ids = true;
|
|
options.realize_instance_attributes = false;
|
|
options.attribute_filter = attribute_filter;
|
|
GeometrySet joined_components = realize_instances(
|
|
GeometrySet::from_instances(instances.release()), options);
|
|
result.add(joined_components.get_component_for_write(component_type));
|
|
}
|
|
|
|
GeometrySet join_geometries(
|
|
const Span<GeometrySet> geometries,
|
|
const bke::AttributeFilter &attribute_filter,
|
|
const std::optional<Span<GeometryComponent::Type>> &component_types_to_join,
|
|
const bool allow_merging_instance_references)
|
|
{
|
|
GeometrySet result;
|
|
result.name = geometries.is_empty() ? "" : geometries[0].name;
|
|
static const Array<GeometryComponent::Type> supported_types(
|
|
{GeometryComponent::Type::Mesh,
|
|
GeometryComponent::Type::PointCloud,
|
|
GeometryComponent::Type::Instance,
|
|
GeometryComponent::Type::Volume,
|
|
GeometryComponent::Type::Curve,
|
|
GeometryComponent::Type::GreasePencil,
|
|
GeometryComponent::Type::Edit});
|
|
|
|
const Span<GeometryComponent::Type> types_to_join = component_types_to_join.has_value() ?
|
|
*component_types_to_join :
|
|
Span<GeometryComponent::Type>(
|
|
supported_types);
|
|
|
|
for (const GeometryComponent::Type type : types_to_join) {
|
|
join_component_type(
|
|
type, geometries, attribute_filter, allow_merging_instance_references, result);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
} // namespace blender::geometry
|