aryeramaty/blender
0
0
Fork 1
forked from blender/blender
Code Pull Requests Activity

davidhaver-WIP-realize-depth #3

Closed
David-Haver wants to merge 65 commits from David-Haver/blender-old:davidhaver-WIP-realize-depth into WIP-realize-depth
pull from: David-Haver/blender-old:davidhaver-WIP-realize-depth
merge into: aryeramaty:WIP-realize-depth

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 65 Files Changed 5 +27 -17
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3b376b2f2b - Show all commits

40
source/blender/geometry/intern/realize_instances.cc
View File

@ -501,31 +501,36 @@ static Vector<std::pair<int, GSpan>> prepare_attribute_fallbacks(
* Calls #fn for every geometry in the given #InstanceReference. Also passes on the transformation * Calls #fn for every geometry in the given #InstanceReference. Also passes on the transformation
* that is applied to every instance. * that is applied to every instance.
*/ */
static bke::GeometrySet geometry_set_from_reference(const InstanceReference &reference) static bke::GeometrySet &geometry_set_from_reference(const InstanceReference &reference,
bke::GeometrySet &r_geometry_set)
{ {
switch (reference.type()) { switch (reference.type()) {
case InstanceReference::Type::Object: { case InstanceReference::Type::Object: {
const Object &object = reference.object(); const Object &object = reference.object();
return bke::object_get_evaluated_geometry_set(object); r_geometry_set = bke::object_get_evaluated_geometry_set(object);
break;
} }
case InstanceReference::Type::Collection: { case InstanceReference::Type::Collection: {
Collection *collection_ptr = &reference.collection(); Collection *collection_ptr = &reference.collection();
std::unique_ptr<bke::Instances> instances = std::make_unique<bke::Instances>(); std::unique_ptr<bke::Instances> instances = std::make_unique<bke::Instances>();
realize_collections(collection_ptr, instances.get()); realize_collections(collection_ptr, instances.get());
bke::GeometrySet collection_geometry = bke::GeometrySet::from_instances(instances.release()); r_geometry_set = bke::GeometrySet::from_instances(instances.release());
collection_geometry.get_component(bke::GeometryComponent::Type::Instance)->add_user(); break;
return collection_geometry;
} }
case InstanceReference::Type::GeometrySet: { case InstanceReference::Type::GeometrySet: {
return reference.geometry_set(); r_geometry_set = reference.geometry_set();
break;
} }
case InstanceReference::Type::None: { case InstanceReference::Type::None: {
return bke::GeometrySet(); // Return an empty GeometrySet for None type r_geometry_set = bke::GeometrySet(); // Return an empty GeometrySet for None type
break;
} }
default: { default: {
return bke::GeometrySet(); r_geometry_set = bke::GeometrySet();
break;
} }
} }
return r_geometry_set;
} }
static void foreach_geometry_in_reference( static void foreach_geometry_in_reference(
@ -535,7 +540,8 @@ static void foreach_geometry_in_reference(
FunctionRef<void(const bke::GeometrySet &geometry_set, const float4x4 &transform, uint32_t id)> FunctionRef<void(const bke::GeometrySet &geometry_set, const float4x4 &transform, uint32_t id)>
fn) fn)
{ {
const bke::GeometrySet geometry_set = geometry_set_from_reference(reference); bke::GeometrySet geometry_set;
geometry_set_from_reference(reference, geometry_set);
fn(geometry_set, base_transform, id); fn(geometry_set, base_transform, id);
} }
@ -769,8 +775,9 @@ bool static attribute_foreach(const bke::GeometrySet &geometry_set,
for (const int index : indices.index_range()) { for (const int index : indices.index_range()) {
const int i = indices[index]; const int i = indices[index];
const int depth_target_tmp = (current_depth == 0) ? instance_depth[i] : depth_target; const int depth_target_tmp = (current_depth == 0) ? instance_depth[i] : depth_target;
bke::GeometrySet instance_geometry_set = geometry_set_from_reference( bke::GeometrySet instance_geometry_set;
instances.references()[instances.reference_handles()[i]]); geometry_set_from_reference(instances.references()[instances.reference_handles()[i]],
instance_geometry_set);
/*Process child instances with a recursive call.*/ /*Process child instances with a recursive call.*/
if (current_depth != depth_target_tmp) { if (current_depth != depth_target_tmp) {
is_child_has_component = attribute_foreach(instance_geometry_set, is_child_has_component = attribute_foreach(instance_geometry_set,
@ -1955,9 +1962,9 @@ bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
return geometry_set; return geometry_set;
} }
Vector<const bke::GeometryComponent *> instances_components_to_merge; bke::GeometrySet not_to_realize_set;
instances_components_to_merge.append( propagate_instances_to_keep(
&geometry_set.get_component_for_write<bke::InstancesComponent>()); geometry_set, options.selection, not_to_realize_set, options.propagation_info);
if (options.keep_original_ids) { if (options.keep_original_ids) {
remove_id_attribute_from_instances(geometry_set); remove_id_attribute_from_instances(geometry_set);
@ -1988,9 +1995,12 @@ bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
const float4x4 transform = float4x4::identity(); const float4x4 transform = float4x4::identity();
InstanceContext attribute_fallbacks(gather_info); InstanceContext attribute_fallbacks(gather_info);
gather_info.instances.instances_components_to_merge = std::move(instances_components_to_merge); if (not_to_realize_set.has_instances()) {
gather_info.instances.instances_components_to_merge.append(
&not_to_realize_set.get_component_for_write<bke::InstancesComponent>());
gather_info.instances.instances_components_transforms.append(float4x4::identity()); gather_info.instances.instances_components_transforms.append(float4x4::identity());
gather_info.instances.attribute_fallback.append((gather_info.instances_attriubutes.size())); gather_info.instances.attribute_fallback.append((gather_info.instances_attriubutes.size()));
}
gather_realize_tasks_recursive(gather_info, 0, -1, geometry_set, transform, attribute_fallbacks); gather_realize_tasks_recursive(gather_info, 0, -1, geometry_set, transform, attribute_fallbacks);